* [gentoo-commits] repo/gentoo:master commit in: gnome-base/gconf/, app-dicts/myspell-ca/, x11-themes/gnome-icon-theme-symbolic/, ...
@ 2020-03-26 15:26 Mikle Kolyada
0 siblings, 0 replies; only message in thread
From: Mikle Kolyada @ 2020-03-26 15:26 UTC (permalink / raw
To: gentoo-commits
commit: 2e51443573bdad1d4757bed11ed5c02f137b822e
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 26 15:25:34 2020 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Thu Mar 26 15:25:34 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e514435
*/*: Discontinue Gentoo SuperH port
Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --ignore-arches
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
app-accessibility/at-spi2-atk/at-spi2-atk-2.32.0.ebuild | 2 +-
app-accessibility/at-spi2-atk/at-spi2-atk-2.34.0.ebuild | 4 ++--
app-accessibility/at-spi2-atk/at-spi2-atk-2.34.2.ebuild | 2 +-
app-admin/apache-tools/apache-tools-2.4.41.ebuild | 2 +-
app-admin/emacs-updater/emacs-updater-1.16.ebuild | 2 +-
app-admin/eselect/eselect-1.4.12.ebuild | 2 +-
app-admin/eselect/eselect-1.4.14.ebuild | 2 +-
app-admin/eselect/eselect-1.4.15.ebuild | 2 +-
app-admin/eselect/eselect-1.4.16.ebuild | 4 ++--
app-admin/fam/fam-2.7.0-r7.ebuild | 2 +-
app-admin/fam/fam-2.7.0_p17_p2.ebuild | 2 +-
app-admin/gam-server/gam-server-0.1.10-r2.ebuild | 2 +-
app-admin/gamin/gamin-0.1.10-r1.ebuild | 2 +-
app-admin/gnome-system-log/gnome-system-log-3.9.90.ebuild | 4 ++--
app-admin/logrotate/logrotate-3.14.0.ebuild | 2 +-
app-admin/logrotate/logrotate-3.15.1.ebuild | 2 +-
app-admin/logrotate/logrotate-3.16.0.ebuild | 2 +-
app-admin/logsentry/logsentry-1.1.1-r2.ebuild | 4 ++--
app-admin/metalog/metalog-20181125.ebuild | 2 +-
app-admin/metalog/metalog-20200113-r1.ebuild | 2 +-
app-admin/metalog/metalog-3-r2.ebuild | 2 +-
app-admin/perl-cleaner/perl-cleaner-2.27.ebuild | 2 +-
app-admin/perl-cleaner/perl-cleaner-2.28.ebuild | 4 ++--
app-admin/perl-cleaner/perl-cleaner-9999.ebuild | 4 ++--
app-admin/sudo/sudo-1.8.28_p1-r2.ebuild | 2 +-
app-admin/sudo/sudo-1.8.29-r2.ebuild | 4 ++--
app-admin/sudo/sudo-1.8.30.ebuild | 2 +-
app-admin/sudo/sudo-1.8.31.ebuild | 2 +-
app-admin/sudo/sudo-1.8.31_p1.ebuild | 2 +-
app-admin/sudo/sudo-9999.ebuild | 4 ++--
app-admin/superadduser/superadduser-1.0.9.ebuild | 2 +-
app-admin/superadduser/superadduser-1.15.ebuild | 4 ++--
app-admin/sysklogd/sysklogd-1.5.1-r1.ebuild | 2 +-
app-admin/sysklogd/sysklogd-2.0.3.ebuild | 4 ++--
app-admin/sysklogd/sysklogd-2.1.1.ebuild | 2 +-
app-admin/sysklogd/sysklogd-2.1.2.ebuild | 2 +-
app-admin/sysklogd/sysklogd-9999.ebuild | 2 +-
app-admin/syslog-ng/syslog-ng-3.22.1.ebuild | 2 +-
app-admin/syslog-ng/syslog-ng-3.24.1.ebuild | 2 +-
app-admin/syslog-ng/syslog-ng-3.25.1.ebuild | 2 +-
app-admin/syslog-ng/syslog-ng-3.26.1.ebuild | 2 +-
app-admin/sysstat/sysstat-12.2.1.ebuild | 2 +-
app-admin/sysstat/sysstat-12.3.1.ebuild | 2 +-
.../system-config-printer/system-config-printer-1.5.12-r1.ebuild | 2 +-
app-admin/webapp-config/webapp-config-1.55-r1.ebuild | 2 +-
app-admin/webapp-config/webapp-config-9999.ebuild | 2 +-
app-arch/bsdsfv/bsdsfv-1.18-r2.ebuild | 4 ++--
app-arch/bzip2/bzip2-1.0.6-r11.ebuild | 2 +-
app-arch/bzip2/bzip2-1.0.7.ebuild | 4 ++--
app-arch/bzip2/bzip2-1.0.8.ebuild | 4 ++--
app-arch/bzip2/bzip2-9999.ebuild | 4 ++--
| 4 ++--
| 2 +-
| 4 ++--
| 4 ++--
app-arch/cpio/cpio-2.12-r1.ebuild | 2 +-
app-arch/cpio/cpio-2.13.ebuild | 2 +-
app-arch/dpkg/dpkg-1.19.0.5.ebuild | 2 +-
app-arch/gzip/gzip-1.10.ebuild | 4 ++--
app-arch/gzip/gzip-1.9.ebuild | 2 +-
app-arch/lbzip2/lbzip2-2.5_p20181227-r1.ebuild | 2 +-
app-arch/lha/lha-114i-r9.ebuild | 2 +-
app-arch/libarchive/libarchive-3.4.2.ebuild | 2 +-
app-arch/lz4/lz4-1.9.2.ebuild | 2 +-
app-arch/lz4/lz4-9999.ebuild | 4 ++--
app-arch/lzip/lzip-1.21.ebuild | 2 +-
app-arch/ncompress/ncompress-4.2.4.5.ebuild | 2 +-
app-arch/ncompress/ncompress-4.2.4.6.ebuild | 4 ++--
app-arch/pax/pax-20161104.ebuild | 2 +-
app-arch/pbzip2/pbzip2-1.1.12-r1.ebuild | 2 +-
app-arch/pbzip2/pbzip2-1.1.12.ebuild | 2 +-
app-arch/pbzip2/pbzip2-1.1.13.ebuild | 2 +-
app-arch/pigz/pigz-2.4.ebuild | 2 +-
app-arch/pixz/pixz-1.0.6-r1.ebuild | 4 ++--
app-arch/pixz/pixz-9999.ebuild | 4 ++--
app-arch/rpm/rpm-4.14.1-r1.ebuild | 2 +-
app-arch/rpm/rpm-4.14.1.ebuild | 2 +-
app-arch/rpm/rpm-4.14.2.1.ebuild | 2 +-
app-arch/rpm2targz/rpm2targz-9.0.0.5g-r1.ebuild | 2 +-
app-arch/rpm2targz/rpm2targz-9.0.0.5g.ebuild | 2 +-
app-arch/sharutils/sharutils-4.15.2-r1.ebuild | 2 +-
app-arch/tar/tar-1.32.90.ebuild | 4 ++--
app-arch/tar/tar-1.32.ebuild | 2 +-
app-arch/unrar/unrar-5.7.5.ebuild | 2 +-
app-arch/unrar/unrar-5.8.5.ebuild | 4 ++--
app-arch/unrar/unrar-5.9.1.ebuild | 2 +-
app-arch/unzip/unzip-6.0_p21-r2.ebuild | 2 +-
app-arch/unzip/unzip-6.0_p25-r1.ebuild | 2 +-
app-arch/xz-utils/xz-utils-5.2.4-r2.ebuild | 2 +-
app-arch/xz-utils/xz-utils-5.2.4-r3.ebuild | 4 ++--
app-arch/xz-utils/xz-utils-5.2.5.ebuild | 2 +-
app-arch/xz-utils/xz-utils-9999.ebuild | 2 +-
app-arch/zip/zip-3.0-r3.ebuild | 2 +-
app-arch/zstd/zstd-1.3.7-r1.ebuild | 2 +-
app-backup/rdiff-backup/rdiff-backup-1.3.3-r3.ebuild | 2 +-
app-backup/rdiff-backup/rdiff-backup-2.0.0.ebuild | 2 +-
app-benchmarks/nbench/nbench-2.2.3-r1.ebuild | 2 +-
app-cdr/cdrdao/cdrdao-1.2.4.ebuild | 2 +-
app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild | 4 ++--
app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild | 2 +-
app-cdr/cue2toc/cue2toc-0.4.ebuild | 4 ++--
app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild | 2 +-
app-crypt/easy-rsa/easy-rsa-3.0.4.ebuild | 4 ++--
app-crypt/easy-rsa/easy-rsa-3.0.5.ebuild | 4 ++--
app-crypt/easy-rsa/easy-rsa-3.0.6.ebuild | 4 ++--
app-crypt/gcr/gcr-3.28.1.ebuild | 2 +-
app-crypt/gcr/gcr-3.34.0-r1.ebuild | 2 +-
app-crypt/gentoo-keys/gentoo-keys-201901130136.ebuild | 2 +-
app-crypt/gnupg/gnupg-2.2.19.ebuild | 2 +-
app-crypt/gpgme/gpgme-1.13.0-r1.ebuild | 2 +-
app-crypt/hashalot/hashalot-0.3-r2.ebuild | 2 +-
app-crypt/heimdal/heimdal-7.5.0.ebuild | 2 +-
app-crypt/heimdal/heimdal-7.6.0.ebuild | 2 +-
app-crypt/heimdal/heimdal-7.7.0-r1.ebuild | 2 +-
app-crypt/libb2/libb2-0.98.1-r1.ebuild | 2 +-
app-crypt/libb2/libb2-0.98.1-r2.ebuild | 4 ++--
app-crypt/mhash/mhash-0.9.9.9-r2.ebuild | 2 +-
app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3.ebuild | 2 +-
app-crypt/mit-krb5/mit-krb5-1.17-r1.ebuild | 2 +-
app-crypt/mit-krb5/mit-krb5-1.17.1.ebuild | 2 +-
app-crypt/mit-krb5/mit-krb5-1.18.ebuild | 2 +-
.../openpgp-keys-gentoo-auth/openpgp-keys-gentoo-auth-20191030.ebuild | 4 ++--
.../openpgp-keys-gentoo-release-20191030.ebuild | 2 +-
app-crypt/p11-kit/p11-kit-0.23.19-r1.ebuild | 2 +-
app-crypt/p11-kit/p11-kit-0.23.20-r1.ebuild | 2 +-
app-crypt/pinentry/pinentry-1.0.0-r2.ebuild | 2 +-
app-crypt/pinentry/pinentry-1.0.0-r3.ebuild | 4 ++--
app-crypt/pinentry/pinentry-1.1.0-r1.ebuild | 4 ++--
app-crypt/pinentry/pinentry-1.1.0-r2.ebuild | 2 +-
app-crypt/pinentry/pinentry-1.1.0-r3.ebuild | 4 ++--
app-crypt/shash/shash-0.2.6-r2.ebuild | 2 +-
app-crypt/shash/shash-0.2.6-r3.ebuild | 2 +-
app-crypt/tpm-tools/tpm-tools-1.3.9.1-r1.ebuild | 4 ++--
app-crypt/trousers/trousers-0.3.14-r1.ebuild | 4 ++--
app-crypt/trousers/trousers-0.3.14-r2.ebuild | 4 ++--
app-dicts/aspell-af/aspell-af-0.50.0.ebuild | 2 +-
app-dicts/aspell-be/aspell-be-0.01-r1.ebuild | 2 +-
app-dicts/aspell-bg/aspell-bg-4.1.0.ebuild | 2 +-
app-dicts/aspell-br/aspell-br-0.50.2.ebuild | 2 +-
app-dicts/aspell-ca/aspell-ca-2.1.5.1.ebuild | 2 +-
app-dicts/aspell-cs/aspell-cs-0.60.20040614.ebuild | 2 +-
app-dicts/aspell-cy/aspell-cy-0.50.3.ebuild | 2 +-
app-dicts/aspell-da/aspell-da-1.7.42.ebuild | 2 +-
app-dicts/aspell-de-alt/aspell-de-alt-2.1.1-r1.ebuild | 2 +-
app-dicts/aspell-de/aspell-de-0.60_pre20030222.ebuild | 2 +-
app-dicts/aspell-el/aspell-el-0.50.3.ebuild | 2 +-
app-dicts/aspell-en/aspell-en-2018.04.16.0.ebuild | 2 +-
app-dicts/aspell-eo/aspell-eo-2.1.20000225.2.ebuild | 2 +-
app-dicts/aspell-es/aspell-es-1.11_p2.ebuild | 4 ++--
app-dicts/aspell-es/aspell-es-1.9a.ebuild | 2 +-
app-dicts/aspell-et/aspell-et-0.1.21.1.ebuild | 2 +-
app-dicts/aspell-fi/aspell-fi-0.7.0.ebuild | 2 +-
app-dicts/aspell-fo/aspell-fo-0.51.0.ebuild | 2 +-
app-dicts/aspell-fr/aspell-fr-0.60.ebuild | 2 +-
app-dicts/aspell-ga/aspell-ga-0.50.4.ebuild | 2 +-
app-dicts/aspell-gl/aspell-gl-0.5.2.ebuild | 2 +-
app-dicts/aspell-he/aspell-he-1.0.0.ebuild | 2 +-
app-dicts/aspell-hr/aspell-hr-0.51.0.ebuild | 2 +-
app-dicts/aspell-is/aspell-is-0.51.1.0.ebuild | 2 +-
app-dicts/aspell-it/aspell-it-2.4.20070901.ebuild | 2 +-
app-dicts/aspell-la/aspell-la-6.0.20020503.0.ebuild | 2 +-
app-dicts/aspell-lt/aspell-lt-1.0.1.ebuild | 2 +-
app-dicts/aspell-nl/aspell-nl-0.50.2.ebuild | 2 +-
app-dicts/aspell-no/aspell-no-0.50.2.ebuild | 2 +-
app-dicts/aspell-pl/aspell-pl-6.0.20120418.0.ebuild | 2 +-
app-dicts/aspell-pt-br/aspell-pt-br-6.0.20090702.ebuild | 2 +-
app-dicts/aspell-pt/aspell-pt-0.50.2-r1.ebuild | 2 +-
app-dicts/aspell-ro/aspell-ro-3.3.2.ebuild | 2 +-
app-dicts/aspell-ru/aspell-ru-0.99.1-r1.ebuild | 2 +-
app-dicts/aspell-sk/aspell-sk-2.01.2.ebuild | 2 +-
app-dicts/aspell-sl/aspell-sl-0.50.0.ebuild | 2 +-
app-dicts/aspell-sr/aspell-sr-0.60.ebuild | 2 +-
app-dicts/aspell-sv/aspell-sv-0.51.0.ebuild | 2 +-
app-dicts/aspell-uk/aspell-uk-1.4.0.0.ebuild | 2 +-
app-dicts/aspell-vi/aspell-vi-0.01.1.1.ebuild | 2 +-
app-dicts/edictionary/edictionary-2.6-r1.ebuild | 4 ++--
app-dicts/gnome-dictionary/gnome-dictionary-3.26.1.ebuild | 4 ++--
app-dicts/myspell-af/myspell-af-20080701.ebuild | 2 +-
app-dicts/myspell-bg/myspell-bg-4.3.ebuild | 2 +-
app-dicts/myspell-ca/myspell-ca-2.3.0.ebuild | 2 +-
app-dicts/myspell-cs/myspell-cs-20110224.ebuild | 2 +-
app-dicts/myspell-cy/myspell-cy-20130708.ebuild | 2 +-
app-dicts/myspell-da/myspell-da-2.3.ebuild | 2 +-
app-dicts/myspell-de/myspell-de-2017.01.12.ebuild | 2 +-
app-dicts/myspell-de_1901/myspell-de_1901-20160403.ebuild | 2 +-
app-dicts/myspell-el/myspell-el-0.9.ebuild | 2 +-
app-dicts/myspell-en/myspell-en-20170101.ebuild | 2 +-
app-dicts/myspell-en/myspell-en-20181101.ebuild | 4 ++--
app-dicts/myspell-en/myspell-en-20190101-r1.ebuild | 4 ++--
app-dicts/myspell-en/myspell-en-20190101.ebuild | 4 ++--
app-dicts/myspell-eo/myspell-eo-1.0-r1.ebuild | 2 +-
app-dicts/myspell-es/myspell-es-0.7.ebuild | 2 +-
app-dicts/myspell-es/myspell-es-2.3.ebuild | 2 +-
app-dicts/myspell-et/myspell-et-20030606.ebuild | 2 +-
app-dicts/myspell-fo/myspell-fo-0.4.2.ebuild | 2 +-
app-dicts/myspell-fr/myspell-fr-4.5-r1.ebuild | 2 +-
app-dicts/myspell-ga/myspell-ga-20160213.ebuild | 2 +-
app-dicts/myspell-gl/myspell-gl-20131013.ebuild | 2 +-
app-dicts/myspell-he/myspell-he-2012.08.15.ebuild | 2 +-
app-dicts/myspell-hr/myspell-hr-20080813.ebuild | 2 +-
app-dicts/myspell-hu/myspell-hu-1.6.1.ebuild | 2 +-
app-dicts/myspell-ia/myspell-ia-20140518.ebuild | 2 +-
app-dicts/myspell-id/myspell-id-2.0.ebuild | 2 +-
app-dicts/myspell-is/myspell-is-2012.09.01.ebuild | 2 +-
app-dicts/myspell-it/myspell-it-20081129-r1.ebuild | 2 +-
app-dicts/myspell-kk/myspell-kk-1.1.2.ebuild | 2 +-
app-dicts/myspell-km/myspell-km-1.6.ebuild | 2 +-
app-dicts/myspell-ku/myspell-ku-0.21.ebuild | 2 +-
app-dicts/myspell-lt/myspell-lt-1.3.ebuild | 2 +-
app-dicts/myspell-lv/myspell-lv-1.3.0.ebuild | 2 +-
app-dicts/myspell-mi/myspell-mi-20060316-r1.ebuild | 2 +-
app-dicts/myspell-mk/myspell-mk-20091211.ebuild | 2 +-
app-dicts/myspell-ms/myspell-ms-20100407.ebuild | 2 +-
app-dicts/myspell-nb/myspell-nb-2.0.10.ebuild | 2 +-
app-dicts/myspell-nl/myspell-nl-2.10g-r1.ebuild | 2 +-
app-dicts/myspell-nl/myspell-nl-2.10g-r2.ebuild | 2 +-
app-dicts/myspell-nn/myspell-nn-2.0.10.ebuild | 2 +-
app-dicts/myspell-pl/myspell-pl-20130306.ebuild | 2 +-
app-dicts/myspell-pt-br/myspell-pt-br-3.0.0.ebuild | 2 +-
app-dicts/myspell-pt/myspell-pt-20120420.ebuild | 2 +-
app-dicts/myspell-ro/myspell-ro-3.3.10.ebuild | 2 +-
app-dicts/myspell-ru/myspell-ru-20150711-r2.ebuild | 2 +-
app-dicts/myspell-ru/myspell-ru-20180627.ebuild | 4 ++--
app-dicts/myspell-sk/myspell-sk-20110224.ebuild | 2 +-
app-dicts/myspell-sl/myspell-sl-2012.01.04.ebuild | 2 +-
app-dicts/myspell-sq/myspell-sq-1.6.4.ebuild | 2 +-
app-dicts/myspell-sv/myspell-sv-2.14.ebuild | 2 +-
app-dicts/myspell-sw/myspell-sw-20110106.ebuild | 2 +-
app-dicts/myspell-tn/myspell-tn-20060316.ebuild | 2 +-
app-dicts/myspell-uk/myspell-uk-1.6.5.ebuild | 2 +-
app-dicts/myspell-zu/myspell-zu-20100126.ebuild | 2 +-
app-doc/autobook/autobook-1.5.ebuild | 4 ++--
app-doc/devmanual/devmanual-0_pre20200207.ebuild | 2 +-
app-doc/devmanual/devmanual-9999.ebuild | 2 +-
app-doc/doxygen/doxygen-1.8.15.ebuild | 2 +-
app-doc/doxygen/doxygen-1.8.16-r1.ebuild | 2 +-
app-doc/doxygen/doxygen-1.8.17.ebuild | 2 +-
app-doc/doxygen/doxygen-9999.ebuild | 2 +-
app-doc/eclass-manpages/eclass-manpages-20200213.ebuild | 2 +-
app-doc/linkers-and-loaders/linkers-and-loaders-1-r1.ebuild | 2 +-
app-doc/linkers-and-loaders/linkers-and-loaders-1.ebuild | 2 +-
app-doc/linux-device-drivers/linux-device-drivers-3.ebuild | 4 ++--
.../linux-kernel-in-a-nutshell/linux-kernel-in-a-nutshell-1-r1.ebuild | 2 +-
app-doc/linuxfromscratch/linuxfromscratch-7.10.ebuild | 2 +-
app-doc/linuxfromscratch/linuxfromscratch-8.0.ebuild | 4 ++--
app-doc/linuxfromscratch/linuxfromscratch-8.2.ebuild | 4 ++--
app-doc/motif-reference-manual/motif-reference-manual-2.3.0-r2.ebuild | 2 +-
app-doc/php-docs/php-docs-20101029-r1.ebuild | 2 +-
app-doc/php-docs/php-docs-20190203.ebuild | 4 ++--
app-doc/phrack-all/phrack-all-69.ebuild | 2 +-
app-doc/phrack/phrack-01.ebuild | 2 +-
app-doc/phrack/phrack-02.ebuild | 2 +-
app-doc/phrack/phrack-03.ebuild | 2 +-
app-doc/phrack/phrack-04.ebuild | 2 +-
app-doc/phrack/phrack-05.ebuild | 2 +-
app-doc/phrack/phrack-06.ebuild | 2 +-
app-doc/phrack/phrack-07.ebuild | 2 +-
app-doc/phrack/phrack-08.ebuild | 2 +-
app-doc/phrack/phrack-09.ebuild | 2 +-
app-doc/phrack/phrack-10.ebuild | 2 +-
app-doc/phrack/phrack-11.ebuild | 2 +-
app-doc/phrack/phrack-12.ebuild | 2 +-
app-doc/phrack/phrack-13.ebuild | 2 +-
app-doc/phrack/phrack-14.ebuild | 2 +-
app-doc/phrack/phrack-15.ebuild | 2 +-
app-doc/phrack/phrack-16.ebuild | 2 +-
app-doc/phrack/phrack-17.ebuild | 2 +-
app-doc/phrack/phrack-18.ebuild | 2 +-
app-doc/phrack/phrack-19.ebuild | 2 +-
app-doc/phrack/phrack-20.ebuild | 2 +-
app-doc/phrack/phrack-21.ebuild | 2 +-
app-doc/phrack/phrack-22.ebuild | 2 +-
app-doc/phrack/phrack-23.ebuild | 2 +-
app-doc/phrack/phrack-24.ebuild | 2 +-
app-doc/phrack/phrack-25.ebuild | 2 +-
app-doc/phrack/phrack-26.ebuild | 2 +-
app-doc/phrack/phrack-27.ebuild | 2 +-
app-doc/phrack/phrack-28.ebuild | 2 +-
app-doc/phrack/phrack-29.ebuild | 2 +-
app-doc/phrack/phrack-30.ebuild | 2 +-
app-doc/phrack/phrack-31.ebuild | 2 +-
app-doc/phrack/phrack-32.ebuild | 2 +-
app-doc/phrack/phrack-33.ebuild | 2 +-
app-doc/phrack/phrack-34.ebuild | 2 +-
app-doc/phrack/phrack-35.ebuild | 2 +-
app-doc/phrack/phrack-36.ebuild | 2 +-
app-doc/phrack/phrack-37.ebuild | 2 +-
app-doc/phrack/phrack-38.ebuild | 2 +-
app-doc/phrack/phrack-39.ebuild | 2 +-
app-doc/phrack/phrack-40.ebuild | 2 +-
app-doc/phrack/phrack-41.ebuild | 2 +-
app-doc/phrack/phrack-42.ebuild | 2 +-
app-doc/phrack/phrack-43.ebuild | 2 +-
app-doc/phrack/phrack-44.ebuild | 2 +-
app-doc/phrack/phrack-45.ebuild | 2 +-
app-doc/phrack/phrack-46.ebuild | 2 +-
app-doc/phrack/phrack-47.ebuild | 2 +-
app-doc/phrack/phrack-48.ebuild | 2 +-
app-doc/phrack/phrack-49.ebuild | 2 +-
app-doc/phrack/phrack-50.ebuild | 2 +-
app-doc/phrack/phrack-51.ebuild | 2 +-
app-doc/phrack/phrack-52.ebuild | 2 +-
app-doc/phrack/phrack-53.ebuild | 2 +-
app-doc/phrack/phrack-54.ebuild | 2 +-
app-doc/phrack/phrack-55.ebuild | 2 +-
app-doc/phrack/phrack-56.ebuild | 2 +-
app-doc/phrack/phrack-57.ebuild | 2 +-
app-doc/phrack/phrack-58.ebuild | 2 +-
app-doc/phrack/phrack-59.ebuild | 2 +-
app-doc/phrack/phrack-60.ebuild | 2 +-
app-doc/phrack/phrack-61.ebuild | 2 +-
app-doc/phrack/phrack-62.ebuild | 2 +-
app-doc/phrack/phrack-63.ebuild | 2 +-
app-doc/phrack/phrack-64.ebuild | 2 +-
app-doc/phrack/phrack-65.ebuild | 2 +-
app-doc/phrack/phrack-66.ebuild | 2 +-
app-doc/phrack/phrack-67.ebuild | 2 +-
app-doc/phrack/phrack-68.ebuild | 2 +-
app-doc/phrack/phrack-69.ebuild | 2 +-
app-doc/pms-bin/pms-bin-5_p20120920.ebuild | 2 +-
app-doc/pms-bin/pms-bin-7_p20180430.ebuild | 2 +-
app-doc/pms/pms-5_p20120920.ebuild | 2 +-
app-doc/pms/pms-7_p20180430-r1.ebuild | 2 +-
app-doc/tldp-howto/tldp-howto-20120707.ebuild | 2 +-
app-doc/zsh-lovers/zsh-lovers-0.9.0.ebuild | 2 +-
app-doc/zsh-lovers/zsh-lovers-0.9.1.ebuild | 4 ++--
app-editors/emacs/emacs-23.4-r18.ebuild | 2 +-
app-editors/emacs/emacs-24.5-r7.ebuild | 2 +-
app-editors/emacs/emacs-25.3-r6.ebuild | 2 +-
app-editors/emacs/emacs-26.3-r1.ebuild | 2 +-
app-editors/emacs/emacs-27.0.50_pre20191223.ebuild | 2 +-
app-editors/emacs/emacs-27.0.90.ebuild | 2 +-
app-editors/emacs/emacs-27.0.9999-r1.ebuild | 2 +-
app-editors/emacs/emacs-28.0.9999.ebuild | 2 +-
app-editors/gedit/gedit-3.32.2-r1.ebuild | 2 +-
app-editors/gedit/gedit-3.34.1.ebuild | 2 +-
app-editors/hexcurse/hexcurse-1.55.ebuild | 2 +-
app-editors/hexcurse/hexcurse-1.60.0.ebuild | 4 ++--
app-editors/hexedit/hexedit-1.2.13.ebuild | 2 +-
app-editors/nano/nano-4.2.ebuild | 2 +-
app-editors/nano/nano-4.6.ebuild | 2 +-
app-editors/nano/nano-4.8.ebuild | 2 +-
app-editors/nano/nano-4.9.ebuild | 2 +-
app-editors/nano/nano-9999.ebuild | 4 ++--
app-editors/vim-core/vim-core-8.1.1486.ebuild | 2 +-
app-editors/vim-core/vim-core-8.1.1846.ebuild | 4 ++--
app-editors/vim-core/vim-core-8.2.0055.ebuild | 2 +-
app-editors/vim-core/vim-core-8.2.0114.ebuild | 2 +-
app-editors/vim-core/vim-core-8.2.0210.ebuild | 2 +-
app-editors/vim-core/vim-core-8.2.0360.ebuild | 2 +-
app-editors/vim-core/vim-core-9999.ebuild | 2 +-
app-editors/vim/vim-8.1.1486.ebuild | 2 +-
app-editors/vim/vim-8.1.1846.ebuild | 2 +-
app-editors/vim/vim-8.2.0055.ebuild | 2 +-
app-editors/vim/vim-8.2.0114.ebuild | 2 +-
app-editors/vim/vim-8.2.0210.ebuild | 2 +-
app-editors/vim/vim-8.2.0360.ebuild | 2 +-
app-editors/vim/vim-9999.ebuild | 2 +-
app-emacs/autoconf-mode/autoconf-mode-2.69-r1.ebuild | 2 +-
app-emacs/doctest-mode/doctest-mode-0.4.ebuild | 4 ++--
app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r3.ebuild | 2 +-
app-emacs/emacs-daemon/emacs-daemon-0.22.ebuild | 2 +-
app-emacs/eselect-mode/eselect-mode-1.4.14.ebuild | 2 +-
app-emacs/eselect-mode/eselect-mode-1.4.15.ebuild | 2 +-
app-emacs/eselect-mode/eselect-mode-1.4.16.ebuild | 4 ++--
app-emacs/lua-mode/lua-mode-20151025.ebuild | 2 +-
app-emacs/po-mode/po-mode-0.20.1.ebuild | 2 +-
app-emacs/pymacs/pymacs-0.26.ebuild | 2 +-
app-emacs/python-mode/python-mode-6.2.3.ebuild | 4 ++--
app-emacs/ruby-mode/ruby-mode-2.4.1.ebuild | 2 +-
app-emacs/ruby-mode/ruby-mode-2.5.5.ebuild | 2 +-
app-emacs/ruby-mode/ruby-mode-2.6.3.ebuild | 4 ++--
app-emacs/ruby-mode/ruby-mode-2.7.0.ebuild | 4 ++--
app-eselect/eselect-awk/eselect-awk-0.2.ebuild | 2 +-
app-eselect/eselect-cblas/eselect-cblas-0.1.ebuild | 2 +-
app-eselect/eselect-cdparanoia/eselect-cdparanoia-0.1.ebuild | 2 +-
app-eselect/eselect-ctags/eselect-ctags-1.18.ebuild | 2 +-
app-eselect/eselect-electron/eselect-electron-2.1.ebuild | 2 +-
app-eselect/eselect-emacs/eselect-emacs-1.18.ebuild | 2 +-
app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild | 2 +-
app-eselect/eselect-iptables/eselect-iptables-20200319.ebuild | 2 +-
.../eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.1-r1.ebuild | 2 +-
app-eselect/eselect-lua/eselect-lua-1.ebuild | 2 +-
app-eselect/eselect-mpost/eselect-mpost-0.3.ebuild | 2 +-
app-eselect/eselect-notify-send/eselect-notify-send-0.1.ebuild | 2 +-
app-eselect/eselect-opengl/eselect-opengl-1.3.1-r4.ebuild | 2 +-
.../eselect-package-manager-20110108-r1.ebuild | 2 +-
app-eselect/eselect-pdftex/eselect-pdftex-0.3.ebuild | 2 +-
app-eselect/eselect-php/eselect-php-0.9.4-r5.ebuild | 2 +-
app-eselect/eselect-php/eselect-php-0.9.5.ebuild | 2 +-
app-eselect/eselect-php/eselect-php-0.9.6.ebuild | 2 +-
app-eselect/eselect-pinentry/eselect-pinentry-0.7.ebuild | 2 +-
app-eselect/eselect-postgresql/eselect-postgresql-2.4.ebuild | 2 +-
app-eselect/eselect-python/eselect-python-20190417.ebuild | 2 +-
app-eselect/eselect-python/eselect-python-99999999.ebuild | 4 ++--
app-eselect/eselect-repository/eselect-repository-7.ebuild | 2 +-
app-eselect/eselect-ruby/eselect-ruby-20170723.ebuild | 2 +-
app-eselect/eselect-ruby/eselect-ruby-20190121.ebuild | 2 +-
app-eselect/eselect-ruby/eselect-ruby-20191222.ebuild | 4 ++--
app-eselect/eselect-sh/eselect-sh-0.4-r2.ebuild | 2 +-
app-eselect/eselect-vi/eselect-vi-1.1.9-r1.ebuild | 2 +-
app-eselect/eselect-vi/eselect-vi-1.1.9.ebuild | 2 +-
app-eselect/eselect-wxwidgets/eselect-wxwidgets-20140423.ebuild | 2 +-
app-eselect/eselect-wxwidgets/eselect-wxwidgets-20180529.ebuild | 2 +-
app-eselect/eselect-xvmc/eselect-xvmc-0.4.ebuild | 2 +-
app-forensics/chkrootkit/chkrootkit-0.52.ebuild | 2 +-
app-forensics/chkrootkit/chkrootkit-0.53.ebuild | 4 ++--
app-i18n/man-pages-de/man-pages-de-2.12-r1.ebuild | 4 ++--
app-i18n/man-pages-de/man-pages-de-2.12.ebuild | 2 +-
app-i18n/man-pages-de/man-pages-de-2.16.ebuild | 2 +-
app-i18n/man-pages-fr/man-pages-fr-3.70-r1.ebuild | 2 +-
app-i18n/man-pages-it/man-pages-it-4.00.ebuild | 2 +-
app-i18n/man-pages-ja/man-pages-ja-20171215.ebuild | 2 +-
app-i18n/man-pages-ja/man-pages-ja-20180315.ebuild | 4 ++--
app-i18n/man-pages-l10n/man-pages-l10n-4.0.0.ebuild | 2 +-
app-i18n/man-pages-nl/man-pages-nl-0.13.3.ebuild | 2 +-
app-i18n/man-pages-pl/man-pages-pl-0.7-r1.ebuild | 4 ++--
app-i18n/man-pages-pl/man-pages-pl-0.7.ebuild | 2 +-
app-i18n/man-pages-ru/man-pages-ru-4.16.2383.2383.20180422.ebuild | 2 +-
app-i18n/man-pages-zh_CN/man-pages-zh_CN-1.6.3.2.ebuild | 2 +-
app-i18n/nkf/nkf-2.1.3-r2.ebuild | 2 +-
app-i18n/nkf/nkf-2.1.4.ebuild | 2 +-
app-i18n/unicode-data/unicode-data-12.0.0.ebuild | 2 +-
app-i18n/unicode-data/unicode-data-12.1.0.ebuild | 4 ++--
app-misc/c_rehash/c_rehash-1.0.2g_p8.ebuild | 4 ++--
app-misc/c_rehash/c_rehash-1.7-r1.ebuild | 2 +-
app-misc/ca-certificates/ca-certificates-20190110.3.43.ebuild | 2 +-
app-misc/datefudge/datefudge-1.22.ebuild | 2 +-
app-misc/devtodo/devtodo-0.1.20-r3.ebuild | 2 +-
app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild | 2 +-
app-misc/evtest/evtest-1.33.ebuild | 4 ++--
app-misc/evtest/evtest-1.34.ebuild | 4 ++--
app-misc/lockfile-progs/lockfile-progs-0.1.17.ebuild | 4 ++--
app-misc/mc/mc-4.8.24.ebuild | 2 +-
app-misc/mc/mc-9999.ebuild | 2 +-
app-misc/media-player-info/media-player-info-23.ebuild | 2 +-
app-misc/mime-types/mime-types-9.ebuild | 2 +-
app-misc/pax-utils/pax-utils-1.2.4-r1.ebuild | 2 +-
app-misc/pax-utils/pax-utils-1.2.5.ebuild | 2 +-
app-misc/realpath/realpath-1.17.ebuild | 2 +-
app-misc/realpath/realpath-1.18.ebuild | 4 ++--
app-misc/screen/screen-4.6.1.ebuild | 2 +-
app-misc/screen/screen-4.6.2-r1.ebuild | 4 ++--
app-misc/screen/screen-4.7.0.ebuild | 2 +-
app-misc/screen/screen-4.8.0.ebuild | 2 +-
app-misc/screen/screen-9999.ebuild | 2 +-
app-misc/tmux/tmux-2.9a.ebuild | 2 +-
app-misc/tmux/tmux-3.0a.ebuild | 4 ++--
app-misc/tmux/tmux-9999.ebuild | 4 ++--
app-misc/zisofs-tools/zisofs-tools-1.0.8.ebuild | 2 +-
app-portage/demerge/demerge-0.047-r3.ebuild | 2 +-
app-portage/eix/eix-0.33.9-r1.ebuild | 2 +-
app-portage/elt-patches/elt-patches-20170317.ebuild | 2 +-
app-portage/elt-patches/elt-patches-20170422.ebuild | 2 +-
app-portage/elt-patches/elt-patches-20170815.ebuild | 2 +-
app-portage/elt-patches/elt-patches-20170826.1.ebuild | 2 +-
app-portage/esearch/esearch-1.3-r2.ebuild | 2 +-
app-portage/g-cpan/g-cpan-0.16.5.ebuild | 2 +-
app-portage/g-cpan/g-cpan-0.16.6.ebuild | 4 ++--
app-portage/g-cpan/g-cpan-0.16.7.ebuild | 4 ++--
app-portage/g-cpan/g-cpan-0.16.9-r1.ebuild | 2 +-
app-portage/g-cpan/g-cpan-9999.ebuild | 4 ++--
app-portage/gemato/gemato-14.3.ebuild | 2 +-
app-portage/genlop/genlop-0.30.10-r1.ebuild | 4 ++--
app-portage/genlop/genlop-0.30.10-r2.ebuild | 2 +-
app-portage/genlop/genlop-0.30.9-r1.ebuild | 2 +-
app-portage/gentoolkit/gentoolkit-0.4.6.ebuild | 2 +-
app-portage/gentoolkit/gentoolkit-0.4.7.ebuild | 2 +-
app-portage/gentoolkit/gentoolkit-0.4.8.ebuild | 2 +-
app-portage/mirrorselect/mirrorselect-2.2.3.ebuild | 2 +-
app-portage/mirrorselect/mirrorselect-2.2.4-r1.ebuild | 2 +-
app-portage/mirrorselect/mirrorselect-2.2.6-r1.ebuild | 2 +-
app-portage/portage-utils/portage-utils-0.74.ebuild | 2 +-
app-portage/portage-utils/portage-utils-0.80.ebuild | 2 +-
app-portage/portage-utils/portage-utils-0.86.ebuild | 2 +-
app-portage/portage-utils/portage-utils-9999.ebuild | 2 +-
app-portage/repoman/repoman-2.3.16.ebuild | 2 +-
app-portage/repoman/repoman-2.3.20.ebuild | 2 +-
app-portage/repoman/repoman-2.3.21.ebuild | 2 +-
app-portage/repoman/repoman-2.3.22.ebuild | 2 +-
app-portage/repoman/repoman-9999.ebuild | 2 +-
app-portage/ufed/ufed-0.94.ebuild | 2 +-
app-portage/ufed/ufed-0.95.ebuild | 4 ++--
app-portage/ufed/ufed-9999.ebuild | 4 ++--
app-shells/bash-completion/bash-completion-2.10.ebuild | 2 +-
app-shells/bash-completion/bash-completion-2.9-r1.ebuild | 2 +-
app-shells/bash/bash-2.05b_p13.ebuild | 2 +-
app-shells/bash/bash-3.0_p22.ebuild | 2 +-
app-shells/bash/bash-3.1_p23.ebuild | 2 +-
app-shells/bash/bash-3.2_p57.ebuild | 2 +-
app-shells/bash/bash-4.0_p44.ebuild | 2 +-
app-shells/bash/bash-4.1_p17.ebuild | 2 +-
app-shells/bash/bash-4.2_p53.ebuild | 2 +-
app-shells/bash/bash-4.3_p48-r2.ebuild | 2 +-
app-shells/bash/bash-4.4_p23-r1.ebuild | 2 +-
app-shells/bash/bash-5.0_p11.ebuild | 2 +-
app-shells/bash/bash-5.0_p16.ebuild | 2 +-
app-shells/dash/dash-0.5.10.1-r2.ebuild | 4 ++--
app-shells/dash/dash-0.5.10.2-r1.ebuild | 2 +-
app-shells/dash/dash-0.5.10.2.ebuild | 4 ++--
app-shells/dash/dash-0.5.9.1-r3.ebuild | 2 +-
app-shells/gentoo-bashcomp/gentoo-bashcomp-20180302.ebuild | 2 +-
app-shells/gentoo-bashcomp/gentoo-bashcomp-20190211.ebuild | 2 +-
.../gentoo-zsh-completions/gentoo-zsh-completions-20180228.ebuild | 2 +-
.../gentoo-zsh-completions/gentoo-zsh-completions-99999999.ebuild | 2 +-
app-shells/mksh/mksh-57-r2.ebuild | 2 +-
app-shells/mksh/mksh-9999.ebuild | 4 ++--
app-shells/push/push-2.0-r1.ebuild | 2 +-
app-shells/quoter/quoter-3.0_p2-r1.ebuild | 2 +-
app-shells/sash/sash-3.8.ebuild | 2 +-
app-shells/tcsh/tcsh-6.20.00.ebuild | 2 +-
app-shells/tcsh/tcsh-6.21.00-r1.ebuild | 2 +-
app-shells/zsh/zsh-5.8.ebuild | 2 +-
app-shells/zsh/zsh-9999.ebuild | 4 ++--
app-text/a2ps/a2ps-4.14-r6.ebuild | 2 +-
app-text/asciidoc/asciidoc-8.6.10_p20181016-r1.ebuild | 2 +-
app-text/asciidoc/asciidoc-9.0.0_rc1.ebuild | 2 +-
app-text/aspell/aspell-0.60.8.ebuild | 2 +-
app-text/bdf2psf/bdf2psf-1.104.ebuild | 2 +-
app-text/bdf2psf/bdf2psf-1.155.ebuild | 4 ++--
app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild | 2 +-
app-text/delta/delta-20060803-r1.ebuild | 2 +-
app-text/djvu/djvu-3.5.27-r1.ebuild | 2 +-
.../docbook-dsssl-stylesheets-1.79-r4.ebuild | 2 +-
app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r4.ebuild | 2 +-
app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild | 2 +-
app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r4.ebuild | 2 +-
app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild | 2 +-
app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r3.ebuild | 2 +-
app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r3.ebuild | 2 +-
app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r1.ebuild | 2 +-
app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild | 2 +-
app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r3.ebuild | 2 +-
app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild | 2 +-
app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild | 2 +-
app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild | 2 +-
app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild | 2 +-
app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild | 2 +-
app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild | 2 +-
.../docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild | 2 +-
.../docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild | 2 +-
.../docbook-xsl-ns-stylesheets-1.78.0.ebuild | 2 +-
.../docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild | 2 +-
app-text/docbook2X/docbook2X-0.8.8-r4.ebuild | 2 +-
app-text/dos2unix/dos2unix-7.3.5.ebuild | 2 +-
app-text/dos2unix/dos2unix-7.4.1.ebuild | 4 ++--
app-text/dos2unix/dos2unix-7.4.2_beta1.ebuild | 4 ++--
app-text/dvipng/dvipng-1.15-r1.ebuild | 2 +-
app-text/dvipsk/dvipsk-5.999_p20190410.ebuild | 2 +-
app-text/dvisvgm/dvisvgm-2.1.3.ebuild | 2 +-
app-text/dvisvgm/dvisvgm-2.6.1.ebuild | 4 ++--
app-text/dvisvgm/dvisvgm-2.7.ebuild | 4 ++--
app-text/enchant/enchant-1.6.1-r1.ebuild | 2 +-
app-text/enchant/enchant-2.2.7.ebuild | 2 +-
app-text/epspdf/epspdf-0.6.0-r1.ebuild | 2 +-
app-text/epspdf/epspdf-0.6.3-r1.ebuild | 4 ++--
app-text/ghostscript-gpl/ghostscript-gpl-9.26.ebuild | 2 +-
app-text/ghostscript-gpl/ghostscript-gpl-9.50.ebuild | 2 +-
app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild | 2 +-
app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r2.ebuild | 2 +-
app-text/highlight/highlight-3.42-r1.ebuild | 2 +-
app-text/htmltidy/htmltidy-20090325-r2.ebuild | 2 +-
app-text/hunspell/hunspell-1.7.0-r1.ebuild | 2 +-
app-text/iso-codes/iso-codes-4.4.ebuild | 2 +-
app-text/jadetex/jadetex-3.13-r8.ebuild | 2 +-
app-text/lcdf-typetools/lcdf-typetools-2.106.ebuild | 2 +-
app-text/lcdf-typetools/lcdf-typetools-2.107.ebuild | 4 ++--
app-text/lcdf-typetools/lcdf-typetools-2.108.ebuild | 4 ++--
app-text/lesspipe/lesspipe-1.83-r1.ebuild | 4 ++--
app-text/lesspipe/lesspipe-1.83.ebuild | 4 ++--
app-text/lesspipe/lesspipe-1.84.ebuild | 4 ++--
app-text/libpaper/libpaper-1.1.24_p5.ebuild | 2 +-
app-text/libpaper/libpaper-1.1.28.ebuild | 2 +-
app-text/lv/lv-4.51-r4.ebuild | 2 +-
| 2 +-
app-text/openjade/openjade-1.3.2-r9.ebuild | 2 +-
app-text/opensp/opensp-1.5.2-r3.ebuild | 2 +-
app-text/opensp/opensp-1.5.2-r6.ebuild | 2 +-
app-text/passivetex/passivetex-1.25-r1.ebuild | 2 +-
app-text/pdfjam/pdfjam-2.08-r1.ebuild | 2 +-
app-text/po4a/po4a-0.47-r1.ebuild | 2 +-
app-text/po4a/po4a-0.56.ebuild | 4 ++--
app-text/po4a/po4a-0.57.ebuild | 2 +-
app-text/poppler-data/poppler-data-0.4.9.ebuild | 2 +-
app-text/poppler/poppler-0.82.0.ebuild | 2 +-
app-text/poppler/poppler-0.85.0.ebuild | 2 +-
app-text/poppler/poppler-0.86.1.ebuild | 2 +-
app-text/poppler/poppler-9999.ebuild | 2 +-
app-text/ps2eps/ps2eps-1.68.ebuild | 2 +-
app-text/ps2pkm/ps2pkm-1.8_p20190410.ebuild | 2 +-
app-text/psutils/psutils-1.17-r3.ebuild | 2 +-
app-text/rarian/rarian-0.8.1-r3.ebuild | 2 +-
app-text/recode/recode-3.6_p20-r1.ebuild | 2 +-
app-text/recode/recode-3.7_pre20140303.ebuild | 4 ++--
app-text/rman/rman-3.2-r1.ebuild | 2 +-
app-text/sablotron/sablotron-1.0.3-r1.ebuild | 2 +-
app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r1.ebuild | 2 +-
app-text/sgml-common/sgml-common-0.6.3-r7.ebuild | 2 +-
app-text/sgmltools-lite/sgmltools-lite-3.0.3-r15.ebuild | 2 +-
app-text/t1utils/t1utils-1.41-r2.ebuild | 2 +-
app-text/teckit/teckit-2.5.6.ebuild | 2 +-
app-text/texi2html/texi2html-5.0-r1.ebuild | 2 +-
app-text/texlive-core/texlive-core-2019-r10.ebuild | 2 +-
app-text/texlive/texlive-2019-r1.ebuild | 2 +-
app-text/tidy-html5/tidy-html5-5.6.0.ebuild | 2 +-
app-text/tree/tree-1.7.0-r1.ebuild | 4 ++--
app-text/tree/tree-1.7.0.ebuild | 2 +-
app-text/tree/tree-1.8.0.ebuild | 4 ++--
app-text/ttf2pk2/ttf2pk2-2.0_p20190410.ebuild | 2 +-
app-text/unrtf/unrtf-0.21.10.ebuild | 2 +-
app-text/unrtf/unrtf-0.21.9.ebuild | 2 +-
app-text/vlna/vlna-1.5.ebuild | 2 +-
app-text/wdiff/wdiff-1.2.2-r1.ebuild | 4 ++--
app-text/wdiff/wdiff-1.2.2.ebuild | 2 +-
app-text/wgetpaste/wgetpaste-2.28-r2.ebuild | 2 +-
app-text/wgetpaste/wgetpaste-2.29-r1.ebuild | 4 ++--
app-text/xdvik/xdvik-22.87.03-r1.ebuild | 2 +-
app-text/xdvik/xdvik-22.87.03-r2.ebuild | 4 ++--
app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild | 2 +-
app-text/xmlto/xmlto-0.0.28-r1.ebuild | 2 +-
app-text/yelp-tools/yelp-tools-3.32.2.ebuild | 2 +-
app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r1.ebuild | 2 +-
app-vim/eselect-syntax/eselect-syntax-20070506-r1.ebuild | 2 +-
app-vim/gentoo-syntax/gentoo-syntax-20200120.ebuild | 2 +-
app-vim/gtk-syntax/gtk-syntax-20130716.ebuild | 2 +-
app-vim/ntp-syntax/ntp-syntax-20031001-r1.ebuild | 2 +-
dev-cpp/atkmm/atkmm-2.28.0.ebuild | 2 +-
dev-cpp/cairomm/cairomm-1.12.0-r1.ebuild | 2 +-
dev-cpp/gconfmm/gconfmm-2.28.3-r1.ebuild | 2 +-
dev-cpp/gflags/gflags-2.2.0.ebuild | 4 ++--
dev-cpp/gflags/gflags-2.2.1-r1.ebuild | 4 ++--
dev-cpp/gflags/gflags-2.2.1.ebuild | 4 ++--
dev-cpp/gflags/gflags-9999.ebuild | 4 ++--
dev-cpp/glibmm/glibmm-2.60.1.ebuild | 2 +-
dev-cpp/glibmm/glibmm-2.62.0.ebuild | 2 +-
dev-cpp/glog/glog-0.3.4-r1.ebuild | 2 +-
dev-cpp/glog/glog-0.4.0.ebuild | 2 +-
dev-cpp/gtest/gtest-1.10.0.ebuild | 2 +-
dev-cpp/gtest/gtest-1.8.0-r1.ebuild | 2 +-
dev-cpp/gtest/gtest-1.8.0.ebuild | 2 +-
dev-cpp/gtest/gtest-1.8.1-r1.ebuild | 2 +-
dev-cpp/gtest/gtest-1.8.1.ebuild | 2 +-
dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild | 2 +-
dev-cpp/gtest/gtest-9999.ebuild | 2 +-
dev-cpp/gtkmm/gtkmm-2.24.5.ebuild | 2 +-
dev-cpp/gtkmm/gtkmm-3.24.2.ebuild | 2 +-
dev-cpp/libglademm/libglademm-2.6.7-r2.ebuild | 2 +-
dev-cpp/libgnomecanvasmm/libgnomecanvasmm-2.26.0-r1.ebuild | 2 +-
dev-cpp/mm-common/mm-common-0.9.12.ebuild | 4 ++--
dev-cpp/pangomm/pangomm-2.42.0.ebuild | 2 +-
dev-cpp/pangomm/pangomm-2.42.1.ebuild | 2 +-
dev-db/cdb/cdb-0.75-r4.ebuild | 2 +-
dev-db/freetds/freetds-1.00.558.ebuild | 2 +-
dev-db/libdbi-drivers/libdbi-drivers-0.9.0-r1.ebuild | 2 +-
dev-db/libdbi-drivers/libdbi-drivers-0.9.0.ebuild | 2 +-
dev-db/libdbi/libdbi-0.9.0.ebuild | 2 +-
dev-db/libiodbc/libiodbc-3.52.12.ebuild | 2 +-
dev-db/lmdb/lmdb-0.9.23.ebuild | 2 +-
dev-db/lmdb/lmdb-0.9.24.ebuild | 4 ++--
dev-db/m17n-db/m17n-db-1.7.0.ebuild | 2 +-
dev-db/m17n-db/m17n-db-1.8.0.ebuild | 4 ++--
dev-db/mysql-connector-c/mysql-connector-c-6.1.11-r2.ebuild | 2 +-
dev-db/mysql-connector-c/mysql-connector-c-8.0.19.ebuild | 2 +-
dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r3.ebuild | 2 +-
dev-db/pgxnclient/pgxnclient-1.2-r1.ebuild | 2 +-
dev-db/pgxnclient/pgxnclient-1.2.1.ebuild | 2 +-
dev-db/postgresql/postgresql-10.10.ebuild | 2 +-
dev-db/postgresql/postgresql-10.11.ebuild | 2 +-
dev-db/postgresql/postgresql-10.12.ebuild | 2 +-
dev-db/postgresql/postgresql-10.9.ebuild | 2 +-
dev-db/postgresql/postgresql-11.4.ebuild | 2 +-
dev-db/postgresql/postgresql-11.5.ebuild | 2 +-
dev-db/postgresql/postgresql-11.6.ebuild | 2 +-
dev-db/postgresql/postgresql-11.7.ebuild | 2 +-
dev-db/postgresql/postgresql-12.0.ebuild | 2 +-
dev-db/postgresql/postgresql-12.1.ebuild | 2 +-
dev-db/postgresql/postgresql-12.2.ebuild | 2 +-
dev-db/postgresql/postgresql-9.4.22-r1.ebuild | 2 +-
dev-db/postgresql/postgresql-9.4.22.ebuild | 2 +-
dev-db/postgresql/postgresql-9.4.23.ebuild | 2 +-
dev-db/postgresql/postgresql-9.4.24.ebuild | 2 +-
dev-db/postgresql/postgresql-9.4.25.ebuild | 2 +-
dev-db/postgresql/postgresql-9.4.26.ebuild | 2 +-
dev-db/postgresql/postgresql-9.5.17-r1.ebuild | 2 +-
dev-db/postgresql/postgresql-9.5.17.ebuild | 2 +-
dev-db/postgresql/postgresql-9.5.18.ebuild | 2 +-
dev-db/postgresql/postgresql-9.5.19.ebuild | 2 +-
dev-db/postgresql/postgresql-9.5.20.ebuild | 2 +-
dev-db/postgresql/postgresql-9.5.21.ebuild | 2 +-
dev-db/postgresql/postgresql-9.6.13-r1.ebuild | 2 +-
dev-db/postgresql/postgresql-9.6.13.ebuild | 2 +-
dev-db/postgresql/postgresql-9.6.14.ebuild | 2 +-
dev-db/postgresql/postgresql-9.6.15.ebuild | 2 +-
dev-db/postgresql/postgresql-9.6.16.ebuild | 2 +-
dev-db/postgresql/postgresql-9.6.17.ebuild | 2 +-
dev-db/qdbm/qdbm-1.8.78-r2.ebuild | 2 +-
dev-db/sqlite/sqlite-3.29.0.ebuild | 2 +-
dev-db/sqlite/sqlite-3.30.1.ebuild | 4 ++--
dev-db/sqlite/sqlite-3.31.1.ebuild | 2 +-
dev-db/unixODBC/unixODBC-2.3.7.ebuild | 2 +-
dev-java/protobuf-java/protobuf-java-3.10.1.ebuild | 4 ++--
dev-java/protobuf-java/protobuf-java-3.11.2.ebuild | 4 ++--
dev-java/protobuf-java/protobuf-java-3.11.4.ebuild | 2 +-
dev-lang/bff/bff-1.0.5.ebuild | 4 ++--
dev-lang/jimtcl/jimtcl-0.76.ebuild | 4 ++--
dev-lang/jimtcl/jimtcl-0.78-r2.ebuild | 4 ++--
dev-lang/lua/lua-5.1.5-r100.ebuild | 4 ++--
dev-lang/lua/lua-5.1.5-r101.ebuild | 4 ++--
dev-lang/lua/lua-5.1.5-r102.ebuild | 4 ++--
dev-lang/lua/lua-5.1.5-r103.ebuild | 2 +-
dev-lang/lua/lua-5.1.5-r4.ebuild | 2 +-
dev-lang/lua/lua-5.1.5-r5.ebuild | 2 +-
dev-lang/lua/lua-5.2.3-r1.ebuild | 4 ++--
dev-lang/lua/lua-5.2.3-r2.ebuild | 4 ++--
dev-lang/lua/lua-5.2.3-r3.ebuild | 4 ++--
dev-lang/lua/lua-5.2.3.ebuild | 4 ++--
dev-lang/lua/lua-5.2.4-r1.ebuild | 4 ++--
dev-lang/lua/lua-5.2.4-r2.ebuild | 2 +-
dev-lang/lua/lua-5.2.4.ebuild | 4 ++--
dev-lang/lua/lua-5.3.3-r1.ebuild | 4 ++--
dev-lang/lua/lua-5.3.3-r2.ebuild | 4 ++--
dev-lang/lua/lua-5.3.3.ebuild | 4 ++--
dev-lang/lua/lua-5.3.5-r1.ebuild | 4 ++--
dev-lang/lua/lua-5.3.5-r2.ebuild | 2 +-
dev-lang/lua/lua-5.3.5.ebuild | 4 ++--
dev-lang/perl/perl-5.30.1.ebuild | 2 +-
dev-lang/php/php-7.2.26.ebuild | 2 +-
dev-lang/php/php-7.2.27.ebuild | 2 +-
dev-lang/php/php-7.2.28-r1.ebuild | 2 +-
dev-lang/php/php-7.2.29.ebuild | 2 +-
dev-lang/php/php-7.3.13.ebuild | 2 +-
dev-lang/php/php-7.3.14.ebuild | 2 +-
dev-lang/php/php-7.3.15-r1.ebuild | 2 +-
dev-lang/php/php-7.3.16.ebuild | 2 +-
dev-lang/php/php-7.4.3-r1.ebuild | 2 +-
dev-lang/php/php-7.4.4.ebuild | 2 +-
dev-lang/python-exec/python-exec-2.4.6-r1.ebuild | 2 +-
dev-lang/python/python-2.7.17-r1.ebuild | 2 +-
dev-lang/python/python-3.6.10.ebuild | 2 +-
dev-lang/python/python-3.7.6.ebuild | 2 +-
dev-lang/python/python-3.7.7.ebuild | 2 +-
dev-lang/python/python-3.8.2.ebuild | 2 +-
dev-lang/python/python-3.9.0_alpha4.ebuild | 2 +-
dev-lang/python/python-3.9.0_alpha5.ebuild | 2 +-
dev-lang/ruby/ruby-2.4.9.ebuild | 2 +-
dev-lang/ruby/ruby-2.5.7.ebuild | 2 +-
dev-lang/ruby/ruby-2.6.5.ebuild | 2 +-
dev-lang/ruby/ruby-2.7.0.ebuild | 2 +-
dev-lang/spidermonkey/spidermonkey-1.8.5-r6.ebuild | 2 +-
dev-lang/spidermonkey/spidermonkey-1.8.5-r7.ebuild | 2 +-
dev-lang/spidermonkey/spidermonkey-1.8.5-r9.ebuild | 2 +-
dev-lang/spidermonkey/spidermonkey-17.0.0-r5.ebuild | 2 +-
dev-lang/spidermonkey/spidermonkey-38.3.0.ebuild | 2 +-
dev-lang/spidermonkey/spidermonkey-45.0.2.ebuild | 2 +-
dev-lang/spidermonkey/spidermonkey-52.9.1_pre1-r1.ebuild | 2 +-
dev-lang/spidermonkey/spidermonkey-52.9.1_pre1.ebuild | 2 +-
dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r2.ebuild | 2 +-
dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r3.ebuild | 2 +-
dev-lang/swig/swig-3.0.12.ebuild | 2 +-
dev-lang/swig/swig-4.0.0.ebuild | 4 ++--
dev-lang/tcl/tcl-8.5.17-r1.ebuild | 2 +-
dev-lang/tcl/tcl-8.6.8.ebuild | 2 +-
dev-lang/tcl/tcl-8.6.9.ebuild | 4 ++--
dev-lang/tk/tk-8.5.17-r1.ebuild | 2 +-
dev-lang/tk/tk-8.6.8.ebuild | 2 +-
dev-lang/tk/tk-8.6.9.1.ebuild | 4 ++--
dev-lang/tk/tk-8.6.9.ebuild | 4 ++--
dev-lang/vala/vala-0.36.20.ebuild | 2 +-
dev-lang/vala/vala-0.40.16.ebuild | 2 +-
dev-lang/vala/vala-0.40.18.ebuild | 2 +-
dev-lang/vala/vala-0.40.19.ebuild | 2 +-
dev-lang/vala/vala-0.44.11.ebuild | 2 +-
dev-lang/vala/vala-0.44.9.ebuild | 2 +-
dev-lang/vala/vala-0.46.6.ebuild | 2 +-
dev-lang/vala/vala-0.48.1.ebuild | 2 +-
dev-libs/apr-util/apr-util-1.6.1-r3.ebuild | 2 +-
dev-libs/apr/apr-1.6.3-r4.ebuild | 2 +-
dev-libs/apr/apr-1.6.5-r1.ebuild | 4 ++--
dev-libs/apr/apr-1.7.0-r1.ebuild | 4 ++--
dev-libs/atf/atf-0.21-r2.ebuild | 2 +-
dev-libs/atk/atk-2.32.0.ebuild | 2 +-
dev-libs/atk/atk-2.34.1.ebuild | 4 ++--
dev-libs/atk/atk-2.35.1.ebuild | 2 +-
dev-libs/boost/boost-1.72.0-r1.ebuild | 2 +-
dev-libs/cgilib/cgilib-0.7-r1.ebuild | 2 +-
dev-libs/check/check-0.10.0-r1.ebuild | 2 +-
dev-libs/check/check-0.12.0.ebuild | 2 +-
dev-libs/check/check-0.14.0-r2.ebuild | 2 +-
dev-libs/check/check-0.14.0.ebuild | 2 +-
dev-libs/cloog/cloog-0.18.1.ebuild | 2 +-
dev-libs/cloog/cloog-0.18.4.ebuild | 2 +-
dev-libs/cloog/cloog-9999.ebuild | 2 +-
dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r2.ebuild | 2 +-
dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r3.ebuild | 2 +-
dev-libs/dbus-glib/dbus-glib-0.110.ebuild | 2 +-
dev-libs/ding-libs/ding-libs-0.5.0.ebuild | 4 ++--
dev-libs/ding-libs/ding-libs-0.6.0.ebuild | 4 ++--
dev-libs/ding-libs/ding-libs-0.6.1.ebuild | 2 +-
dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild | 2 +-
dev-libs/elfutils/elfutils-0.176-r1.ebuild | 2 +-
dev-libs/elfutils/elfutils-0.177.ebuild | 2 +-
dev-libs/elfutils/elfutils-0.178.ebuild | 4 ++--
dev-libs/eventlog/eventlog-0.2.12.ebuild | 2 +-
dev-libs/expat/expat-2.2.8.ebuild | 2 +-
dev-libs/expat/expat-2.2.9.ebuild | 2 +-
dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild | 2 +-
dev-libs/fribidi/fribidi-1.0.8.ebuild | 2 +-
dev-libs/fribidi/fribidi-1.0.9.ebuild | 2 +-
dev-libs/geoip/geoip-1.6.10.ebuild | 2 +-
dev-libs/geoip/geoip-1.6.11.ebuild | 2 +-
dev-libs/geoip/geoip-1.6.12.ebuild | 2 +-
dev-libs/geoip/geoip-1.6.9-r1.ebuild | 2 +-
dev-libs/glib/glib-2.60.7-r1.ebuild | 2 +-
dev-libs/glib/glib-2.60.7-r2.ebuild | 2 +-
dev-libs/glib/glib-2.60.7.ebuild | 2 +-
dev-libs/glib/glib-2.62.5.ebuild | 2 +-
dev-libs/glib/glib-2.62.6.ebuild | 2 +-
dev-libs/glib/glib-2.64.1.ebuild | 2 +-
dev-libs/gmp/gmp-4.3.2-r1.ebuild | 2 +-
dev-libs/gmp/gmp-6.1.2-r1.ebuild | 2 +-
dev-libs/gmp/gmp-6.1.2.ebuild | 2 +-
dev-libs/gmp/gmp-6.2.0-r1.ebuild | 2 +-
.../gobject-introspection-common-1.60.2.ebuild | 2 +-
.../gobject-introspection-common-1.62.0.ebuild | 2 +-
.../gobject-introspection-common-1.64.0.ebuild | 2 +-
dev-libs/gobject-introspection/gobject-introspection-1.60.2-r1.ebuild | 2 +-
dev-libs/gobject-introspection/gobject-introspection-1.62.0.ebuild | 2 +-
dev-libs/gobject-introspection/gobject-introspection-1.64.0.ebuild | 2 +-
dev-libs/icu/icu-65.1-r1.ebuild | 2 +-
dev-libs/icu/icu-66.1.ebuild | 2 +-
dev-libs/iniparser/iniparser-3.1-r1.ebuild | 2 +-
dev-libs/iniparser/iniparser-3.1-r2.ebuild | 2 +-
dev-libs/iniparser/iniparser-4.1.ebuild | 4 ++--
dev-libs/isl/isl-0.12.2.ebuild | 2 +-
dev-libs/isl/isl-0.21.ebuild | 2 +-
dev-libs/isl/isl-0.22.1.ebuild | 2 +-
dev-libs/ivykis/ivykis-0.42.3-r1.ebuild | 2 +-
dev-libs/ivykis/ivykis-0.42.4.ebuild | 2 +-
dev-libs/jansson/jansson-2.10.ebuild | 2 +-
dev-libs/jansson/jansson-2.11.ebuild | 2 +-
dev-libs/jansson/jansson-2.12.ebuild | 4 ++--
dev-libs/json-c/json-c-0.12.ebuild | 2 +-
dev-libs/json-c/json-c-0.13.1-r1.ebuild | 2 +-
dev-libs/kpathsea/kpathsea-6.3.1_p20190410.ebuild | 2 +-
dev-libs/libIDL/libIDL-0.8.14-r2.ebuild | 2 +-
dev-libs/libaio/libaio-0.3.110.ebuild | 2 +-
dev-libs/libaio/libaio-0.3.111.ebuild | 4 ++--
dev-libs/libaio/libaio-0.3.112.ebuild | 4 ++--
dev-libs/libaio/libaio-9999.ebuild | 4 ++--
dev-libs/libassuan/libassuan-2.5.1-r1.ebuild | 2 +-
dev-libs/libassuan/libassuan-2.5.1.ebuild | 2 +-
dev-libs/libassuan/libassuan-2.5.3.ebuild | 2 +-
dev-libs/libatasmart/libatasmart-0.19_p5.ebuild | 2 +-
dev-libs/libatomic_ops/libatomic_ops-7.6.10.ebuild | 2 +-
dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1-r1.ebuild | 4 ++--
dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2-r2.ebuild | 2 +-
dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.0-r1.ebuild | 4 ++--
dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild | 4 ++--
dev-libs/libcdio/libcdio-0.93.ebuild | 2 +-
dev-libs/libcdio/libcdio-0.94-r1.ebuild | 2 +-
dev-libs/libcdio/libcdio-1.1.0.ebuild | 2 +-
dev-libs/libcdio/libcdio-2.0.0-r1.ebuild | 2 +-
dev-libs/libcdio/libcdio-2.0.0.ebuild | 2 +-
dev-libs/libcdio/libcdio-2.1.0-r1.ebuild | 2 +-
dev-libs/libcroco/libcroco-0.6.13.ebuild | 2 +-
dev-libs/libdaemon/libdaemon-0.14-r3.ebuild | 2 +-
dev-libs/libedit/libedit-20191211.3.1.ebuild | 2 +-
dev-libs/libev/libev-4.25.ebuild | 2 +-
dev-libs/libev/libev-4.27.ebuild | 4 ++--
dev-libs/libev/libev-4.31.ebuild | 2 +-
dev-libs/libevdev/libevdev-1.8.0.ebuild | 2 +-
dev-libs/libevdev/libevdev-1.9.0.ebuild | 2 +-
dev-libs/libevdev/libevdev-9999.ebuild | 2 +-
dev-libs/libevent/libevent-2.1.11.ebuild | 2 +-
dev-libs/libevent/libevent-2.1.8.ebuild | 2 +-
dev-libs/libffi-compat/libffi-compat-3.2.1-r3.ebuild | 4 ++--
dev-libs/libffi/libffi-3.2.1.ebuild | 2 +-
dev-libs/libffi/libffi-3.3-r1.ebuild | 2 +-
dev-libs/libffi/libffi-3.3_rc0.ebuild | 2 +-
dev-libs/libgamin/libgamin-0.1.10-r5.ebuild | 2 +-
dev-libs/libgcrypt-compat/libgcrypt-compat-1.5.6.ebuild | 2 +-
dev-libs/libgcrypt/libgcrypt-1.8.3-r1.ebuild | 2 +-
dev-libs/libgcrypt/libgcrypt-1.8.3.ebuild | 2 +-
dev-libs/libgcrypt/libgcrypt-1.8.4.ebuild | 2 +-
dev-libs/libgcrypt/libgcrypt-1.8.5.ebuild | 2 +-
dev-libs/libgee/libgee-0.20.2.ebuild | 2 +-
dev-libs/libgee/libgee-0.20.3.ebuild | 2 +-
dev-libs/libgee/libgee-0.6.8.ebuild | 2 +-
dev-libs/libgpg-error/libgpg-error-1.36.ebuild | 2 +-
dev-libs/libgpg-error/libgpg-error-1.37.ebuild | 2 +-
dev-libs/libgweather/libgweather-3.32.2-r1.ebuild | 4 ++--
dev-libs/libgweather/libgweather-3.34.0.ebuild | 2 +-
dev-libs/libiconv/libiconv-1.15.ebuild | 2 +-
dev-libs/libintl/libintl-0.19.7.ebuild | 2 +-
dev-libs/libintl/libintl-0.19.8.1.ebuild | 2 +-
dev-libs/libintl/libintl-0.20.1.ebuild | 4 ++--
dev-libs/libksba/libksba-1.3.5-r1.ebuild | 2 +-
dev-libs/libksba/libksba-1.3.5-r2.ebuild | 2 +-
dev-libs/liblinear/liblinear-210-r1.ebuild | 2 +-
dev-libs/liblinear/liblinear-221.ebuild | 4 ++--
dev-libs/liblinear/liblinear-230.ebuild | 4 ++--
dev-libs/libltdl/libltdl-2.4.6.ebuild | 2 +-
dev-libs/liblzw/liblzw-0.2-r1.ebuild | 2 +-
dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild | 2 +-
dev-libs/libmemcached/libmemcached-1.0.18-r3.ebuild | 2 +-
dev-libs/libmix/libmix-2.05-r7.ebuild | 2 +-
dev-libs/libnatspec/libnatspec-0.2.6-r1.ebuild | 2 +-
dev-libs/libnatspec/libnatspec-0.3.0.ebuild | 2 +-
dev-libs/libnl/libnl-1.1.4-r1.ebuild | 4 ++--
dev-libs/libnl/libnl-1.1.4.ebuild | 2 +-
dev-libs/libnl/libnl-3.4.0.ebuild | 2 +-
dev-libs/libnl/libnl-3.5.0.ebuild | 2 +-
dev-libs/liboil/liboil-0.3.17-r2.ebuild | 2 +-
dev-libs/libotf/libotf-0.9.13.ebuild | 2 +-
dev-libs/libotf/libotf-0.9.16.ebuild | 4 ++--
dev-libs/libp11/libp11-0.4.10.ebuild | 2 +-
dev-libs/libpcre/libpcre-8.42.ebuild | 2 +-
dev-libs/libpcre/libpcre-8.43.ebuild | 2 +-
dev-libs/libpcre/libpcre-8.44.ebuild | 2 +-
dev-libs/libpcre2/libpcre2-10.33-r1.ebuild | 2 +-
dev-libs/libpcre2/libpcre2-10.34.ebuild | 2 +-
dev-libs/libpipeline/libpipeline-1.4.2.ebuild | 2 +-
dev-libs/libpipeline/libpipeline-1.5.1.ebuild | 4 ++--
dev-libs/libpipeline/libpipeline-1.5.2.ebuild | 2 +-
dev-libs/libpthread-stubs/libpthread-stubs-0.4-r1.ebuild | 2 +-
dev-libs/libpwquality/libpwquality-1.4.1.ebuild | 2 +-
dev-libs/libpwquality/libpwquality-1.4.2.ebuild | 2 +-
dev-libs/libsigc++/libsigc++-1.2.7.ebuild | 2 +-
dev-libs/libsigc++/libsigc++-2.10.1.ebuild | 2 +-
dev-libs/libsigsegv/libsigsegv-2.11.ebuild | 2 +-
dev-libs/libsigsegv/libsigsegv-2.12-r1.ebuild | 2 +-
dev-libs/libsigsegv/libsigsegv-2.12.ebuild | 2 +-
dev-libs/libtasn1/libtasn1-4.13.ebuild | 2 +-
dev-libs/libtasn1/libtasn1-4.15.0-r1.ebuild | 4 ++--
dev-libs/libtasn1/libtasn1-4.16.0.ebuild | 2 +-
dev-libs/libtommath/libtommath-1.1.0.ebuild | 2 +-
dev-libs/libunique/libunique-1.1.6-r2.ebuild | 2 +-
dev-libs/libunique/libunique-3.0.2-r1.ebuild | 2 +-
dev-libs/libunistring/libunistring-0.9.10.ebuild | 2 +-
dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild | 2 +-
dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild | 4 ++--
dev-libs/libusb/libusb-1.0.19-r1.ebuild | 2 +-
dev-libs/libusb/libusb-1.0.21-r1.ebuild | 2 +-
dev-libs/libusb/libusb-1.0.22.ebuild | 4 ++--
dev-libs/libusb/libusb-1.0.23-r1.ebuild | 4 ++--
dev-libs/libverto/libverto-0.2.5-r1.ebuild | 2 +-
dev-libs/libverto/libverto-0.3.0.ebuild | 4 ++--
dev-libs/libverto/libverto-0.3.1.ebuild | 4 ++--
dev-libs/libxml2/libxml2-2.9.9-r2.ebuild | 2 +-
dev-libs/libxml2/libxml2-2.9.9-r3.ebuild | 2 +-
dev-libs/libxslt/libxslt-1.1.33-r1.ebuild | 2 +-
dev-libs/libyaml/libyaml-0.2.2.ebuild | 2 +-
dev-libs/lzo/lzo-2.10.ebuild | 2 +-
dev-libs/mm/mm-1.4.2-r2.ebuild | 2 +-
dev-libs/mpc/mpc-1.1.0-r1.ebuild | 2 +-
dev-libs/mpfr/mpfr-4.0.2.ebuild | 2 +-
dev-libs/nettle/nettle-3.4.1.ebuild | 2 +-
dev-libs/nettle/nettle-3.5.1.ebuild | 4 ++--
dev-libs/npth/npth-1.3.ebuild | 2 +-
dev-libs/npth/npth-1.4.ebuild | 4 ++--
dev-libs/npth/npth-1.5.ebuild | 4 ++--
dev-libs/npth/npth-1.6-r1.ebuild | 4 ++--
dev-libs/npth/npth-1.6.ebuild | 4 ++--
dev-libs/nspr/nspr-4.20.ebuild | 2 +-
dev-libs/nspr/nspr-4.22.ebuild | 2 +-
dev-libs/nspr/nspr-4.24.ebuild | 4 ++--
dev-libs/nspr/nspr-4.25.ebuild | 2 +-
dev-libs/nss/nss-3.47.1-r1.ebuild | 2 +-
dev-libs/nss/nss-3.48-r1.ebuild | 4 ++--
dev-libs/nss/nss-3.49.2.ebuild | 2 +-
dev-libs/nss/nss-3.50-r1.ebuild | 2 +-
dev-libs/nss/nss-3.51.ebuild | 2 +-
dev-libs/oniguruma/oniguruma-6.9.4.ebuild | 4 ++--
dev-libs/openct/openct-0.6.20-r4.ebuild | 2 +-
dev-libs/opensc/opensc-0.20.0.ebuild | 2 +-
dev-libs/openssl-compat/openssl-compat-0.9.8z_p8-r1.ebuild | 4 ++--
dev-libs/openssl-compat/openssl-compat-1.0.2u.ebuild | 2 +-
dev-libs/openssl/openssl-1.0.2u.ebuild | 2 +-
dev-libs/openssl/openssl-1.1.0l.ebuild | 4 ++--
dev-libs/openssl/openssl-1.1.1d-r3.ebuild | 2 +-
dev-libs/openssl/openssl-1.1.1e.ebuild | 2 +-
dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild | 4 ++--
dev-libs/pakchois/pakchois-0.4-r2.ebuild | 2 +-
dev-libs/pkcs11-helper/pkcs11-helper-1.25.1.ebuild | 2 +-
dev-libs/popt/popt-1.16-r2.ebuild | 2 +-
dev-libs/ppl/ppl-1.1.ebuild | 2 +-
dev-libs/ppl/ppl-1.2-r1.ebuild | 2 +-
dev-libs/ppl/ppl-1.2.ebuild | 2 +-
dev-libs/protobuf/protobuf-3.10.1.ebuild | 2 +-
dev-libs/protobuf/protobuf-3.11.2.ebuild | 4 ++--
dev-libs/protobuf/protobuf-3.11.4.ebuild | 2 +-
dev-libs/ptexenc/ptexenc-1.3.7_p20190410.ebuild | 2 +-
dev-libs/uulib/uulib-0.5.20-r1.ebuild | 2 +-
dev-libs/vala-common/vala-common-0.44.11.ebuild | 2 +-
dev-libs/vala-common/vala-common-0.44.9.ebuild | 2 +-
dev-libs/vala-common/vala-common-0.46.6.ebuild | 2 +-
dev-libs/vala-common/vala-common-0.48.1.ebuild | 2 +-
dev-libs/wayland-protocols/wayland-protocols-1.18.ebuild | 2 +-
dev-libs/wayland-protocols/wayland-protocols-1.19.ebuild | 2 +-
dev-libs/wayland-protocols/wayland-protocols-1.20.ebuild | 2 +-
dev-libs/wayland-protocols/wayland-protocols-9999.ebuild | 2 +-
dev-libs/wayland/wayland-1.17.0.ebuild | 2 +-
dev-libs/wayland/wayland-1.18.0.ebuild | 2 +-
dev-libs/wayland/wayland-9999.ebuild | 2 +-
dev-libs/xmlrpc-c/xmlrpc-c-1.39.11-r1.ebuild | 2 +-
dev-libs/yaz/yaz-3.0.53.ebuild | 2 +-
dev-libs/zziplib/zziplib-0.13.69-r1.ebuild | 2 +-
dev-lua/lutok/lutok-0.4-r1.ebuild | 2 +-
dev-lua/lutok/lutok-0.4-r2.ebuild | 2 +-
dev-perl/Algorithm-Diff/Algorithm-Diff-1.190.300.ebuild | 2 +-
dev-perl/Alien-Build/Alien-Build-1.790.0.ebuild | 2 +-
dev-perl/Alien-Libxml2/Alien-Libxml2-0.90.0.ebuild | 2 +-
dev-perl/App-pwhich/App-pwhich-1.150.0.ebuild | 4 ++--
dev-perl/Archive-Zip/Archive-Zip-1.640.0.ebuild | 2 +-
dev-perl/Authen-NTLM/Authen-NTLM-1.90.0-r1.ebuild | 2 +-
dev-perl/Authen-PAM/Authen-PAM-0.160.0-r1.ebuild | 2 +-
dev-perl/Authen-PAM/Authen-PAM-0.160.0-r2.ebuild | 2 +-
dev-perl/Authen-SASL/Authen-SASL-2.160.0-r1.ebuild | 2 +-
dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.240.0.ebuild | 2 +-
dev-perl/BSD-Resource/BSD-Resource-1.291.100.ebuild | 2 +-
dev-perl/Bit-Vector/Bit-Vector-7.400.0.ebuild | 2 +-
dev-perl/CGI-Fast/CGI-Fast-2.130.0.ebuild | 4 ++--
dev-perl/CGI/CGI-4.220.0.ebuild | 2 +-
dev-perl/CGI/CGI-4.400.0.ebuild | 2 +-
dev-perl/CPAN-Meta-Check/CPAN-Meta-Check-0.14.0.ebuild | 2 +-
dev-perl/Cache-Memcached/Cache-Memcached-1.300.0-r1.ebuild | 2 +-
dev-perl/Canary-Stability/Canary-Stability-2012.0.0.ebuild | 2 +-
dev-perl/Capture-Tiny/Capture-Tiny-0.460.0.ebuild | 2 +-
dev-perl/Capture-Tiny/Capture-Tiny-0.480.0.ebuild | 2 +-
dev-perl/Carp-Clan/Carp-Clan-6.60.0.ebuild | 2 +-
.../Class-Data-Inheritable/Class-Data-Inheritable-0.80.0-r2.ebuild | 2 +-
dev-perl/Class-Factory-Util/Class-Factory-Util-1.700.0-r2.ebuild | 2 +-
dev-perl/Class-Inspector/Class-Inspector-1.320.0.ebuild | 2 +-
dev-perl/Class-Load/Class-Load-0.240.0.ebuild | 2 +-
dev-perl/Class-MakeMethods/Class-MakeMethods-1.10.0-r1.ebuild | 2 +-
dev-perl/Class-MethodMaker/Class-MethodMaker-2.240.0.ebuild | 2 +-
dev-perl/Class-Singleton/Class-Singleton-1.500.0.ebuild | 2 +-
dev-perl/Class-Tiny/Class-Tiny-1.6.0.ebuild | 2 +-
dev-perl/Convert-ASN1/Convert-ASN1-0.270.0.ebuild | 2 +-
dev-perl/Convert-UUlib/Convert-UUlib-1.400.0-r1.ebuild | 2 +-
dev-perl/Convert-UUlib/Convert-UUlib-1.500.0-r1.ebuild | 4 ++--
dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-3.23.900.ebuild | 4 ++--
dev-perl/Crypt-IDEA/Crypt-IDEA-1.100.0-r1.ebuild | 4 ++--
dev-perl/Crypt-IDEA/Crypt-IDEA-1.100.0.ebuild | 2 +-
dev-perl/Crypt-OpenSSL-Bignum/Crypt-OpenSSL-Bignum-0.90.0.ebuild | 2 +-
dev-perl/Crypt-OpenSSL-RSA/Crypt-OpenSSL-RSA-0.280.0-r3.ebuild | 2 +-
dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.110.0.ebuild | 2 +-
dev-perl/Crypt-RC4/Crypt-RC4-2.020.0-r1.ebuild | 2 +-
dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.720.0-r1.ebuild | 2 +-
dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.720.0-r2.ebuild | 2 +-
dev-perl/Crypt-SmbHash/Crypt-SmbHash-0.120.0-r1.ebuild | 2 +-
dev-perl/Crypt-SmbHash/Crypt-SmbHash-0.120.0-r2.ebuild | 2 +-
dev-perl/Crypt-Twofish/Crypt-Twofish-2.170.0-r1.ebuild | 4 ++--
dev-perl/Curses/Curses-1.360.0.ebuild | 2 +-
dev-perl/DBD-Pg/DBD-Pg-3.10.0.ebuild | 2 +-
dev-perl/DBD-Pg/DBD-Pg-3.5.3.ebuild | 2 +-
dev-perl/DBD-Pg/DBD-Pg-3.6.2.ebuild | 4 ++--
dev-perl/DBD-Pg/DBD-Pg-3.7.0.ebuild | 2 +-
dev-perl/DBD-SQLite/DBD-SQLite-1.560.0.ebuild | 2 +-
dev-perl/DBD-SQLite/DBD-SQLite-1.580.0.ebuild | 2 +-
dev-perl/DBD-mysql/DBD-mysql-4.44.0-r1.ebuild | 2 +-
dev-perl/DBI/DBI-1.637.0.ebuild | 2 +-
dev-perl/Data-OptList/Data-OptList-0.110.0.ebuild | 2 +-
dev-perl/Date-Manip/Date-Manip-6.600.0.ebuild | 2 +-
dev-perl/Date-Pcalc/Date-Pcalc-6.100.0-r1.ebuild | 4 ++--
.../DateTime-Format-Builder/DateTime-Format-Builder-0.810.0-r1.ebuild | 4 ++--
.../DateTime-Format-DateParse-0.50.0-r1.ebuild | 2 +-
.../DateTime-Format-ISO8601/DateTime-Format-ISO8601-0.80.0-r1.ebuild | 4 ++--
.../DateTime-Format-Strptime/DateTime-Format-Strptime-1.740.0.ebuild | 4 ++--
dev-perl/DateTime-Locale/DateTime-Locale-0.460.0.ebuild | 2 +-
dev-perl/DateTime-Locale/DateTime-Locale-1.160.0.ebuild | 4 ++--
dev-perl/DateTime-Locale/DateTime-Locale-1.20.0.ebuild | 4 ++--
dev-perl/DateTime-Locale/DateTime-Locale-1.30.0.ebuild | 4 ++--
dev-perl/DateTime-Locale/DateTime-Locale-1.50.0.ebuild | 4 ++--
dev-perl/DateTime-TimeZone/DateTime-TimeZone-1.930.0.ebuild | 2 +-
dev-perl/DateTime-TimeZone/DateTime-TimeZone-1.940.0.ebuild | 4 ++--
dev-perl/DateTime-TimeZone/DateTime-TimeZone-2.10.0.ebuild | 4 ++--
dev-perl/DateTime-TimeZone/DateTime-TimeZone-2.130.0.ebuild | 4 ++--
dev-perl/DateTime/DateTime-1.200.0.ebuild | 2 +-
dev-perl/DateTime/DateTime-1.210.0.ebuild | 4 ++--
dev-perl/DateTime/DateTime-1.280.0.ebuild | 4 ++--
dev-perl/DateTime/DateTime-1.440.0.ebuild | 4 ++--
dev-perl/Devel-CallChecker/Devel-CallChecker-0.8.0.ebuild | 4 ++--
dev-perl/Devel-Caller/Devel-Caller-2.60.0.ebuild | 4 ++--
dev-perl/Devel-CheckBin/Devel-CheckBin-0.40.0.ebuild | 2 +-
dev-perl/Devel-Hide/Devel-Hide-0.0.900.ebuild | 4 ++--
dev-perl/Devel-LexAlias/Devel-LexAlias-0.50.0.ebuild | 4 ++--
dev-perl/Devel-StackTrace/Devel-StackTrace-2.20.0.ebuild | 2 +-
dev-perl/Devel-Symdump/Devel-Symdump-2.180.0.ebuild | 2 +-
dev-perl/Digest-BubbleBabble/Digest-BubbleBabble-0.20.0-r1.ebuild | 2 +-
dev-perl/Digest-CRC/Digest-CRC-0.210.0.ebuild | 2 +-
dev-perl/Digest-CRC/Digest-CRC-0.220.0_p2.ebuild | 2 +-
dev-perl/Digest-HMAC/Digest-HMAC-1.30.0-r1.ebuild | 2 +-
dev-perl/Digest-MD4/Digest-MD4-1.900.0-r1.ebuild | 2 +-
dev-perl/Digest-Perl-MD5/Digest-Perl-MD5-1.900.0.ebuild | 2 +-
dev-perl/Digest-SHA1/Digest-SHA1-2.130.0-r1.ebuild | 2 +-
dev-perl/Dist-CheckConflicts/Dist-CheckConflicts-0.110.0.ebuild | 2 +-
dev-perl/DynaLoader-Functions/DynaLoader-Functions-0.3.0.ebuild | 4 ++--
dev-perl/Encode-Detect/Encode-Detect-1.10.0-r1.ebuild | 2 +-
dev-perl/Encode-EUCJPASCII/Encode-EUCJPASCII-0.30.0.ebuild | 4 ++--
| 4 ++--
dev-perl/Encode-Locale/Encode-Locale-1.30.0-r1.ebuild | 2 +-
dev-perl/Encode-Locale/Encode-Locale-1.50.0.ebuild | 2 +-
dev-perl/Error/Error-0.170.240.ebuild | 2 +-
dev-perl/Error/Error-0.170.250.ebuild | 2 +-
dev-perl/Eval-Closure/Eval-Closure-0.140.0.ebuild | 4 ++--
dev-perl/Exception-Class/Exception-Class-1.430.0.ebuild | 2 +-
dev-perl/Expect/Expect-1.350.0.ebuild | 2 +-
dev-perl/Exporter-Tiny/Exporter-Tiny-1.2.1.ebuild | 2 +-
dev-perl/ExtUtils-Config/ExtUtils-Config-0.8.0.ebuild | 2 +-
dev-perl/ExtUtils-Depends/ExtUtils-Depends-0.404.0.ebuild | 2 +-
dev-perl/ExtUtils-Depends/ExtUtils-Depends-0.405.0.ebuild | 2 +-
dev-perl/ExtUtils-F77/ExtUtils-F77-1.200.0-r1.ebuild | 2 +-
dev-perl/ExtUtils-Helpers/ExtUtils-Helpers-0.26.0.ebuild | 2 +-
dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.11.0.ebuild | 2 +-
dev-perl/ExtUtils-PkgConfig/ExtUtils-PkgConfig-1.160.0.ebuild | 2 +-
dev-perl/FCGI/FCGI-0.780.0.ebuild | 2 +-
dev-perl/FFI-CheckLib/FFI-CheckLib-0.250.0.ebuild | 2 +-
dev-perl/File-BaseDir/File-BaseDir-0.30.0-r1.ebuild | 2 +-
dev-perl/File-BaseDir/File-BaseDir-0.70.0.ebuild | 2 +-
dev-perl/File-Copy-Recursive/File-Copy-Recursive-0.380.0-r1.ebuild | 2 +-
dev-perl/File-DesktopEntry/File-DesktopEntry-0.220.0.ebuild | 2 +-
dev-perl/File-DesktopEntry/File-DesktopEntry-0.40.0-r1.ebuild | 2 +-
dev-perl/File-Find-Rule/File-Find-Rule-0.340.0.ebuild | 4 ++--
dev-perl/File-Listing/File-Listing-6.40.0-r1.ebuild | 2 +-
dev-perl/File-MimeInfo/File-MimeInfo-0.270.0.ebuild | 2 +-
dev-perl/File-MimeInfo/File-MimeInfo-0.280.0.ebuild | 2 +-
dev-perl/File-Remove/File-Remove-1.570.0.ebuild | 2 +-
dev-perl/File-ShareDir-Install/File-ShareDir-Install-0.110.0.ebuild | 2 +-
dev-perl/File-ShareDir/File-ShareDir-1.104.0.ebuild | 2 +-
dev-perl/File-Slurp-Tiny/File-Slurp-Tiny-0.4.0.ebuild | 2 +-
dev-perl/File-Slurp/File-Slurp-9999.190.0-r1.ebuild | 2 +-
dev-perl/File-Slurp/File-Slurp-9999.270.0.ebuild | 2 +-
dev-perl/File-Slurper/File-Slurper-0.10.0.ebuild | 4 ++--
dev-perl/File-Which/File-Which-1.220.0.ebuild | 2 +-
dev-perl/File-Which/File-Which-1.90.0-r1.ebuild | 2 +-
dev-perl/File-chdir/File-chdir-0.101.100.ebuild | 4 ++--
dev-perl/Filter/Filter-1.570.0.ebuild | 2 +-
dev-perl/Font-TTF/Font-TTF-1.20.0-r1.ebuild | 2 +-
dev-perl/Font-TTF/Font-TTF-1.60.0.ebuild | 2 +-
dev-perl/GD/GD-2.560.0-r1.ebuild | 2 +-
dev-perl/GD/GD-2.560.0-r2.ebuild | 2 +-
dev-perl/GD/GD-2.660.0.ebuild | 2 +-
dev-perl/GSSAPI/GSSAPI-0.280.0-r1.ebuild | 2 +-
dev-perl/Geo-IP/Geo-IP-1.510.0.ebuild | 2 +-
dev-perl/HTML-Form/HTML-Form-6.30.0-r1.ebuild | 2 +-
dev-perl/HTML-Form/HTML-Form-6.30.0-r2.ebuild | 2 +-
dev-perl/HTML-Parser/HTML-Parser-3.710.0-r1.ebuild | 2 +-
dev-perl/HTML-Parser/HTML-Parser-3.720.0.ebuild | 2 +-
dev-perl/HTML-Tagset/HTML-Tagset-3.200.0-r1.ebuild | 2 +-
dev-perl/HTML-Tree/HTML-Tree-5.60.0.ebuild | 2 +-
dev-perl/HTML-Tree/HTML-Tree-5.70.0.ebuild | 2 +-
dev-perl/HTTP-Cookies/HTTP-Cookies-6.40.0.ebuild | 2 +-
dev-perl/HTTP-Daemon/HTTP-Daemon-6.10.0-r2.ebuild | 2 +-
dev-perl/HTTP-Daemon/HTTP-Daemon-6.60.0.ebuild | 4 ++--
dev-perl/HTTP-Date/HTTP-Date-6.20.0-r1.ebuild | 2 +-
dev-perl/HTTP-Message/HTTP-Message-6.110.0.ebuild | 2 +-
dev-perl/HTTP-Message/HTTP-Message-6.130.0.ebuild | 2 +-
dev-perl/HTTP-Negotiate/HTTP-Negotiate-6.10.0-r1.ebuild | 2 +-
dev-perl/HTTP-Negotiate/HTTP-Negotiate-6.10.0.ebuild | 2 +-
dev-perl/IO-HTML/IO-HTML-1.1.0.ebuild | 2 +-
dev-perl/IO-Socket-INET6/IO-Socket-INET6-2.720.0-r1.ebuild | 2 +-
dev-perl/IO-Socket-INET6/IO-Socket-INET6-2.720.0.ebuild | 2 +-
dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.52.0.ebuild | 2 +-
dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.66.0.ebuild | 2 +-
dev-perl/IO-String/IO-String-1.80.0-r1.ebuild | 2 +-
dev-perl/IO-Stty/IO-Stty-0.30.0.ebuild | 2 +-
dev-perl/IO-Tty/IO-Tty-1.120.0.ebuild | 2 +-
dev-perl/IO-stringy/IO-stringy-2.111.0.ebuild | 2 +-
dev-perl/IPC-Run3/IPC-Run3-0.48.0.ebuild | 2 +-
dev-perl/IPC-System-Simple/IPC-System-Simple-1.250.0.ebuild | 2 +-
dev-perl/Importer/Importer-0.24.0.ebuild | 4 ++--
dev-perl/Inline/Inline-0.500.0-r1.ebuild | 2 +-
dev-perl/Inline/Inline-0.800.0.ebuild | 2 +-
dev-perl/JSON-MaybeXS/JSON-MaybeXS-1.3.9.ebuild | 2 +-
dev-perl/JSON-XS/JSON-XS-3.40.0.ebuild | 2 +-
dev-perl/JSON/JSON-2.900.0.ebuild | 2 +-
dev-perl/JSON/JSON-2.940.0.ebuild | 2 +-
dev-perl/Jcode/Jcode-2.70.0-r1.ebuild | 2 +-
dev-perl/LWP-MediaTypes/LWP-MediaTypes-6.20.0-r1.ebuild | 2 +-
dev-perl/LWP-Protocol-https/LWP-Protocol-https-6.60.0.ebuild | 2 +-
dev-perl/LWP-Protocol-https/LWP-Protocol-https-6.70.0.ebuild | 2 +-
dev-perl/List-AllUtils/List-AllUtils-0.140.0.ebuild | 4 ++--
dev-perl/List-AllUtils/List-AllUtils-0.90.0.ebuild | 2 +-
dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.418.0.ebuild | 2 +-
dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.426.0.ebuild | 4 ++--
dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.428.0.ebuild | 4 ++--
dev-perl/List-MoreUtils/List-MoreUtils-0.418.0.ebuild | 2 +-
dev-perl/List-MoreUtils/List-MoreUtils-0.419.0.ebuild | 4 ++--
dev-perl/List-MoreUtils/List-MoreUtils-0.426.0.ebuild | 4 ++--
dev-perl/List-SomeUtils-XS/List-SomeUtils-XS-0.550.0.ebuild | 4 ++--
dev-perl/List-SomeUtils/List-SomeUtils-0.560.0.ebuild | 4 ++--
dev-perl/List-UtilsBy/List-UtilsBy-0.100.0.ebuild | 4 ++--
dev-perl/Locale-Codes/Locale-Codes-3.620.0.ebuild | 2 +-
dev-perl/Locale-Maketext-Lexicon/Locale-Maketext-Lexicon-1.0.0.ebuild | 2 +-
dev-perl/Locale-PO/Locale-PO-0.270.0.ebuild | 2 +-
dev-perl/Locale-gettext/Locale-gettext-1.70.0.ebuild | 2 +-
dev-perl/Log-Agent/Log-Agent-1.1.0.ebuild | 2 +-
dev-perl/MIME-Charset/MIME-Charset-1.12.2.ebuild | 4 ++--
dev-perl/MIME-tools/MIME-tools-5.509.0.ebuild | 2 +-
dev-perl/MRO-Compat/MRO-Compat-0.130.0.ebuild | 2 +-
dev-perl/Mail-DKIM/Mail-DKIM-0.410.0.ebuild | 2 +-
dev-perl/Mail-DKIM/Mail-DKIM-0.440.0.ebuild | 2 +-
dev-perl/Mail-IMAPClient/Mail-IMAPClient-3.390.0.ebuild | 2 +-
dev-perl/Mail-SPF/Mail-SPF-2.9.0-r2.ebuild | 2 +-
dev-perl/MailTools/MailTools-2.190.0.ebuild | 2 +-
dev-perl/Math-Round/Math-Round-0.70.0.ebuild | 4 ++--
dev-perl/MediaWiki-API/MediaWiki-API-0.410.0.ebuild | 4 ++--
dev-perl/Module-Build-Tiny/Module-Build-Tiny-0.39.0.ebuild | 2 +-
dev-perl/Module-Build/Module-Build-0.422.400.ebuild | 2 +-
dev-perl/Module-Implementation/Module-Implementation-0.90.0.ebuild | 2 +-
dev-perl/Module-Pluggable/Module-Pluggable-5.200.0.ebuild | 2 +-
dev-perl/Module-Runtime/Module-Runtime-0.16.0.ebuild | 2 +-
dev-perl/Module-ScanDeps/Module-ScanDeps-1.230.0.ebuild | 4 ++--
dev-perl/Module-ScanDeps/Module-ScanDeps-1.240.0.ebuild | 4 ++--
dev-perl/Mozilla-CA/Mozilla-CA-20999999.ebuild | 2 +-
dev-perl/Net-CIDR-Lite/Net-CIDR-Lite-0.210.0-r1.ebuild | 2 +-
dev-perl/Net-DBus/Net-DBus-1.1.0.ebuild | 2 +-
.../Net-DNS-Resolver-Mock/Net-DNS-Resolver-Mock-1.201.710.310.ebuild | 2 +-
.../Net-DNS-Resolver-Programmable-0.9.0.ebuild | 2 +-
dev-perl/Net-DNS-SEC/Net-DNS-SEC-1.30.0.ebuild | 2 +-
dev-perl/Net-DNS/Net-DNS-1.130.0.ebuild | 4 ++--
dev-perl/Net-Daemon/Net-Daemon-0.480.0-r2.ebuild | 2 +-
dev-perl/Net-HTTP/Net-HTTP-6.170.0.ebuild | 2 +-
dev-perl/Net-IDN-Encode/Net-IDN-Encode-2.400.0.ebuild | 4 ++--
dev-perl/Net-IDN-Encode/Net-IDN-Encode-2.500.0.ebuild | 4 ++--
dev-perl/Net-IP/Net-IP-1.260.0-r1.ebuild | 2 +-
dev-perl/Net-LibIDN/Net-LibIDN-0.120.0-r2.ebuild | 2 +-
dev-perl/Net-Patricia/Net-Patricia-1.220.0-r1.ebuild | 2 +-
dev-perl/Net-SMTP-SSL/Net-SMTP-SSL-1.30.0.ebuild | 2 +-
dev-perl/Net-SMTP-SSL/Net-SMTP-SSL-1.40.0.ebuild | 2 +-
dev-perl/Net-SSLeay/Net-SSLeay-1.820.0.ebuild | 2 +-
dev-perl/Net-SSLeay/Net-SSLeay-1.880.0.ebuild | 2 +-
dev-perl/Net-Subnet/Net-Subnet-1.30.0-r1.ebuild | 4 ++--
dev-perl/NetAddr-IP/NetAddr-IP-4.78.0.ebuild | 2 +-
dev-perl/NetAddr-IP/NetAddr-IP-4.79.0.ebuild | 2 +-
dev-perl/Number-Compare/Number-Compare-0.30.0-r1.ebuild | 2 +-
dev-perl/OLE-StorageLite/OLE-StorageLite-0.190.0-r1.ebuild | 2 +-
dev-perl/Package-Constants/Package-Constants-0.60.0.ebuild | 2 +-
.../Package-DeprecationManager-0.150.0.ebuild | 2 +-
.../Package-DeprecationManager-0.170.0.ebuild | 2 +-
dev-perl/Package-Stash-XS/Package-Stash-XS-0.280.0.ebuild | 2 +-
dev-perl/Package-Stash/Package-Stash-0.370.0.ebuild | 2 +-
dev-perl/PadWalker/PadWalker-2.300.0.ebuild | 2 +-
dev-perl/Params-Classify/Params-Classify-0.13.0-r1.ebuild | 4 ++--
dev-perl/Params-Classify/Params-Classify-0.15.0.ebuild | 4 ++--
dev-perl/Params-Util/Params-Util-1.60.0-r1.ebuild | 2 +-
dev-perl/Params-Util/Params-Util-1.70.0.ebuild | 2 +-
dev-perl/Params-Validate/Params-Validate-1.290.0.ebuild | 2 +-
.../Params-ValidationCompiler-0.260.0.ebuild | 4 ++--
dev-perl/Parse-RecDescent/Parse-RecDescent-1.967.15.ebuild | 2 +-
dev-perl/Path-Class/Path-Class-0.360.0.ebuild | 2 +-
dev-perl/Path-Class/Path-Class-0.370.0.ebuild | 2 +-
dev-perl/Path-Tiny/Path-Tiny-0.104.0.ebuild | 2 +-
dev-perl/Perl-Tidy/Perl-Tidy-20171214.0.0.ebuild | 2 +-
dev-perl/Perl-Tidy/Perl-Tidy-20190915.0.0.ebuild | 2 +-
dev-perl/PerlIO-gzip/PerlIO-gzip-0.190.0.ebuild | 2 +-
dev-perl/PerlIO-gzip/PerlIO-gzip-0.200.0.ebuild | 2 +-
dev-perl/PerlIO-utf8_strict/PerlIO-utf8_strict-0.7.0.ebuild | 4 ++--
dev-perl/PlRPC/PlRPC-0.202.0-r2.ebuild | 2 +-
dev-perl/PlRPC/PlRPC-0.202.0-r3.ebuild | 2 +-
dev-perl/Pod-Coverage/Pod-Coverage-0.230.0-r1.ebuild | 2 +-
dev-perl/PortageXS/PortageXS-0.02.10-r4.ebuild | 2 +-
dev-perl/PortageXS/PortageXS-0.2.10-r5.ebuild | 4 ++--
dev-perl/PortageXS/PortageXS-0.2.12-r1.ebuild | 4 ++--
dev-perl/Probe-Perl/Probe-Perl-0.30.0.ebuild | 2 +-
dev-perl/Readonly-XS/Readonly-XS-1.50.0-r1.ebuild | 4 ++--
dev-perl/Readonly/Readonly-2.0.0.ebuild | 2 +-
dev-perl/Readonly/Readonly-2.10.0.ebuild | 4 ++--
dev-perl/Readonly/Readonly-2.50.0.ebuild | 2 +-
dev-perl/Ref-Util-XS/Ref-Util-XS-0.116.0.ebuild | 4 ++--
dev-perl/Ref-Util/Ref-Util-0.203.0.ebuild | 4 ++--
dev-perl/Role-Tiny/Role-Tiny-2.0.6.ebuild | 4 ++--
dev-perl/SGMLSpm/SGMLSpm-1.03-r7.ebuild | 2 +-
dev-perl/SGMLSpm/SGMLSpm-1.1-r1.ebuild | 2 +-
dev-perl/SUPER/SUPER-1.201.411.170.ebuild | 2 +-
dev-perl/Scope-Guard/Scope-Guard-0.210.0.ebuild | 4 ++--
dev-perl/Set-Scalar/Set-Scalar-1.290.0.ebuild | 2 +-
dev-perl/Shell-EnvImporter/Shell-EnvImporter-1.70.0-r2.ebuild | 2 +-
dev-perl/Socket6/Socket6-0.270.0.ebuild | 2 +-
dev-perl/Socket6/Socket6-0.280.0.ebuild | 2 +-
dev-perl/Specio/Specio-0.420.0.ebuild | 4 ++--
dev-perl/Spiffy/Spiffy-0.460.0.ebuild | 2 +-
dev-perl/Spreadsheet-ParseExcel/Spreadsheet-ParseExcel-0.650.0.ebuild | 2 +-
dev-perl/Spreadsheet-WriteExcel/Spreadsheet-WriteExcel-2.400.0.ebuild | 2 +-
dev-perl/String-CRC32/String-CRC32-1.500.0.ebuild | 2 +-
dev-perl/String-CRC32/String-CRC32-1.600.0.ebuild | 2 +-
.../Sub-Exporter-Progressive/Sub-Exporter-Progressive-0.1.13.ebuild | 2 +-
dev-perl/Sub-Exporter/Sub-Exporter-0.987.0.ebuild | 2 +-
dev-perl/Sub-Identify/Sub-Identify-0.140.0.ebuild | 2 +-
dev-perl/Sub-Info/Sub-Info-0.2.0.ebuild | 4 ++--
dev-perl/Sub-Install/Sub-Install-0.928.0.ebuild | 2 +-
dev-perl/Sub-Name/Sub-Name-0.150.0.ebuild | 4 ++--
dev-perl/Sub-Name/Sub-Name-0.210.0.ebuild | 2 +-
dev-perl/Sub-Name/Sub-Name-0.50.0-r1.ebuild | 2 +-
dev-perl/Sub-Quote/Sub-Quote-2.4.0.ebuild | 4 ++--
dev-perl/Sub-Uplevel/Sub-Uplevel-0.280.0.ebuild | 2 +-
dev-perl/Taint-Runtime/Taint-Runtime-0.30.0-r1.ebuild | 2 +-
dev-perl/Term-ReadLine-Perl/Term-ReadLine-Perl-1.30.300-r1.ebuild | 2 +-
dev-perl/Term-ReadLine-Perl/Term-ReadLine-Perl-1.30.300-r2.ebuild | 2 +-
dev-perl/Term-Table/Term-Table-0.8.0.ebuild | 4 ++--
dev-perl/TermReadKey/TermReadKey-2.330.0.ebuild | 2 +-
dev-perl/TermReadKey/TermReadKey-2.370.0.ebuild | 2 +-
dev-perl/Test-Base/Test-Base-0.880.0.ebuild | 2 +-
dev-perl/Test-Deep/Test-Deep-1.126.0.ebuild | 2 +-
dev-perl/Test-Deep/Test-Deep-1.127.0.ebuild | 2 +-
dev-perl/Test-Exception/Test-Exception-0.430.0.ebuild | 2 +-
dev-perl/Test-FailWarnings/Test-FailWarnings-0.8.0-r1.ebuild | 2 +-
dev-perl/Test-Fatal/Test-Fatal-0.14.0.ebuild | 2 +-
dev-perl/Test-File-ShareDir/Test-File-ShareDir-1.1.2.ebuild | 4 ++--
dev-perl/Test-Inter/Test-Inter-1.60.0.ebuild | 2 +-
dev-perl/Test-Inter/Test-Inter-1.90.0.ebuild | 2 +-
dev-perl/Test-LeakTrace/Test-LeakTrace-0.160.0.ebuild | 2 +-
dev-perl/Test-MockModule/Test-MockModule-0.130.0.ebuild | 2 +-
dev-perl/Test-MockRandom/Test-MockRandom-1.10.0.ebuild | 2 +-
dev-perl/Test-Needs/Test-Needs-0.2.5.ebuild | 2 +-
dev-perl/Test-NoWarnings/Test-NoWarnings-1.40.0-r3.ebuild | 2 +-
dev-perl/Test-Output/Test-Output-1.30.0.ebuild | 2 +-
dev-perl/Test-Output/Test-Output-1.31.0.ebuild | 2 +-
dev-perl/Test-Pod-Coverage/Test-Pod-Coverage-1.100.0.ebuild | 2 +-
dev-perl/Test-Pod/Test-Pod-1.510.0.ebuild | 2 +-
dev-perl/Test-Requires/Test-Requires-0.100.0.ebuild | 2 +-
dev-perl/Test-RequiresInternet/Test-RequiresInternet-0.50.0.ebuild | 2 +-
dev-perl/Test-Script/Test-Script-1.180.0.ebuild | 2 +-
dev-perl/Test-Script/Test-Script-1.230.0.ebuild | 4 ++--
dev-perl/Test-Taint/Test-Taint-1.60.0-r1.ebuild | 2 +-
dev-perl/Test-Warn/Test-Warn-0.320.0.ebuild | 2 +-
dev-perl/Test-Warnings/Test-Warnings-0.16.0.ebuild | 2 +-
dev-perl/Test-Warnings/Test-Warnings-0.26.0.ebuild | 2 +-
dev-perl/Test-Without-Module/Test-Without-Module-0.200.0.ebuild | 4 ++--
dev-perl/Test-YAML/Test-YAML-1.50.0.ebuild | 4 ++--
dev-perl/Test-YAML/Test-YAML-1.60.0.ebuild | 2 +-
.../Test2-Plugin-NoWarnings/Test2-Plugin-NoWarnings-0.60.0.ebuild | 4 ++--
dev-perl/Test2-Suite/Test2-Suite-0.0.77.ebuild | 4 ++--
dev-perl/Text-CSV_XS/Text-CSV_XS-1.340.0.ebuild | 2 +-
dev-perl/Text-CharWidth/Text-CharWidth-0.40.0-r1.ebuild | 2 +-
dev-perl/Text-Diff/Text-Diff-1.450.0.ebuild | 2 +-
dev-perl/Text-Glob/Text-Glob-0.110.0.ebuild | 2 +-
dev-perl/Text-Iconv/Text-Iconv-1.700.0-r1.ebuild | 2 +-
dev-perl/Text-Iconv/Text-Iconv-1.700.0-r2.ebuild | 2 +-
dev-perl/Text-Unidecode/Text-Unidecode-1.300.0.ebuild | 2 +-
dev-perl/Text-WrapI18N/Text-WrapI18N-0.60.0-r1.ebuild | 2 +-
dev-perl/Tie-IxHash/Tie-IxHash-1.230.0.ebuild | 2 +-
dev-perl/Time-Duration/Time-Duration-1.200.0.ebuild | 2 +-
dev-perl/TimeDate/TimeDate-2.300.0.ebuild | 2 +-
dev-perl/Tk/Tk-804.33.0.ebuild | 2 +-
dev-perl/Tk/Tk-804.34.0.ebuild | 4 ++--
dev-perl/Tree-DAG_Node/Tree-DAG_Node-1.310.0.ebuild | 2 +-
dev-perl/Try-Tiny/Try-Tiny-0.240.0.ebuild | 2 +-
dev-perl/Try-Tiny/Try-Tiny-0.300.0.ebuild | 2 +-
dev-perl/Types-Serialiser/Types-Serialiser-1.0.0-r1.ebuild | 2 +-
dev-perl/URI/URI-1.710.0.ebuild | 2 +-
dev-perl/URI/URI-1.730.0.ebuild | 2 +-
.../Unicode-EastAsianWidth/Unicode-EastAsianWidth-1.330.0-r1.ebuild | 2 +-
dev-perl/Unicode-LineBreak/Unicode-LineBreak-2017.4.0-r1.ebuild | 4 ++--
dev-perl/Unicode-Map/Unicode-Map-0.112.0-r1.ebuild | 2 +-
dev-perl/Unicode-Map8/Unicode-Map8-0.130.0-r1.ebuild | 4 ++--
dev-perl/Unicode-Map8/Unicode-Map8-0.130.0.ebuild | 2 +-
dev-perl/Unicode-MapUTF8/Unicode-MapUTF8-1.110.0-r1.ebuild | 2 +-
dev-perl/Unicode-MapUTF8/Unicode-MapUTF8-1.110.0-r2.ebuild | 2 +-
dev-perl/Unicode-String/Unicode-String-2.100.0.ebuild | 2 +-
dev-perl/Unicode-UTF8/Unicode-UTF8-0.620.0.ebuild | 2 +-
dev-perl/Variable-Magic/Variable-Magic-0.620.0.ebuild | 2 +-
dev-perl/WWW-RobotRules/WWW-RobotRules-6.20.0-r1.ebuild | 2 +-
dev-perl/WWW-RobotRules/WWW-RobotRules-6.20.0.ebuild | 2 +-
dev-perl/X11-Protocol/X11-Protocol-0.560.0-r2.ebuild | 4 ++--
dev-perl/X500-DN/X500-DN-0.290.0-r1.ebuild | 2 +-
dev-perl/XML-Filter-BufferText/XML-Filter-BufferText-1.10.0-r1.ebuild | 2 +-
dev-perl/XML-Generator/XML-Generator-1.40.0-r1.ebuild | 2 +-
dev-perl/XML-Handler-YAWriter/XML-Handler-YAWriter-0.230.0-r2.ebuild | 2 +-
dev-perl/XML-LibXML/XML-LibXML-2.20.100.ebuild | 2 +-
dev-perl/XML-NamespaceSupport/XML-NamespaceSupport-1.120.0.ebuild | 2 +-
dev-perl/XML-Parser/XML-Parser-2.440.0.ebuild | 2 +-
dev-perl/XML-SAX-Base/XML-SAX-Base-1.90.0.ebuild | 2 +-
dev-perl/XML-SAX-Expat/XML-SAX-Expat-0.510.0.ebuild | 2 +-
dev-perl/XML-SAX-Writer/XML-SAX-Writer-0.560.0.ebuild | 2 +-
dev-perl/XML-SAX-Writer/XML-SAX-Writer-0.570.0.ebuild | 2 +-
dev-perl/XML-SAX/XML-SAX-0.990.0-r1.ebuild | 2 +-
dev-perl/XML-SAX/XML-SAX-1.0.0.ebuild | 2 +-
dev-perl/XML-Simple/XML-Simple-2.250.0.ebuild | 2 +-
dev-perl/XML-Twig/XML-Twig-3.520.0.ebuild | 2 +-
dev-perl/XML-Writer/XML-Writer-0.625.0.ebuild | 2 +-
dev-perl/XML-XPath/XML-XPath-1.420.0.ebuild | 2 +-
dev-perl/YAML-LibYAML/YAML-LibYAML-0.690.0.ebuild | 2 +-
dev-perl/YAML-PP/YAML-PP-0.18.0.ebuild | 4 ++--
dev-perl/YAML-Syck/YAML-Syck-1.300.0.ebuild | 2 +-
dev-perl/YAML-Syck/YAML-Syck-1.310.0.ebuild | 4 ++--
dev-perl/YAML-Tiny/YAML-Tiny-1.690.0.ebuild | 2 +-
dev-perl/YAML-Tiny/YAML-Tiny-1.730.0.ebuild | 4 ++--
dev-perl/YAML/YAML-1.150.0.ebuild | 2 +-
dev-perl/YAML/YAML-1.240.0.ebuild | 4 ++--
dev-perl/YAML/YAML-1.260.0-r1.ebuild | 4 ++--
dev-perl/common-sense/common-sense-3.740.0-r1.ebuild | 2 +-
dev-perl/frontier-rpc/frontier-rpc-0.07_beta4-r1.ebuild | 2 +-
dev-perl/frontier-rpc/frontier-rpc-0.07_beta4-r2.ebuild | 2 +-
dev-perl/glib-perl/glib-perl-1.326.0.ebuild | 2 +-
dev-perl/glib-perl/glib-perl-1.329.100.ebuild | 2 +-
dev-perl/libintl-perl/libintl-perl-1.280.0.ebuild | 2 +-
dev-perl/libintl-perl/libintl-perl-1.310.0.ebuild | 2 +-
dev-perl/libwww-perl/libwww-perl-6.150.0.ebuild | 2 +-
dev-perl/libwww-perl/libwww-perl-6.270.0.ebuild | 2 +-
dev-perl/libxml-perl/libxml-perl-0.80.0-r2.ebuild | 2 +-
dev-perl/namespace-autoclean/namespace-autoclean-0.280.0.ebuild | 2 +-
dev-perl/namespace-clean/namespace-clean-0.270.0.ebuild | 2 +-
dev-perl/pcsc-perl/pcsc-perl-1.4.14.ebuild | 2 +-
dev-perl/perl-ldap/perl-ldap-0.650.0.ebuild | 2 +-
dev-perl/prefork/prefork-1.40.0-r2.ebuild | 2 +-
dev-php/File_Iterator/File_Iterator-1.4.2.ebuild | 4 ++--
dev-php/File_Iterator/File_Iterator-1.4.3.ebuild | 4 ++--
dev-php/File_Iterator/File_Iterator-2.0.2-r1.ebuild | 4 ++--
dev-php/File_Iterator/File_Iterator-2.0.2.ebuild | 4 ++--
dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.5.ebuild | 4 ++--
dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.7.ebuild | 4 ++--
dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.8.ebuild | 4 ++--
dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.9.ebuild | 4 ++--
dev-php/PEAR-Auth_SASL/PEAR-Auth_SASL-1.1.0.ebuild | 4 ++--
dev-php/PEAR-Cache/PEAR-Cache-1.5.6-r2.ebuild | 4 ++--
dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.1-r1.ebuild | 2 +-
dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.3.ebuild | 2 +-
dev-php/PEAR-DB/PEAR-DB-1.9.2-r1.ebuild | 4 ++--
dev-php/PEAR-DB/PEAR-DB-1.9.3.ebuild | 4 ++--
dev-php/PEAR-Date/PEAR-Date-1.5.0_alpha4-r1.ebuild | 4 ++--
dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild | 2 +-
dev-php/PEAR-File/PEAR-File-1.4.1-r1.ebuild | 4 ++--
dev-php/PEAR-File_Gettext/PEAR-File_Gettext-0.4.2-r1.ebuild | 4 ++--
dev-php/PEAR-HTML_Common/PEAR-HTML_Common-1.2.5-r1.ebuild | 4 ++--
dev-php/PEAR-HTML_Common2/PEAR-HTML_Common2-2.1.1.ebuild | 4 ++--
dev-php/PEAR-HTML_Common2/PEAR-HTML_Common2-2.1.2.ebuild | 4 ++--
dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.3.0-r1.ebuild | 4 ++--
dev-php/PEAR-Log/PEAR-Log-1.13.1.ebuild | 2 +-
dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta5-r2.ebuild | 4 ++--
.../PEAR-MDB2_Driver_mssql-1.5.0_beta4-r1.ebuild | 4 ++--
.../PEAR-MDB2_Driver_mysqli-1.5.0_beta4-r1.ebuild | 4 ++--
.../PEAR-MDB2_Driver_pgsql-1.5.0_beta4-r1.ebuild | 4 ++--
dev-php/PEAR-Mail/PEAR-Mail-1.4.1-r1.ebuild | 4 ++--
dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.2-r1.ebuild | 4 ++--
dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.4.ebuild | 4 ++--
dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.6.ebuild | 2 +-
dev-php/PEAR-Mail_mimeDecode/PEAR-Mail_mimeDecode-1.5.6-r2.ebuild | 4 ++--
dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.2-r3.ebuild | 2 +-
dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.3.ebuild | 2 +-
dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.8.1.ebuild | 4 ++--
dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.9.0.ebuild | 4 ++--
dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.2-r1.ebuild | 2 +-
dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.4.ebuild | 2 +-
dev-php/PEAR-Net_Socket/PEAR-Net_Socket-1.2.2.ebuild | 4 ++--
dev-php/PEAR-Net_URL/PEAR-Net_URL-1.0.15-r1.ebuild | 4 ++--
dev-php/PEAR-Net_URL2/PEAR-Net_URL2-2.2.1-r2.ebuild | 4 ++--
dev-php/PEAR-OLE/PEAR-OLE-1.0.0_rc3.ebuild | 4 ++--
dev-php/PEAR-PEAR/PEAR-PEAR-1.10.6.ebuild | 2 +-
dev-php/PEAR-PEAR/PEAR-PEAR-1.10.7.ebuild | 2 +-
dev-php/PEAR-PEAR/PEAR-PEAR-1.10.9.ebuild | 2 +-
.../PEAR-Spreadsheet_Excel_Writer-0.9.4.ebuild | 4 ++--
dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.1.1-r1.ebuild | 2 +-
dev-php/PEAR-Validate/PEAR-Validate-0.8.5-r1.ebuild | 4 ++--
dev-php/PEAR-XML_Parser/PEAR-XML_Parser-1.3.7-r1.ebuild | 4 ++--
dev-php/PEAR-XML_Parser/PEAR-XML_Parser-1.3.8.ebuild | 4 ++--
| 4 ++--
| 2 +-
dev-php/PEAR-XML_Serializer/PEAR-XML_Serializer-0.21.0-r1.ebuild | 4 ++--
dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.2.ebuild | 2 +-
dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.3.ebuild | 2 +-
dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.4.ebuild | 2 +-
dev-php/PHP_CodeCoverage/PHP_CodeCoverage-4.0.7-r2.ebuild | 4 ++--
dev-php/PHP_CodeCoverage/PHP_CodeCoverage-7.0.10-r1.ebuild | 4 ++--
dev-php/PHP_Timer/PHP_Timer-1.0.9.ebuild | 4 ++--
dev-php/PHP_Timer/PHP_Timer-2.1.2-r1.ebuild | 4 ++--
dev-php/PHP_TokenStream/PHP_TokenStream-1.4.11-r1.ebuild | 4 ++--
dev-php/PHP_TokenStream/PHP_TokenStream-3.1.1.ebuild | 4 ++--
dev-php/Text_Template/Text_Template-1.2.1.ebuild | 4 ++--
dev-php/doctrine-instantiator/doctrine-instantiator-1.0.5.ebuild | 2 +-
dev-php/doctrine-instantiator/doctrine-instantiator-1.1.0.ebuild | 2 +-
dev-php/doctrine-instantiator/doctrine-instantiator-1.3.0.ebuild | 4 ++--
dev-php/fedora-autoloader/fedora-autoloader-0.2.1.ebuild | 4 ++--
dev-php/fedora-autoloader/fedora-autoloader-1.0.0.ebuild | 4 ++--
dev-php/fedora-autoloader/fedora-autoloader-1.0.1.ebuild | 2 +-
dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.0.ebuild | 2 +-
dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.1.ebuild | 2 +-
dev-php/myclabs-deepcopy/myclabs-deepcopy-1.9.4.ebuild | 4 ++--
dev-php/pear/pear-1.10.1-r1.ebuild | 4 ++--
dev-php/pear/pear-1.10.3.ebuild | 4 ++--
dev-php/pecl-timezonedb/pecl-timezonedb-2019.3.ebuild | 4 ++--
dev-php/pecl-yaz/pecl-yaz-1.2.2-r1.ebuild | 4 ++--
dev-php/pecl-yaz/pecl-yaz-1.2.3.ebuild | 4 ++--
dev-php/phar-io-manifest/phar-io-manifest-1.0.3.ebuild | 4 ++--
dev-php/phar-io-version/phar-io-version-2.0.1.ebuild | 4 ++--
.../phpdocumentor-reflection-common-1.0.ebuild | 4 ++--
.../phpdocumentor-reflection-docblock-3.1.1.ebuild | 4 ++--
.../phpdocumentor-type-resolver-0.2.1.ebuild | 4 ++--
dev-php/phpspec-prophecy/phpspec-prophecy-1.10.0.ebuild | 4 ++--
dev-php/phpspec-prophecy/phpspec-prophecy-1.10.1.ebuild | 2 +-
dev-php/phpspec-prophecy/phpspec-prophecy-1.7.0.ebuild | 4 ++--
dev-php/phpspec-prophecy/phpspec-prophecy-1.8.0.ebuild | 4 ++--
dev-php/phpspec-prophecy/phpspec-prophecy-1.9.0.ebuild | 4 ++--
dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3-r1.ebuild | 4 ++--
dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3.ebuild | 4 ++--
dev-php/phpunit/phpunit-5.7.15-r3.ebuild | 4 ++--
dev-php/phpunit/phpunit-8.5.0.ebuild | 4 ++--
dev-php/phpunit/phpunit-8.5.1.ebuild | 2 +-
dev-php/phpunit/phpunit-8.5.2.ebuild | 2 +-
.../sebastian-code-unit-reverse-lookup-1.0.1.ebuild | 4 ++--
dev-php/sebastian-comparator/sebastian-comparator-1.2.4.ebuild | 4 ++--
dev-php/sebastian-comparator/sebastian-comparator-3.0.2.ebuild | 4 ++--
dev-php/sebastian-diff/sebastian-diff-1.4.1-r1.ebuild | 4 ++--
dev-php/sebastian-diff/sebastian-diff-3.0.2.ebuild | 4 ++--
dev-php/sebastian-environment/sebastian-environment-2.0.0.ebuild | 4 ++--
dev-php/sebastian-environment/sebastian-environment-4.2.3.ebuild | 4 ++--
dev-php/sebastian-exporter/sebastian-exporter-2.0.0.ebuild | 4 ++--
dev-php/sebastian-exporter/sebastian-exporter-3.1.2.ebuild | 4 ++--
dev-php/sebastian-global-state/sebastian-global-state-1.1.1.ebuild | 4 ++--
dev-php/sebastian-global-state/sebastian-global-state-3.0.0.ebuild | 4 ++--
.../sebastian-object-enumerator-2.0.1.ebuild | 4 ++--
.../sebastian-object-enumerator-3.0.3.ebuild | 4 ++--
.../sebastian-object-reflector-1.1.1.ebuild | 4 ++--
.../sebastian-recursion-context-2.0.0.ebuild | 4 ++--
.../sebastian-recursion-context-3.0.0.ebuild | 4 ++--
.../sebastian-resource-operations-1.0.0.ebuild | 4 ++--
.../sebastian-resource-operations-2.0.1.ebuild | 4 ++--
dev-php/sebastian-type/sebastian-type-1.1.3.ebuild | 4 ++--
dev-php/sebastian-version/sebastian-version-2.0.1.ebuild | 4 ++--
dev-php/symfony-yaml/symfony-yaml-2.1.0.ebuild | 4 ++--
dev-php/theseer-tokenizer/theseer-tokenizer-1.1.0.ebuild | 4 ++--
dev-php/theseer-tokenizer/theseer-tokenizer-1.1.3.ebuild | 4 ++--
dev-php/webmozart-assert/webmozart-assert-1.2.0.ebuild | 4 ++--
dev-php/webmozart-assert/webmozart-assert-1.4.0.ebuild | 4 ++--
dev-python/Babel/Babel-2.8.0.ebuild | 2 +-
dev-python/CacheControl/CacheControl-0.11.5.ebuild | 2 +-
dev-python/CacheControl/CacheControl-0.11.7.ebuild | 2 +-
dev-python/PyContracts/PyContracts-1.7.9.ebuild | 2 +-
dev-python/PyContracts/PyContracts-1.8.0.ebuild | 2 +-
dev-python/PyContracts/PyContracts-1.8.12.ebuild | 2 +-
dev-python/PySocks/PySocks-1.6.7.ebuild | 2 +-
dev-python/PySocks/PySocks-1.6.8.ebuild | 2 +-
dev-python/PySocks/PySocks-1.7.1.ebuild | 2 +-
dev-python/alabaster/alabaster-0.7.12.ebuild | 2 +-
dev-python/apipkg/apipkg-1.5.ebuild | 2 +-
dev-python/appdirs/appdirs-1.4.3-r1.ebuild | 2 +-
dev-python/attrs/attrs-19.3.0.ebuild | 2 +-
dev-python/automat/automat-0.8.0.ebuild | 2 +-
dev-python/backports-abc/backports-abc-0.5.ebuild | 2 +-
dev-python/backports-lzma/backports-lzma-0.0.10.ebuild | 2 +-
dev-python/backports-lzma/backports-lzma-0.0.12.ebuild | 2 +-
dev-python/backports-lzma/backports-lzma-0.0.13.ebuild | 2 +-
.../backports-ssl-match-hostname-3.5.0.1-r1.ebuild | 2 +-
.../backports-unittest-mock/backports-unittest-mock-1.5-r1.ebuild | 2 +-
dev-python/backports/backports-1.0.ebuild | 2 +-
dev-python/bcrypt/bcrypt-3.1.6.ebuild | 2 +-
dev-python/bcrypt/bcrypt-3.1.7-r2.ebuild | 2 +-
dev-python/beaker/beaker-1.8.1.ebuild | 2 +-
dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild | 2 +-
dev-python/bottle/bottle-0.12.18.ebuild | 2 +-
dev-python/certifi/certifi-2019.11.28.ebuild | 2 +-
dev-python/cffi/cffi-1.13.2.ebuild | 2 +-
dev-python/cffi/cffi-1.14.0.ebuild | 2 +-
dev-python/characteristic/characteristic-14.3.0-r3.ebuild | 2 +-
dev-python/chardet/chardet-3.0.4.ebuild | 2 +-
dev-python/click/click-6.7-r1.ebuild | 2 +-
dev-python/colorama/colorama-0.3.9-r1.ebuild | 2 +-
dev-python/colorama/colorama-0.4.1.ebuild | 2 +-
dev-python/colorama/colorama-0.4.3.ebuild | 2 +-
dev-python/constantly/constantly-15.1.0-r1.ebuild | 2 +-
dev-python/cov-core/cov-core-1.15.0-r1.ebuild | 2 +-
dev-python/cov-core/cov-core-1.15.0.ebuild | 2 +-
dev-python/coverage/coverage-4.2.ebuild | 2 +-
dev-python/coverage/coverage-4.5.2.ebuild | 2 +-
dev-python/cryptography-vectors/cryptography-vectors-2.6.1.ebuild | 2 +-
dev-python/cryptography/cryptography-2.6.1-r1.ebuild | 2 +-
dev-python/cryptography/cryptography-2.8-r1.ebuild | 2 +-
dev-python/cssselect/cssselect-1.1.0.ebuild | 2 +-
dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild | 2 +-
dev-python/cython/cython-0.29.14-r1.ebuild | 2 +-
dev-python/cython/cython-0.29.15.ebuild | 2 +-
dev-python/dbus-python/dbus-python-1.2.4.ebuild | 2 +-
dev-python/decorator/decorator-4.3.2.ebuild | 2 +-
dev-python/decorator/decorator-4.4.0.ebuild | 2 +-
dev-python/decorator/decorator-4.4.1.ebuild | 2 +-
dev-python/decorator/decorator-4.4.2.ebuild | 2 +-
dev-python/defusedxml/defusedxml-0.5.0.ebuild | 2 +-
dev-python/defusedxml/defusedxml-0.6.0.ebuild | 2 +-
dev-python/distlib/distlib-0.2.1.ebuild | 2 +-
dev-python/distlib/distlib-0.2.4.ebuild | 2 +-
dev-python/dnspython/dnspython-1.15.0-r1.ebuild | 2 +-
dev-python/dnspython/dnspython-1.16.0-r1.ebuild | 2 +-
dev-python/dnspython/dnspython-1.16.0.ebuild | 2 +-
dev-python/docutils-glep/docutils-glep-1.2.ebuild | 2 +-
dev-python/docutils/docutils-0.12.ebuild | 2 +-
dev-python/docutils/docutils-0.13.1.ebuild | 2 +-
dev-python/docutils/docutils-0.14.ebuild | 2 +-
dev-python/docutils/docutils-0.15.2.ebuild | 2 +-
dev-python/docutils/docutils-0.16.ebuild | 2 +-
dev-python/ecdsa/ecdsa-0.13.3.ebuild | 2 +-
dev-python/ecdsa/ecdsa-0.14.1-r1.ebuild | 2 +-
dev-python/ecdsa/ecdsa-0.14.1.ebuild | 2 +-
dev-python/elementtree/elementtree-1.2.6-r3.ebuild | 2 +-
dev-python/enum34/enum34-1.1.6-r1.ebuild | 2 +-
dev-python/execnet/execnet-1.4.1.ebuild | 2 +-
dev-python/execnet/execnet-1.5.0.ebuild | 2 +-
dev-python/execnet/execnet-1.7.1.ebuild | 2 +-
| 2 +-
| 2 +-
dev-python/filemagic/filemagic-1.6.ebuild | 2 +-
dev-python/fixtures/fixtures-1.4.0.ebuild | 2 +-
dev-python/fixtures/fixtures-3.0.0.ebuild | 2 +-
dev-python/flaky/flaky-3.6.1.ebuild | 2 +-
dev-python/freezegun/freezegun-0.3.15.ebuild | 2 +-
dev-python/funcsigs/funcsigs-1.0.2-r1.ebuild | 2 +-
dev-python/functools32/functools32-3.2.3.ebuild | 2 +-
dev-python/futures/futures-3.1.1.ebuild | 2 +-
dev-python/futures/futures-3.2.0.ebuild | 2 +-
dev-python/gconf-python/gconf-python-2.28.1-r1.ebuild | 2 +-
dev-python/genty/genty-1.3.2.ebuild | 2 +-
dev-python/gmpy/gmpy-2.0.8-r1.ebuild | 2 +-
dev-python/gmpy/gmpy-2.0.8.ebuild | 2 +-
dev-python/gnome-python-base/gnome-python-base-2.28.1-r1.ebuild | 2 +-
.../gnome-python-desktop-base-2.32.0-r1.ebuild | 2 +-
dev-python/gnome-vfs-python/gnome-vfs-python-2.28.1-r1.ebuild | 2 +-
dev-python/google-apputils/google-apputils-0.4.2-r1.ebuild | 2 +-
dev-python/google-apputils/google-apputils-0.4.2-r2.ebuild | 2 +-
dev-python/hgdistver/hgdistver-0.25.ebuild | 2 +-
dev-python/hpack/hpack-3.0.0.ebuild | 2 +-
dev-python/html5lib/html5lib-0.9999999.ebuild | 2 +-
dev-python/html5lib/html5lib-0.999999999.ebuild | 2 +-
dev-python/hyper-h2/hyper-h2-3.1.1.ebuild | 2 +-
dev-python/hyper-h2/hyper-h2-3.2.0.ebuild | 2 +-
dev-python/hyperframe/hyperframe-5.1.0.ebuild | 2 +-
dev-python/hyperframe/hyperframe-5.2.0.ebuild | 2 +-
dev-python/hyperlink/hyperlink-19.0.0.ebuild | 2 +-
dev-python/hypothesis/hypothesis-4.47.5.ebuild | 2 +-
dev-python/hypothesis/hypothesis-4.50.8.ebuild | 2 +-
dev-python/idna/idna-2.8.ebuild | 2 +-
dev-python/incremental/incremental-17.5.0.ebuild | 2 +-
dev-python/ipaddress/ipaddress-1.0.14.ebuild | 2 +-
dev-python/ipaddress/ipaddress-1.0.18.ebuild | 2 +-
dev-python/ipaddress/ipaddress-1.0.19.ebuild | 2 +-
dev-python/ipaddress/ipaddress-1.0.22.ebuild | 2 +-
dev-python/ipaddress/ipaddress-1.0.23.ebuild | 2 +-
dev-python/iso8601/iso8601-0.1.10.ebuild | 2 +-
dev-python/iso8601/iso8601-0.1.11.ebuild | 2 +-
dev-python/iso8601/iso8601-0.1.12.ebuild | 2 +-
dev-python/itsdangerous/itsdangerous-1.1.0.ebuild | 2 +-
dev-python/jinja/jinja-2.10.3-r1.ebuild | 2 +-
dev-python/jinja/jinja-2.11.1.ebuild | 2 +-
dev-python/jinja/jinja-2.8.1.ebuild | 2 +-
dev-python/jsonschema/jsonschema-2.5.1-r2.ebuild | 2 +-
dev-python/jsonschema/jsonschema-2.6.0.ebuild | 2 +-
dev-python/jsonschema/jsonschema-3.0.1.ebuild | 2 +-
dev-python/libbonobo-python/libbonobo-python-2.28.1-r1.ebuild | 2 +-
dev-python/libgnome-python/libgnome-python-2.28.1-r1.ebuild | 2 +-
.../libgnomecanvas-python/libgnomecanvas-python-2.28.1-r1.ebuild | 2 +-
dev-python/librsvg-python/librsvg-python-2.32.0-r1.ebuild | 2 +-
dev-python/linecache2/linecache2-1.0.0.ebuild | 2 +-
dev-python/lockfile/lockfile-0.11.0-r1.ebuild | 2 +-
dev-python/lockfile/lockfile-0.12.2-r1.ebuild | 2 +-
dev-python/lockfile/lockfile-0.12.2-r2.ebuild | 2 +-
dev-python/lxml/lxml-4.4.2.ebuild | 2 +-
dev-python/lxml/lxml-4.4.3.ebuild | 2 +-
dev-python/lxml/lxml-4.5.0.ebuild | 2 +-
dev-python/m2r/m2r-0.1.14.ebuild | 2 +-
dev-python/mako/mako-1.0.7.ebuild | 2 +-
dev-python/mako/mako-1.1.0.ebuild | 2 +-
dev-python/mako/mako-1.1.1.ebuild | 2 +-
dev-python/mako/mako-1.1.2.ebuild | 2 +-
dev-python/markupsafe/markupsafe-0.23.ebuild | 2 +-
dev-python/markupsafe/markupsafe-1.0.ebuild | 2 +-
dev-python/markupsafe/markupsafe-1.1.1.ebuild | 2 +-
dev-python/medusa/medusa-0.5.4-r1.ebuild | 2 +-
dev-python/mimeparse/mimeparse-0.1.4-r1.ebuild | 2 +-
dev-python/mimeparse/mimeparse-1.6.0.ebuild | 2 +-
dev-python/mistune/mistune-0.8.3.ebuild | 2 +-
dev-python/mistune/mistune-0.8.4.ebuild | 2 +-
dev-python/mock/mock-1.0.1-r2.ebuild | 2 +-
dev-python/mock/mock-1.3.0-r2.ebuild | 2 +-
dev-python/mock/mock-2.0.0.ebuild | 2 +-
dev-python/mock/mock-3.0.5-r1.ebuild | 2 +-
dev-python/mox/mox-0.5.3-r1.ebuild | 2 +-
dev-python/mysql-python/mysql-python-1.2.3-r1.ebuild | 2 +-
dev-python/mysql-python/mysql-python-1.2.5-r1.ebuild | 2 +-
dev-python/mysql-python/mysql-python-1.2.5-r2.ebuild | 2 +-
dev-python/mysql-python/mysql-python-1.2.5-r3.ebuild | 2 +-
dev-python/namespace-google/namespace-google-1.ebuild | 2 +-
dev-python/namespace-jaraco/namespace-jaraco-1.ebuild | 2 +-
dev-python/namespace-jaraco/namespace-jaraco-2.ebuild | 2 +-
dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild | 2 +-
dev-python/namespace-zope/namespace-zope-1.ebuild | 2 +-
dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild | 2 +-
dev-python/ndg-httpsclient/ndg-httpsclient-0.4.2-r1.ebuild | 2 +-
dev-python/node-semver/node-semver-0.2.0.ebuild | 2 +-
dev-python/node-semver/node-semver-0.6.1.ebuild | 2 +-
dev-python/node-semver/node-semver-0.7.0.ebuild | 2 +-
dev-python/nose-show-skipped/nose-show-skipped-0.1.ebuild | 2 +-
dev-python/nose/nose-1.3.7-r3.ebuild | 2 +-
dev-python/nose/nose-1.3.7-r4.ebuild | 2 +-
dev-python/notify-python/notify-python-0.1.1-r3.ebuild | 2 +-
dev-python/numpy-python2/numpy-python2-1.16.5.ebuild | 4 ++--
dev-python/numpy/numpy-1.16.5.ebuild | 2 +-
dev-python/numpy/numpy-1.17.4-r2.ebuild | 2 +-
dev-python/oslo-sphinx/oslo-sphinx-4.18.0.ebuild | 2 +-
dev-python/packaging/packaging-20.1.ebuild | 2 +-
dev-python/packaging/packaging-20.3.ebuild | 2 +-
dev-python/paramiko/paramiko-2.4.2.ebuild | 2 +-
dev-python/paramiko/paramiko-2.6.0.ebuild | 2 +-
dev-python/paramiko/paramiko-2.7.1.ebuild | 2 +-
dev-python/path-py/path-py-11.5.2.ebuild | 2 +-
dev-python/path-py/path-py-12.0.2.ebuild | 2 +-
dev-python/pbr/pbr-0.8.2-r1.ebuild | 2 +-
dev-python/pbr/pbr-1.10.0-r1.ebuild | 2 +-
dev-python/pexpect/pexpect-4.6.0.ebuild | 2 +-
dev-python/pip/pip-9.0.1-r2.ebuild | 2 +-
dev-python/ply/ply-3.11.ebuild | 2 +-
dev-python/pretend/pretend-1.0.8-r1.ebuild | 2 +-
dev-python/pretend/pretend-1.0.8.ebuild | 2 +-
dev-python/pretend/pretend-1.0.9.ebuild | 2 +-
dev-python/priority/priority-1.3.0.ebuild | 2 +-
dev-python/process-tests/process-tests-2.0.2.ebuild | 2 +-
dev-python/progress/progress-1.2.ebuild | 2 +-
dev-python/progress/progress-1.3.ebuild | 2 +-
dev-python/protobuf-python/protobuf-python-3.10.1.ebuild | 2 +-
dev-python/protobuf-python/protobuf-python-3.11.2.ebuild | 2 +-
dev-python/protobuf-python/protobuf-python-3.11.4.ebuild | 2 +-
dev-python/psycopg/psycopg-2.7.4.ebuild | 2 +-
dev-python/psycopg/psycopg-2.7.5.ebuild | 2 +-
dev-python/psycopg/psycopg-2.7.7.ebuild | 2 +-
dev-python/psycopg/psycopg-2.8.3.ebuild | 2 +-
dev-python/psycopg/psycopg-2.8.4.ebuild | 2 +-
dev-python/ptyprocess/ptyprocess-0.5.2.ebuild | 2 +-
dev-python/ptyprocess/ptyprocess-0.6.0.ebuild | 2 +-
dev-python/py/py-1.4.30.ebuild | 2 +-
dev-python/py/py-1.4.34.ebuild | 2 +-
dev-python/py/py-1.5.2.ebuild | 2 +-
dev-python/py/py-1.5.3.ebuild | 2 +-
dev-python/py/py-1.5.4.ebuild | 2 +-
dev-python/py/py-1.8.0.ebuild | 2 +-
dev-python/pyasn1-modules/pyasn1-modules-0.0.10.ebuild | 2 +-
dev-python/pyasn1-modules/pyasn1-modules-0.0.5-r1.ebuild | 2 +-
dev-python/pyasn1-modules/pyasn1-modules-0.0.8.ebuild | 2 +-
dev-python/pyasn1-modules/pyasn1-modules-0.1.4.ebuild | 2 +-
dev-python/pyasn1-modules/pyasn1-modules-0.1.5.ebuild | 2 +-
dev-python/pyasn1-modules/pyasn1-modules-0.2.1.ebuild | 2 +-
dev-python/pyasn1/pyasn1-0.2.3.ebuild | 2 +-
dev-python/pyasn1/pyasn1-0.3.7.ebuild | 2 +-
dev-python/pyasn1/pyasn1-0.4.2.ebuild | 2 +-
dev-python/pyasn1/pyasn1-0.4.3.ebuild | 2 +-
dev-python/pyasn1/pyasn1-0.4.8.ebuild | 2 +-
dev-python/pyblake2/pyblake2-1.1.2.ebuild | 2 +-
dev-python/pycairo/pycairo-1.18.2.ebuild | 2 +-
dev-python/pycmd/pycmd-1.2.ebuild | 2 +-
dev-python/pycparser/pycparser-2.19-r1.ebuild | 2 +-
dev-python/pycparser/pycparser-2.20.ebuild | 2 +-
dev-python/pycrypto/pycrypto-2.6.1-r2.ebuild | 2 +-
dev-python/pycups/pycups-1.9.73-r1.ebuild | 2 +-
dev-python/pycups/pycups-1.9.73-r2.ebuild | 2 +-
dev-python/pycurl/pycurl-7.43.0.2.ebuild | 2 +-
dev-python/pycurl/pycurl-7.43.0.3.ebuild | 2 +-
dev-python/pycurl/pycurl-7.43.0.5.ebuild | 2 +-
dev-python/pycurl/pycurl-7.43.0.ebuild | 2 +-
dev-python/pydecomp/pydecomp-0.3.ebuild | 2 +-
dev-python/pydecomp/pydecomp-9999.ebuild | 2 +-
dev-python/pydot/pydot-1.4.1.ebuild | 2 +-
dev-python/pyelftools/pyelftools-0.24-r1.ebuild | 2 +-
dev-python/pyelftools/pyelftools-0.24.ebuild | 2 +-
dev-python/pyelftools/pyelftools-0.25.ebuild | 2 +-
dev-python/pyftpdlib/pyftpdlib-1.5.5-r1.ebuild | 2 +-
dev-python/pyftpdlib/pyftpdlib-1.5.6.ebuild | 2 +-
dev-python/pygments/pygments-2.3.1.ebuild | 2 +-
dev-python/pygments/pygments-2.4.2.ebuild | 2 +-
dev-python/pygments/pygments-2.5.2.ebuild | 2 +-
dev-python/pygments/pygments-2.6.1.ebuild | 2 +-
dev-python/pygobject/pygobject-2.28.6-r55.ebuild | 2 +-
dev-python/pygobject/pygobject-3.32.1.ebuild | 2 +-
dev-python/pygobject/pygobject-3.34.0.ebuild | 2 +-
dev-python/pygtk/pygtk-2.24.0-r4.ebuild | 2 +-
dev-python/pygtk/pygtk-2.24.0-r5.ebuild | 2 +-
dev-python/pygtksourceview/pygtksourceview-2.10.1-r1.ebuild | 2 +-
dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.ebuild | 2 +-
dev-python/pylibacl/pylibacl-0.5.0-r1.ebuild | 2 +-
dev-python/pylibacl/pylibacl-0.5.3.ebuild | 2 +-
dev-python/pymssql/pymssql-1.0.2-r1.ebuild | 2 +-
dev-python/pymssql/pymssql-2.1.3.ebuild | 2 +-
dev-python/pyopengl/pyopengl-3.1.0.ebuild | 2 +-
dev-python/pyopenssl/pyopenssl-19.0.0.ebuild | 2 +-
dev-python/pyopenssl/pyopenssl-19.1.0.ebuild | 2 +-
dev-python/pyorbit/pyorbit-2.24.0-r1.ebuild | 2 +-
dev-python/pyparsing/pyparsing-2.2.0.ebuild | 2 +-
dev-python/pyparsing/pyparsing-2.3.0.ebuild | 2 +-
dev-python/pyparsing/pyparsing-2.3.1.ebuild | 2 +-
dev-python/pyparsing/pyparsing-2.4.0.ebuild | 2 +-
dev-python/pyparsing/pyparsing-2.4.6.ebuild | 2 +-
dev-python/pyquery/pyquery-1.2.13-r1.ebuild | 2 +-
dev-python/pyquery/pyquery-1.2.13.ebuild | 2 +-
dev-python/pyquery/pyquery-1.4.0.ebuild | 2 +-
dev-python/pyquery/pyquery-1.4.1.ebuild | 2 +-
dev-python/pyrex/pyrex-0.9.9-r1.ebuild | 2 +-
dev-python/pyrsistent/pyrsistent-0.15.6.ebuild | 2 +-
dev-python/pyserial/pyserial-3.4.ebuild | 2 +-
dev-python/pysha3/pysha3-1.0.2-r1.ebuild | 2 +-
dev-python/pytest-cache/pytest-cache-1.0-r1.ebuild | 2 +-
dev-python/pytest-cache/pytest-cache-1.0-r2.ebuild | 2 +-
dev-python/pytest-expect/pytest-expect-1.1.0-r1.ebuild | 2 +-
dev-python/pytest-expect/pytest-expect-1.1.0.ebuild | 2 +-
dev-python/pytest-runner/pytest-runner-5.2.ebuild | 2 +-
dev-python/pytest-xdist/pytest-xdist-1.23.2.ebuild | 2 +-
dev-python/python-dateutil/python-dateutil-2.7.2-r1.ebuild | 2 +-
dev-python/python-dateutil/python-dateutil-2.8.0.ebuild | 2 +-
dev-python/python-dateutil/python-dateutil-2.8.1-r1.ebuild | 2 +-
dev-python/python-docs/python-docs-2.7.14.ebuild | 2 +-
dev-python/python-docs/python-docs-2.7.17.ebuild | 2 +-
dev-python/python-docs/python-docs-3.6.10.ebuild | 2 +-
dev-python/python-docs/python-docs-3.6.3.ebuild | 2 +-
dev-python/python-docs/python-docs-3.6.4.ebuild | 4 ++--
dev-python/python-docs/python-docs-3.7.0.ebuild | 4 ++--
dev-python/python-docs/python-docs-3.7.6.ebuild | 2 +-
dev-python/python-docs/python-docs-3.7.7.ebuild | 2 +-
dev-python/python-docs/python-docs-3.8.1.ebuild | 2 +-
dev-python/python-docs/python-docs-3.8.2.ebuild | 2 +-
dev-python/python-fchksum/python-fchksum-1.7.1-r1.ebuild | 2 +-
dev-python/python-gflags/python-gflags-3.1.1.ebuild | 2 +-
dev-python/python-gflags/python-gflags-3.1.2-r1.ebuild | 2 +-
dev-python/python-libevdev/python-libevdev-0.8.ebuild | 2 +-
dev-python/pytidylib/pytidylib-0.3.2.ebuild | 2 +-
dev-python/pytz/pytz-2016.3.ebuild | 2 +-
dev-python/pytz/pytz-2017.2.ebuild | 2 +-
dev-python/pytz/pytz-2018.4.ebuild | 2 +-
dev-python/pytz/pytz-2018.9.ebuild | 2 +-
dev-python/pytz/pytz-2019.3.ebuild | 2 +-
dev-python/pyxattr/pyxattr-0.6.0-r1.ebuild | 2 +-
dev-python/pyxattr/pyxattr-0.6.1-r1.ebuild | 2 +-
dev-python/pyxattr/pyxattr-0.6.1.ebuild | 2 +-
dev-python/pyxattr/pyxattr-0.7.1.ebuild | 2 +-
dev-python/pyyaml/pyyaml-3.12.ebuild | 2 +-
dev-python/pyyaml/pyyaml-3.13.ebuild | 2 +-
dev-python/pyyaml/pyyaml-5.1.2.ebuild | 2 +-
dev-python/pyyaml/pyyaml-5.1.ebuild | 2 +-
dev-python/pyyaml/pyyaml-5.3.1.ebuild | 2 +-
dev-python/pyyaml/pyyaml-5.3.ebuild | 2 +-
dev-python/regendoc/regendoc-0.5.ebuild | 2 +-
dev-python/regendoc/regendoc-0.6.1.ebuild | 2 +-
dev-python/requests/requests-2.21.0-r1.ebuild | 2 +-
dev-python/restkit/restkit-4.2.2.ebuild | 2 +-
dev-python/retrying/retrying-1.3.3.ebuild | 2 +-
dev-python/rfc3986/rfc3986-0.3.1.ebuild | 2 +-
dev-python/rfc3986/rfc3986-0.4.1.ebuild | 2 +-
dev-python/rfc3986/rfc3986-1.1.0.ebuild | 2 +-
dev-python/rfc3986/rfc3986-1.2.0.ebuild | 2 +-
dev-python/rfc3986/rfc3986-1.3.2.ebuild | 2 +-
dev-python/rfc3987/rfc3987-1.3.7.ebuild | 2 +-
dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild | 2 +-
dev-python/rfc3987/rfc3987-1.3.8.ebuild | 2 +-
dev-python/rst-linker/rst-linker-1.11.ebuild | 2 +-
dev-python/rst-linker/rst-linker-1.9-r1.ebuild | 2 +-
dev-python/rst-linker/rst-linker-2.0.0.ebuild | 4 ++--
dev-python/service_identity/service_identity-14.0.0.ebuild | 2 +-
dev-python/service_identity/service_identity-16.0.0.ebuild | 2 +-
dev-python/service_identity/service_identity-17.0.0-r1.ebuild | 2 +-
dev-python/service_identity/service_identity-17.0.0.ebuild | 2 +-
dev-python/service_identity/service_identity-18.1.0.ebuild | 2 +-
dev-python/setuptools/setuptools-42.0.2.ebuild | 2 +-
dev-python/setuptools/setuptools-44.0.0.ebuild | 2 +-
dev-python/setuptools/setuptools-44.1.0.ebuild | 2 +-
dev-python/setuptools/setuptools-45.3.0.ebuild | 2 +-
dev-python/setuptools_scm/setuptools_scm-1.15.6-r1.ebuild | 2 +-
dev-python/setuptools_scm/setuptools_scm-3.2.0.ebuild | 2 +-
dev-python/setuptools_scm/setuptools_scm-3.4.3.ebuild | 2 +-
dev-python/setuptools_scm/setuptools_scm-3.5.0.ebuild | 2 +-
dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild | 2 +-
dev-python/six/six-1.12.0.ebuild | 2 +-
dev-python/six/six-1.13.0.ebuild | 2 +-
dev-python/six/six-1.14.0.ebuild | 2 +-
dev-python/snakeoil/snakeoil-0.7.5.ebuild | 2 +-
dev-python/snakeoil/snakeoil-0.8.8.ebuild | 2 +-
dev-python/snakeoil/snakeoil-9999.ebuild | 4 ++--
dev-python/snowballstemmer/snowballstemmer-1.2.1.ebuild | 2 +-
dev-python/snowballstemmer/snowballstemmer-2.0.0.ebuild | 2 +-
dev-python/soappy/soappy-0.12.22.ebuild | 2 +-
dev-python/socketpool/socketpool-0.5.3-r2.ebuild | 2 +-
dev-python/sphinx-epytext/sphinx-epytext-0.0.4.ebuild | 2 +-
dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild | 2 +-
.../sphinx-py3doc-enhanced-theme-2.3.2.ebuild | 2 +-
dev-python/sphinx/sphinx-1.7.5-r1.ebuild | 2 +-
dev-python/sphinx/sphinx-2.0.1-r1.ebuild | 2 +-
dev-python/sphinx/sphinx-2.4.3-r1.ebuild | 2 +-
dev-python/sphinx/sphinx-2.4.4.ebuild | 2 +-
dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9.ebuild | 2 +-
dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.2.4.ebuild | 2 +-
.../sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.1.ebuild | 2 +-
.../sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2.ebuild | 2 +-
dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.1.ebuild | 2 +-
dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2.ebuild | 2 +-
dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.2.ebuild | 2 +-
dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.3.ebuild | 2 +-
.../sphinxcontrib-issuetracker-0.11-r1.ebuild | 2 +-
.../sphinxcontrib-issuetracker-0.11-r2.ebuild | 2 +-
dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r1.ebuild | 2 +-
dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1.ebuild | 2 +-
dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.2.ebuild | 2 +-
dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3.ebuild | 2 +-
.../sphinxcontrib-serializinghtml-1.1.3.ebuild | 2 +-
.../sphinxcontrib-serializinghtml-1.1.4.ebuild | 2 +-
dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.12.0.ebuild | 2 +-
dev-python/sqlalchemy/sqlalchemy-0.7.10.ebuild | 4 ++--
dev-python/sqlalchemy/sqlalchemy-1.2.18.ebuild | 2 +-
dev-python/sqlalchemy/sqlalchemy-1.3.11.ebuild | 2 +-
dev-python/sqlalchemy/sqlalchemy-1.3.3.ebuild | 2 +-
dev-python/sqlalchemy/sqlalchemy-1.3.4.ebuild | 2 +-
dev-python/ssl-fetch/ssl-fetch-0.4.ebuild | 2 +-
dev-python/strict-rfc3339/strict-rfc3339-0.6.ebuild | 2 +-
dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild | 2 +-
dev-python/strict-rfc3339/strict-rfc3339-0.7.ebuild | 2 +-
dev-python/subunit/subunit-1.2.0-r1.ebuild | 2 +-
dev-python/tempita/tempita-0.5.3-r2.ebuild | 2 +-
dev-python/testrepository/testrepository-0.0.18-r1.ebuild | 2 +-
dev-python/testrepository/testrepository-0.0.20.ebuild | 2 +-
dev-python/testresources/testresources-0.2.7-r2.ebuild | 2 +-
dev-python/testresources/testresources-1.0.0.ebuild | 2 +-
dev-python/testresources/testresources-2.0.1.ebuild | 2 +-
dev-python/testscenarios/testscenarios-0.5.0.ebuild | 2 +-
dev-python/testtools/testtools-2.3.0.ebuild | 2 +-
dev-python/textfsm/textfsm-0.4.0.ebuild | 2 +-
dev-python/traceback2/traceback2-1.4.0.ebuild | 2 +-
dev-python/twisted/twisted-19.10.0.ebuild | 2 +-
dev-python/u-msgpack/u-msgpack-2.4.1.ebuild | 2 +-
dev-python/u-msgpack/u-msgpack-2.5.2.ebuild | 2 +-
dev-python/unittest2/unittest2-1.1.0.ebuild | 2 +-
dev-python/urllib3/urllib3-1.24.2.ebuild | 2 +-
dev-python/vcversioner/vcversioner-2.16.0.0.ebuild | 2 +-
dev-python/versioneer/versioneer-0.16.ebuild | 2 +-
dev-python/versioneer/versioneer-0.18-r1.ebuild | 2 +-
dev-python/versioneer/versioneer-0.18.ebuild | 2 +-
dev-python/virtualenv/virtualenv-16.0.0.ebuild | 2 +-
dev-python/waitress/waitress-1.0.2.ebuild | 2 +-
dev-python/waitress/waitress-1.3.1.ebuild | 2 +-
dev-python/webcolors/webcolors-1.10.ebuild | 2 +-
dev-python/webcolors/webcolors-1.11.1.ebuild | 2 +-
dev-python/webcolors/webcolors-1.5.ebuild | 2 +-
dev-python/webcolors/webcolors-1.8.1.ebuild | 2 +-
dev-python/webencodings/webencodings-0.5.1-r1.ebuild | 2 +-
dev-python/webencodings/webencodings-0.5.1.ebuild | 2 +-
dev-python/webob/webob-1.8.2-r1.ebuild | 2 +-
dev-python/webob/webob-1.8.2.ebuild | 2 +-
dev-python/webob/webob-1.8.5-r1.ebuild | 2 +-
dev-python/webob/webob-1.8.5-r3.ebuild | 2 +-
dev-python/webob/webob-1.8.5.ebuild | 2 +-
dev-python/webtest/webtest-2.0.21.ebuild | 2 +-
dev-python/webtest/webtest-2.0.29-r1.ebuild | 2 +-
dev-python/webtest/webtest-2.0.29.ebuild | 2 +-
dev-python/webtest/webtest-2.0.33.ebuild | 2 +-
dev-python/wheel/wheel-0.29.0.ebuild | 2 +-
dev-python/wheel/wheel-0.33.6.ebuild | 2 +-
dev-python/wheel/wheel-0.34.2.ebuild | 2 +-
dev-python/wsgiproxy2/wsgiproxy2-0.4.2.ebuild | 2 +-
dev-python/wsgiproxy2/wsgiproxy2-0.4.4-r1.ebuild | 2 +-
dev-python/wsgiproxy2/wsgiproxy2-0.4.6.ebuild | 2 +-
dev-python/wstools/wstools-0.4.3.ebuild | 2 +-
dev-python/wstools/wstools-0.4.5-r1.ebuild | 2 +-
dev-python/wxpython/wxpython-3.0.2.0.ebuild | 2 +-
dev-python/wxpython/wxpython-4.0.6.ebuild | 2 +-
dev-python/wxpython/wxpython-4.0.7.ebuild | 2 +-
dev-python/zope-event/zope-event-4.2.0.ebuild | 2 +-
dev-python/zope-event/zope-event-4.3.0.ebuild | 2 +-
dev-python/zope-event/zope-event-4.4.ebuild | 2 +-
dev-python/zope-interface/zope-interface-4.1.1.ebuild | 2 +-
dev-python/zope-interface/zope-interface-4.3.2.ebuild | 2 +-
dev-python/zope-interface/zope-interface-4.4.3.ebuild | 2 +-
dev-python/zope-interface/zope-interface-4.5.0.ebuild | 2 +-
dev-python/zope-interface/zope-interface-4.6.0.ebuild | 2 +-
dev-python/zope-interface/zope-interface-4.7.1.ebuild | 2 +-
dev-ruby/builder/builder-3.2.3.ebuild | 2 +-
dev-ruby/builder/builder-3.2.4.ebuild | 2 +-
dev-ruby/did_you_mean/did_you_mean-1.1.2.ebuild | 2 +-
dev-ruby/did_you_mean/did_you_mean-1.2.1.ebuild | 2 +-
dev-ruby/did_you_mean/did_you_mean-1.3.0.ebuild | 4 ++--
dev-ruby/did_you_mean/did_you_mean-1.3.1.ebuild | 4 ++--
dev-ruby/did_you_mean/did_you_mean-1.4.0.ebuild | 4 ++--
dev-ruby/hoe/hoe-3.16.0.ebuild | 2 +-
dev-ruby/hoe/hoe-3.18.1.ebuild | 4 ++--
dev-ruby/hoe/hoe-3.19.0.ebuild | 4 ++--
dev-ruby/hoe/hoe-3.20.0.ebuild | 4 ++--
dev-ruby/hoe/hoe-3.21.0.ebuild | 2 +-
dev-ruby/json/json-1.8.6-r1.ebuild | 2 +-
dev-ruby/json/json-2.2.0.ebuild | 2 +-
dev-ruby/json/json-2.3.0.ebuild | 2 +-
dev-ruby/kpeg/kpeg-1.1.0-r1.ebuild | 2 +-
dev-ruby/minitest/minitest-4.7.5-r2.ebuild | 2 +-
dev-ruby/minitest/minitest-5.11.3.ebuild | 2 +-
dev-ruby/minitest/minitest-5.12.2.ebuild | 4 ++--
dev-ruby/minitest/minitest-5.13.0.ebuild | 4 ++--
dev-ruby/minitest/minitest-5.14.0.ebuild | 2 +-
dev-ruby/net-telnet/net-telnet-0.1.1-r1.ebuild | 2 +-
dev-ruby/net-telnet/net-telnet-0.2.0.ebuild | 4 ++--
dev-ruby/power_assert/power_assert-1.1.5.ebuild | 2 +-
dev-ruby/power_assert/power_assert-1.1.6.ebuild | 2 +-
dev-ruby/power_assert/power_assert-1.1.7.ebuild | 2 +-
dev-ruby/racc/racc-1.4.14.ebuild | 2 +-
dev-ruby/racc/racc-1.4.16-r1.ebuild | 4 ++--
dev-ruby/rake/rake-12.3.3.ebuild | 2 +-
dev-ruby/rake/rake-13.0.0.ebuild | 4 ++--
dev-ruby/rake/rake-13.0.1.ebuild | 4 ++--
dev-ruby/rdoc/rdoc-5.1.0-r1.ebuild | 2 +-
dev-ruby/rdoc/rdoc-6.1.2.ebuild | 2 +-
dev-ruby/rdoc/rdoc-6.2.0.ebuild | 4 ++--
dev-ruby/rrdtool-bindings/rrdtool-bindings-1.6.0.ebuild | 2 +-
dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.1-r1.ebuild | 2 +-
dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild | 2 +-
dev-ruby/rubygems/rubygems-2.7.10.ebuild | 2 +-
dev-ruby/rubygems/rubygems-3.0.3.ebuild | 4 ++--
dev-ruby/rubygems/rubygems-3.0.4-r1.ebuild | 4 ++--
dev-ruby/rubygems/rubygems-3.0.6.ebuild | 4 ++--
dev-ruby/rubygems/rubygems-3.0.8.ebuild | 2 +-
dev-ruby/rubygems/rubygems-3.1.2.ebuild | 2 +-
dev-ruby/test-unit/test-unit-3.3.3.ebuild | 2 +-
dev-ruby/test-unit/test-unit-3.3.4.ebuild | 4 ++--
dev-ruby/test-unit/test-unit-3.3.5.ebuild | 2 +-
dev-ruby/xmlrpc/xmlrpc-0.3.0.ebuild | 2 +-
dev-scheme/guile/guile-1.8.8-r3.ebuild | 2 +-
dev-scheme/guile/guile-2.0.13-r2.ebuild | 4 ++--
dev-scheme/guile/guile-2.0.14-r3.ebuild | 2 +-
dev-scheme/guile/guile-2.2.3.ebuild | 4 ++--
dev-scheme/guile/guile-2.2.4.ebuild | 2 +-
dev-scheme/guile/guile-2.2.6.ebuild | 4 ++--
dev-tcltk/blt/blt-2.4z-r13.ebuild | 2 +-
dev-tcltk/blt/blt-2.4z-r14.ebuild | 4 ++--
dev-tcltk/expect/expect-5.45.4.ebuild | 2 +-
dev-tcltk/thread/thread-2.8.2.ebuild | 4 ++--
dev-tcltk/tix/tix-8.4.3-r1.ebuild | 2 +-
dev-tcltk/togl/togl-2.0-r2.ebuild | 2 +-
dev-tcltk/togl/togl-2.0-r3.ebuild | 4 ++--
dev-tex/bibtexu/bibtexu-3.71_p20190410.ebuild | 2 +-
dev-tex/chktex/chktex-1.7.6.ebuild | 2 +-
dev-tex/cjk-latex/cjk-latex-4.8.4.ebuild | 2 +-
dev-tex/currvita/currvita-0.9i-r1.ebuild | 2 +-
dev-tex/detex/detex-2.8-r1.ebuild | 2 +-
dev-tex/dot2tex/dot2tex-2.11.3.ebuild | 2 +-
dev-tex/dot2texi/dot2texi-3.0.ebuild | 2 +-
dev-tex/dvi2tty/dvi2tty-5.3.4-r1.ebuild | 2 +-
dev-tex/envlab/envlab-1.2-r1.ebuild | 2 +-
dev-tex/europecv/europecv-20060424-r2.ebuild | 2 +-
dev-tex/feynmf/feynmf-1.08-r6.ebuild | 2 +-
dev-tex/g-brief/g-brief-4.0.2-r1.ebuild | 2 +-
dev-tex/glossaries/glossaries-4.41.ebuild | 2 +-
dev-tex/latex-beamer/latex-beamer-3.56-r1.ebuild | 2 +-
dev-tex/latex-beamer/latex-beamer-3.57.ebuild | 2 +-
dev-tex/latex2html/latex2html-2015.ebuild | 2 +-
dev-tex/latex2html/latex2html-2017.2-r2.ebuild | 4 ++--
dev-tex/latexdiff/latexdiff-1.2.1.ebuild | 2 +-
dev-tex/latexdiff/latexdiff-1.3.0.ebuild | 2 +-
dev-tex/latexdiff/latexdiff-9999.ebuild | 4 ++--
dev-tex/latexmk/latexmk-456.ebuild | 2 +-
dev-tex/latexmk/latexmk-465.ebuild | 4 ++--
dev-tex/leaflet/leaflet-20041222.ebuild | 2 +-
dev-tex/pgf/pgf-3.1.4b-r2.ebuild | 2 +-
dev-tex/pgf/pgf-3.1.5b.ebuild | 2 +-
dev-tex/svninfo/svninfo-0.7.4.ebuild | 2 +-
dev-tex/tex4ht/tex4ht-20090611_p1038-r8.ebuild | 2 +-
dev-tex/translator/translator-1.00.ebuild | 2 +-
dev-tex/xmltex/xmltex-1.9-r3.ebuild | 2 +-
dev-texlive/texlive-basic/texlive-basic-2019-r1.ebuild | 2 +-
| 2 +-
dev-texlive/texlive-context/texlive-context-2019.ebuild | 2 +-
| 2 +-
.../texlive-fontsrecommended/texlive-fontsrecommended-2019.ebuild | 2 +-
dev-texlive/texlive-fontutils/texlive-fontutils-2019.ebuild | 2 +-
| 2 +-
dev-texlive/texlive-games/texlive-games-2019.ebuild | 2 +-
dev-texlive/texlive-humanities/texlive-humanities-2019.ebuild | 2 +-
dev-texlive/texlive-langarabic/texlive-langarabic-2019.ebuild | 2 +-
dev-texlive/texlive-langchinese/texlive-langchinese-2019.ebuild | 2 +-
dev-texlive/texlive-langcjk/texlive-langcjk-2019.ebuild | 2 +-
dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2019.ebuild | 2 +-
.../texlive-langczechslovak/texlive-langczechslovak-2019-r1.ebuild | 2 +-
dev-texlive/texlive-langenglish/texlive-langenglish-2019.ebuild | 2 +-
dev-texlive/texlive-langeuropean/texlive-langeuropean-2019.ebuild | 2 +-
dev-texlive/texlive-langfrench/texlive-langfrench-2019.ebuild | 2 +-
dev-texlive/texlive-langgerman/texlive-langgerman-2019.ebuild | 2 +-
dev-texlive/texlive-langgreek/texlive-langgreek-2019.ebuild | 2 +-
dev-texlive/texlive-langitalian/texlive-langitalian-2019.ebuild | 2 +-
dev-texlive/texlive-langjapanese/texlive-langjapanese-2019.ebuild | 2 +-
dev-texlive/texlive-langkorean/texlive-langkorean-2019.ebuild | 2 +-
dev-texlive/texlive-langother/texlive-langother-2019.ebuild | 2 +-
dev-texlive/texlive-langpolish/texlive-langpolish-2019.ebuild | 2 +-
dev-texlive/texlive-langportuguese/texlive-langportuguese-2019.ebuild | 2 +-
dev-texlive/texlive-langspanish/texlive-langspanish-2019.ebuild | 2 +-
dev-texlive/texlive-latex/texlive-latex-2019.ebuild | 2 +-
| 2 +-
.../texlive-latexrecommended/texlive-latexrecommended-2019-r2.ebuild | 2 +-
dev-texlive/texlive-luatex/texlive-luatex-2019.ebuild | 2 +-
dev-texlive/texlive-mathscience/texlive-mathscience-2019.ebuild | 2 +-
dev-texlive/texlive-metapost/texlive-metapost-2019.ebuild | 2 +-
dev-texlive/texlive-music/texlive-music-2019.ebuild | 2 +-
dev-texlive/texlive-pictures/texlive-pictures-2019.ebuild | 2 +-
dev-texlive/texlive-plaingeneric/texlive-plaingeneric-2019.ebuild | 2 +-
dev-texlive/texlive-pstricks/texlive-pstricks-2019.ebuild | 2 +-
dev-texlive/texlive-publishers/texlive-publishers-2019.ebuild | 2 +-
dev-texlive/texlive-xetex/texlive-xetex-2019.ebuild | 2 +-
dev-util/boost-build/boost-build-1.72.0.ebuild | 2 +-
dev-util/byacc/byacc-20190617.ebuild | 2 +-
dev-util/byacc/byacc-20191125.ebuild | 4 ++--
dev-util/catalyst/catalyst-3.0.8.ebuild | 2 +-
dev-util/catalyst/catalyst-3.0.9.ebuild | 2 +-
dev-util/catalyst/catalyst-9999.ebuild | 2 +-
dev-util/ccache/ccache-3.7.2.ebuild | 2 +-
dev-util/ccache/ccache-3.7.6.ebuild | 2 +-
dev-util/ccache/ccache-3.7.7-r1.ebuild | 2 +-
dev-util/ccache/ccache-3.7.7.ebuild | 2 +-
dev-util/ccache/ccache-3.7.8-r1.ebuild | 2 +-
dev-util/ccache/ccache-3.7.8.ebuild | 2 +-
dev-util/cgvg/cgvg-1.6.3.ebuild | 2 +-
dev-util/cmake/cmake-3.13.5.ebuild | 2 +-
dev-util/cmake/cmake-3.14.6.ebuild | 2 +-
dev-util/cmake/cmake-3.16.5.ebuild | 2 +-
dev-util/cmake/cmake-3.17.0.ebuild | 2 +-
dev-util/cpuinfo-collection/cpuinfo-collection-20101114.ebuild | 2 +-
dev-util/cscope/cscope-15.8a-r1.ebuild | 2 +-
dev-util/cscope/cscope-15.8a-r2.ebuild | 4 ++--
dev-util/cscope/cscope-15.9.ebuild | 4 ++--
dev-util/ctags/ctags-20190331.ebuild | 2 +-
dev-util/cunit/cunit-2.1_p3.ebuild | 2 +-
dev-util/debhelper/debhelper-12.8.ebuild | 2 +-
dev-util/debhelper/debhelper-12.9.ebuild | 2 +-
dev-util/debhelper/debhelper-9.20160814.ebuild | 2 +-
dev-util/debootstrap/debootstrap-1.0.115.ebuild | 2 +-
dev-util/debootstrap/debootstrap-1.0.116.ebuild | 4 ++--
dev-util/debootstrap/debootstrap-1.0.117.ebuild | 2 +-
dev-util/debootstrap/debootstrap-1.0.123.ebuild | 2 +-
dev-util/dejagnu/dejagnu-1.6.2.ebuild | 2 +-
dev-util/dejagnu/dejagnu-1.6.ebuild | 2 +-
dev-util/desktop-file-utils/desktop-file-utils-0.24.ebuild | 2 +-
dev-util/dialog/dialog-1.3.20170131.ebuild | 2 +-
dev-util/dialog/dialog-1.3.20191110.ebuild | 2 +-
dev-util/dialog/dialog-1.3.20191210.ebuild | 2 +-
dev-util/dialog/dialog-1.3.20200228.ebuild | 2 +-
dev-util/diffstat/diffstat-1.60.ebuild | 2 +-
dev-util/diffstat/diffstat-1.61.ebuild | 4 ++--
dev-util/diffstat/diffstat-1.63.ebuild | 2 +-
dev-util/gdbus-codegen/gdbus-codegen-2.60.7.ebuild | 2 +-
dev-util/gdbus-codegen/gdbus-codegen-2.62.5.ebuild | 2 +-
dev-util/gdbus-codegen/gdbus-codegen-2.62.6.ebuild | 2 +-
dev-util/gdbus-codegen/gdbus-codegen-2.64.1.ebuild | 2 +-
dev-util/glade/glade-3.22.1-r1.ebuild | 2 +-
dev-util/glade/glade-3.22.2.ebuild | 2 +-
dev-util/glib-utils/glib-utils-2.60.7.ebuild | 2 +-
dev-util/glib-utils/glib-utils-2.62.5.ebuild | 2 +-
dev-util/glib-utils/glib-utils-2.62.6.ebuild | 2 +-
dev-util/glib-utils/glib-utils-2.64.1.ebuild | 2 +-
dev-util/gob/gob-2.0.20.ebuild | 4 ++--
dev-util/gperf/gperf-3.1.ebuild | 2 +-
dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild | 2 +-
dev-util/gtk-doc-am/gtk-doc-am-1.25-r1.ebuild | 2 +-
dev-util/gtk-doc-am/gtk-doc-am-1.32.ebuild | 2 +-
dev-util/gtk-doc/gtk-doc-1.25-r1.ebuild | 2 +-
dev-util/gtk-doc/gtk-doc-1.32-r1.ebuild | 2 +-
dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.11.ebuild | 2 +-
dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.13.ebuild | 2 +-
dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.14.ebuild | 2 +-
dev-util/indent/indent-2.2.11-r1.ebuild | 2 +-
dev-util/indent/indent-2.2.11_p5.ebuild | 2 +-
dev-util/indent/indent-2.2.12.ebuild | 2 +-
dev-util/intltool/intltool-0.51.0-r2.ebuild | 2 +-
dev-util/itstool/itstool-2.0.2.ebuild | 2 +-
dev-util/itstool/itstool-2.0.6-r1.ebuild | 2 +-
dev-util/kyua/kyua-0.13-r2.ebuild | 2 +-
dev-util/lcov/lcov-1.13-r2.ebuild | 4 ++--
dev-util/lcov/lcov-1.14.ebuild | 4 ++--
dev-util/lcov/lcov-1.14_p2.ebuild | 4 ++--
dev-util/lcov/lcov-9999.ebuild | 4 ++--
dev-util/meson/meson-0.52.1.ebuild | 2 +-
dev-util/meson/meson-0.53.1.ebuild | 2 +-
dev-util/meson/meson-9999.ebuild | 2 +-
dev-util/ninja/ninja-1.10.0.ebuild | 2 +-
dev-util/ninja/ninja-1.8.2-r1.ebuild | 2 +-
dev-util/ninja/ninja-1.8.2-r2.ebuild | 2 +-
dev-util/ninja/ninja-1.8.2.ebuild | 2 +-
dev-util/ninja/ninja-1.9.0.ebuild | 2 +-
dev-util/ninja/ninja-9999.ebuild | 2 +-
dev-util/patchutils/patchutils-0.3.3.ebuild | 2 +-
dev-util/patchutils/patchutils-0.3.4.ebuild | 2 +-
dev-util/pkgconf/pkgconf-1.6.3.ebuild | 2 +-
dev-util/pkgconf/pkgconf-9999.ebuild | 4 ++--
dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild | 2 +-
dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild | 4 ++--
dev-util/pkgconfig/pkgconfig-0.29.1.ebuild | 4 ++--
dev-util/pkgconfig/pkgconfig-0.29.2.ebuild | 2 +-
dev-util/pkgconfig/pkgconfig-9999.ebuild | 4 ++--
dev-util/ragel/ragel-6.10.ebuild | 2 +-
dev-util/ragel/ragel-6.7-r1.ebuild | 2 +-
dev-util/ragel/ragel-6.8.ebuild | 4 ++--
dev-util/ragel/ragel-6.9.ebuild | 4 ++--
dev-util/re2c/re2c-1.1.1.ebuild | 2 +-
dev-util/re2c/re2c-1.2.1.ebuild | 2 +-
dev-util/re2c/re2c-1.3.ebuild | 2 +-
dev-util/scons/scons-3.1.1.ebuild | 2 +-
dev-util/scons/scons-3.1.2.ebuild | 2 +-
dev-util/shadowman/shadowman-2.ebuild | 2 +-
dev-util/shflags/shflags-1.0.3.ebuild | 2 +-
dev-util/shflags/shflags-1.2.3.ebuild | 4 ++--
dev-util/shtool/shtool-2.0.8-r1.ebuild | 2 +-
dev-util/source-highlight/source-highlight-3.1.8.ebuild | 2 +-
dev-util/source-highlight/source-highlight-3.1.9.ebuild | 2 +-
dev-util/strace/strace-4.26.ebuild | 2 +-
dev-util/strace/strace-5.3.ebuild | 4 ++--
dev-util/strace/strace-5.4.ebuild | 4 ++--
dev-util/strace/strace-5.5.ebuild | 2 +-
dev-util/strace/strace-9999.ebuild | 4 ++--
dev-util/unifdef/unifdef-2.10.ebuild | 2 +-
dev-util/unifdef/unifdef-2.11.ebuild | 4 ++--
dev-util/unifdef/unifdef-2.12.ebuild | 2 +-
dev-util/yacc/yacc-1.9.1-r6.ebuild | 2 +-
dev-vcs/bzr/bzr-2.7.0.ebuild | 2 +-
dev-vcs/bzr/bzr-2.7.1_pre.ebuild | 4 ++--
dev-vcs/cvs/cvs-1.12.12-r12.ebuild | 2 +-
dev-vcs/cvsps/cvsps-2.2_beta1-r1.ebuild | 2 +-
dev-vcs/cvsps/cvsps-2.2_beta1.ebuild | 2 +-
dev-vcs/cvsps/cvsps-3.13-r2.ebuild | 2 +-
dev-vcs/cvsync/cvsync-2014.08.24.014706.ebuild | 4 ++--
dev-vcs/cvsync/cvsync-9999.ebuild | 4 ++--
dev-vcs/git-tools/git-tools-2017.10.ebuild | 2 +-
dev-vcs/git/git-2.23.1-r1.ebuild | 2 +-
dev-vcs/git/git-2.24.1.ebuild | 2 +-
dev-vcs/git/git-2.25.1.ebuild | 2 +-
dev-vcs/git/git-2.25.2.ebuild | 2 +-
dev-vcs/git/git-2.26.0.ebuild | 2 +-
dev-vcs/git/git-9999-r1.ebuild | 2 +-
dev-vcs/git/git-9999-r2.ebuild | 2 +-
dev-vcs/git/git-9999-r3.ebuild | 2 +-
dev-vcs/git/git-9999.ebuild | 2 +-
dev-vcs/pwclient/pwclient-20141110122616.ebuild | 2 +-
dev-vcs/rcs/rcs-5.9.3.ebuild | 2 +-
dev-vcs/rcs/rcs-5.9.4.ebuild | 4 ++--
dev-vcs/repo/repo-1.26.ebuild | 2 +-
dev-vcs/repo/repo-1.27.ebuild | 2 +-
dev-vcs/repo/repo-2.4.ebuild | 2 +-
dev-vcs/tig/tig-2.3.3.ebuild | 4 ++--
dev-vcs/tig/tig-2.4.1.ebuild | 4 ++--
dev-vcs/tig/tig-2.5.0.ebuild | 4 ++--
dev-vcs/tig/tig-9999.ebuild | 4 ++--
games-misc/asr-manpages/asr-manpages-1.3_rc6.ebuild | 4 ++--
games-misc/fortune-mod-all/fortune-mod-all-4.ebuild | 2 +-
games-misc/fortune-mod-at-linux/fortune-mod-at-linux-20030120.ebuild | 4 ++--
.../fortune-mod-bofh-excuses/fortune-mod-bofh-excuses-1.2-r1.ebuild | 2 +-
games-misc/fortune-mod-chucknorris/fortune-mod-chucknorris-0.1.ebuild | 4 ++--
games-misc/fortune-mod-cs/fortune-mod-cs-1.6.9.ebuild | 4 ++--
games-misc/fortune-mod-fvl/fortune-mod-fvl-20030120.ebuild | 4 ++--
games-misc/fortune-mod-it/fortune-mod-it-1.99.ebuild | 4 ++--
.../fortune-mod-kernelcookies/fortune-mod-kernelcookies-9.ebuild | 4 ++--
games-misc/fortune-mod-mormon/fortune-mod-mormon-1.1.0.ebuild | 4 ++--
.../fortune-mod-norbert-tretkowski-20030120.ebuild | 4 ++--
games-misc/fortune-mod-osfortune/fortune-mod-osfortune-1.ebuild | 2 +-
| 4 ++--
games-misc/fortune-mod-scriptures/fortune-mod-scriptures-1.1.0.ebuild | 4 ++--
games-misc/fortune-mod-tao/fortune-mod-tao-1.ebuild | 4 ++--
.../fortune-mod-thomas-ogrisegg-20030120.ebuild | 4 ++--
games-misc/fortune-mod-zx-error/fortune-mod-zx-error-1.0-r1.ebuild | 2 +-
games-misc/fortune-mod/fortune-mod-1.99.1-r2.ebuild | 2 +-
games-misc/funny-manpages/funny-manpages-1.3_rc5-r1.ebuild | 4 ++--
games-misc/funny-manpages/funny-manpages-2.3.ebuild | 4 ++--
games-misc/games-envd/games-envd-0.ebuild | 2 +-
games-misc/wtf/wtf-20090924.ebuild | 4 ++--
gnome-base/dconf-editor/dconf-editor-3.34.2.ebuild | 4 ++--
gnome-base/dconf-editor/dconf-editor-3.34.4.ebuild | 2 +-
gnome-base/dconf/dconf-0.32.0-r2.ebuild | 2 +-
gnome-base/dconf/dconf-0.34.0.ebuild | 2 +-
gnome-base/gconf/gconf-3.2.6-r4.ebuild | 2 +-
gnome-base/gdm/gdm-3.32.0.ebuild | 4 ++--
gnome-base/gdm/gdm-3.34.1.ebuild | 2 +-
gnome-base/gnome-common/gnome-common-3.18.0-r1.ebuild | 2 +-
gnome-base/gnome-control-center/gnome-control-center-3.30.3-r1.ebuild | 4 ++--
gnome-base/gnome-desktop/gnome-desktop-2.32.1-r2.ebuild | 2 +-
gnome-base/gnome-desktop/gnome-desktop-3.32.2.ebuild | 4 ++--
gnome-base/gnome-desktop/gnome-desktop-3.34.4.ebuild | 2 +-
gnome-base/gnome-keyring/gnome-keyring-3.31.91-r1.ebuild | 2 +-
gnome-base/gnome-keyring/gnome-keyring-3.34.0.ebuild | 2 +-
| 2 +-
gnome-base/gnome-mime-data/gnome-mime-data-2.18.0.ebuild | 2 +-
gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild | 2 +-
.../gsettings-desktop-schemas/gsettings-desktop-schemas-3.24.1.ebuild | 2 +-
.../gsettings-desktop-schemas/gsettings-desktop-schemas-3.32.0.ebuild | 2 +-
.../gsettings-desktop-schemas/gsettings-desktop-schemas-3.34.0.ebuild | 2 +-
gnome-base/gvfs/gvfs-1.40.2.ebuild | 2 +-
gnome-base/gvfs/gvfs-1.42.2.ebuild | 2 +-
gnome-base/libbonobo/libbonobo-2.24.3-r1.ebuild | 2 +-
gnome-base/libbonoboui/libbonoboui-2.24.5-r1.ebuild | 2 +-
gnome-base/libglade/libglade-2.6.4-r2.ebuild | 2 +-
gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild | 2 +-
gnome-base/libgnome/libgnome-2.32.1-r1.ebuild | 2 +-
gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild | 2 +-
gnome-base/libgnomekbd/libgnomekbd-3.26.1.ebuild | 4 ++--
gnome-base/libgnomeui/libgnomeui-2.24.5-r1.ebuild | 2 +-
gnome-base/libgtop/libgtop-2.38.0.ebuild | 2 +-
gnome-base/libgtop/libgtop-2.40.0-r1.ebuild | 2 +-
gnome-base/libgtop/libgtop-2.40.0.ebuild | 2 +-
gnome-base/librsvg/librsvg-2.40.21.ebuild | 2 +-
gnome-base/orbit/orbit-2.14.19-r5.ebuild | 2 +-
| 4 ++--
| 4 ++--
| 2 +-
| 4 ++--
| 4 ++--
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
mail-client/mailx-support/mailx-support-20060102-r2.ebuild | 2 +-
mail-client/mailx/mailx-8.1.2.20160123.ebuild | 2 +-
mail-filter/bogofilter/bogofilter-1.2.4-r3.ebuild | 2 +-
mail-filter/maildrop/maildrop-3.0.0.ebuild | 2 +-
mail-filter/procmail/procmail-3.22-r14.ebuild | 2 +-
mail-filter/spamassassin/spamassassin-3.4.3.ebuild | 2 +-
mail-filter/spamassassin/spamassassin-3.4.4.ebuild | 2 +-
mail-mta/courier/courier-1.0.5.ebuild | 2 +-
mail-mta/postfix/postfix-3.4.10.ebuild | 2 +-
mail-mta/postfix/postfix-3.4.9.ebuild | 2 +-
mail-mta/postfix/postfix-3.5.0.ebuild | 2 +-
mail-mta/postfix/postfix-3.6_pre20200316.ebuild | 2 +-
mail-mta/sendmail/sendmail-8.15.2-r2.ebuild | 2 +-
mail-mta/ssmtp/ssmtp-2.64-r3.ebuild | 2 +-
media-fonts/alee-fonts/alee-fonts-13-r1.ebuild | 2 +-
media-fonts/aquafont/aquafont-2.7-r4.ebuild | 2 +-
media-fonts/aquapfont/aquapfont-2.6-r2.ebuild | 2 +-
media-fonts/arabeyes-fonts/arabeyes-fonts-2.0-r1.ebuild | 4 ++--
media-fonts/arkpandora/arkpandora-2.04.ebuild | 2 +-
media-fonts/arphicfonts/arphicfonts-0.2.20080216.1-r2.ebuild | 2 +-
media-fonts/artwiz-aleczapka-en/artwiz-aleczapka-en-1.3.ebuild | 2 +-
media-fonts/artwiz-latin1/artwiz-latin1-1.1.ebuild | 2 +-
media-fonts/baekmuk-fonts/baekmuk-fonts-2.2-r2.ebuild | 2 +-
media-fonts/cantarell/cantarell-0.111.ebuild | 2 +-
media-fonts/cheapskatefonts/cheapskatefonts-1.0.ebuild | 2 +-
media-fonts/comic-neue/comic-neue-2.2.ebuild | 2 +-
media-fonts/comic-neue/comic-neue-2.3.ebuild | 4 ++--
media-fonts/corefonts/corefonts-1-r7.ebuild | 2 +-
media-fonts/cronyx-fonts/cronyx-fonts-2.3.8.ebuild | 2 +-
media-fonts/culmus/culmus-0.120-r5.ebuild | 2 +-
media-fonts/culmus/culmus-0.133.ebuild | 4 ++--
media-fonts/dejavu/dejavu-2.35.ebuild | 2 +-
media-fonts/dejavu/dejavu-2.37.ebuild | 2 +-
media-fonts/efont-unicode/efont-unicode-0.4.2-r1.ebuild | 2 +-
media-fonts/encodings/encodings-1.0.5.ebuild | 2 +-
media-fonts/essays1743/essays1743-2.100.ebuild | 4 ++--
media-fonts/farsi-fonts/farsi-fonts-0.4.ebuild | 2 +-
media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.3-r1.ebuild | 2 +-
media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.3-r1.ebuild | 2 +-
.../font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.4-r1.ebuild | 2 +-
.../font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.4-r1.ebuild | 2 +-
.../font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.4-r1.ebuild | 2 +-
media-fonts/font-alias/font-alias-1.0.3-r1.ebuild | 2 +-
media-fonts/font-arabic-misc/font-arabic-misc-1.0.3-r1.ebuild | 2 +-
media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.3-r1.ebuild | 2 +-
media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.3-r1.ebuild | 2 +-
.../font-bh-lucidatypewriter-100dpi-1.0.3-r1.ebuild | 2 +-
.../font-bh-lucidatypewriter-75dpi-1.0.3-r1.ebuild | 2 +-
media-fonts/font-bh-ttf/font-bh-ttf-1.0.3-r1.ebuild | 2 +-
media-fonts/font-bh-type1/font-bh-type1-1.0.3-r1.ebuild | 2 +-
.../font-bitstream-100dpi/font-bitstream-100dpi-1.0.3-r1.ebuild | 2 +-
media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.3-r1.ebuild | 2 +-
.../font-bitstream-speedo/font-bitstream-speedo-1.0.2-r1.ebuild | 2 +-
media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.3-r1.ebuild | 2 +-
media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.3-r1.ebuild | 2 +-
media-fonts/font-cursor-misc/font-cursor-misc-1.0.3-r1.ebuild | 2 +-
media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.3-r1.ebuild | 2 +-
media-fonts/font-dec-misc/font-dec-misc-1.0.3-r1.ebuild | 2 +-
media-fonts/font-ibm-type1/font-ibm-type1-1.0.3-r1.ebuild | 2 +-
media-fonts/font-isas-misc/font-isas-misc-1.0.3-r1.ebuild | 2 +-
media-fonts/font-jis-misc/font-jis-misc-1.0.3-r1.ebuild | 2 +-
media-fonts/font-micro-misc/font-micro-misc-1.0.3-r1.ebuild | 2 +-
media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.3-r1.ebuild | 2 +-
media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.3-r1.ebuild | 2 +-
media-fonts/font-misc-meltho/font-misc-meltho-1.0.3-r1.ebuild | 2 +-
media-fonts/font-misc-misc/font-misc-misc-1.1.2-r1.ebuild | 2 +-
media-fonts/font-mutt-misc/font-mutt-misc-1.0.3-r1.ebuild | 2 +-
media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.2-r1.ebuild | 2 +-
media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.4-r1.ebuild | 2 +-
media-fonts/font-sony-misc/font-sony-misc-1.0.3-r1.ebuild | 2 +-
media-fonts/font-sun-misc/font-sun-misc-1.0.3-r1.ebuild | 2 +-
media-fonts/font-util/font-util-1.3.2-r1.ebuild | 2 +-
.../font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.3-r1.ebuild | 2 +-
media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.4-r1.ebuild | 2 +-
media-fonts/free-bangla-font/free-bangla-font-0.2.ebuild | 2 +-
media-fonts/freefont/freefont-20120503.ebuild | 2 +-
media-fonts/freefonts/freefonts-0.10-r4.ebuild | 2 +-
media-fonts/fs-fonts/fs-fonts-0.1_alpha3.ebuild | 2 +-
media-fonts/hunkyfonts/hunkyfonts-0.3.1.ebuild | 2 +-
media-fonts/intlfonts/intlfonts-1.2.1-r1.ebuild | 2 +-
media-fonts/ipaex/ipaex-002.01.ebuild | 2 +-
media-fonts/ipamonafont/ipamonafont-1.0.8.ebuild | 2 +-
media-fonts/ja-ipafonts/ja-ipafonts-003.02-r1.ebuild | 2 +-
media-fonts/ja-ipafonts/ja-ipafonts-003.03.ebuild | 4 ++--
media-fonts/jisx0213-fonts/jisx0213-fonts-20040425-r2.ebuild | 2 +-
media-fonts/kacst-fonts/kacst-fonts-2.01.ebuild | 4 ++--
media-fonts/kochi-substitute/kochi-substitute-20030809-r3.ebuild | 2 +-
media-fonts/konfont/konfont-0.1.ebuild | 2 +-
media-fonts/lfpfonts-fix/lfpfonts-fix-0.83-r2.ebuild | 2 +-
media-fonts/lfpfonts-var/lfpfonts-var-0.84.ebuild | 2 +-
media-fonts/lohit-assamese/lohit-assamese-2.91.5.ebuild | 2 +-
media-fonts/lohit-bengali/lohit-bengali-2.91.5.ebuild | 2 +-
media-fonts/lohit-devanagari/lohit-devanagari-2.95.4.ebuild | 2 +-
media-fonts/lohit-fonts/lohit-fonts-2.20150220.ebuild | 2 +-
media-fonts/lohit-gujarati/lohit-gujarati-2.92.4.ebuild | 2 +-
media-fonts/lohit-gurmukhi/lohit-gurmukhi-2.91.2.ebuild | 2 +-
media-fonts/lohit-kannada/lohit-kannada-2.5.4.ebuild | 2 +-
media-fonts/lohit-malayalam/lohit-malayalam-2.92.2.ebuild | 2 +-
media-fonts/lohit-marathi/lohit-marathi-2.94.2.ebuild | 2 +-
media-fonts/lohit-nepali/lohit-nepali-2.94.2.ebuild | 2 +-
media-fonts/lohit-odia/lohit-odia-2.91.2.ebuild | 2 +-
media-fonts/lohit-tamil-classical/lohit-tamil-classical-2.5.4.ebuild | 2 +-
media-fonts/lohit-tamil/lohit-tamil-2.91.3.ebuild | 2 +-
media-fonts/lohit-telugu/lohit-telugu-2.5.5.ebuild | 2 +-
media-fonts/mikachan-font-otf/mikachan-font-otf-9.1-r1.ebuild | 2 +-
media-fonts/mikachan-font-ttc/mikachan-font-ttc-9.1.ebuild | 2 +-
media-fonts/mikachan-font-ttf/mikachan-font-ttf-8.9-r2.ebuild | 2 +-
media-fonts/monafont/monafont-2.90-r2.ebuild | 2 +-
media-fonts/mplus-fonts/mplus-fonts-2.2.4-r1.ebuild | 2 +-
media-fonts/open-sans/open-sans-1-r1.ebuild | 2 +-
media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2-r1.ebuild | 4 ++--
media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2.ebuild | 2 +-
media-fonts/oto/oto-0.5.ebuild | 2 +-
media-fonts/pcf2bdf/pcf2bdf-1.04-r1.ebuild | 2 +-
media-fonts/sazanami/sazanami-20040629.ebuild | 2 +-
media-fonts/sgi-fonts/sgi-fonts-1.0.ebuild | 2 +-
media-fonts/shinonome/shinonome-0.9.11.ebuild | 2 +-
media-fonts/sil-abyssinica/sil-abyssinica-1.500.ebuild | 2 +-
media-fonts/sil-arabicfonts/sil-arabicfonts-2.100.ebuild | 2 +-
media-fonts/sil-charis/sil-charis-5.000-r1.ebuild | 2 +-
media-fonts/sil-doulos/sil-doulos-5.000-r1.ebuild | 2 +-
media-fonts/sil-ezra/sil-ezra-2.51.ebuild | 2 +-
media-fonts/sil-galatia/sil-galatia-2.1.ebuild | 2 +-
media-fonts/sil-gentium/sil-gentium-5.000-r1.ebuild | 2 +-
media-fonts/sil-padauk/sil-padauk-2.8-r1.ebuild | 2 +-
media-fonts/source-han-sans/source-han-sans-1.001.ebuild | 2 +-
media-fonts/source-han-sans/source-han-sans-1.004.ebuild | 4 ++--
media-fonts/source-pro/source-pro-20141211.ebuild | 2 +-
media-fonts/source-pro/source-pro-20160608.ebuild | 4 ++--
media-fonts/source-pro/source-pro-20170111.ebuild | 2 +-
media-fonts/stix-fonts/stix-fonts-1.1.1.ebuild | 4 ++--
media-fonts/stix-fonts/stix-fonts-2.0.0.ebuild | 4 ++--
media-fonts/tengwar-fonts/tengwar-fonts-1.9d.ebuild | 2 +-
media-fonts/terminus-font/terminus-font-4.46.ebuild | 2 +-
media-fonts/terminus-font/terminus-font-4.47.ebuild | 2 +-
media-fonts/terminus-font/terminus-font-4.48.ebuild | 2 +-
media-fonts/texcm-ttf/texcm-ttf-1.0.ebuild | 2 +-
media-fonts/ttf-bitstream-vera/ttf-bitstream-vera-1.10-r3.ebuild | 2 +-
| 2 +-
media-fonts/unfonts/unfonts-1.0.2_pre080608-r1.ebuild | 2 +-
media-fonts/unifont/unifont-10.0.04.ebuild | 4 ++--
media-fonts/unifont/unifont-10.0.05.ebuild | 4 ++--
media-fonts/unifont/unifont-10.0.06.ebuild | 2 +-
media-fonts/unifont/unifont-11.0.02.ebuild | 4 ++--
media-fonts/unifont/unifont-9.0.06.ebuild | 2 +-
media-fonts/urw-fonts/urw-fonts-2.4.9.ebuild | 2 +-
media-fonts/urwvn-fonts/urwvn-fonts-3.05.ebuild | 2 +-
media-fonts/vollkorn/vollkorn-2.1.ebuild | 4 ++--
media-fonts/wqy-bitmapfont/wqy-bitmapfont-1.0.0_rc1.ebuild | 2 +-
media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r3.ebuild | 2 +-
media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r4.ebuild | 2 +-
media-fonts/zh-kcfonts/zh-kcfonts-1.05-r3.ebuild | 2 +-
media-gfx/ebdftopcf/ebdftopcf-2.ebuild | 2 +-
media-gfx/exiv2/exiv2-0.27.2.ebuild | 2 +-
media-gfx/fbida/fbida-2.12.ebuild | 2 +-
media-gfx/fbida/fbida-2.13-r1.ebuild | 4 ++--
media-gfx/fbida/fbida-2.14.ebuild | 4 ++--
media-gfx/fontforge/fontforge-20170731-r5.ebuild | 2 +-
media-gfx/fontforge/fontforge-20190317-r3.ebuild | 2 +-
media-gfx/fontforge/fontforge-20190801.ebuild | 2 +-
media-gfx/gnome-font-viewer/gnome-font-viewer-3.32.0.ebuild | 4 ++--
media-gfx/gnome-font-viewer/gnome-font-viewer-3.34.0.ebuild | 2 +-
media-gfx/gnome-screenshot/gnome-screenshot-3.32.0.ebuild | 4 ++--
media-gfx/graphite2/graphite2-1.3.13.ebuild | 2 +-
media-gfx/graphviz/graphviz-2.42.3.ebuild | 2 +-
media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild | 2 +-
media-gfx/imagemagick/imagemagick-6.9.11.0.ebuild | 2 +-
media-gfx/imagemagick/imagemagick-6.9.11.1.ebuild | 2 +-
media-gfx/imagemagick/imagemagick-7.0.10.0.ebuild | 2 +-
media-gfx/imagemagick/imagemagick-7.0.10.1.ebuild | 2 +-
media-gfx/imagemagick/imagemagick-9999.ebuild | 2 +-
media-gfx/potrace/potrace-1.15.ebuild | 2 +-
media-gfx/potrace/potrace-1.16.ebuild | 4 ++--
media-gfx/sam2p/sam2p-0.49.3.ebuild | 2 +-
media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild | 2 +-
media-gfx/scrot/scrot-0.8_p13-r1.ebuild | 2 +-
media-gfx/scrot/scrot-1.2.ebuild | 4 ++--
media-gfx/ufraw/ufraw-0.22-r3.ebuild | 4 ++--
media-gfx/xloadimage/xloadimage-4.1-r12.ebuild | 2 +-
media-libs/a52dec/a52dec-0.7.4-r6.ebuild | 2 +-
media-libs/a52dec/a52dec-0.7.4-r7.ebuild | 2 +-
media-libs/aalib/aalib-1.4_rc5-r9.ebuild | 2 +-
media-libs/alsa-lib/alsa-lib-1.2.1.2.ebuild | 2 +-
media-libs/alsa-lib/alsa-lib-1.2.2.ebuild | 2 +-
media-libs/audiofile/audiofile-0.3.6-r3.ebuild | 2 +-
media-libs/bio2jack/bio2jack-0.9-r2.ebuild | 2 +-
media-libs/exempi/exempi-2.4.5-r1.ebuild | 2 +-
media-libs/faac/faac-1.29.9.2.ebuild | 2 +-
media-libs/faad2/faad2-2.8.8.ebuild | 2 +-
media-libs/faad2/faad2-2.9.0.ebuild | 4 ++--
media-libs/flac/flac-1.3.2-r1.ebuild | 2 +-
media-libs/flac/flac-1.3.3.ebuild | 2 +-
media-libs/fontconfig/fontconfig-2.12.6.ebuild | 2 +-
media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild | 2 +-
media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild | 4 ++--
media-libs/freeglut/freeglut-3.2.1.ebuild | 2 +-
media-libs/freetype/freetype-2.10.0.ebuild | 4 ++--
media-libs/freetype/freetype-2.10.1.ebuild | 4 ++--
media-libs/freetype/freetype-2.9.1-r3.ebuild | 2 +-
media-libs/freetype/freetype-2.9.1-r4.ebuild | 4 ++--
media-libs/freetype/freetype-9999.ebuild | 4 ++--
media-libs/ftgl/ftgl-2.1.3_rc5.ebuild | 2 +-
media-libs/gd/gd-2.2.5-r2.ebuild | 2 +-
media-libs/giblib/giblib-1.2.4-r1.ebuild | 2 +-
media-libs/giflib/giflib-5.1.4.ebuild | 2 +-
media-libs/giflib/giflib-5.2.1-r1.ebuild | 2 +-
media-libs/glew/glew-1.10.0-r100.ebuild | 4 ++--
media-libs/glew/glew-1.6.0-r100.ebuild | 4 ++--
media-libs/glew/glew-2.1.0-r1.ebuild | 2 +-
media-libs/glu/glu-9.0.1.ebuild | 2 +-
media-libs/glu/glu-9999.ebuild | 2 +-
media-libs/gst-plugins-base/gst-plugins-base-1.14.5.ebuild | 2 +-
media-libs/gst-plugins-good/gst-plugins-good-1.14.5.ebuild | 2 +-
media-libs/gst-plugins-ugly/gst-plugins-ugly-1.14.3.ebuild | 2 +-
media-libs/gstreamer/gstreamer-1.14.5.ebuild | 2 +-
media-libs/harfbuzz/harfbuzz-2.6.1.ebuild | 2 +-
media-libs/harfbuzz/harfbuzz-2.6.4.ebuild | 2 +-
media-libs/harfbuzz/harfbuzz-9999.ebuild | 2 +-
media-libs/id3lib/id3lib-3.8.3-r8.ebuild | 2 +-
media-libs/imlib/imlib-1.9.15-r5.ebuild | 2 +-
media-libs/imlib2/imlib2-1.6.1.ebuild | 2 +-
media-libs/jbig2dec/jbig2dec-0.14.ebuild | 2 +-
media-libs/jbig2dec/jbig2dec-0.17-r1.ebuild | 2 +-
media-libs/jbigkit/jbigkit-2.1.ebuild | 2 +-
media-libs/jpeg/jpeg-6b-r12.ebuild | 4 ++--
media-libs/jpeg/jpeg-8d-r2.ebuild | 4 ++--
media-libs/jpeg/jpeg-9c.ebuild | 2 +-
media-libs/lcms/lcms-2.9.ebuild | 2 +-
media-libs/lensfun/lensfun-0.3.2-r1.ebuild | 2 +-
media-libs/libao/libao-1.2.2-r1.ebuild | 4 ++--
media-libs/libao/libao-1.2.2.ebuild | 2 +-
media-libs/libart_lgpl/libart_lgpl-2.3.21-r3.ebuild | 2 +-
media-libs/libcaca/libcaca-0.99_beta19-r1.ebuild | 2 +-
media-libs/libcanberra/libcanberra-0.30-r5.ebuild | 2 +-
media-libs/libcddb/libcddb-1.3.2-r1.ebuild | 2 +-
media-libs/libcue/libcue-2.2.1.ebuild | 4 ++--
media-libs/libdca/libdca-0.0.5-r3.ebuild | 2 +-
media-libs/libdvdcss/libdvdcss-1.4.2.ebuild | 2 +-
media-libs/libdvdnav/libdvdnav-6.0.0.ebuild | 2 +-
media-libs/libdvdnav/libdvdnav-6.0.1.ebuild | 4 ++--
media-libs/libdvdnav/libdvdnav-9999.ebuild | 4 ++--
media-libs/libdvdread/libdvdread-6.0.0.ebuild | 2 +-
media-libs/libdvdread/libdvdread-6.0.1.ebuild | 4 ++--
media-libs/libdvdread/libdvdread-6.0.2.ebuild | 4 ++--
media-libs/libdvdread/libdvdread-9999.ebuild | 4 ++--
media-libs/libexif/libexif-0.6.21-r3.ebuild | 2 +-
media-libs/libfame/libfame-0.9.1-r2.ebuild | 2 +-
media-libs/libfpx/libfpx-1.3.1_p10.ebuild | 2 +-
media-libs/libggi/libggi-2.2.2-r1.ebuild | 2 +-
media-libs/libgii/libgii-1.0.2-r2.ebuild | 2 +-
media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild | 2 +-
media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r2.ebuild | 2 +-
media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild | 2 +-
media-libs/libjpeg-turbo/libjpeg-turbo-2.0.4.ebuild | 2 +-
media-libs/libldac/libldac-2.0.2-r1.ebuild | 4 ++--
media-libs/libmad/libmad-0.15.1b-r9.ebuild | 2 +-
media-libs/libmikmod/libmikmod-3.3.11.1.ebuild | 2 +-
media-libs/libmng/libmng-2.0.3.ebuild | 2 +-
media-libs/libmodplug/libmodplug-0.8.9.0.ebuild | 2 +-
media-libs/libmp4v2/libmp4v2-2.0.0-r1.ebuild | 2 +-
media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild | 2 +-
media-libs/libmpeg3/libmpeg3-1.8-r1.ebuild | 2 +-
media-libs/libogg/libogg-1.3.3.ebuild | 2 +-
media-libs/libogg/libogg-1.3.4.ebuild | 2 +-
media-libs/libpng-compat/libpng-compat-1.2.59.ebuild | 4 ++--
media-libs/libpng-compat/libpng-compat-1.5.30.ebuild | 4 ++--
media-libs/libpng/libpng-1.6.37.ebuild | 2 +-
media-libs/libsamplerate/libsamplerate-0.1.9.ebuild | 2 +-
media-libs/libsamplerate/libsamplerate-9999.ebuild | 4 ++--
media-libs/libsdl/libsdl-1.2.15-r9.ebuild | 2 +-
media-libs/libshout/libshout-2.4.1-r2.ebuild | 2 +-
media-libs/libshout/libshout-2.4.2.ebuild | 4 ++--
media-libs/libshout/libshout-2.4.3.ebuild | 4 ++--
media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild | 2 +-
media-libs/libsndfile/libsndfile-1.0.29_pre2_p20191024.ebuild | 2 +-
media-libs/libsndfile/libsndfile-9999.ebuild | 2 +-
media-libs/libtheora/libtheora-1.1.1-r2.ebuild | 2 +-
media-libs/libuninameslist/libuninameslist-20091231-r1.ebuild | 2 +-
media-libs/libv4l/libv4l-1.10.1.ebuild | 2 +-
media-libs/libv4l/libv4l-1.16.3.ebuild | 4 ++--
media-libs/libv4l/libv4l-1.16.6.ebuild | 2 +-
media-libs/libv4l/libv4l-1.18.0.ebuild | 2 +-
media-libs/libv4l/libv4l-1.6.2.ebuild | 2 +-
media-libs/libvorbis/libvorbis-1.3.6-r1.ebuild | 2 +-
media-libs/libvorbis/libvorbis-1.3.6.ebuild | 2 +-
media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild | 2 +-
media-libs/mesa/mesa-19.3.5.ebuild | 2 +-
media-libs/mesa/mesa-20.0.1-r1.ebuild | 2 +-
media-libs/mesa/mesa-20.0.2.ebuild | 2 +-
media-libs/mesa/mesa-9999.ebuild | 2 +-
media-libs/nas/nas-1.9.4-r2.ebuild | 2 +-
media-libs/netpbm/netpbm-10.66.00.ebuild | 2 +-
media-libs/netpbm/netpbm-10.70.00.ebuild | 2 +-
media-libs/netpbm/netpbm-10.76.00.ebuild | 2 +-
media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild | 2 +-
media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild | 2 +-
media-libs/openjpeg/openjpeg-2.3.1.ebuild | 2 +-
media-libs/portaudio/portaudio-19.06.00-r1.ebuild | 2 +-
media-libs/portaudio/portaudio-19.06.00-r2.ebuild | 4 ++--
media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild | 2 +-
media-libs/smpeg/smpeg-0.4.4-r10.ebuild | 2 +-
media-libs/speex/speex-1.2.0-r1.ebuild | 2 +-
media-libs/speexdsp/speexdsp-1.2_rc3-r2.ebuild | 2 +-
media-libs/t1lib/t1lib-5.1.2-r2.ebuild | 2 +-
media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild | 2 +-
media-libs/tiff/tiff-4.1.0.ebuild | 2 +-
media-libs/urt/urt-3.1b-r1.ebuild | 2 +-
media-libs/urt/urt-3.1b-r3.ebuild | 2 +-
media-plugins/alsa-plugins/alsa-plugins-1.2.1.ebuild | 2 +-
media-plugins/alsa-plugins/alsa-plugins-1.2.2.ebuild | 2 +-
media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.14.3.ebuild | 2 +-
media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.14.3.ebuild | 2 +-
media-plugins/gst-plugins-flac/gst-plugins-flac-1.14.5.ebuild | 2 +-
.../gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.14.5.ebuild | 2 +-
media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.14.3.ebuild | 2 +-
media-plugins/gst-plugins-oss/gst-plugins-oss-1.14.5.ebuild | 2 +-
media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.14.5.ebuild | 2 +-
media-sound/alsa-utils/alsa-utils-1.2.1.ebuild | 2 +-
media-sound/alsa-utils/alsa-utils-1.2.2.ebuild | 2 +-
media-sound/aumix/aumix-2.9.1.ebuild | 2 +-
media-sound/flac123/flac123-0.0.12.ebuild | 4 ++--
.../jack-audio-connection-kit-0.125.0.ebuild | 2 +-
media-sound/lame/lame-3.100-r1.ebuild | 2 +-
media-sound/lame/lame-3.100-r2.ebuild | 4 ++--
media-sound/mpd/mpd-0.21.18-r1.ebuild | 2 +-
media-sound/mpd/mpd-0.21.19-r1.ebuild | 2 +-
media-sound/mpd/mpd-0.21.20.ebuild | 2 +-
media-sound/mpd/mpd-0.21.21.ebuild | 2 +-
media-sound/mt-daapd/mt-daapd-0.2.4.2.ebuild | 4 ++--
media-sound/pulseaudio/pulseaudio-13.0.ebuild | 2 +-
media-video/mpeg2vidcodec/mpeg2vidcodec-12-r1.ebuild | 2 +-
media-video/vcdimager/vcdimager-0.7.24.ebuild | 2 +-
media-video/vcdimager/vcdimager-2.0.1.ebuild | 2 +-
net-analyzer/arping/arping-2.17.ebuild | 2 +-
net-analyzer/arping/arping-2.20.ebuild | 4 ++--
net-analyzer/arping/arping-2.21.ebuild | 2 +-
net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild | 2 +-
net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r2.ebuild | 4 ++--
net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r3.ebuild | 4 ++--
net-analyzer/mtr/mtr-0.87.ebuild | 2 +-
net-analyzer/mtr/mtr-0.92-r1.ebuild | 4 ++--
net-analyzer/mtr/mtr-0.93-r1.ebuild | 4 ++--
net-analyzer/net-snmp/net-snmp-5.8-r3.ebuild | 2 +-
net-analyzer/net-snmp/net-snmp-5.8-r4.ebuild | 2 +-
net-analyzer/net-snmp/net-snmp-5.8-r5.ebuild | 2 +-
net-analyzer/net-snmp/net-snmp-5.8.1_pre1-r1.ebuild | 2 +-
net-analyzer/net-snmp/net-snmp-5.8.1_pre2.ebuild | 2 +-
net-analyzer/netcat/netcat-110-r9.ebuild | 2 +-
net-analyzer/netcat/netcat-110.20180111.ebuild | 4 ++--
net-analyzer/netselect/netselect-0.4-r1.ebuild | 2 +-
net-analyzer/ngrep/ngrep-1.45-r3.ebuild | 2 +-
net-analyzer/ngrep/ngrep-1.47.ebuild | 2 +-
net-analyzer/nmap/nmap-7.80-r1.ebuild | 2 +-
net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild | 2 +-
net-analyzer/rrdtool/rrdtool-1.7.1.ebuild | 2 +-
net-analyzer/rrdtool/rrdtool-1.7.2.ebuild | 2 +-
net-analyzer/tcpdump/tcpdump-4.9.3-r1.ebuild | 2 +-
net-analyzer/tcpdump/tcpdump-4.9.3.ebuild | 2 +-
net-analyzer/tcpdump/tcpdump-9999.ebuild | 2 +-
net-analyzer/traceroute/traceroute-2.0.20.ebuild | 2 +-
net-analyzer/traceroute/traceroute-2.0.22.ebuild | 4 ++--
net-analyzer/traceroute/traceroute-2.1.0.ebuild | 2 +-
net-dialup/linux-atm/linux-atm-2.5.2.ebuild | 2 +-
net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild | 2 +-
net-dialup/mgetty/mgetty-1.2.1-r1.ebuild | 2 +-
net-dialup/mgetty/mgetty-1.2.1.ebuild | 2 +-
net-dialup/minicom/minicom-2.7.1.ebuild | 2 +-
net-dialup/ppp-scripts/ppp-scripts-0.ebuild | 2 +-
net-dialup/ppp/ppp-2.4.7-r7.ebuild | 2 +-
net-dialup/ppp/ppp-2.4.8.ebuild | 2 +-
net-dialup/rp-pppoe/rp-pppoe-3.12-r1.ebuild | 2 +-
net-dialup/rp-pppoe/rp-pppoe-3.13.ebuild | 2 +-
net-dns/bind-tools/bind-tools-9.14.11.ebuild | 2 +-
net-dns/bind-tools/bind-tools-9.14.8.ebuild | 2 +-
net-dns/bind-tools/bind-tools-9.14.9.ebuild | 2 +-
net-dns/bind-tools/bind-tools-9.16.1.ebuild | 2 +-
net-dns/bind/bind-9.14.11.ebuild | 2 +-
net-dns/bind/bind-9.14.8.ebuild | 2 +-
net-dns/bind/bind-9.14.9.ebuild | 2 +-
net-dns/bind/bind-9.16.1.ebuild | 2 +-
net-dns/c-ares/c-ares-1.13.0.ebuild | 2 +-
net-dns/c-ares/c-ares-1.14.0.ebuild | 2 +-
net-dns/c-ares/c-ares-1.15.0.ebuild | 2 +-
net-dns/dnsmasq/dnsmasq-2.80-r1.ebuild | 2 +-
net-dns/dnssec-root/dnssec-root-20181220-r1.ebuild | 4 ++--
net-dns/idnkit/idnkit-1.0-r2.ebuild | 2 +-
net-dns/idnkit/idnkit-2.3.ebuild | 2 +-
net-dns/ldns-utils/ldns-utils-1.7.0-r1.ebuild | 2 +-
net-dns/ldns-utils/ldns-utils-1.7.1.ebuild | 4 ++--
net-dns/libidn/libidn-1.35.ebuild | 2 +-
net-dns/libidn2/libidn2-2.1.1a-r1.ebuild | 2 +-
net-dns/libidn2/libidn2-2.3.0.ebuild | 2 +-
net-dns/openresolv/openresolv-3.9.0.ebuild | 2 +-
net-dns/openresolv/openresolv-3.9.2.ebuild | 4 ++--
net-firewall/iptables/iptables-1.6.1-r3.ebuild | 2 +-
net-firewall/iptables/iptables-1.6.2-r2.ebuild | 4 ++--
net-firewall/iptables/iptables-1.8.3-r1.ebuild | 4 ++--
net-firewall/iptables/iptables-1.8.4-r1.ebuild | 2 +-
net-firewall/iptables/iptables-1.8.4.ebuild | 4 ++--
net-fs/cifs-utils/cifs-utils-6.7.ebuild | 2 +-
net-fs/cifs-utils/cifs-utils-6.8-r1.ebuild | 4 ++--
net-fs/cifs-utils/cifs-utils-6.9-r1.ebuild | 2 +-
net-fs/libnfs/libnfs-2.0.0.ebuild | 2 +-
net-fs/libnfs/libnfs-3.0.0.ebuild | 4 ++--
net-fs/libnfs/libnfs-4.0.0.ebuild | 4 ++--
net-fs/libnfs/libnfs-9999.ebuild | 4 ++--
net-fs/nfs-utils/nfs-utils-2.3.4.ebuild | 2 +-
net-fs/nfs-utils/nfs-utils-2.4.1-r4.ebuild | 2 +-
net-fs/nfs-utils/nfs-utils-2.4.2-r1.ebuild | 2 +-
net-fs/nfs-utils/nfs-utils-2.4.3.ebuild | 2 +-
net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild | 2 +-
net-ftp/ftpbase/ftpbase-0.01-r3.ebuild | 2 +-
net-ftp/ncftp/ncftp-3.2.6-r1.ebuild | 2 +-
net-ftp/ncftp/ncftp-3.2.6.ebuild | 2 +-
net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild | 2 +-
net-ftp/vsftpd/vsftpd-3.0.3-r3.ebuild | 2 +-
| 2 +-
net-libs/c-client/c-client-2007f-r6.ebuild | 2 +-
net-libs/courier-authlib/courier-authlib-0.66.4.ebuild | 2 +-
net-libs/courier-authlib/courier-authlib-0.67.0.ebuild | 4 ++--
net-libs/courier-authlib/courier-authlib-0.68.0-r1.ebuild | 4 ++--
net-libs/courier-authlib/courier-authlib-0.69.0-r1.ebuild | 2 +-
net-libs/courier-unicode/courier-unicode-2.1.ebuild | 2 +-
net-libs/glib-networking/glib-networking-2.60.3.ebuild | 2 +-
net-libs/glib-networking/glib-networking-2.60.4.ebuild | 2 +-
net-libs/glib-networking/glib-networking-2.62.3.ebuild | 2 +-
net-libs/glib-networking/glib-networking-2.64.0.ebuild | 2 +-
net-libs/gnutls/gnutls-3.6.11.1-r1.ebuild | 4 ++--
net-libs/gnutls/gnutls-3.6.12.ebuild | 2 +-
net-libs/gnutls/gnutls-3.6.7-r1.ebuild | 2 +-
net-libs/ldns/ldns-1.7.0-r2.ebuild | 2 +-
net-libs/ldns/ldns-1.7.1-r1.ebuild | 2 +-
net-libs/libasyncns/libasyncns-0.8-r4.ebuild | 2 +-
net-libs/libesmtp/libesmtp-1.0.6-r3.ebuild | 2 +-
net-libs/libgssglue/libgssglue-0.4-r1.ebuild | 2 +-
net-libs/liblockfile/liblockfile-1.16.ebuild | 2 +-
net-libs/libmnl/libmnl-1.0.3-r1.ebuild | 2 +-
net-libs/libmnl/libmnl-1.0.4.ebuild | 2 +-
net-libs/libnet/libnet-1.2.ebuild | 2 +-
net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.4.ebuild | 2 +-
net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.5.ebuild | 4 ++--
net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.6.ebuild | 2 +-
net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.7.ebuild | 2 +-
net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild | 2 +-
net-libs/libnfsidmap/libnfsidmap-0.27.ebuild | 2 +-
net-libs/libnsl/libnsl-0-r1.ebuild | 2 +-
net-libs/libnsl/libnsl-1.2.0.ebuild | 2 +-
net-libs/libpcap/libpcap-1.9.1-r2.ebuild | 2 +-
net-libs/libpcap/libpcap-1.9.1.ebuild | 2 +-
net-libs/libproxy/libproxy-0.4.13-r2.ebuild | 2 +-
net-libs/libproxy/libproxy-0.4.15-r1.ebuild | 2 +-
net-libs/librsync/librsync-0.9.7-r3.ebuild | 2 +-
net-libs/librsync/librsync-2.0.1-r1.ebuild | 2 +-
net-libs/librsync/librsync-2.0.2.ebuild | 4 ++--
net-libs/librsync/librsync-2.1.0.ebuild | 4 ++--
net-libs/librsync/librsync-2.2.1.ebuild | 4 ++--
net-libs/libsmi/libsmi-0.4.8-r1.ebuild | 2 +-
net-libs/libsmi/libsmi-0.5.0.ebuild | 2 +-
net-libs/libsoup/libsoup-2.62.3.ebuild | 2 +-
net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild | 2 +-
net-libs/libtirpc/libtirpc-1.2.5.ebuild | 2 +-
net-libs/libvncserver/libvncserver-0.9.12-r4.ebuild | 2 +-
net-libs/libvncserver/libvncserver-0.9.12-r5.ebuild | 2 +-
net-libs/mbedtls/mbedtls-2.17.0.ebuild | 2 +-
net-libs/mbedtls/mbedtls-2.19.1-r2.ebuild | 2 +-
net-libs/neon/neon-0.30.2.ebuild | 2 +-
net-libs/nghttp2/nghttp2-1.39.2.ebuild | 2 +-
net-libs/nghttp2/nghttp2-1.40.0.ebuild | 2 +-
net-libs/nghttp2/nghttp2-9999.ebuild | 4 ++--
net-libs/rpcsvc-proto/rpcsvc-proto-0.ebuild | 2 +-
net-libs/rpcsvc-proto/rpcsvc-proto-1.4-r1.ebuild | 2 +-
net-libs/rpcsvc-proto/rpcsvc-proto-1.4.1.ebuild | 2 +-
net-libs/serf/serf-1.3.8-r1.ebuild | 2 +-
net-libs/serf/serf-1.3.8.ebuild | 2 +-
net-libs/serf/serf-1.3.9-r1.ebuild | 4 ++--
net-libs/serf/serf-1.3.9.ebuild | 2 +-
net-mail/autorespond/autorespond-2.0.4.ebuild | 2 +-
net-mail/autorespond/autorespond-2.0.5.ebuild | 2 +-
net-mail/checkpassword/checkpassword-0.90-r4.ebuild | 2 +-
net-mail/cmd5checkpw/cmd5checkpw-0.30-r2.ebuild | 2 +-
net-mail/cmd5checkpw/cmd5checkpw-0.30-r3.ebuild | 4 ++--
net-mail/dot-forward/dot-forward-0.71-r4.ebuild | 2 +-
net-mail/fetchmail/fetchmail-6.4.1-r3.ebuild | 2 +-
net-mail/fetchmail/fetchmail-6.4.1.ebuild | 2 +-
net-mail/fetchmail/fetchmail-6.4.2.ebuild | 2 +-
net-mail/mailbase/mailbase-1.5-r1.ebuild | 2 +-
net-mail/metamail/metamail-2.7.53.3-r2.ebuild | 2 +-
net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild | 4 ++--
net-mail/qmailadmin/qmailadmin-1.2.16.ebuild | 4 ++--
net-mail/queue-fix/queue-fix-1.4-r3.ebuild | 2 +-
net-mail/queue-repair/queue-repair-0.9.0-r1.ebuild | 2 +-
net-mail/smtptools/smtptools-0.2.3.ebuild | 2 +-
net-mail/vpopmail/vpopmail-5.4.33-r6.ebuild | 2 +-
net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild | 4 ++--
net-misc/curl/curl-7.66.0.ebuild | 2 +-
net-misc/curl/curl-7.67.0-r1.ebuild | 4 ++--
net-misc/curl/curl-7.68.0.ebuild | 2 +-
net-misc/curl/curl-7.69.0.ebuild | 2 +-
net-misc/curl/curl-7.69.1.ebuild | 2 +-
net-misc/dhcp/dhcp-4.4.1.ebuild | 2 +-
net-misc/dhcp/dhcp-4.4.2-r2.ebuild | 2 +-
net-misc/dhcp/dhcp-4.4.2.ebuild | 2 +-
net-misc/dhcpcd/dhcpcd-7.2.3.ebuild | 2 +-
net-misc/dhcpcd/dhcpcd-7.2.5.ebuild | 4 ++--
net-misc/dhcpcd/dhcpcd-8.0.6.ebuild | 4 ++--
net-misc/dhcpcd/dhcpcd-8.1.5.ebuild | 2 +-
net-misc/dhcpcd/dhcpcd-8.1.6.ebuild | 2 +-
net-misc/dhcpcd/dhcpcd-9999.ebuild | 4 ++--
net-misc/dropbear/dropbear-2017.75.ebuild | 2 +-
net-misc/dropbear/dropbear-2018.76.ebuild | 4 ++--
net-misc/dropbear/dropbear-2019.78.ebuild | 2 +-
net-misc/ethertypes/ethertypes-0.ebuild | 4 ++--
net-misc/fakeidentd/fakeidentd-2.6-r1.ebuild | 2 +-
net-misc/htpdate/htpdate-1.0.7.ebuild | 4 ++--
net-misc/htpdate/htpdate-1.2.0.ebuild | 4 ++--
net-misc/htpdate/htpdate-1.2.2.ebuild | 4 ++--
net-misc/ipcalc/ipcalc-0.41.ebuild | 2 +-
net-misc/iputils/iputils-20180629.ebuild | 2 +-
net-misc/iputils/iputils-20190515.ebuild | 4 ++--
net-misc/iputils/iputils-20190709.ebuild | 2 +-
net-misc/iputils/iputils-99999999.ebuild | 2 +-
net-misc/jwhois/jwhois-4.0-r1.ebuild | 2 +-
net-misc/keychain/keychain-2.8.1.ebuild | 2 +-
net-misc/keychain/keychain-2.8.5.ebuild | 2 +-
net-misc/lksctp-tools/lksctp-tools-1.0.17.ebuild | 2 +-
net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild | 2 +-
net-misc/memcached/memcached-1.5.22.ebuild | 2 +-
net-misc/memcached/memcached-1.6.2.ebuild | 2 +-
net-misc/netdate/netdate-1.2-r1.ebuild | 4 ++--
net-misc/netifrc/netifrc-0.2.2.ebuild | 2 +-
net-misc/netifrc/netifrc-0.2.3.ebuild | 2 +-
net-misc/netifrc/netifrc-0.2.4.ebuild | 2 +-
net-misc/netifrc/netifrc-0.3.0.ebuild | 2 +-
net-misc/netifrc/netifrc-0.3.1.ebuild | 2 +-
net-misc/netifrc/netifrc-0.4.0-r1.ebuild | 2 +-
net-misc/netifrc/netifrc-0.4.0.ebuild | 2 +-
net-misc/netifrc/netifrc-0.5.0.ebuild | 2 +-
net-misc/netifrc/netifrc-0.5.1.ebuild | 2 +-
net-misc/netifrc/netifrc-0.6.0.ebuild | 2 +-
net-misc/netifrc/netifrc-0.6.1.ebuild | 2 +-
net-misc/netifrc/netifrc-0.7.1.ebuild | 2 +-
net-misc/netifrc/netifrc-9999.ebuild | 2 +-
net-misc/netkit-fingerd/netkit-fingerd-0.17-r3.ebuild | 2 +-
net-misc/netkit-rsh/netkit-rsh-0.17-r10.ebuild | 2 +-
net-misc/netkit-telnetd/netkit-telnetd-0.17-r10.ebuild | 2 +-
net-misc/netkit-telnetd/netkit-telnetd-0.17-r12.ebuild | 2 +-
net-misc/ntp/ntp-4.2.8_p13-r2.ebuild | 2 +-
net-misc/ntp/ntp-4.2.8_p13.ebuild | 2 +-
net-misc/ntp/ntp-4.2.8_p14-r2.ebuild | 2 +-
net-misc/oidentd/oidentd-2.4.0.ebuild | 2 +-
net-misc/openntpd/openntpd-6.0_p1.ebuild | 2 +-
net-misc/openntpd/openntpd-6.2_p3-r1.ebuild | 4 ++--
net-misc/openntpd/openntpd-6.2_p3.ebuild | 4 ++--
net-misc/openssh/openssh-7.5_p1-r5.ebuild | 2 +-
net-misc/openssh/openssh-7.7_p1-r10.ebuild | 2 +-
net-misc/openssh/openssh-7.9_p1-r5.ebuild | 2 +-
net-misc/openssh/openssh-8.0_p1-r5.ebuild | 2 +-
net-misc/openssh/openssh-8.1_p1-r3.ebuild | 2 +-
net-misc/openssh/openssh-8.2_p1-r5.ebuild | 2 +-
net-misc/openssh/openssh-8.2_p1-r6.ebuild | 2 +-
net-misc/proxytunnel/proxytunnel-1.9.1-r1.ebuild | 4 ++--
net-misc/proxytunnel/proxytunnel-1.9.1-r2.ebuild | 2 +-
net-misc/proxytunnel/proxytunnel-9999.ebuild | 4 ++--
net-misc/rsync/rsync-3.1.3.ebuild | 2 +-
net-misc/socat/socat-1.7.3.2.ebuild | 2 +-
net-misc/socat/socat-1.7.3.3.ebuild | 4 ++--
net-misc/socat/socat-1.7.3.4.ebuild | 2 +-
net-misc/sslh/sslh-1.20.ebuild | 4 ++--
net-misc/sslh/sslh-9999.ebuild | 4 ++--
net-misc/telnet-bsd/telnet-bsd-1.2-r1.ebuild | 2 +-
net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild | 2 +-
net-misc/wget/wget-1.20.3-r1.ebuild | 2 +-
net-misc/wget/wget-1.20.3-r3.ebuild | 2 +-
net-misc/whois/whois-5.4.3.ebuild | 2 +-
net-misc/whois/whois-5.5.5.ebuild | 2 +-
net-misc/whois/whois-5.5.6.ebuild | 2 +-
net-misc/whois/whois-9999.ebuild | 4 ++--
net-nds/gssproxy/gssproxy-0.8.2.ebuild | 2 +-
net-nds/openldap/openldap-2.4.48.ebuild | 2 +-
net-nds/openldap/openldap-2.4.49-r1.ebuild | 2 +-
net-nds/openldap/openldap-2.4.49-r2.ebuild | 2 +-
net-nds/rpcbind/rpcbind-1.2.5.ebuild | 2 +-
net-nds/rpcbind/rpcbind-9999.ebuild | 2 +-
net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild | 2 +-
net-print/cups-windows/cups-windows-6.0-r1.ebuild | 2 +-
net-print/cups/cups-2.2.13.ebuild | 2 +-
net-print/cups/cups-2.3.1.ebuild | 4 ++--
net-print/cups/cups-9999.ebuild | 4 ++--
net-print/foomatic-db-engine/foomatic-db-engine-4.0.12.ebuild | 2 +-
net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20170331.ebuild | 2 +-
net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20180126.ebuild | 4 ++--
net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20190226.ebuild | 4 ++--
net-print/foomatic-db/foomatic-db-4.0.20170331.ebuild | 2 +-
net-print/foomatic-db/foomatic-db-4.0.20180126.ebuild | 4 ++--
net-print/foomatic-db/foomatic-db-4.0.20190226.ebuild | 4 ++--
net-print/libgnomecups/libgnomecups-0.2.3-r3.ebuild | 2 +-
net-print/libgnomecups/libgnomecups-0.2.3-r5.ebuild | 2 +-
net-proxy/dante/dante-1.4.1-r2.ebuild | 2 +-
net-proxy/pingtunnel/pingtunnel-0.72.ebuild | 2 +-
net-vpn/openvpn/openvpn-2.4.6-r1.ebuild | 2 +-
net-vpn/openvpn/openvpn-2.4.6.ebuild | 2 +-
net-vpn/openvpn/openvpn-2.4.7-r1.ebuild | 2 +-
net-vpn/openvpn/openvpn-2.4.8.ebuild | 2 +-
net-vpn/wireguard-modules/wireguard-modules-0.0.20200318.ebuild | 2 +-
net-vpn/wireguard-modules/wireguard-modules-9999.ebuild | 4 ++--
net-vpn/wireguard-tools/wireguard-tools-1.0.20200319.ebuild | 2 +-
net-wireless/irda-utils/irda-utils-0.9.18-r6.ebuild | 2 +-
net-wireless/wireless-tools/wireless-tools-30_pre9-r1.ebuild | 2 +-
net-wireless/wireless-tools/wireless-tools-30_pre9.ebuild | 4 ++--
perl-core/File-Temp/File-Temp-0.230.900.ebuild | 2 +-
perl-core/IO-Zlib/IO-Zlib-1.100.0.ebuild | 2 +-
perl-core/Module-Loaded/Module-Loaded-0.80.0-r1.ebuild | 4 ++--
perl-core/Params-Check/Params-Check-0.380.0-r1.ebuild | 4 ++--
perl-core/Text-Tabs+Wrap/Text-Tabs+Wrap-2013.52.300-r1.ebuild | 2 +-
sci-calculators/pcalc/pcalc-3-r1.ebuild | 2 +-
sci-calculators/pcalc/pcalc-4.ebuild | 4 ++--
sci-electronics/iverilog/iverilog-10.3.ebuild | 2 +-
sci-electronics/iverilog/iverilog-9999.ebuild | 2 +-
sci-libs/djbfft/djbfft-0.76-r2.ebuild | 2 +-
sci-libs/gsl/gsl-1.16.ebuild | 2 +-
sci-libs/gsl/gsl-2.4.ebuild | 4 ++--
sci-libs/gsl/gsl-2.5-r1.ebuild | 2 +-
sci-libs/gsl/gsl-2.5.ebuild | 4 ++--
sci-libs/mpir/mpir-3.0.0.ebuild | 4 ++--
sys-apps/acl/acl-2.2.53.ebuild | 2 +-
sys-apps/attr/attr-2.4.48-r3.ebuild | 2 +-
sys-apps/attr/attr-9999.ebuild | 2 +-
sys-apps/baobab/baobab-3.34.0.ebuild | 4 ++--
sys-apps/baselayout/baselayout-2.4.1-r2.ebuild | 2 +-
sys-apps/baselayout/baselayout-2.6-r1.ebuild | 2 +-
sys-apps/baselayout/baselayout-2.7.ebuild | 2 +-
sys-apps/baselayout/baselayout-9999.ebuild | 2 +-
sys-apps/busybox/busybox-1.31.1-r2.ebuild | 2 +-
sys-apps/busybox/busybox-9999.ebuild | 4 ++--
sys-apps/coreutils/coreutils-8.30.ebuild | 2 +-
sys-apps/coreutils/coreutils-8.31-r1.ebuild | 2 +-
sys-apps/coreutils/coreutils-8.31.ebuild | 2 +-
sys-apps/coreutils/coreutils-8.32-r1.ebuild | 2 +-
sys-apps/cracklib-words/cracklib-words-2.9.6.ebuild | 2 +-
sys-apps/daisydog/daisydog-2014.05.30.ebuild | 2 +-
sys-apps/dbus/dbus-1.12.16.ebuild | 2 +-
sys-apps/debianutils/debianutils-4.8.3.ebuild | 2 +-
sys-apps/debianutils/debianutils-4.8.6.3.ebuild | 4 ++--
sys-apps/debianutils/debianutils-4.9.1.ebuild | 4 ++--
sys-apps/debianutils/debianutils-4.9.ebuild | 4 ++--
sys-apps/diffutils/diffutils-3.6-r1.ebuild | 2 +-
sys-apps/diffutils/diffutils-3.7.ebuild | 4 ++--
sys-apps/dmapi/dmapi-2.2.12-r1.ebuild | 2 +-
sys-apps/dtc/dtc-1.4.4.ebuild | 4 ++--
sys-apps/dtc/dtc-1.4.6.ebuild | 4 ++--
sys-apps/dtc/dtc-1.5.0.ebuild | 2 +-
sys-apps/dtc/dtc-9999.ebuild | 4 ++--
sys-apps/ed/ed-1.15-r1.ebuild | 2 +-
sys-apps/ed/ed-1.16.ebuild | 2 +-
sys-apps/ethtool/ethtool-4.19.ebuild | 2 +-
sys-apps/ethtool/ethtool-5.3.ebuild | 4 ++--
sys-apps/ethtool/ethtool-5.4.ebuild | 2 +-
sys-apps/fbset/fbset-2.1.ebuild | 2 +-
sys-apps/file/file-5.37-r1.ebuild | 2 +-
sys-apps/file/file-5.38.ebuild | 2 +-
sys-apps/file/file-9999.ebuild | 2 +-
sys-apps/findutils/findutils-4.6.0-r1.ebuild | 2 +-
sys-apps/findutils/findutils-4.7.0.ebuild | 2 +-
sys-apps/gawk/gawk-4.2.1-r1.ebuild | 2 +-
sys-apps/gawk/gawk-5.0.0.ebuild | 2 +-
sys-apps/gawk/gawk-5.0.1.ebuild | 2 +-
sys-apps/gentoo-functions/gentoo-functions-0.12.ebuild | 2 +-
sys-apps/gentoo-functions/gentoo-functions-0.13.ebuild | 2 +-
sys-apps/gentoo-functions/gentoo-functions-9999.ebuild | 2 +-
sys-apps/gnome-disk-utility/gnome-disk-utility-3.32.1.ebuild | 4 ++--
sys-apps/gnome-disk-utility/gnome-disk-utility-3.34.5.ebuild | 2 +-
sys-apps/grep/grep-3.1-r1.ebuild | 2 +-
sys-apps/grep/grep-3.3-r1.ebuild | 2 +-
sys-apps/grep/grep-3.4.ebuild | 2 +-
sys-apps/groff/groff-1.22.2.ebuild | 2 +-
sys-apps/groff/groff-1.22.3.ebuild | 2 +-
sys-apps/groff/groff-1.22.4.ebuild | 2 +-
sys-apps/hdparm/hdparm-9.56.ebuild | 2 +-
sys-apps/hdparm/hdparm-9.58.ebuild | 4 ++--
sys-apps/help2man/help2man-1.47.10.ebuild | 2 +-
sys-apps/help2man/help2man-1.47.12.ebuild | 2 +-
sys-apps/help2man/help2man-1.47.13.ebuild | 2 +-
sys-apps/hwids/hwids-20190316.ebuild | 2 +-
sys-apps/hwids/hwids-20190818.ebuild | 2 +-
sys-apps/hwids/hwids-20191025.ebuild | 2 +-
sys-apps/hwids/hwids-20200204.ebuild | 2 +-
sys-apps/hwids/hwids-20200306.ebuild | 2 +-
sys-apps/hwids/hwids-99999999.ebuild | 2 +-
sys-apps/install-xattr/install-xattr-0.5.ebuild | 2 +-
sys-apps/install-xattr/install-xattr-0.7.ebuild | 4 ++--
sys-apps/install-xattr/install-xattr-0.8.ebuild | 4 ++--
sys-apps/install-xattr/install-xattr-9999.ebuild | 4 ++--
sys-apps/iproute2/iproute2-4.19.0-r1.ebuild | 2 +-
sys-apps/iproute2/iproute2-5.2.0-r1.ebuild | 2 +-
sys-apps/iproute2/iproute2-5.4.0.ebuild | 4 ++--
sys-apps/iproute2/iproute2-5.5.0.ebuild | 2 +-
sys-apps/iproute2/iproute2-9999.ebuild | 4 ++--
sys-apps/kbd/kbd-2.0.4-r1.ebuild | 4 ++--
sys-apps/kbd/kbd-2.0.4.ebuild | 2 +-
sys-apps/kbd/kbd-2.2.0-r2.ebuild | 4 ++--
sys-apps/kbd/kbd-9999.ebuild | 4 ++--
sys-apps/keyutils/keyutils-1.6.1.ebuild | 2 +-
sys-apps/kmod/kmod-26-r5.ebuild | 2 +-
sys-apps/kmod/kmod-27-r1.ebuild | 2 +-
sys-apps/kmod/kmod-9999.ebuild | 2 +-
sys-apps/less/less-530.ebuild | 4 ++--
sys-apps/less/less-531.ebuild | 2 +-
sys-apps/less/less-551.ebuild | 2 +-
sys-apps/less/less-554.ebuild | 2 +-
sys-apps/less/less-556.ebuild | 2 +-
sys-apps/lsb-release/lsb-release-1.4-r3.ebuild | 2 +-
sys-apps/makedev/makedev-3.23.1-r1.ebuild | 2 +-
sys-apps/man-db/man-db-2.7.6.1-r2.ebuild | 2 +-
sys-apps/man-db/man-db-2.8.7.ebuild | 2 +-
sys-apps/man-db/man-db-2.9.0.ebuild | 4 ++--
sys-apps/man-db/man-db-2.9.1.ebuild | 2 +-
sys-apps/man-db/man-db-9999.ebuild | 4 ++--
sys-apps/man-pages-posix/man-pages-posix-2013a.ebuild | 2 +-
sys-apps/man-pages/man-pages-5.04.ebuild | 2 +-
sys-apps/man-pages/man-pages-5.05-r1.ebuild | 2 +-
sys-apps/man-pages/man-pages-5.05.ebuild | 2 +-
sys-apps/man2html/man2html-1.6g.ebuild | 2 +-
sys-apps/mawk/mawk-1.3.4_p20161120.ebuild | 2 +-
sys-apps/mawk/mawk-1.3.4_p20190203-r1.ebuild | 2 +-
sys-apps/mawk/mawk-1.3.4_p20200106-r1.ebuild | 2 +-
sys-apps/miscfiles/miscfiles-1.5-r3.ebuild | 2 +-
sys-apps/mlocate/mlocate-0.26-r2.ebuild | 2 +-
sys-apps/modutils/modutils-2.4.27-r2.ebuild | 2 +-
sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild | 2 +-
sys-apps/net-tools/net-tools-1.60_p20180626073013.ebuild | 2 +-
sys-apps/net-tools/net-tools-9999.ebuild | 4 ++--
sys-apps/nosig/nosig-2.ebuild | 2 +-
sys-apps/openrc/openrc-0.41.2.ebuild | 2 +-
sys-apps/openrc/openrc-0.42.1.ebuild | 2 +-
sys-apps/openrc/openrc-9999.ebuild | 2 +-
sys-apps/opentmpfiles/opentmpfiles-0.1.1.ebuild | 2 +-
sys-apps/opentmpfiles/opentmpfiles-0.1.2.ebuild | 4 ++--
sys-apps/opentmpfiles/opentmpfiles-0.1.3-r1.ebuild | 4 ++--
sys-apps/opentmpfiles/opentmpfiles-0.1.3.ebuild | 2 +-
sys-apps/opentmpfiles/opentmpfiles-0.2.ebuild | 2 +-
sys-apps/opentmpfiles/opentmpfiles-9999.ebuild | 4 ++--
sys-apps/paxctl/paxctl-0.7-r2.ebuild | 2 +-
sys-apps/paxctl/paxctl-0.8.ebuild | 2 +-
sys-apps/paxctl/paxctl-0.9.ebuild | 2 +-
sys-apps/pciutils/pciutils-3.5.6-r1.ebuild | 2 +-
sys-apps/pciutils/pciutils-3.6.2-r1.ebuild | 2 +-
sys-apps/pciutils/pciutils-3.6.3.ebuild | 2 +-
sys-apps/pciutils/pciutils-3.6.4.ebuild | 2 +-
sys-apps/pcmciautils/pcmciautils-018_p8-r1.ebuild | 4 ++--
sys-apps/pcsc-lite/pcsc-lite-1.8.25-r1.ebuild | 2 +-
sys-apps/pcsc-lite/pcsc-lite-1.8.26.ebuild | 2 +-
sys-apps/pkgcore/pkgcore-0.10.11.ebuild | 2 +-
sys-apps/pkgcore/pkgcore-9999.ebuild | 2 +-
sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild | 2 +-
sys-apps/portage/portage-2.3.69.ebuild | 2 +-
sys-apps/portage/portage-2.3.89-r1.ebuild | 2 +-
sys-apps/portage/portage-2.3.94.ebuild | 2 +-
sys-apps/portage/portage-2.3.95.ebuild | 2 +-
sys-apps/portage/portage-2.3.96-r1.ebuild | 2 +-
sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.57-r1.ebuild | 2 +-
sys-apps/sandbox/sandbox-2.12.ebuild | 2 +-
sys-apps/sandbox/sandbox-2.13.ebuild | 2 +-
sys-apps/sandbox/sandbox-2.14.ebuild | 4 ++--
sys-apps/sandbox/sandbox-2.15.ebuild | 4 ++--
sys-apps/sandbox/sandbox-2.17.ebuild | 4 ++--
sys-apps/sandbox/sandbox-2.18.ebuild | 4 ++--
sys-apps/sdparm/sdparm-1.10.ebuild | 2 +-
sys-apps/sdparm/sdparm-1.11.ebuild | 2 +-
sys-apps/sed/sed-4.5.ebuild | 2 +-
sys-apps/sed/sed-4.7.ebuild | 2 +-
sys-apps/sed/sed-4.8.ebuild | 2 +-
sys-apps/setserial/setserial-2.17-r5.ebuild | 2 +-
sys-apps/sg3_utils/sg3_utils-1.42.ebuild | 2 +-
sys-apps/sg3_utils/sg3_utils-1.44.ebuild | 2 +-
sys-apps/sg3_utils/sg3_utils-1.45-r1.ebuild | 2 +-
sys-apps/shadow/shadow-4.6.ebuild | 2 +-
sys-apps/shadow/shadow-4.7-r2.ebuild | 2 +-
sys-apps/shadow/shadow-4.8-r4.ebuild | 2 +-
sys-apps/shadow/shadow-4.8.1-r2.ebuild | 2 +-
sys-apps/sysvinit/sysvinit-2.93.ebuild | 2 +-
sys-apps/sysvinit/sysvinit-2.95-r1.ebuild | 4 ++--
sys-apps/sysvinit/sysvinit-2.96.ebuild | 4 ++--
sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild | 2 +-
sys-apps/texinfo/texinfo-6.6-r1.ebuild | 2 +-
sys-apps/texinfo/texinfo-6.7.ebuild | 4 ++--
sys-apps/ucspi-ssl/ucspi-ssl-0.94-r1.ebuild | 2 +-
sys-apps/ucspi-ssl/ucspi-ssl-0.97.ebuild | 4 ++--
sys-apps/ucspi-ssl/ucspi-ssl-0.98b.ebuild | 4 ++--
sys-apps/ucspi-ssl/ucspi-ssl-0.99.ebuild | 4 ++--
sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild | 4 ++--
sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild | 2 +-
sys-apps/usbutils/usbutils-009.ebuild | 2 +-
sys-apps/usbutils/usbutils-010-r1.ebuild | 2 +-
sys-apps/usbutils/usbutils-012.ebuild | 2 +-
sys-apps/utempter/utempter-0.5.5.6.ebuild | 2 +-
sys-apps/util-linux/util-linux-2.33.2.ebuild | 2 +-
sys-apps/util-linux/util-linux-2.34-r3.ebuild | 2 +-
sys-apps/util-linux/util-linux-2.35.1.ebuild | 2 +-
sys-apps/util-linux/util-linux-2.35.ebuild | 2 +-
sys-apps/util-linux/util-linux-9999.ebuild | 2 +-
sys-apps/watchdog/watchdog-5.15.ebuild | 4 ++--
sys-apps/which/which-2.21.ebuild | 2 +-
sys-apps/xinetd/xinetd-2.3.15-r3.ebuild | 2 +-
sys-apps/xinetd/xinetd-2.3.15.3-r2.ebuild | 4 ++--
sys-apps/xinetd/xinetd-2.3.15.3.ebuild | 2 +-
sys-apps/xinetd/xinetd-2.3.15.4.ebuild | 4 ++--
sys-auth/consolekit/consolekit-0.4.6.ebuild | 2 +-
sys-auth/google-authenticator/google-authenticator-1.08.ebuild | 4 ++--
sys-auth/google-authenticator/google-authenticator-9999.ebuild | 4 ++--
sys-auth/pam_krb5/pam_krb5-4.6.ebuild | 2 +-
sys-auth/pam_krb5/pam_krb5-4.7.ebuild | 4 ++--
sys-auth/pam_mktemp/pam_mktemp-1.1.1.ebuild | 2 +-
sys-auth/pam_passwdqc/pam_passwdqc-1.3.0.ebuild | 2 +-
sys-auth/pam_ssh/pam_ssh-2.3.ebuild | 2 +-
sys-auth/pambase/pambase-20190402.ebuild | 2 +-
sys-auth/pambase/pambase-20191128.ebuild | 4 ++--
sys-auth/pambase/pambase-20200304.ebuild | 2 +-
sys-auth/passwdqc/passwdqc-1.3.0.ebuild | 2 +-
sys-auth/polkit/polkit-0.115-r4.ebuild | 2 +-
sys-auth/polkit/polkit-0.116-r1.ebuild | 4 ++--
sys-auth/realtime-base/realtime-base-0.1.ebuild | 2 +-
sys-auth/rtkit/rtkit-0.11-r2.ebuild | 2 +-
sys-auth/rtkit/rtkit-0.11-r3.ebuild | 2 +-
sys-auth/rtkit/rtkit-0.12.ebuild | 2 +-
sys-auth/skey/skey-1.1.5-r11.ebuild | 2 +-
sys-auth/sssd/sssd-1.16.3-r3.ebuild | 2 +-
sys-auth/sssd/sssd-2.1.0-r1.ebuild | 2 +-
sys-auth/sssd/sssd-2.2.0-r1.ebuild | 2 +-
sys-auth/sssd/sssd-2.2.2.ebuild | 2 +-
sys-auth/sssd/sssd-2.2.3.ebuild | 2 +-
sys-block/disktype/disktype-9.ebuild | 4 ++--
sys-block/parted/parted-3.2-r1.ebuild | 2 +-
sys-block/parted/parted-3.2_p23.ebuild | 2 +-
sys-block/parted/parted-3.2_p25.ebuild | 2 +-
sys-block/parted/parted-3.3-r1.ebuild | 2 +-
.../thin-provisioning-tools/thin-provisioning-tools-0.7.0.ebuild | 2 +-
.../thin-provisioning-tools/thin-provisioning-tools-0.7.6.ebuild | 4 ++--
.../thin-provisioning-tools/thin-provisioning-tools-0.8.3.ebuild | 4 ++--
.../thin-provisioning-tools/thin-provisioning-tools-0.8.5.ebuild | 4 ++--
sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild | 4 ++--
sys-boot/shlilo-lantank/shlilo-lantank-20040408.ebuild | 4 ++--
sys-cluster/sanlock/sanlock-3.6.0.ebuild | 2 +-
sys-cluster/sanlock/sanlock-3.8.0.ebuild | 2 +-
sys-devel/autoconf-archive/autoconf-archive-2018.03.13.ebuild | 2 +-
sys-devel/autoconf-archive/autoconf-archive-2019.01.06.ebuild | 4 ++--
sys-devel/autoconf-wrapper/autoconf-wrapper-13-r1.ebuild | 2 +-
sys-devel/autoconf/autoconf-2.13-r1.ebuild | 2 +-
sys-devel/autoconf/autoconf-2.64-r1.ebuild | 2 +-
sys-devel/autoconf/autoconf-2.69-r4.ebuild | 2 +-
sys-devel/autoconf/autoconf-2.69-r5.ebuild | 2 +-
sys-devel/autoconf/autoconf-9999.ebuild | 4 ++--
sys-devel/autogen/autogen-5.18.16-r1.ebuild | 2 +-
sys-devel/autogen/autogen-5.18.16.ebuild | 2 +-
sys-devel/automake-wrapper/automake-wrapper-10.ebuild | 2 +-
sys-devel/automake-wrapper/automake-wrapper-11.ebuild | 2 +-
sys-devel/automake/automake-1.10.3-r3.ebuild | 2 +-
sys-devel/automake/automake-1.11.6-r3.ebuild | 2 +-
sys-devel/automake/automake-1.12.6-r2.ebuild | 2 +-
sys-devel/automake/automake-1.13.4-r2.ebuild | 2 +-
sys-devel/automake/automake-1.14.1-r2.ebuild | 2 +-
sys-devel/automake/automake-1.15.1-r2.ebuild | 2 +-
sys-devel/automake/automake-1.16.1-r1.ebuild | 2 +-
sys-devel/automake/automake-1.16.1-r2.ebuild | 2 +-
sys-devel/automake/automake-1.16.2.ebuild | 2 +-
sys-devel/automake/automake-1.4_p6-r2.ebuild | 2 +-
sys-devel/automake/automake-1.5-r2.ebuild | 2 +-
sys-devel/automake/automake-1.6.3-r2.ebuild | 2 +-
sys-devel/automake/automake-1.7.9-r3.ebuild | 2 +-
sys-devel/automake/automake-1.8.5-r5.ebuild | 2 +-
sys-devel/automake/automake-1.9.6-r5.ebuild | 2 +-
sys-devel/automake/automake-9999.ebuild | 2 +-
sys-devel/bc/bc-1.06.95-r2.ebuild | 2 +-
sys-devel/bc/bc-1.07.1-r3.ebuild | 2 +-
sys-devel/binutils-config/binutils-config-5.1-r1.ebuild | 2 +-
sys-devel/binutils-config/binutils-config-5.2.ebuild | 2 +-
sys-devel/binutils/binutils-2.32-r1.ebuild | 2 +-
sys-devel/binutils/binutils-2.32-r2.ebuild | 2 +-
sys-devel/binutils/binutils-2.33.1-r1.ebuild | 2 +-
sys-devel/binutils/binutils-2.34.ebuild | 2 +-
sys-devel/bison/bison-3.1.ebuild | 2 +-
sys-devel/bison/bison-3.3.2.ebuild | 2 +-
sys-devel/bison/bison-3.4.2.ebuild | 2 +-
sys-devel/bison/bison-3.5.2.ebuild | 2 +-
sys-devel/bison/bison-3.5.3.ebuild | 2 +-
sys-devel/crossdev/crossdev-20200125.ebuild | 2 +-
sys-devel/crossdev/crossdev-20200131.ebuild | 2 +-
sys-devel/crossdev/crossdev-99999999.ebuild | 4 ++--
sys-devel/distcc/distcc-3.3.3-r1.ebuild | 2 +-
sys-devel/flex/flex-2.6.1.ebuild | 2 +-
sys-devel/flex/flex-2.6.3-r1.ebuild | 2 +-
sys-devel/flex/flex-2.6.3.ebuild | 2 +-
sys-devel/flex/flex-2.6.4-r1.ebuild | 2 +-
sys-devel/flex/flex-2.6.4.ebuild | 2 +-
sys-devel/gcc-config/gcc-config-2.1.ebuild | 2 +-
sys-devel/gcc-config/gcc-config-2.2.1.ebuild | 2 +-
sys-devel/gcc-config/gcc-config-9999.ebuild | 4 ++--
sys-devel/gcc/gcc-3.4.6-r5.ebuild | 2 +-
sys-devel/gcc/gcc-4.1.2-r2.ebuild | 4 ++--
sys-devel/gcc/gcc-4.3.6-r4.ebuild | 4 ++--
sys-devel/gcc/gcc-4.4.7-r3.ebuild | 4 ++--
sys-devel/gcc/gcc-4.5.4-r3.ebuild | 4 ++--
sys-devel/gcc/gcc-4.6.4-r3.ebuild | 4 ++--
sys-devel/gcc/gcc-4.7.4-r3.ebuild | 4 ++--
sys-devel/gcc/gcc-4.8.5-r3.ebuild | 4 ++--
sys-devel/gcc/gcc-4.9.4-r1.ebuild | 4 ++--
sys-devel/gcc/gcc-5.5.0.ebuild | 4 ++--
sys-devel/gcc/gcc-6.5.0-r1.ebuild | 2 +-
sys-devel/gcc/gcc-7.4.0-r2.ebuild | 2 +-
sys-devel/gcc/gcc-7.5.0.ebuild | 2 +-
sys-devel/gcc/gcc-8.3.0-r1.ebuild | 2 +-
sys-devel/gcc/gcc-8.3.0-r3.ebuild | 2 +-
sys-devel/gcc/gcc-8.4.0.ebuild | 2 +-
sys-devel/gcc/gcc-9.2.0-r2.ebuild | 2 +-
sys-devel/gcc/gcc-9.2.0-r3.ebuild | 2 +-
sys-devel/gcc/gcc-9.2.0-r4.ebuild | 2 +-
sys-devel/gcc/gcc-9.3.0.ebuild | 2 +-
sys-devel/gdb/gdb-8.3.1-r1.ebuild | 2 +-
sys-devel/gdb/gdb-8.3.1.ebuild | 2 +-
sys-devel/gdb/gdb-9.1.ebuild | 2 +-
sys-devel/gdb/gdb-9999.ebuild | 2 +-
sys-devel/gettext/gettext-0.20.1.ebuild | 2 +-
sys-devel/gettext/gettext-0.21_rc1.ebuild | 2 +-
sys-devel/gnuconfig/gnuconfig-20190912.ebuild | 2 +-
sys-devel/gnuconfig/gnuconfig-99999999.ebuild | 4 ++--
sys-devel/libtool/libtool-2.4.6-r6.ebuild | 2 +-
sys-devel/libtool/libtool-9999.ebuild | 4 ++--
sys-devel/m4/m4-1.4.17.ebuild | 2 +-
sys-devel/m4/m4-1.4.18-r1.ebuild | 2 +-
sys-devel/make/make-4.2.1-r4.ebuild | 2 +-
sys-devel/make/make-4.3.ebuild | 2 +-
sys-devel/patch/patch-2.7.6-r4.ebuild | 2 +-
sys-devel/remake/remake-4.2.1.1.4-r1.ebuild | 4 ++--
sys-devel/smatch/smatch-1.60.ebuild | 4 ++--
sys-devel/smatch/smatch-9999.ebuild | 4 ++--
sys-devel/sparse/sparse-0.5.1.ebuild | 4 ++--
sys-devel/sparse/sparse-0.5.2_rc1.ebuild | 4 ++--
sys-devel/sparse/sparse-0.6.0.ebuild | 4 ++--
sys-devel/sparse/sparse-0.6.1.ebuild | 2 +-
sys-devel/sparse/sparse-9999.ebuild | 2 +-
sys-firmware/seabios/seabios-1.10.2.ebuild | 2 +-
sys-firmware/seabios/seabios-1.11.0-r1.ebuild | 2 +-
sys-firmware/seabios/seabios-1.11.0.ebuild | 2 +-
sys-firmware/seabios/seabios-1.12.0.ebuild | 2 +-
sys-firmware/sgabios/sgabios-0.1_pre8-r1.ebuild | 4 ++--
sys-fs/arm-fdisk/arm-fdisk-3.0.6-r1.ebuild | 2 +-
sys-fs/cryptsetup/cryptsetup-1.7.5-r1.ebuild | 2 +-
sys-fs/cryptsetup/cryptsetup-2.2.1-r1.ebuild | 2 +-
sys-fs/cryptsetup/cryptsetup-2.2.2.ebuild | 2 +-
sys-fs/cryptsetup/cryptsetup-2.3.0.ebuild | 2 +-
sys-fs/cryptsetup/cryptsetup-2.3.1.ebuild | 2 +-
sys-fs/dosfstools/dosfstools-4.1.ebuild | 2 +-
sys-fs/e2fsprogs/e2fsprogs-1.45.4.ebuild | 2 +-
sys-fs/e2fsprogs/e2fsprogs-1.45.5.ebuild | 2 +-
sys-fs/e2fsprogs/e2fsprogs-1.45.6.ebuild | 2 +-
sys-fs/eudev/eudev-3.2.9.ebuild | 2 +-
sys-fs/exfat-utils/exfat-utils-1.3.0.ebuild | 4 ++--
sys-fs/fuse-common/fuse-common-3.2.6.ebuild | 2 +-
sys-fs/fuse-common/fuse-common-3.8.0.ebuild | 4 ++--
sys-fs/fuse-common/fuse-common-3.9.0.ebuild | 4 ++--
sys-fs/fuse-exfat/fuse-exfat-1.3.0.ebuild | 4 ++--
sys-fs/fuse/fuse-2.9.8.ebuild | 2 +-
sys-fs/fuse/fuse-2.9.9-r1.ebuild | 4 ++--
sys-fs/fuse/fuse-3.8.0.ebuild | 2 +-
sys-fs/fuse/fuse-3.9.0.ebuild | 2 +-
sys-fs/fuse/fuse-3.9.1.ebuild | 2 +-
sys-fs/jfsutils/jfsutils-1.1.15.ebuild | 2 +-
sys-fs/lvm2/lvm2-2.02.116.ebuild | 2 +-
sys-fs/lvm2/lvm2-2.02.145-r2.ebuild | 2 +-
sys-fs/lvm2/lvm2-2.02.184-r5.ebuild | 2 +-
sys-fs/lvm2/lvm2-2.02.186-r2.ebuild | 4 ++--
sys-fs/lvm2/lvm2-2.03.08.ebuild | 2 +-
sys-fs/squashfs-tools/squashfs-tools-4.3-r2.ebuild | 2 +-
sys-fs/squashfs-tools/squashfs-tools-4.3_p12.ebuild | 4 ++--
sys-fs/squashfs-tools/squashfs-tools-4.3_p7.ebuild | 2 +-
sys-fs/squashfs-tools/squashfs-tools-4.4.ebuild | 2 +-
sys-fs/static-dev/static-dev-0.1.ebuild | 2 +-
sys-fs/sysfsutils/sysfsutils-2.1.0.ebuild | 2 +-
sys-fs/udev-init-scripts/udev-init-scripts-33.ebuild | 2 +-
sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild | 2 +-
sys-fs/udev/udev-242.ebuild | 2 +-
sys-fs/udev/udev-243-r2.ebuild | 4 ++--
sys-fs/udev/udev-243.ebuild | 4 ++--
sys-fs/udev/udev-245.ebuild | 2 +-
sys-fs/udev/udev-9999.ebuild | 2 +-
sys-fs/udisks/udisks-1.0.5-r3.ebuild | 2 +-
sys-fs/xfsprogs/xfsprogs-4.19.0.ebuild | 2 +-
sys-fs/xfsprogs/xfsprogs-5.4.0-r1.ebuild | 2 +-
sys-fs/xfsprogs/xfsprogs-5.5.0.ebuild | 2 +-
sys-kernel/genkernel/genkernel-3.4.52.3.ebuild | 2 +-
sys-kernel/genkernel/genkernel-3.4.52.4-r1.ebuild | 2 +-
sys-kernel/genkernel/genkernel-3.4.52.4-r2.ebuild | 2 +-
sys-kernel/genkernel/genkernel-3.4.52.4-r3.ebuild | 2 +-
sys-kernel/genkernel/genkernel-3.5.1.1.ebuild | 2 +-
sys-kernel/genkernel/genkernel-3.5.2.0-r1.ebuild | 2 +-
sys-kernel/genkernel/genkernel-3.5.2.1.ebuild | 2 +-
sys-kernel/genkernel/genkernel-3.5.2.2.ebuild | 2 +-
sys-kernel/genkernel/genkernel-3.5.2.3.ebuild | 2 +-
sys-kernel/genkernel/genkernel-3.5.2.4.ebuild | 2 +-
sys-kernel/genkernel/genkernel-3.5.2.5.ebuild | 2 +-
sys-kernel/genkernel/genkernel-3.5.3.2.ebuild | 2 +-
sys-kernel/genkernel/genkernel-3.5.3.3.ebuild | 2 +-
sys-kernel/genkernel/genkernel-4.0.5.ebuild | 2 +-
sys-kernel/genkernel/genkernel-9999.ebuild | 2 +-
sys-kernel/gentoo-sources/gentoo-sources-4.14.166.ebuild | 2 +-
sys-kernel/gentoo-sources/gentoo-sources-4.14.169.ebuild | 2 +-
sys-kernel/gentoo-sources/gentoo-sources-4.14.170.ebuild | 2 +-
sys-kernel/gentoo-sources/gentoo-sources-4.14.171.ebuild | 2 +-
sys-kernel/gentoo-sources/gentoo-sources-4.14.172.ebuild | 2 +-
sys-kernel/gentoo-sources/gentoo-sources-4.14.173.ebuild | 2 +-
sys-kernel/gentoo-sources/gentoo-sources-4.14.174.ebuild | 2 +-
sys-kernel/gentoo-sources/gentoo-sources-4.19.108.ebuild | 2 +-
sys-kernel/gentoo-sources/gentoo-sources-4.19.109.ebuild | 2 +-
sys-kernel/gentoo-sources/gentoo-sources-4.19.110.ebuild | 2 +-
sys-kernel/gentoo-sources/gentoo-sources-4.19.111.ebuild | 2 +-
sys-kernel/gentoo-sources/gentoo-sources-4.19.112.ebuild | 2 +-
sys-kernel/gentoo-sources/gentoo-sources-4.19.113.ebuild | 2 +-
sys-kernel/gentoo-sources/gentoo-sources-4.19.97.ebuild | 2 +-
sys-kernel/gentoo-sources/gentoo-sources-4.4.210.ebuild | 2 +-
sys-kernel/gentoo-sources/gentoo-sources-4.4.212.ebuild | 2 +-
sys-kernel/gentoo-sources/gentoo-sources-4.4.213.ebuild | 2 +-
sys-kernel/gentoo-sources/gentoo-sources-4.4.214.ebuild | 2 +-
sys-kernel/gentoo-sources/gentoo-sources-4.4.215.ebuild | 2 +-
sys-kernel/gentoo-sources/gentoo-sources-4.4.216.ebuild | 2 +-
sys-kernel/gentoo-sources/gentoo-sources-4.4.217.ebuild | 2 +-
sys-kernel/gentoo-sources/gentoo-sources-4.9.210.ebuild | 2 +-
sys-kernel/gentoo-sources/gentoo-sources-4.9.212.ebuild | 2 +-
sys-kernel/gentoo-sources/gentoo-sources-4.9.213.ebuild | 2 +-
sys-kernel/gentoo-sources/gentoo-sources-4.9.214.ebuild | 2 +-
sys-kernel/gentoo-sources/gentoo-sources-4.9.215.ebuild | 2 +-
sys-kernel/gentoo-sources/gentoo-sources-4.9.216.ebuild | 2 +-
sys-kernel/gentoo-sources/gentoo-sources-4.9.217.ebuild | 2 +-
sys-kernel/gentoo-sources/gentoo-sources-5.4.24.ebuild | 2 +-
sys-kernel/gentoo-sources/gentoo-sources-5.4.25.ebuild | 2 +-
sys-kernel/gentoo-sources/gentoo-sources-5.4.26.ebuild | 2 +-
sys-kernel/gentoo-sources/gentoo-sources-5.4.27.ebuild | 2 +-
sys-kernel/gentoo-sources/gentoo-sources-5.4.28.ebuild | 2 +-
sys-kernel/gentoo-sources/gentoo-sources-5.5.10.ebuild | 2 +-
sys-kernel/gentoo-sources/gentoo-sources-5.5.11.ebuild | 2 +-
sys-kernel/gentoo-sources/gentoo-sources-5.5.13.ebuild | 2 +-
sys-kernel/gentoo-sources/gentoo-sources-5.5.7.ebuild | 2 +-
sys-kernel/gentoo-sources/gentoo-sources-5.5.8.ebuild | 2 +-
sys-kernel/gentoo-sources/gentoo-sources-5.5.9.ebuild | 2 +-
sys-kernel/git-sources/git-sources-5.6_rc1.ebuild | 2 +-
sys-kernel/git-sources/git-sources-5.6_rc2.ebuild | 2 +-
sys-kernel/git-sources/git-sources-5.6_rc3.ebuild | 2 +-
sys-kernel/git-sources/git-sources-5.6_rc4.ebuild | 2 +-
sys-kernel/git-sources/git-sources-5.6_rc5.ebuild | 2 +-
sys-kernel/git-sources/git-sources-5.6_rc6.ebuild | 2 +-
sys-kernel/git-sources/git-sources-5.6_rc7.ebuild | 2 +-
sys-kernel/installkernel-gentoo/installkernel-gentoo-1.ebuild | 2 +-
sys-kernel/installkernel-gentoo/installkernel-gentoo-2.ebuild | 2 +-
sys-kernel/linux-docs/linux-docs-4.19.99.ebuild | 2 +-
sys-kernel/linux-docs/linux-docs-5.4.15.ebuild | 2 +-
sys-kernel/linux-firmware/linux-firmware-20190815.ebuild | 2 +-
sys-kernel/linux-firmware/linux-firmware-20190923.ebuild | 2 +-
sys-kernel/linux-firmware/linux-firmware-20191022.ebuild | 2 +-
sys-kernel/linux-firmware/linux-firmware-20191215.ebuild | 2 +-
sys-kernel/linux-firmware/linux-firmware-20200122.ebuild | 2 +-
sys-kernel/linux-firmware/linux-firmware-20200316.ebuild | 2 +-
sys-kernel/linux-firmware/linux-firmware-99999999.ebuild | 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
sys-kernel/vanilla-sources/vanilla-sources-3.16.82.ebuild | 2 +-
sys-kernel/vanilla-sources/vanilla-sources-4.14.174.ebuild | 2 +-
sys-kernel/vanilla-sources/vanilla-sources-4.19.113.ebuild | 2 +-
sys-kernel/vanilla-sources/vanilla-sources-4.4.217.ebuild | 2 +-
sys-kernel/vanilla-sources/vanilla-sources-4.9.217.ebuild | 2 +-
sys-kernel/vanilla-sources/vanilla-sources-5.4.28.ebuild | 2 +-
sys-kernel/vanilla-sources/vanilla-sources-5.5.13.ebuild | 2 +-
sys-libs/argp-standalone/argp-standalone-1.3-r2.ebuild | 2 +-
sys-libs/binutils-libs/binutils-libs-2.32-r1.ebuild | 2 +-
sys-libs/binutils-libs/binutils-libs-2.33.1-r1.ebuild | 2 +-
sys-libs/binutils-libs/binutils-libs-2.34.ebuild | 2 +-
sys-libs/cracklib/cracklib-2.9.6-r2.ebuild | 2 +-
sys-libs/cracklib/cracklib-2.9.7.ebuild | 2 +-
sys-libs/db/db-1.85-r4.ebuild | 2 +-
sys-libs/db/db-18.1.32.ebuild | 4 ++--
sys-libs/db/db-3.2.9_p2-r1.ebuild | 2 +-
sys-libs/db/db-4.2.52_p5-r2.ebuild | 2 +-
sys-libs/db/db-4.3.29_p1-r2.ebuild | 2 +-
sys-libs/db/db-4.4.20_p4-r2.ebuild | 4 ++--
sys-libs/db/db-4.5.20_p2-r2.ebuild | 2 +-
sys-libs/db/db-4.6.21_p4-r1.ebuild | 2 +-
sys-libs/db/db-4.7.25_p4-r1.ebuild | 2 +-
sys-libs/db/db-4.8.30-r3.ebuild | 2 +-
sys-libs/db/db-5.1.29-r2.ebuild | 4 ++--
sys-libs/db/db-5.3.28-r2.ebuild | 2 +-
sys-libs/db/db-5.3.28-r4.ebuild | 4 ++--
sys-libs/db/db-6.0.35-r2.ebuild | 4 ++--
sys-libs/db/db-6.1.38.ebuild | 4 ++--
sys-libs/db/db-6.2.38.ebuild | 4 ++--
sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.4.ebuild | 2 +-
sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.5.ebuild | 2 +-
sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.6.ebuild | 2 +-
sys-libs/gdbm/gdbm-1.13-r2.ebuild | 2 +-
sys-libs/gdbm/gdbm-1.14.1.ebuild | 4 ++--
sys-libs/gdbm/gdbm-1.17.ebuild | 4 ++--
sys-libs/gdbm/gdbm-1.18.1.ebuild | 4 ++--
sys-libs/gdbm/gdbm-1.18.ebuild | 4 ++--
sys-libs/glibc/glibc-2.24-r4.ebuild | 2 +-
sys-libs/glibc/glibc-2.25-r11.ebuild | 2 +-
sys-libs/glibc/glibc-2.26-r7.ebuild | 2 +-
sys-libs/glibc/glibc-2.27-r6.ebuild | 2 +-
sys-libs/glibc/glibc-2.28-r6.ebuild | 2 +-
sys-libs/glibc/glibc-2.29-r7.ebuild | 2 +-
sys-libs/glibc/glibc-2.30-r6.ebuild | 2 +-
sys-libs/gpm/gpm-1.20.7-r2.ebuild | 2 +-
sys-libs/ldb/ldb-1.1.29-r1.ebuild | 2 +-
sys-libs/ldb/ldb-1.1.31.ebuild | 2 +-
sys-libs/ldb/ldb-1.2.4.ebuild | 2 +-
sys-libs/ldb/ldb-1.3.6.ebuild | 2 +-
sys-libs/ldb/ldb-1.3.8.ebuild | 2 +-
sys-libs/ldb/ldb-1.4.8.ebuild | 2 +-
sys-libs/ldb/ldb-1.5.4.ebuild | 2 +-
sys-libs/ldb/ldb-1.5.6.ebuild | 2 +-
sys-libs/ldb/ldb-1.6.3.ebuild | 2 +-
sys-libs/ldb/ldb-2.0.8.ebuild | 2 +-
sys-libs/ldb/ldb-2.0.9.ebuild | 2 +-
sys-libs/ldb/ldb-2.1.1.ebuild | 2 +-
sys-libs/libcap-ng/libcap-ng-0.7.10.ebuild | 2 +-
sys-libs/libcap-ng/libcap-ng-0.7.8.ebuild | 2 +-
sys-libs/libcap-ng/libcap-ng-0.7.9.ebuild | 2 +-
sys-libs/libcap/libcap-2.26-r2.ebuild | 2 +-
sys-libs/libcap/libcap-2.27.ebuild | 4 ++--
sys-libs/libcap/libcap-2.32.ebuild | 2 +-
sys-libs/libcap/libcap-2.33.ebuild | 2 +-
sys-libs/libraw1394/libraw1394-2.1.2-r1.ebuild | 2 +-
sys-libs/libutempter/libutempter-1.1.6-r3.ebuild | 2 +-
sys-libs/mtdev/mtdev-1.1.6.ebuild | 2 +-
sys-libs/ncurses-compat/ncurses-compat-5.9.ebuild | 2 +-
sys-libs/ncurses-compat/ncurses-compat-6.1_p20190609.ebuild | 4 ++--
sys-libs/ncurses/ncurses-6.1_p20181020.ebuild | 2 +-
sys-libs/ncurses/ncurses-6.1_p20190609.ebuild | 4 ++--
sys-libs/ncurses/ncurses-6.2-r1.ebuild | 2 +-
sys-libs/newlib/newlib-2.2.0.ebuild | 2 +-
sys-libs/newlib/newlib-2.5.0.ebuild | 2 +-
sys-libs/newlib/newlib-3.1.0.ebuild | 2 +-
sys-libs/newlib/newlib-3.3.0.ebuild | 2 +-
sys-libs/newlib/newlib-9999.ebuild | 2 +-
sys-libs/pam/pam-1.3.1-r2.ebuild | 2 +-
sys-libs/pam/pam-1.3.1_p20200128-r1.ebuild | 2 +-
sys-libs/pwdb/pwdb-0.62-r1.ebuild | 2 +-
sys-libs/readline/readline-6.3_p8-r3.ebuild | 2 +-
sys-libs/readline/readline-7.0_p5-r1.ebuild | 2 +-
sys-libs/readline/readline-8.0_p1-r1.ebuild | 4 ++--
sys-libs/readline/readline-8.0_p4.ebuild | 2 +-
sys-libs/slang/slang-2.3.2.ebuild | 2 +-
sys-libs/talloc/talloc-2.1.14.ebuild | 4 ++--
sys-libs/talloc/talloc-2.1.16.ebuild | 2 +-
sys-libs/talloc/talloc-2.1.9.ebuild | 2 +-
sys-libs/talloc/talloc-2.2.0.ebuild | 2 +-
sys-libs/talloc/talloc-2.3.0.ebuild | 2 +-
sys-libs/talloc/talloc-2.3.1.ebuild | 2 +-
sys-libs/tdb/tdb-1.3.13.ebuild | 2 +-
sys-libs/tdb/tdb-1.3.16.ebuild | 4 ++--
sys-libs/tdb/tdb-1.3.18.ebuild | 2 +-
sys-libs/tdb/tdb-1.4.0.ebuild | 2 +-
sys-libs/tdb/tdb-1.4.2.ebuild | 2 +-
sys-libs/tdb/tdb-1.4.3.ebuild | 2 +-
sys-libs/tevent/tevent-0.10.0.ebuild | 2 +-
sys-libs/tevent/tevent-0.10.1.ebuild | 2 +-
sys-libs/tevent/tevent-0.10.2.ebuild | 2 +-
sys-libs/tevent/tevent-0.9.31-r1.ebuild | 2 +-
sys-libs/tevent/tevent-0.9.37.ebuild | 4 ++--
sys-libs/tevent/tevent-0.9.39.ebuild | 2 +-
sys-libs/timezone-data/timezone-data-2019c.ebuild | 2 +-
sys-libs/zlib/zlib-1.2.11-r2.ebuild | 2 +-
sys-process/audit/audit-2.6.4.ebuild | 2 +-
sys-process/audit/audit-2.7.1.ebuild | 2 +-
sys-process/audit/audit-2.8.2.ebuild | 2 +-
sys-process/audit/audit-2.8.3.ebuild | 2 +-
sys-process/audit/audit-2.8.4.ebuild | 2 +-
sys-process/audit/audit-2.8.5.ebuild | 2 +-
sys-process/cronbase/cronbase-0.3.7-r6.ebuild | 2 +-
sys-process/cronie/cronie-1.5.4-r1.ebuild | 2 +-
sys-process/cronie/cronie-1.5.5.ebuild | 4 ++--
sys-process/daemontools/daemontools-0.76-r8.ebuild | 2 +-
sys-process/dcron/dcron-4.5-r2.ebuild | 2 +-
sys-process/htop/htop-2.2.0.ebuild | 2 +-
sys-process/htop/htop-3.0.0_beta5.ebuild | 2 +-
sys-process/lsof/lsof-4.91.ebuild | 2 +-
sys-process/lsof/lsof-4.93.2-r1.ebuild | 4 ++--
sys-process/procps/procps-3.3.15-r1.ebuild | 2 +-
sys-process/procps/procps-3.3.16-r2.ebuild | 2 +-
sys-process/psmisc/psmisc-23.1-r1.ebuild | 2 +-
sys-process/psmisc/psmisc-23.2-r2.ebuild | 4 ++--
sys-process/psmisc/psmisc-23.3-r1.ebuild | 4 ++--
sys-process/runit/runit-2.1.1-r2.ebuild | 2 +-
sys-process/runit/runit-2.1.2-r1.ebuild | 4 ++--
sys-process/runit/runit-2.1.2.ebuild | 4 ++--
sys-process/time/time-1.7-r3.ebuild | 2 +-
sys-process/time/time-1.7.2.ebuild | 2 +-
sys-process/time/time-1.9.ebuild | 4 ++--
virtual/acl/acl-0-r1.ebuild | 2 +-
virtual/acl/acl-0-r2.ebuild | 4 ++--
virtual/acl/acl-0.ebuild | 2 +-
virtual/awk/awk-1.ebuild | 2 +-
virtual/cdrtools/cdrtools-0.ebuild | 2 +-
virtual/checkpassword/checkpassword-0.ebuild | 2 +-
virtual/cron/cron-0-r1.ebuild | 2 +-
virtual/daemontools/daemontools-0.ebuild | 2 +-
virtual/dev-manager/dev-manager-0-r2.ebuild | 2 +-
virtual/editor/editor-0-r3.ebuild | 2 +-
virtual/eject/eject-0-r1.ebuild | 2 +-
virtual/emacs/emacs-23.ebuild | 2 +-
virtual/emacs/emacs-24.ebuild | 2 +-
virtual/emacs/emacs-25.ebuild | 2 +-
virtual/emacs/emacs-26-r2.ebuild | 2 +-
virtual/fam/fam-0-r1.ebuild | 2 +-
virtual/fortran/fortran-0.ebuild | 2 +-
virtual/freedesktop-icon-theme/freedesktop-icon-theme-0-r3.ebuild | 2 +-
virtual/glu/glu-9.0-r2.ebuild | 2 +-
virtual/httpd-basic/httpd-basic-0-r2.ebuild | 2 +-
virtual/httpd-cgi/httpd-cgi-0-r1.ebuild | 2 +-
virtual/httpd-cgi/httpd-cgi-0-r2.ebuild | 2 +-
virtual/httpd-fastcgi/httpd-fastcgi-0-r1.ebuild | 2 +-
virtual/httpd-php/httpd-php-7.2.ebuild | 4 ++--
virtual/httpd-php/httpd-php-7.3.ebuild | 4 ++--
virtual/httpd-php/httpd-php-7.4.ebuild | 2 +-
virtual/imagemagick-tools/imagemagick-tools-0.ebuild | 2 +-
virtual/imap-c-client/imap-c-client-1.ebuild | 2 +-
virtual/imap-c-client/imap-c-client-2.ebuild | 2 +-
virtual/inetd/inetd-0.ebuild | 2 +-
virtual/jack/jack-0.ebuild | 2 +-
virtual/jpeg/jpeg-0-r3.ebuild | 2 +-
virtual/krb5/krb5-0-r1.ebuild | 2 +-
virtual/latex-base/latex-base-1.0.ebuild | 2 +-
virtual/libc/libc-1.ebuild | 2 +-
virtual/libcrypt/libcrypt-1.ebuild | 2 +-
virtual/libcrypt/libcrypt-2.ebuild | 2 +-
virtual/libelf/libelf-3.ebuild | 2 +-
virtual/libffi/libffi-3.0.13-r1.ebuild | 2 +-
virtual/libffi/libffi-3.3_rc0.ebuild | 2 +-
virtual/libgudev/libgudev-215-r3.ebuild | 2 +-
virtual/libgudev/libgudev-230.ebuild | 2 +-
virtual/libgudev/libgudev-232.ebuild | 2 +-
virtual/libiconv/libiconv-0-r1.ebuild | 2 +-
virtual/libiconv/libiconv-0-r2.ebuild | 2 +-
virtual/libiconv/libiconv-0.ebuild | 2 +-
virtual/libintl/libintl-0-r1.ebuild | 2 +-
virtual/libintl/libintl-0-r2.ebuild | 2 +-
virtual/libintl/libintl-0.ebuild | 2 +-
virtual/libudev/libudev-215-r1.ebuild | 2 +-
virtual/libudev/libudev-232-r1.ebuild | 2 +-
virtual/libudev/libudev-232-r2.ebuild | 4 ++--
virtual/libudev/libudev-232-r3.ebuild | 4 ++--
virtual/libusb/libusb-0-r2.ebuild | 2 +-
virtual/libusb/libusb-1-r1.ebuild | 2 +-
virtual/libusb/libusb-1-r2.ebuild | 2 +-
virtual/linux-sources/linux-sources-3-r4.ebuild | 2 +-
virtual/logger/logger-0-r1.ebuild | 2 +-
virtual/mailx/mailx-1.ebuild | 2 +-
virtual/mailx/mailx-2.ebuild | 4 ++--
virtual/man/man-0-r3.ebuild | 2 +-
virtual/mda/mda-0.ebuild | 2 +-
virtual/modutils/modutils-0.ebuild | 2 +-
virtual/mta/mta-1-r1.ebuild | 2 +-
virtual/mysql/mysql-5.5-r2.ebuild | 4 ++--
virtual/mysql/mysql-5.6-r13.ebuild | 2 +-
virtual/notification-daemon/notification-daemon-0.ebuild | 2 +-
virtual/opengl/opengl-7.0-r2.ebuild | 2 +-
| 4 ++--
| 2 +-
virtual/package-manager/package-manager-1.ebuild | 2 +-
| 2 +-
virtual/perl-Archive-Tar/perl-Archive-Tar-2.320.0.ebuild | 2 +-
.../perl-Attribute-Handlers/perl-Attribute-Handlers-1.10.0-r2.ebuild | 2 +-
virtual/perl-AutoLoader/perl-AutoLoader-5.740.0-r8.ebuild | 2 +-
.../perl-CPAN-Meta-Requirements-2.140.0-r5.ebuild | 2 +-
virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.18.0-r5.ebuild | 2 +-
virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.150.10-r3.ebuild | 2 +-
virtual/perl-CPAN/perl-CPAN-2.220.0.ebuild | 2 +-
virtual/perl-Carp/perl-Carp-1.500.0-r2.ebuild | 2 +-
virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.84.0.ebuild | 2 +-
virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.84.0.ebuild | 2 +-
virtual/perl-DB_File/perl-DB_File-1.843.0.ebuild | 2 +-
virtual/perl-Data-Dumper/perl-Data-Dumper-2.174.0.ebuild | 2 +-
virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.520.0.ebuild | 2 +-
virtual/perl-Digest-MD5/perl-Digest-MD5-2.550.0-r2.ebuild | 2 +-
virtual/perl-Digest-SHA/perl-Digest-SHA-6.20.0.ebuild | 2 +-
virtual/perl-Digest/perl-Digest-1.170.100_rc-r9.ebuild | 2 +-
virtual/perl-Dumpvalue/perl-Dumpvalue-1.180.0-r5.ebuild | 2 +-
virtual/perl-Encode/perl-Encode-3.10.0.ebuild | 2 +-
virtual/perl-Exporter/perl-Exporter-5.730.0-r2.ebuild | 2 +-
.../perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.231.ebuild | 2 +-
.../perl-ExtUtils-Constant/perl-ExtUtils-Constant-0.250.0-r2.ebuild | 2 +-
virtual/perl-ExtUtils-Install/perl-ExtUtils-Install-2.140.0-r2.ebuild | 2 +-
.../perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.340.0-r2.ebuild | 2 +-
virtual/perl-ExtUtils-Manifest/perl-ExtUtils-Manifest-1.720.0.ebuild | 2 +-
virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.400.0.ebuild | 2 +-
virtual/perl-File-Path/perl-File-Path-2.160.0.ebuild | 2 +-
virtual/perl-File-Spec/perl-File-Spec-3.780.0.ebuild | 2 +-
virtual/perl-File-Temp/perl-File-Temp-0.230.900.ebuild | 2 +-
virtual/perl-Filter-Simple/perl-Filter-Simple-0.950.0-r2.ebuild | 2 +-
virtual/perl-Getopt-Long/perl-Getopt-Long-2.500.0-r2.ebuild | 2 +-
virtual/perl-HTTP-Tiny/perl-HTTP-Tiny-0.76.0.ebuild | 2 +-
virtual/perl-I18N-LangTags/perl-I18N-LangTags-0.430.0-r2.ebuild | 2 +-
virtual/perl-IO-Compress/perl-IO-Compress-2.84.0.ebuild | 2 +-
virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.390.0-r2.ebuild | 2 +-
virtual/perl-IO-Zlib/perl-IO-Zlib-1.100.0-r13.ebuild | 2 +-
virtual/perl-IO/perl-IO-1.400.0.ebuild | 2 +-
virtual/perl-IPC-Cmd/perl-IPC-Cmd-1.20.0.ebuild | 2 +-
virtual/perl-JSON-PP/perl-JSON-PP-4.20.0.ebuild | 2 +-
.../perl-Locale-Maketext-Simple-0.210.100_rc-r9.ebuild | 2 +-
virtual/perl-Locale-Maketext/perl-Locale-Maketext-1.290.0-r2.ebuild | 2 +-
virtual/perl-MIME-Base64/perl-MIME-Base64-3.150.0-r6.ebuild | 2 +-
.../perl-Math-BigInt-FastCalc-0.500.800.ebuild | 2 +-
virtual/perl-Math-BigInt/perl-Math-BigInt-1.999.816.ebuild | 2 +-
virtual/perl-Math-BigRat/perl-Math-BigRat-0.261.400.ebuild | 2 +-
virtual/perl-Math-Complex/perl-Math-Complex-1.590.100-r3.ebuild | 2 +-
virtual/perl-Memoize/perl-Memoize-1.30.100_rc-r9.ebuild | 2 +-
.../perl-Module-CoreList/perl-Module-CoreList-5.201.911.100.ebuild | 2 +-
.../perl-Module-Load-Conditional-0.680.0-r3.ebuild | 2 +-
virtual/perl-Module-Load/perl-Module-Load-0.340.0.ebuild | 2 +-
virtual/perl-Module-Loaded/perl-Module-Loaded-0.80.0-r12.ebuild | 2 +-
virtual/perl-Module-Metadata/perl-Module-Metadata-1.0.36.ebuild | 2 +-
virtual/perl-Net-Ping/perl-Net-Ping-2.710.0.ebuild | 2 +-
virtual/perl-Params-Check/perl-Params-Check-0.380.0-r9.ebuild | 2 +-
virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-2.150.10-r3.ebuild | 2 +-
virtual/perl-Perl-OSType/perl-Perl-OSType-1.10.0-r3.ebuild | 2 +-
virtual/perl-Pod-Escapes/perl-Pod-Escapes-1.70.0-r6.ebuild | 2 +-
virtual/perl-Pod-Parser/perl-Pod-Parser-1.630.0-r6.ebuild | 2 +-
virtual/perl-Pod-Simple/perl-Pod-Simple-3.350.0-r3.ebuild | 2 +-
virtual/perl-Safe/perl-Safe-2.400.0-r3.ebuild | 2 +-
.../perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.500.0-r2.ebuild | 2 +-
virtual/perl-Socket/perl-Socket-2.27.0-r2.ebuild | 2 +-
virtual/perl-Storable/perl-Storable-3.150.0.ebuild | 2 +-
virtual/perl-Sys-Syslog/perl-Sys-Syslog-0.350.0-r3.ebuild | 2 +-
virtual/perl-Term-ANSIColor/perl-Term-ANSIColor-4.60.0-r3.ebuild | 2 +-
virtual/perl-Term-ReadLine/perl-Term-ReadLine-1.170.0-r3.ebuild | 2 +-
virtual/perl-Test-Harness/perl-Test-Harness-3.420.0-r2.ebuild | 2 +-
virtual/perl-Test-Simple/perl-Test-Simple-1.302.162.ebuild | 2 +-
virtual/perl-Test/perl-Test-1.310.0-r2.ebuild | 2 +-
virtual/perl-Text-Balanced/perl-Text-Balanced-2.30.0-r6.ebuild | 2 +-
virtual/perl-Text-ParseWords/perl-Text-ParseWords-3.300.0-r6.ebuild | 2 +-
virtual/perl-Text-Tabs+Wrap/perl-Text-Tabs+Wrap-2013.52.300-r9.ebuild | 2 +-
virtual/perl-Thread-Queue/perl-Thread-Queue-3.130.0.ebuild | 2 +-
virtual/perl-Thread-Semaphore/perl-Thread-Semaphore-2.130.0-r3.ebuild | 2 +-
virtual/perl-Tie-RefHash/perl-Tie-RefHash-1.390.0-r11.ebuild | 2 +-
virtual/perl-Time-HiRes/perl-Time-HiRes-1.976.0.ebuild | 2 +-
virtual/perl-Time-Local/perl-Time-Local-1.280.0.ebuild | 2 +-
virtual/perl-Time-Piece/perl-Time-Piece-1.330.0.ebuild | 2 +-
virtual/perl-Unicode-Collate/perl-Unicode-Collate-1.270.0.ebuild | 2 +-
.../perl-Unicode-Normalize/perl-Unicode-Normalize-1.260.0-r2.ebuild | 2 +-
virtual/perl-XSLoader/perl-XSLoader-0.300.0-r2.ebuild | 2 +-
virtual/perl-autodie/perl-autodie-2.290.0-r5.ebuild | 2 +-
virtual/perl-bignum/perl-bignum-0.510.0.ebuild | 2 +-
virtual/perl-if/perl-if-0.60.800-r2.ebuild | 2 +-
virtual/perl-libnet/perl-libnet-3.110.0-r2.ebuild | 2 +-
virtual/perl-parent/perl-parent-0.237.0.ebuild | 2 +-
virtual/perl-podlators/perl-podlators-4.110.0.ebuild | 2 +-
virtual/perl-threads-shared/perl-threads-shared-1.600.0.ebuild | 2 +-
virtual/perl-threads/perl-threads-2.220.0-r2.ebuild | 2 +-
virtual/perl-version/perl-version-0.992.400.ebuild | 2 +-
virtual/pkgconfig/pkgconfig-0-r1.ebuild | 2 +-
virtual/pkgconfig/pkgconfig-1.ebuild | 2 +-
virtual/python-backports_abc/python-backports_abc-0.ebuild | 2 +-
virtual/python-cffi/python-cffi-0.ebuild | 2 +-
virtual/python-enum34/python-enum34-2.ebuild | 2 +-
virtual/python-funcsigs/python-funcsigs-2-r1.ebuild | 2 +-
virtual/python-futures/python-futures-0.ebuild | 2 +-
virtual/python-futures/python-futures-1.ebuild | 2 +-
virtual/python-ipaddress/python-ipaddress-1.0-r1.ebuild | 2 +-
virtual/python-unittest-mock/python-unittest-mock-1.ebuild | 2 +-
virtual/qmail/qmail-1.03.ebuild | 2 +-
virtual/resolvconf/resolvconf-1.ebuild | 2 +-
virtual/ruby-ssl/ruby-ssl-11.ebuild | 2 +-
virtual/rubygems/rubygems-15.ebuild | 2 +-
virtual/rubygems/rubygems-16.ebuild | 4 ++--
virtual/service-manager/service-manager-0.ebuild | 2 +-
virtual/service-manager/service-manager-1.ebuild | 4 ++--
virtual/shadow/shadow-0.ebuild | 2 +-
virtual/ssh/ssh-0.ebuild | 2 +-
virtual/tex-base/tex-base-0.ebuild | 2 +-
virtual/texi2dvi/texi2dvi-0-r2.ebuild | 2 +-
virtual/tmpfiles/tmpfiles-0.ebuild | 2 +-
virtual/ttf-fonts/ttf-fonts-1-r1.ebuild | 2 +-
virtual/udev/udev-215.ebuild | 2 +-
virtual/udev/udev-217.ebuild | 2 +-
virtual/wireguard/wireguard-1.ebuild | 4 ++--
virtual/yacc/yacc-0.ebuild | 2 +-
www-client/links/links-2.20.2-r1.ebuild | 2 +-
www-client/links/links-2.20.2.ebuild | 2 +-
www-client/lynx/lynx-2.8.9_p1.ebuild | 2 +-
www-client/lynx/lynx-2.9.0_pre1.ebuild | 4 ++--
www-client/lynx/lynx-2.9.0_pre4.ebuild | 4 ++--
www-servers/apache/apache-2.4.41.ebuild | 2 +-
www-servers/lighttpd/lighttpd-1.4.53.ebuild | 2 +-
www-servers/lighttpd/lighttpd-1.4.54.ebuild | 2 +-
www-servers/lighttpd/lighttpd-1.4.55.ebuild | 2 +-
www-servers/spawn-fcgi/spawn-fcgi-1.6.4-r1.ebuild | 2 +-
www-servers/tornado/tornado-4.5.3.ebuild | 2 +-
www-servers/tornado/tornado-5.1-r1.ebuild | 2 +-
www-servers/tornado/tornado-6.0.3.ebuild | 2 +-
x11-apps/appres/appres-1.0.4.ebuild | 2 +-
x11-apps/appres/appres-1.0.5.ebuild | 2 +-
x11-apps/bdftopcf/bdftopcf-1.1.ebuild | 2 +-
x11-apps/beforelight/beforelight-1.0.5.ebuild | 4 ++--
x11-apps/bitmap/bitmap-1.0.9.ebuild | 2 +-
x11-apps/editres/editres-1.0.6.ebuild | 4 ++--
x11-apps/editres/editres-1.0.7.ebuild | 4 ++--
x11-apps/fonttosfnt/fonttosfnt-1.1.0.ebuild | 2 +-
x11-apps/fslsfonts/fslsfonts-1.0.5-r1.ebuild | 4 ++--
x11-apps/fstobdf/fstobdf-1.0.6.ebuild | 4 ++--
x11-apps/iceauth/iceauth-1.0.8.ebuild | 2 +-
x11-apps/ico/ico-1.0.4.ebuild | 4 ++--
x11-apps/ico/ico-1.0.5.ebuild | 4 ++--
x11-apps/listres/listres-1.0.4.ebuild | 4 ++--
x11-apps/luit/luit-20190106.ebuild | 2 +-
x11-apps/mesa-progs/mesa-progs-8.4.0.ebuild | 2 +-
x11-apps/mesa-progs/mesa-progs-9999.ebuild | 4 ++--
x11-apps/mkfontdir/mkfontdir-1.2.0.ebuild | 2 +-
x11-apps/mkfontscale/mkfontscale-1.2.1.ebuild | 2 +-
x11-apps/oclock/oclock-1.0.4.ebuild | 2 +-
x11-apps/rgb/rgb-1.0.5.ebuild | 2 +-
x11-apps/rgb/rgb-1.0.6.ebuild | 2 +-
x11-apps/rstart/rstart-1.0.5-r1.ebuild | 4 ++--
x11-apps/scripts/scripts-1.0.1-r1.ebuild | 4 ++--
x11-apps/sessreg/sessreg-1.1.2.ebuild | 2 +-
x11-apps/setxkbmap/setxkbmap-1.3.2.ebuild | 2 +-
x11-apps/showfont/showfont-1.0.4.ebuild | 4 ++--
x11-apps/showfont/showfont-1.0.5.ebuild | 4 ++--
x11-apps/smproxy/smproxy-1.0.6.ebuild | 2 +-
x11-apps/viewres/viewres-1.0.6.ebuild | 4 ++--
x11-apps/x11perf/x11perf-1.6.1.ebuild | 2 +-
x11-apps/xauth/xauth-1.1.ebuild | 2 +-
x11-apps/xauth/xauth-9999.ebuild | 4 ++--
x11-apps/xbacklight/xbacklight-1.2.3.ebuild | 2 +-
x11-apps/xbiff/xbiff-1.0.4.ebuild | 4 ++--
x11-apps/xcalc/xcalc-1.1.0.ebuild | 4 ++--
x11-apps/xclipboard/xclipboard-1.1.3.ebuild | 4 ++--
x11-apps/xclock/xclock-1.0.9.ebuild | 2 +-
x11-apps/xcmsdb/xcmsdb-1.0.5.ebuild | 2 +-
x11-apps/xconsole/xconsole-1.0.7.ebuild | 2 +-
x11-apps/xcursorgen/xcursorgen-1.0.7.ebuild | 2 +-
x11-apps/xdbedizzy/xdbedizzy-1.1.0.ebuild | 4 ++--
x11-apps/xditview/xditview-1.0.5.ebuild | 4 ++--
x11-apps/xdm/xdm-1.1.12.ebuild | 2 +-
x11-apps/xdpyinfo/xdpyinfo-1.3.1.ebuild | 2 +-
x11-apps/xdpyinfo/xdpyinfo-1.3.2.ebuild | 2 +-
x11-apps/xdriinfo/xdriinfo-1.0.5.ebuild | 2 +-
x11-apps/xdriinfo/xdriinfo-1.0.6.ebuild | 2 +-
x11-apps/xev/xev-1.2.3.ebuild | 2 +-
x11-apps/xeyes/xeyes-1.1.1.ebuild | 2 +-
x11-apps/xeyes/xeyes-1.1.2.ebuild | 2 +-
x11-apps/xf86dga/xf86dga-1.0.3.ebuild | 2 +-
x11-apps/xfd/xfd-1.1.3.ebuild | 4 ++--
x11-apps/xfontsel/xfontsel-1.0.5.ebuild | 2 +-
x11-apps/xfontsel/xfontsel-1.0.6.ebuild | 2 +-
x11-apps/xgamma/xgamma-1.0.6.ebuild | 2 +-
x11-apps/xgc/xgc-1.0.4.ebuild | 4 ++--
x11-apps/xgc/xgc-1.0.5.ebuild | 4 ++--
x11-apps/xhost/xhost-1.0.8.ebuild | 2 +-
x11-apps/xinit/xinit-1.4.1.ebuild | 2 +-
x11-apps/xinput/xinput-1.6.3.ebuild | 2 +-
x11-apps/xkbcomp/xkbcomp-1.4.3.ebuild | 2 +-
x11-apps/xkbevd/xkbevd-1.1.4.ebuild | 2 +-
x11-apps/xkbprint/xkbprint-1.0.5.ebuild | 4 ++--
x11-apps/xkbutils/xkbutils-1.0.4.ebuild | 2 +-
x11-apps/xkill/xkill-1.0.4.ebuild | 2 +-
x11-apps/xkill/xkill-1.0.5.ebuild | 2 +-
x11-apps/xload/xload-1.1.2.ebuild | 2 +-
x11-apps/xload/xload-1.1.3.ebuild | 2 +-
x11-apps/xlogo/xlogo-1.0.5.ebuild | 2 +-
x11-apps/xlsatoms/xlsatoms-1.1.3.ebuild | 2 +-
x11-apps/xlsclients/xlsclients-1.1.4.ebuild | 2 +-
x11-apps/xlsfonts/xlsfonts-1.0.6.ebuild | 2 +-
x11-apps/xmag/xmag-1.0.6.ebuild | 4 ++--
x11-apps/xman/xman-1.1.5.ebuild | 2 +-
x11-apps/xmessage/xmessage-1.0.4.ebuild | 2 +-
x11-apps/xmessage/xmessage-1.0.5.ebuild | 2 +-
x11-apps/xmodmap/xmodmap-1.0.10.ebuild | 2 +-
x11-apps/xmore/xmore-1.0.3.ebuild | 4 ++--
x11-apps/xpr/xpr-1.0.5.ebuild | 2 +-
x11-apps/xprop/xprop-1.2.4.ebuild | 2 +-
x11-apps/xrandr/xrandr-1.5.1.ebuild | 2 +-
x11-apps/xrdb/xrdb-1.2.0.ebuild | 2 +-
x11-apps/xrefresh/xrefresh-1.0.5.ebuild | 2 +-
x11-apps/xrefresh/xrefresh-1.0.6.ebuild | 2 +-
x11-apps/xset/xset-1.2.3.ebuild | 2 +-
x11-apps/xset/xset-1.2.4.ebuild | 2 +-
x11-apps/xsetroot/xsetroot-1.1.1.ebuild | 2 +-
x11-apps/xsetroot/xsetroot-1.1.2.ebuild | 2 +-
x11-apps/xsm/xsm-1.0.3.ebuild | 2 +-
x11-apps/xsm/xsm-1.0.4.ebuild | 2 +-
x11-apps/xstdcmap/xstdcmap-1.0.4.ebuild | 4 ++--
x11-apps/xvidtune/xvidtune-1.0.3.ebuild | 2 +-
x11-apps/xvinfo/xvinfo-1.1.4.ebuild | 2 +-
x11-apps/xwd/xwd-1.0.6.ebuild | 2 +-
x11-apps/xwd/xwd-1.0.7.ebuild | 2 +-
x11-apps/xwininfo/xwininfo-1.1.5.ebuild | 2 +-
x11-apps/xwud/xwud-1.0.5.ebuild | 2 +-
x11-base/xcb-proto/xcb-proto-1.13.ebuild | 2 +-
x11-base/xcb-proto/xcb-proto-1.14.ebuild | 2 +-
x11-base/xorg-drivers/xorg-drivers-1.20-r1.ebuild | 2 +-
x11-base/xorg-drivers/xorg-drivers-9999.ebuild | 2 +-
x11-base/xorg-proto/xorg-proto-2019.2.ebuild | 2 +-
x11-base/xorg-proto/xorg-proto-9999.ebuild | 2 +-
x11-base/xorg-server/xorg-server-1.20.7.ebuild | 2 +-
x11-base/xorg-server/xorg-server-9999.ebuild | 2 +-
x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild | 2 +-
.../xf86-input-elographics/xf86-input-elographics-1.4.2.ebuild | 2 +-
x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.6.ebuild | 2 +-
x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.3.ebuild | 2 +-
x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.9.0.ebuild | 2 +-
x11-drivers/xf86-input-mouse/xf86-input-mouse-1.9.3.ebuild | 2 +-
x11-drivers/xf86-input-void/xf86-input-void-1.4.1.ebuild | 2 +-
x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.8.ebuild | 2 +-
x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.5.0.ebuild | 2 +-
x11-libs/cairo/cairo-1.16.0-r3.ebuild | 2 +-
x11-libs/cairo/cairo-9999.ebuild | 2 +-
x11-libs/gdk-pixbuf/gdk-pixbuf-2.40.0.ebuild | 2 +-
x11-libs/gnome-pty-helper/gnome-pty-helper-0.40.2.ebuild | 2 +-
x11-libs/gtk+/gtk+-2.24.32-r1.ebuild | 2 +-
x11-libs/gtk+/gtk+-3.24.11.ebuild | 2 +-
x11-libs/gtk+/gtk+-3.24.13.ebuild | 2 +-
x11-libs/gtk+/gtk+-3.24.14.ebuild | 2 +-
x11-libs/gtkglarea/gtkglarea-2.0.1-r1.ebuild | 2 +-
x11-libs/gtkglarea/gtkglarea-2.1.0.ebuild | 2 +-
x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild | 2 +-
x11-libs/gtksourceview/gtksourceview-2.10.5-r3.ebuild | 2 +-
x11-libs/gtksourceview/gtksourceview-3.24.11.ebuild | 2 +-
x11-libs/gtksourceview/gtksourceview-4.2.0.ebuild | 4 ++--
x11-libs/libFS/libFS-1.0.8.ebuild | 2 +-
x11-libs/libICE/libICE-1.0.10.ebuild | 2 +-
x11-libs/libSM/libSM-1.2.3.ebuild | 2 +-
x11-libs/libX11/libX11-1.6.9.ebuild | 2 +-
x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild | 2 +-
x11-libs/libXau/libXau-1.0.9.ebuild | 2 +-
x11-libs/libXaw/libXaw-1.0.13-r1.ebuild | 2 +-
x11-libs/libXaw3d/libXaw3d-1.6.3.ebuild | 2 +-
x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild | 2 +-
x11-libs/libXcursor/libXcursor-1.2.0.ebuild | 2 +-
x11-libs/libXdamage/libXdamage-1.1.5.ebuild | 2 +-
x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild | 2 +-
x11-libs/libXext/libXext-1.3.4.ebuild | 2 +-
x11-libs/libXfixes/libXfixes-5.0.3-r1.ebuild | 2 +-
x11-libs/libXfont2/libXfont2-2.0.4.ebuild | 2 +-
x11-libs/libXft/libXft-2.3.3.ebuild | 2 +-
x11-libs/libXi/libXi-1.7.10.ebuild | 2 +-
x11-libs/libXinerama/libXinerama-1.1.4.ebuild | 2 +-
x11-libs/libXmu/libXmu-1.1.3.ebuild | 2 +-
x11-libs/libXpm/libXpm-3.5.13.ebuild | 2 +-
x11-libs/libXrandr/libXrandr-1.5.2.ebuild | 2 +-
x11-libs/libXrender/libXrender-0.9.10-r1.ebuild | 2 +-
x11-libs/libXres/libXres-1.2.0-r1.ebuild | 2 +-
x11-libs/libXt/libXt-1.2.0.ebuild | 2 +-
x11-libs/libXtst/libXtst-1.2.3-r1.ebuild | 2 +-
x11-libs/libXv/libXv-1.0.11-r1.ebuild | 2 +-
x11-libs/libXvMC/libXvMC-1.0.12.ebuild | 2 +-
x11-libs/libXxf86dga/libXxf86dga-1.1.5.ebuild | 2 +-
x11-libs/libXxf86misc/libXxf86misc-1.0.4.ebuild | 2 +-
x11-libs/libXxf86vm/libXxf86vm-1.1.4-r1.ebuild | 2 +-
x11-libs/libast/libast-0.7-r2.ebuild | 2 +-
x11-libs/libdmx/libdmx-1.1.4.ebuild | 2 +-
x11-libs/libdrm/libdrm-2.4.100.ebuild | 2 +-
x11-libs/libdrm/libdrm-9999.ebuild | 4 ++--
x11-libs/libfontenc/libfontenc-1.1.4.ebuild | 2 +-
x11-libs/libnotify/libnotify-0.7.8.ebuild | 2 +-
x11-libs/libpciaccess/libpciaccess-0.16.ebuild | 2 +-
x11-libs/libwnck/libwnck-2.31.0.ebuild | 2 +-
x11-libs/libwnck/libwnck-3.30.0.ebuild | 2 +-
x11-libs/libxcb/libxcb-1.13.1.ebuild | 2 +-
x11-libs/libxcb/libxcb-1.14.ebuild | 2 +-
x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild | 2 +-
x11-libs/libxklavier/libxklavier-5.4.ebuild | 2 +-
x11-libs/libxshmfence/libxshmfence-1.3-r1.ebuild | 2 +-
x11-libs/motif/motif-2.3.8-r1.ebuild | 2 +-
x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild | 2 +-
x11-libs/pango/pango-1.42.4-r2.ebuild | 2 +-
x11-libs/pango/pango-1.44.7.ebuild | 2 +-
x11-libs/pangox-compat/pangox-compat-0.0.2-r1.ebuild | 2 +-
x11-libs/pangox-compat/pangox-compat-0.0.2.ebuild | 2 +-
x11-libs/pixman/pixman-0.38.4.ebuild | 2 +-
x11-libs/pixman/pixman-9999.ebuild | 4 ++--
x11-libs/startup-notification/startup-notification-0.12-r1.ebuild | 2 +-
x11-libs/tslib/tslib-1.21.ebuild | 2 +-
x11-libs/vte/vte-0.28.2-r208.ebuild | 2 +-
x11-libs/vte/vte-0.56.4.ebuild | 2 +-
x11-libs/vte/vte-0.58.3.ebuild | 2 +-
x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild | 2 +-
x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild | 4 ++--
x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r2.ebuild | 2 +-
x11-libs/xcb-util-image/xcb-util-image-0.4.0-r1.ebuild | 2 +-
x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r1.ebuild | 2 +-
x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r2.ebuild | 2 +-
x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r2.ebuild | 2 +-
x11-libs/xcb-util/xcb-util-0.4.0-r1.ebuild | 2 +-
x11-libs/xforms/xforms-1.2.4.ebuild | 2 +-
x11-libs/xtrans/xtrans-1.4.0.ebuild | 2 +-
x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild | 2 +-
x11-misc/gccmakedep/gccmakedep-9999.ebuild | 4 ++--
x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r1.ebuild | 2 +-
x11-misc/imake/imake-1.0.8.ebuild | 2 +-
x11-misc/makedepend/makedepend-1.0.6.ebuild | 2 +-
x11-misc/notification-daemon/notification-daemon-0.5.0.ebuild | 4 ++--
x11-misc/notification-daemon/notification-daemon-3.14.1.ebuild | 2 +-
x11-misc/notification-daemon/notification-daemon-3.18.2.ebuild | 4 ++--
x11-misc/notification-daemon/notification-daemon-3.20.0.ebuild | 2 +-
x11-misc/shared-mime-info/shared-mime-info-1.10-r1.ebuild | 2 +-
x11-misc/shared-mime-info/shared-mime-info-1.10.ebuild | 2 +-
x11-misc/util-macros/util-macros-1.19.2-r1.ebuild | 2 +-
x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild | 2 +-
x11-misc/x11vnc/x11vnc-0.9.16-r3.ebuild | 2 +-
x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild | 2 +-
x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild | 2 +-
x11-misc/xkeyboard-config/xkeyboard-config-2.29.ebuild | 2 +-
x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild | 2 +-
x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild | 2 +-
x11-misc/xscreensaver/xscreensaver-5.38.ebuild | 2 +-
x11-misc/xscreensaver/xscreensaver-5.43-r2.ebuild | 2 +-
x11-misc/xscreensaver/xscreensaver-5.44-r1.ebuild | 2 +-
x11-misc/xtrace/xtrace-1.4.0.ebuild | 2 +-
x11-terms/eterm/eterm-0.9.6-r2.ebuild | 2 +-
x11-terms/gnome-terminal/gnome-terminal-3.32.2.ebuild | 4 ++--
x11-terms/gnome-terminal/gnome-terminal-3.34.2.ebuild | 2 +-
x11-terms/xterm/xterm-337.ebuild | 2 +-
x11-terms/xterm/xterm-351.ebuild | 2 +-
x11-terms/xterm/xterm-353.ebuild | 2 +-
x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.32.0.ebuild | 2 +-
x11-themes/arc-icon-theme/arc-icon-theme-20161122.ebuild | 4 ++--
x11-themes/gentoo-xcursors/gentoo-xcursors-0.3.1.ebuild | 2 +-
x11-themes/gnome-backgrounds/gnome-backgrounds-3.32.0.ebuild | 4 ++--
x11-themes/gnome-backgrounds/gnome-backgrounds-3.34.0.ebuild | 2 +-
.../gnome-icon-theme-symbolic/gnome-icon-theme-symbolic-3.10.1.ebuild | 4 ++--
.../gnome-icon-theme-symbolic/gnome-icon-theme-symbolic-3.12.0.ebuild | 4 ++--
x11-themes/gnome-themes-standard/gnome-themes-standard-3.28.ebuild | 2 +-
x11-themes/gtk-engines-adwaita/gtk-engines-adwaita-3.28.ebuild | 2 +-
x11-themes/gtk-engines/gtk-engines-2.20.2-r2.ebuild | 2 +-
x11-themes/hicolor-icon-theme/hicolor-icon-theme-0.17.ebuild | 2 +-
x11-themes/sound-theme-freedesktop/sound-theme-freedesktop-0.8.ebuild | 2 +-
x11-themes/vertex-icon-theme/vertex-icon-theme-20150506.ebuild | 4 ++--
x11-themes/xcursor-themes/xcursor-themes-1.0.6.ebuild | 2 +-
x11-wm/sawfish/sawfish-1.12.0-r1.ebuild | 2 +-
x11-wm/twm/twm-1.0.10.ebuild | 2 +-
xfce-base/garcon/garcon-0.6.4-r2.ebuild | 2 +-
xfce-base/libxfce4ui/libxfce4ui-4.14.1.ebuild | 2 +-
xfce-base/libxfce4ui/libxfce4ui-4.15.1.ebuild | 2 +-
xfce-base/libxfce4util/libxfce4util-4.14.0.ebuild | 2 +-
xfce-base/libxfce4util/libxfce4util-4.15.0.ebuild | 2 +-
xfce-base/xfconf/xfconf-4.14.1.ebuild | 2 +-
| 2 +-
3965 files changed, 4676 insertions(+), 4676 deletions(-)
diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.32.0.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.32.0.ebuild
index cd11d7751d1..1f9a97d647a 100644
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.32.0.ebuild
+++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.32.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
LICENSE="LGPL-2+"
SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.34.0.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.34.0.ebuild
index 8e6420357ff..c6a01cab85b 100644
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.34.0.ebuild
+++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.34.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="test"
RESTRICT="!test? ( test )"
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 16a5d64cc5b..c6a01cab85b 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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/app-admin/apache-tools/apache-tools-2.4.41.ebuild b/app-admin/apache-tools/apache-tools-2.4.41.ebuild
index e93fdc6cd59..98e7d3ab1cd 100644
--- a/app-admin/apache-tools/apache-tools-2.4.41.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.41.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
IUSE="libressl ssl"
RESTRICT="test"
diff --git a/app-admin/emacs-updater/emacs-updater-1.16.ebuild b/app-admin/emacs-updater/emacs-updater-1.16.ebuild
index 25dc8ffca26..5a788b9ffbe 100644
--- a/app-admin/emacs-updater/emacs-updater-1.16.ebuild
+++ b/app-admin/emacs-updater/emacs-updater-1.16.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
DEPEND="|| ( sys-apps/util-linux app-misc/getopt )"
RDEPEND="${DEPEND}
diff --git a/app-admin/eselect/eselect-1.4.12.ebuild b/app-admin/eselect/eselect-1.4.12.ebuild
index 2f14bca0364..39fe198cd86 100644
--- a/app-admin/eselect/eselect-1.4.12.ebuild
+++ b/app-admin/eselect/eselect-1.4.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc emacs vim-syntax"
RDEPEND="sys-apps/sed
diff --git a/app-admin/eselect/eselect-1.4.14.ebuild b/app-admin/eselect/eselect-1.4.14.ebuild
index 6967514601a..7eeb4a502e3 100644
--- a/app-admin/eselect/eselect-1.4.14.ebuild
+++ b/app-admin/eselect/eselect-1.4.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc emacs vim-syntax"
RDEPEND="sys-apps/sed
diff --git a/app-admin/eselect/eselect-1.4.15.ebuild b/app-admin/eselect/eselect-1.4.15.ebuild
index baa32886ec5..77c8c713b16 100644
--- a/app-admin/eselect/eselect-1.4.15.ebuild
+++ b/app-admin/eselect/eselect-1.4.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc emacs vim-syntax"
RDEPEND="sys-apps/sed
diff --git a/app-admin/eselect/eselect-1.4.16.ebuild b/app-admin/eselect/eselect-1.4.16.ebuild
index aa84c092b38..8a0858a2dec 100644
--- a/app-admin/eselect/eselect-1.4.16.ebuild
+++ b/app-admin/eselect/eselect-1.4.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc emacs vim-syntax"
RDEPEND="sys-apps/sed
diff --git a/app-admin/fam/fam-2.7.0-r7.ebuild b/app-admin/fam/fam-2.7.0-r7.ebuild
index 5abda88a4a1..d004e44ba17 100644
--- a/app-admin/fam/fam-2.7.0-r7.ebuild
+++ b/app-admin/fam/fam-2.7.0-r7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://oss.sgi.com/projects/fam/download/stable/${P}.tar.gz
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE="static-libs"
DEPEND="net-nds/rpcbind
diff --git a/app-admin/fam/fam-2.7.0_p17_p2.ebuild b/app-admin/fam/fam-2.7.0_p17_p2.ebuild
index b6eb27e65c1..b9aea003bf5 100644
--- a/app-admin/fam/fam-2.7.0_p17_p2.ebuild
+++ b/app-admin/fam/fam-2.7.0_p17_p2.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 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE="static-libs"
DEPEND="
diff --git a/app-admin/gam-server/gam-server-0.1.10-r2.ebuild b/app-admin/gam-server/gam-server-0.1.10-r2.ebuild
index ead4d98b153..260abe63826 100644
--- a/app-admin/gam-server/gam-server-0.1.10-r2.ebuild
+++ b/app-admin/gam-server/gam-server-0.1.10-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x86-solaris"
IUSE="debug kernel_linux"
RDEPEND=">=dev-libs/glib-2:2
diff --git a/app-admin/gamin/gamin-0.1.10-r1.ebuild b/app-admin/gamin/gamin-0.1.10-r1.ebuild
index 0313695cbc3..7ae2088c11d 100644
--- a/app-admin/gamin/gamin-0.1.10-r1.ebuild
+++ b/app-admin/gamin/gamin-0.1.10-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh 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"
IUSE=""
RDEPEND="!app-admin/fam
diff --git a/app-admin/gnome-system-log/gnome-system-log-3.9.90.ebuild b/app-admin/gnome-system-log/gnome-system-log-3.9.90.ebuild
index 3697ee7615f..14d75e88063 100644
--- a/app-admin/gnome-system-log/gnome-system-log-3.9.90.ebuild
+++ b/app-admin/gnome-system-log/gnome-system-log-3.9.90.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Attic/GnomeUtils"
LICENSE="GPL-2+ CC-BY-SA-3.0"
SLOT="0"
IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="
>=dev-libs/glib-2.31:2
diff --git a/app-admin/logrotate/logrotate-3.14.0.ebuild b/app-admin/logrotate/logrotate-3.14.0.ebuild
index ab589a26bc2..2b5c352f13f 100644
--- a/app-admin/logrotate/logrotate-3.14.0.ebuild
+++ b/app-admin/logrotate/logrotate-3.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="acl +cron selinux"
COMMON_DEPEND="
diff --git a/app-admin/logrotate/logrotate-3.15.1.ebuild b/app-admin/logrotate/logrotate-3.15.1.ebuild
index aa92d896ca4..7222c9aa202 100644
--- a/app-admin/logrotate/logrotate-3.15.1.ebuild
+++ b/app-admin/logrotate/logrotate-3.15.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="acl +cron selinux"
COMMON_DEPEND="
diff --git a/app-admin/logrotate/logrotate-3.16.0.ebuild b/app-admin/logrotate/logrotate-3.16.0.ebuild
index ae6c65c79eb..b63b513c2ef 100644
--- a/app-admin/logrotate/logrotate-3.16.0.ebuild
+++ b/app-admin/logrotate/logrotate-3.16.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="acl +cron selinux"
COMMON_DEPEND="
diff --git a/app-admin/logsentry/logsentry-1.1.1-r2.ebuild b/app-admin/logsentry/logsentry-1.1.1-r2.ebuild
index f21b1a95261..39ec1c755fc 100644
--- a/app-admin/logsentry/logsentry-1.1.1-r2.ebuild
+++ b/app-admin/logsentry/logsentry-1.1.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 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.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ~s390 ~sh sparc x86"
+KEYWORDS="amd64 arm ~mips ppc ~s390 sparc x86"
IUSE=""
DEPEND=">=sys-apps/sed-4"
diff --git a/app-admin/metalog/metalog-20181125.ebuild b/app-admin/metalog/metalog-20181125.ebuild
index 5b05f920880..d4f4b8fb696 100644
--- a/app-admin/metalog/metalog-20181125.ebuild
+++ b/app-admin/metalog/metalog-20181125.ebuild
@@ -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 sh 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-20200113-r1.ebuild b/app-admin/metalog/metalog-20200113-r1.ebuild
index 0810553ec43..c7915bf6893 100644
--- a/app-admin/metalog/metalog-20200113-r1.ebuild
+++ b/app-admin/metalog/metalog-20200113-r1.ebuild
@@ -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 ~sh ~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 548059b4177..e44fb7ddc99 100644
--- a/app-admin/metalog/metalog-3-r2.ebuild
+++ b/app-admin/metalog/metalog-3-r2.ebuild
@@ -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 sh 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 89ba31112a1..314e59e8cfb 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="GPL-2"
diff --git a/app-admin/perl-cleaner/perl-cleaner-2.28.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.28.ebuild
index 8fe627b2744..2fcf8550b42 100644
--- a/app-admin/perl-cleaner/perl-cleaner-2.28.ebuild
+++ b/app-admin/perl-cleaner/perl-cleaner-2.28.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="GPL-2"
diff --git a/app-admin/perl-cleaner/perl-cleaner-9999.ebuild b/app-admin/perl-cleaner/perl-cleaner-9999.ebuild
index 8fe627b2744..2fcf8550b42 100644
--- a/app-admin/perl-cleaner/perl-cleaner-9999.ebuild
+++ b/app-admin/perl-cleaner/perl-cleaner-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="GPL-2"
diff --git a/app-admin/sudo/sudo-1.8.28_p1-r2.ebuild b/app-admin/sudo/sudo-1.8.28_p1-r2.ebuild
index e43a49df120..47224e32f95 100644
--- a/app-admin/sudo/sudo-1.8.28_p1-r2.ebuild
+++ b/app-admin/sudo/sudo-1.8.28_p1-r2.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 sh 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/sudo/sudo-1.8.29-r2.ebuild b/app-admin/sudo/sudo-1.8.29-r2.ebuild
index 50585e30f91..da5146b1241 100644
--- a/app-admin/sudo/sudo-1.8.29-r2.ebuild
+++ b/app-admin/sudo/sudo-1.8.29-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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 ~sh ~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/sudo/sudo-1.8.30.ebuild b/app-admin/sudo/sudo-1.8.30.ebuild
index 944dd7d0353..f0df8a6c9e2 100644
--- a/app-admin/sudo/sudo-1.8.30.ebuild
+++ b/app-admin/sudo/sudo-1.8.30.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 ~sh ~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/sudo/sudo-1.8.31.ebuild b/app-admin/sudo/sudo-1.8.31.ebuild
index cb95f878c24..bcf32b59470 100644
--- a/app-admin/sudo/sudo-1.8.31.ebuild
+++ b/app-admin/sudo/sudo-1.8.31.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 sh 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/sudo/sudo-1.8.31_p1.ebuild b/app-admin/sudo/sudo-1.8.31_p1.ebuild
index 944dd7d0353..f0df8a6c9e2 100644
--- a/app-admin/sudo/sudo-1.8.31_p1.ebuild
+++ b/app-admin/sudo/sudo-1.8.31_p1.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 ~sh ~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/sudo/sudo-9999.ebuild b/app-admin/sudo/sudo-9999.ebuild
index fc4f44f8e4f..f0df8a6c9e2 100644
--- a/app-admin/sudo/sudo-9999.ebuild
+++ b/app-admin/sudo/sudo-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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 ~sh ~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 ba48155eaaf..77ee7f4af1c 100644
--- a/app-admin/superadduser/superadduser-1.0.9.ebuild
+++ b/app-admin/superadduser/superadduser-1.0.9.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 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/superadduser/superadduser-1.15.ebuild b/app-admin/superadduser/superadduser-1.15.ebuild
index 78ba0682ff0..5006da875fe 100644
--- a/app-admin/superadduser/superadduser-1.15.ebuild
+++ b/app-admin/superadduser/superadduser-1.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 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 ~sh ~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/sysklogd/sysklogd-1.5.1-r1.ebuild b/app-admin/sysklogd/sysklogd-1.5.1-r1.ebuild
index 574518ceb8d..e22a204f9a9 100644
--- a/app-admin/sysklogd/sysklogd-1.5.1-r1.ebuild
+++ b/app-admin/sysklogd/sysklogd-1.5.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.infodrom.org/projects/sysklogd/download/${P}.tar.gz
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="logrotate"
RESTRICT="test"
diff --git a/app-admin/sysklogd/sysklogd-2.0.3.ebuild b/app-admin/sysklogd/sysklogd-2.0.3.ebuild
index be89e5f845c..0830400639b 100644
--- a/app-admin/sysklogd/sysklogd-2.0.3.ebuild
+++ b/app-admin/sysklogd/sysklogd-2.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/troglobit/sysklogd/releases/download/v${PV}/${P}.tar
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="klogd logger logrotate systemd"
RESTRICT="test"
diff --git a/app-admin/sysklogd/sysklogd-2.1.1.ebuild b/app-admin/sysklogd/sysklogd-2.1.1.ebuild
index bd1e8726ca4..ad19247bad9 100644
--- a/app-admin/sysklogd/sysklogd-2.1.1.ebuild
+++ b/app-admin/sysklogd/sysklogd-2.1.1.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == *9999 ]] ; then
EGIT_REPO_URI="https://github.com/troglobit/sysklogd.git"
else
SRC_URI="https://github.com/troglobit/sysklogd/releases/download/v${PV}/${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
fi
LICENSE="BSD"
diff --git a/app-admin/sysklogd/sysklogd-2.1.2.ebuild b/app-admin/sysklogd/sysklogd-2.1.2.ebuild
index bd1e8726ca4..ad19247bad9 100644
--- a/app-admin/sysklogd/sysklogd-2.1.2.ebuild
+++ b/app-admin/sysklogd/sysklogd-2.1.2.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == *9999 ]] ; then
EGIT_REPO_URI="https://github.com/troglobit/sysklogd.git"
else
SRC_URI="https://github.com/troglobit/sysklogd/releases/download/v${PV}/${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
fi
LICENSE="BSD"
diff --git a/app-admin/sysklogd/sysklogd-9999.ebuild b/app-admin/sysklogd/sysklogd-9999.ebuild
index bd1e8726ca4..ad19247bad9 100644
--- a/app-admin/sysklogd/sysklogd-9999.ebuild
+++ b/app-admin/sysklogd/sysklogd-9999.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == *9999 ]] ; then
EGIT_REPO_URI="https://github.com/troglobit/sysklogd.git"
else
SRC_URI="https://github.com/troglobit/sysklogd/releases/download/v${PV}/${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
fi
LICENSE="BSD"
diff --git a/app-admin/syslog-ng/syslog-ng-3.22.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.22.1.ebuild
index 6cc34d99367..bc25d093014 100644
--- a/app-admin/syslog-ng/syslog-ng-3.22.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.22.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="amqp caps dbi geoip geoip2 http ipv6 json kafka libressl mongodb pacct python redis smtp snmp spoof-source systemd tcpd"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
# unit tests require https://github.com/Snaipe/Criterion with additional deps
diff --git a/app-admin/syslog-ng/syslog-ng-3.24.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.24.1.ebuild
index dad96a4c152..900f50cb7f4 100644
--- a/app-admin/syslog-ng/syslog-ng-3.24.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.24.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="amqp caps dbi geoip2 http ipv6 json kafka libressl mongodb pacct python redis smtp snmp spoof-source systemd tcpd"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
# unit tests require https://github.com/Snaipe/Criterion with additional deps
diff --git a/app-admin/syslog-ng/syslog-ng-3.25.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.25.1.ebuild
index 6a918ed857d..5a0dfd96064 100644
--- a/app-admin/syslog-ng/syslog-ng-3.25.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.25.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="amqp caps dbi geoip2 http ipv6 json kafka libressl mongodb pacct python redis smtp snmp test spoof-source systemd tcpd"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RESTRICT="!test? ( test )"
diff --git a/app-admin/syslog-ng/syslog-ng-3.26.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.26.1.ebuild
index a59f6f1d1c7..fffd41d2483 100644
--- a/app-admin/syslog-ng/syslog-ng-3.26.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.26.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="amqp caps dbi geoip2 http ipv6 json kafka libressl mongodb pacct python redis smtp snmp test spoof-source systemd tcpd"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RESTRICT="!test? ( test )"
diff --git a/app-admin/sysstat/sysstat-12.2.1.ebuild b/app-admin/sysstat/sysstat-12.2.1.ebuild
index c3e396c6637..7a96f5aa78c 100644
--- a/app-admin/sysstat/sysstat-12.2.1.ebuild
+++ b/app-admin/sysstat/sysstat-12.2.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="debug nls lm-sensors selinux static"
CDEPEND="
diff --git a/app-admin/sysstat/sysstat-12.3.1.ebuild b/app-admin/sysstat/sysstat-12.3.1.ebuild
index 5c114d68304..5bcf69fe150 100644
--- a/app-admin/sysstat/sysstat-12.3.1.ebuild
+++ b/app-admin/sysstat/sysstat-12.3.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="debug nls lm-sensors selinux static"
CDEPEND="
diff --git a/app-admin/system-config-printer/system-config-printer-1.5.12-r1.ebuild b/app-admin/system-config-printer/system-config-printer-1.5.12-r1.ebuild
index a62572dca40..6f0b21fb6e2 100644
--- a/app-admin/system-config-printer/system-config-printer-1.5.12-r1.ebuild
+++ b/app-admin/system-config-printer/system-config-printer-1.5.12-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/OpenPrinting/system-config-printer"
SRC_URI="https://github.com/OpenPrinting/${PN}/releases/download/${PV}/${P}.tar.xz"
LICENSE="GPL-2+"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~sparc x86"
SLOT="0"
IUSE="doc gnome-keyring policykit"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
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 5c673ce152b..ccb5d10ffb4 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=( python{3_6,3_7} )
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 ~sh 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-admin/webapp-config/webapp-config-9999.ebuild b/app-admin/webapp-config/webapp-config-9999.ebuild
index 98c743df74f..206b5aa84ed 100644
--- a/app-admin/webapp-config/webapp-config-9999.ebuild
+++ b/app-admin/webapp-config/webapp-config-9999.ebuild
@@ -14,7 +14,7 @@ then
KEYWORDS=""
else
SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
fi
DESCRIPTION="Gentoo's installer for web-based applications"
diff --git a/app-arch/bsdsfv/bsdsfv-1.18-r2.ebuild b/app-arch/bsdsfv/bsdsfv-1.18-r2.ebuild
index 587200385df..9c59d15f47c 100644
--- a/app-arch/bsdsfv/bsdsfv-1.18-r2.ebuild
+++ b/app-arch/bsdsfv/bsdsfv-1.18-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~m68k ppc ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm ~hppa ~m68k ppc ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${PN}
diff --git a/app-arch/bzip2/bzip2-1.0.6-r11.ebuild b/app-arch/bzip2/bzip2-1.0.6-r11.ebuild
index c140ad8820f..7f7de40a049 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r11.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r11.ebuild
@@ -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 sh 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.7.ebuild b/app-arch/bzip2/bzip2-1.0.7.ebuild
index 95c7e67969f..37ab7244dad 100644
--- a/app-arch/bzip2/bzip2-1.0.7.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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="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 ~sh ~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.ebuild b/app-arch/bzip2/bzip2-1.0.8.ebuild
index 98b583d85c4..e1e25b90ee4 100644
--- a/app-arch/bzip2/bzip2-1.0.8.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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="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 ~sh ~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-9999.ebuild b/app-arch/bzip2/bzip2-9999.ebuild
index ac95fff0d7b..a0c9cd7a462 100644
--- a/app-arch/bzip2/bzip2-9999.ebuild
+++ b/app-arch/bzip2/bzip2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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://gitlab.com/federicomenaquintero/bzip2.git"
else
SRC_URI=""
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
fi
LICENSE="BZIP2"
SLOT="0/1" # subslot = SONAME
--git a/app-arch/cabextract/cabextract-1.8.ebuild b/app-arch/cabextract/cabextract-1.8.ebuild
index c97854959b5..b938acb234a 100644
--- a/app-arch/cabextract/cabextract-1.8.ebuild
+++ b/app-arch/cabextract/cabextract-1.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.cabextract.org.uk/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="extras"
RDEPEND="extras? ( dev-lang/perl )"
--git a/app-arch/cabextract/cabextract-1.9-r2.ebuild b/app-arch/cabextract/cabextract-1.9-r2.ebuild
index c5c6ae499b7..0773997e79a 100644
--- a/app-arch/cabextract/cabextract-1.9-r2.ebuild
+++ b/app-arch/cabextract/cabextract-1.9-r2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
LIBMSPACK_DEPEND="~dev-libs/libmspack-9999:="
else
- KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
MY_PV="${PV/_alpha/alpha}"
MY_P="${PN}-${MY_PV}"
SRC_URI="https://www.cabextract.org.uk/${P}.tar.gz"
--git a/app-arch/cabextract/cabextract-1.9.1.ebuild b/app-arch/cabextract/cabextract-1.9.1.ebuild
index 71d12ab8e37..4f03b18057e 100644
--- a/app-arch/cabextract/cabextract-1.9.1.ebuild
+++ b/app-arch/cabextract/cabextract-1.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
LIBMSPACK_DEPEND="~dev-libs/libmspack-9999:="
else
- KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
MY_PV="${PV/_alpha/alpha}"
MY_P="${PN}-${MY_PV}"
SRC_URI="https://www.cabextract.org.uk/${P}.tar.gz"
--git a/app-arch/cabextract/cabextract-9999.ebuild b/app-arch/cabextract/cabextract-9999.ebuild
index 5cf2a83afa2..4f03b18057e 100644
--- a/app-arch/cabextract/cabextract-9999.ebuild
+++ b/app-arch/cabextract/cabextract-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
LIBMSPACK_DEPEND="~dev-libs/libmspack-9999:="
else
- KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
MY_PV="${PV/_alpha/alpha}"
MY_P="${PN}-${MY_PV}"
SRC_URI="https://www.cabextract.org.uk/${P}.tar.gz"
diff --git a/app-arch/cpio/cpio-2.12-r1.ebuild b/app-arch/cpio/cpio-2.12-r1.ebuild
index 2c74b76cbc1..ea2f4ab3dda 100644
--- a/app-arch/cpio/cpio-2.12-r1.ebuild
+++ b/app-arch/cpio/cpio-2.12-r1.ebuild
@@ -11,7 +11,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 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="nls"
src_prepare() {
diff --git a/app-arch/cpio/cpio-2.13.ebuild b/app-arch/cpio/cpio-2.13.ebuild
index 4f5966691a5..1c53d1e5fb8 100644
--- a/app-arch/cpio/cpio-2.13.ebuild
+++ b/app-arch/cpio/cpio-2.13.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 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="nls"
PATCHES=(
diff --git a/app-arch/dpkg/dpkg-1.19.0.5.ebuild b/app-arch/dpkg/dpkg-1.19.0.5.ebuild
index d6cb3e00ce9..8e7961e3167 100644
--- a/app-arch/dpkg/dpkg-1.19.0.5.ebuild
+++ b/app-arch/dpkg/dpkg-1.19.0.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
IUSE="+bzip2 +lzma nls selinux test unicode +update-alternatives +zlib"
RESTRICT="!test? ( test )"
diff --git a/app-arch/gzip/gzip-1.10.ebuild b/app-arch/gzip/gzip-1.10.ebuild
index 8a25973c52a..470b1f4f576 100644
--- a/app-arch/gzip/gzip-1.10.ebuild
+++ b/app-arch/gzip/gzip-1.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="pic static"
PATCHES=(
diff --git a/app-arch/gzip/gzip-1.9.ebuild b/app-arch/gzip/gzip-1.9.ebuild
index 1de3ecfbee1..053a986e615 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 1ce9c2d04fc..47438638dcf 100644
--- a/app-arch/lbzip2/lbzip2-2.5_p20181227-r1.ebuild
+++ b/app-arch/lbzip2/lbzip2-2.5_p20181227-r1.ebuild
@@ -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 sh 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-r9.ebuild b/app-arch/lha/lha-114i-r9.ebuild
index b53863911a3..2bb169c00c8 100644
--- a/app-arch/lha/lha-114i-r9.ebuild
+++ b/app-arch/lha/lha-114i-r9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/22231/${MY_P}.tar.gz"
LICENSE="lha"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~m68k-mint"
+KEYWORDS="~alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~m68k-mint"
RESTRICT="bindist"
S="${WORKDIR}/${MY_P}"
diff --git a/app-arch/libarchive/libarchive-3.4.2.ebuild b/app-arch/libarchive/libarchive-3.4.2.ebuild
index e90980d5ce6..756e6d25a7c 100644
--- a/app-arch/libarchive/libarchive-3.4.2.ebuild
+++ b/app-arch/libarchive/libarchive-3.4.2.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 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="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.2.ebuild b/app-arch/lz4/lz4-1.9.2.ebuild
index 235404d993b..747fbb11eef 100644
--- a/app-arch/lz4/lz4-1.9.2.ebuild
+++ b/app-arch/lz4/lz4-1.9.2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
EGIT_BRANCH=dev
else
SRC_URI="https://github.com/lz4/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="Extremely Fast Compression algorithm"
diff --git a/app-arch/lz4/lz4-9999.ebuild b/app-arch/lz4/lz4-9999.ebuild
index 2cbe311b2b2..d1ea0341d33 100644
--- a/app-arch/lz4/lz4-9999.ebuild
+++ b/app-arch/lz4/lz4-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
EGIT_BRANCH=dev
else
SRC_URI="https://github.com/Cyan4973/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="Extremely Fast Compression algorithm"
diff --git a/app-arch/lzip/lzip-1.21.ebuild b/app-arch/lzip/lzip-1.21.ebuild
index 11503754e15..e31a63a3fad 100644
--- a/app-arch/lzip/lzip-1.21.ebuild
+++ b/app-arch/lzip/lzip-1.21.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.savannah.gnu.org/releases/${PN}/${P/_/-}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
S="${WORKDIR}/${P/_/-}"
diff --git a/app-arch/ncompress/ncompress-4.2.4.5.ebuild b/app-arch/ncompress/ncompress-4.2.4.5.ebuild
index 7edfcc5ebfc..a80905198ba 100644
--- a/app-arch/ncompress/ncompress-4.2.4.5.ebuild
+++ b/app-arch/ncompress/ncompress-4.2.4.5.ebuild
@@ -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 sh 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/ncompress/ncompress-4.2.4.6.ebuild b/app-arch/ncompress/ncompress-4.2.4.6.ebuild
index 01c7341ac7e..b6a8705dfce 100644
--- a/app-arch/ncompress/ncompress-4.2.4.6.ebuild
+++ b/app-arch/ncompress/ncompress-4.2.4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -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 ~sh ~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_prepare() {
diff --git a/app-arch/pax/pax-20161104.ebuild b/app-arch/pax/pax-20161104.ebuild
index c7fdcdfe4ac..d6f650f7647 100644
--- a/app-arch/pax/pax-20161104.ebuild
+++ b/app-arch/pax/pax-20161104.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.mirbsd.org/MirOS/dist/mir/cpio/paxmirabilis-${PV}.cpio.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
RDEPEND="
dev-libs/libbsd
diff --git a/app-arch/pbzip2/pbzip2-1.1.12-r1.ebuild b/app-arch/pbzip2/pbzip2-1.1.12-r1.ebuild
index 46b9973a1e9..8590d21d481 100644
--- a/app-arch/pbzip2/pbzip2-1.1.12-r1.ebuild
+++ b/app-arch/pbzip2/pbzip2-1.1.12-r1.ebuild
@@ -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 ~sh ~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/pbzip2/pbzip2-1.1.12.ebuild b/app-arch/pbzip2/pbzip2-1.1.12.ebuild
index a262d448ac1..bfe7b9ae079 100644
--- a/app-arch/pbzip2/pbzip2-1.1.12.ebuild
+++ b/app-arch/pbzip2/pbzip2-1.1.12.ebuild
@@ -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 sh 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/pbzip2/pbzip2-1.1.13.ebuild b/app-arch/pbzip2/pbzip2-1.1.13.ebuild
index 0da12986a25..18d59a91340 100644
--- a/app-arch/pbzip2/pbzip2-1.1.13.ebuild
+++ b/app-arch/pbzip2/pbzip2-1.1.13.ebuild
@@ -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 ~sh ~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.ebuild b/app-arch/pigz/pigz-2.4.ebuild
index a716aa5a4f9..5faeaee1c87 100644
--- a/app-arch/pigz/pigz-2.4.ebuild
+++ b/app-arch/pigz/pigz-2.4.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 sh 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.6-r1.ebuild b/app-arch/pixz/pixz-1.0.6-r1.ebuild
index 37d6b9ffdf6..9469acf1427 100644
--- a/app-arch/pixz/pixz-1.0.6-r1.ebuild
+++ b/app-arch/pixz/pixz-1.0.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -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 sh 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/pixz/pixz-9999.ebuild b/app-arch/pixz/pixz-9999.ebuild
index a1998849bea..32751bd95c4 100644
--- a/app-arch/pixz/pixz-9999.ebuild
+++ b/app-arch/pixz/pixz-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -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 ~sh ~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.1-r1.ebuild b/app-arch/rpm/rpm-4.14.1-r1.ebuild
index f95c369665b..52ab90d9528 100644
--- a/app-arch/rpm/rpm-4.14.1-r1.ebuild
+++ b/app-arch/rpm/rpm-4.14.1-r1.ebuild
@@ -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 ~sh ~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.14.1.ebuild b/app-arch/rpm/rpm-4.14.1.ebuild
index c71cfe51717..bcc88deaf12 100644
--- a/app-arch/rpm/rpm-4.14.1.ebuild
+++ b/app-arch/rpm/rpm-4.14.1.ebuild
@@ -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 ~sh ~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.14.2.1.ebuild b/app-arch/rpm/rpm-4.14.2.1.ebuild
index 404c615c4bc..138f3de74f0 100644
--- a/app-arch/rpm/rpm-4.14.2.1.ebuild
+++ b/app-arch/rpm/rpm-4.14.2.1.ebuild
@@ -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 ~sh ~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-r1.ebuild b/app-arch/rpm2targz/rpm2targz-9.0.0.5g-r1.ebuild
index f40eb7d857f..8408bbd8e30 100644
--- a/app-arch/rpm2targz/rpm2targz-9.0.0.5g-r1.ebuild
+++ b/app-arch/rpm2targz/rpm2targz-9.0.0.5g-r1.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 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="app-arch/cpio"
diff --git a/app-arch/rpm2targz/rpm2targz-9.0.0.5g.ebuild b/app-arch/rpm2targz/rpm2targz-9.0.0.5g.ebuild
index 696d4c72b76..ac75c210b4b 100644
--- a/app-arch/rpm2targz/rpm2targz-9.0.0.5g.ebuild
+++ b/app-arch/rpm2targz/rpm2targz-9.0.0.5g.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 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="app-arch/cpio"
diff --git a/app-arch/sharutils/sharutils-4.15.2-r1.ebuild b/app-arch/sharutils/sharutils-4.15.2-r1.ebuild
index bf018da9bb7..1ca16cf4a1b 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="nls"
DEPEND="app-arch/xz-utils
diff --git a/app-arch/tar/tar-1.32.90.ebuild b/app-arch/tar/tar-1.32.90.ebuild
index 64746b70278..e24fc8e11b8 100644
--- a/app-arch/tar/tar-1.32.90.ebuild
+++ b/app-arch/tar/tar-1.32.90.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/tar/${P}.tar.xz
LICENSE="GPL-3+"
SLOT="0"
[[ -n "$(ver_cut 3)" ]] && [[ "$(ver_cut 3)" -ge 90 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="acl elibc_glibc minimal nls selinux static userland_GNU xattr"
LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )"
diff --git a/app-arch/tar/tar-1.32.ebuild b/app-arch/tar/tar-1.32.ebuild
index d57bff06041..aae5fa05480 100644
--- a/app-arch/tar/tar-1.32.ebuild
+++ b/app-arch/tar/tar-1.32.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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="acl elibc_glibc minimal nls selinux static userland_GNU xattr"
LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )"
diff --git a/app-arch/unrar/unrar-5.7.5.ebuild b/app-arch/unrar/unrar-5.7.5.ebuild
index 9745c0265ad..6825ce682c6 100644
--- a/app-arch/unrar/unrar-5.7.5.ebuild
+++ b/app-arch/unrar/unrar-5.7.5.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/5"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
diff --git a/app-arch/unrar/unrar-5.8.5.ebuild b/app-arch/unrar/unrar-5.8.5.ebuild
index 892d9759c30..a8613fd47bf 100644
--- a/app-arch/unrar/unrar-5.8.5.ebuild
+++ b/app-arch/unrar/unrar-5.8.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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/5"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
diff --git a/app-arch/unrar/unrar-5.9.1.ebuild b/app-arch/unrar/unrar-5.9.1.ebuild
index 232fbdb7ddd..1e825e7ac11 100644
--- a/app-arch/unrar/unrar-5.9.1.ebuild
+++ b/app-arch/unrar/unrar-5.9.1.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/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
diff --git a/app-arch/unzip/unzip-6.0_p21-r2.ebuild b/app-arch/unzip/unzip-6.0_p21-r2.ebuild
index 533f9275b79..3b19411df25 100644
--- a/app-arch/unzip/unzip-6.0_p21-r2.ebuild
+++ b/app-arch/unzip/unzip-6.0_p21-r2.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 sh sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux"
IUSE="bzip2 natspec unicode"
DEPEND="bzip2? ( app-arch/bzip2 )
diff --git a/app-arch/unzip/unzip-6.0_p25-r1.ebuild b/app-arch/unzip/unzip-6.0_p25-r1.ebuild
index b393dd2445e..e0c69c8909d 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 ~sh sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc ~x86 ~x86-linux"
IUSE="bzip2 natspec unicode"
DEPEND="bzip2? ( app-arch/bzip2 )
diff --git a/app-arch/xz-utils/xz-utils-5.2.4-r2.ebuild b/app-arch/xz-utils/xz-utils-5.2.4-r2.ebuild
index 5763d979655..e72a5f27918 100644
--- a/app-arch/xz-utils/xz-utils-5.2.4-r2.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.4-r2.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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
S="${WORKDIR}/${MY_P}"
EXTRA_DEPEND=
fi
diff --git a/app-arch/xz-utils/xz-utils-5.2.4-r3.ebuild b/app-arch/xz-utils/xz-utils-5.2.4-r3.ebuild
index 4086a001c98..3a7654adc71 100644
--- a/app-arch/xz-utils/xz-utils-5.2.4-r3.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Remember: we cannot leverage autotools in this ebuild in order
@@ -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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
S="${WORKDIR}/${MY_P}"
EXTRA_DEPEND=
fi
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 f518b2b582b..e129349a96f 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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
S="${WORKDIR}/${MY_P}"
fi
diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild
index f518b2b582b..e129349a96f 100644
--- a/app-arch/xz-utils/xz-utils-9999.ebuild
+++ b/app-arch/xz-utils/xz-utils-9999.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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
S="${WORKDIR}/${MY_P}"
fi
diff --git a/app-arch/zip/zip-3.0-r3.ebuild b/app-arch/zip/zip-3.0-r3.ebuild
index 5321fa4006e..3c66d002efa 100644
--- a/app-arch/zip/zip-3.0-r3.ebuild
+++ b/app-arch/zip/zip-3.0-r3.ebuild
@@ -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 ~sh 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"
RDEPEND="bzip2? ( app-arch/bzip2 )
diff --git a/app-arch/zstd/zstd-1.3.7-r1.ebuild b/app-arch/zstd/zstd-1.3.7-r1.ebuild
index 381d7c89a8d..021a555b13c 100644
--- a/app-arch/zstd/zstd-1.3.7-r1.ebuild
+++ b/app-arch/zstd/zstd-1.3.7-r1.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 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="lz4 static-libs"
RDEPEND="app-arch/xz-utils
diff --git a/app-backup/rdiff-backup/rdiff-backup-1.3.3-r3.ebuild b/app-backup/rdiff-backup/rdiff-backup-1.3.3-r3.ebuild
index 5f5650978ca..07a46592840 100644
--- a/app-backup/rdiff-backup/rdiff-backup-1.3.3-r3.ebuild
+++ b/app-backup/rdiff-backup/rdiff-backup-1.3.3-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/sol1/${PN}/archive/r${UPSTREAM_PV}.tar.gz -> ${P}.ta
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="examples"
DEPEND="
diff --git a/app-backup/rdiff-backup/rdiff-backup-2.0.0.ebuild b/app-backup/rdiff-backup/rdiff-backup-2.0.0.ebuild
index f60e5ef0cb9..aba67332dcd 100644
--- a/app-backup/rdiff-backup/rdiff-backup-2.0.0.ebuild
+++ b/app-backup/rdiff-backup/rdiff-backup-2.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/rdiff-backup/${PN}/releases/download/v${PV}/${P}.tar
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="examples"
DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/app-benchmarks/nbench/nbench-2.2.3-r1.ebuild b/app-benchmarks/nbench/nbench-2.2.3-r1.ebuild
index 258c6f48bf8..7a02dfbc8f6 100644
--- a/app-benchmarks/nbench/nbench-2.2.3-r1.ebuild
+++ b/app-benchmarks/nbench/nbench-2.2.3-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.tux.org/~mayer/linux/${MY_P}.tar.gz"
LICENSE="freedist"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~mips ppc ppc64 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~mips ppc ppc64 sparc x86"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-cdr/cdrdao/cdrdao-1.2.4.ebuild b/app-cdr/cdrdao/cdrdao-1.2.4.ebuild
index b69577f0b35..5b26d6d1fa8 100644
--- a/app-cdr/cdrdao/cdrdao-1.2.4.ebuild
+++ b/app-cdr/cdrdao/cdrdao-1.2.4.ebuild
@@ -16,7 +16,7 @@ fi
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ppc ppc64 sparc x86"
IUSE="encode mad vorbis"
COMMON_DEPEND="
diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild
index 2743c501d42..282f987416e 100644
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 83036c5f5a0..f09039c76ef 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="acl caps nls unicode"
RDEPEND="acl? ( virtual/acl )
diff --git a/app-cdr/cue2toc/cue2toc-0.4.ebuild b/app-cdr/cue2toc/cue2toc-0.4.ebuild
index 53717f1601d..66abd1c3f55 100644
--- a/app-cdr/cue2toc/cue2toc-0.4.ebuild
+++ b/app-cdr/cue2toc/cue2toc-0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/cue2toc/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc ~x86"
IUSE=""
DEPEND="!app-cdr/cdrdao"
diff --git a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild
index 64ecc66e386..cb3bf598e1e 100644
--- a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild
+++ b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://fy.chalmers.se/~appro/linux/DVD+RW/tools/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="virtual/cdrtools"
diff --git a/app-crypt/easy-rsa/easy-rsa-3.0.4.ebuild b/app-crypt/easy-rsa/easy-rsa-3.0.4.ebuild
index b5675685cfc..6d770f3626c 100644
--- a/app-crypt/easy-rsa/easy-rsa-3.0.4.ebuild
+++ b/app-crypt/easy-rsa/easy-rsa-3.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/OpenVPN/easy-rsa/releases/download/v${PV}/${MY_P}.tg
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~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.5.ebuild b/app-crypt/easy-rsa/easy-rsa-3.0.5.ebuild
index 6add47e064d..fd0685a8069 100644
--- a/app-crypt/easy-rsa/easy-rsa-3.0.5.ebuild
+++ b/app-crypt/easy-rsa/easy-rsa-3.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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 ~sh ~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.6.ebuild b/app-crypt/easy-rsa/easy-rsa-3.0.6.ebuild
index 2246b264a3b..e6a124b4fe8 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-2019 Gentoo Authors
+# Copyright 1999-2020 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 ~sh ~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/gcr/gcr-3.28.1.ebuild b/app-crypt/gcr/gcr-3.28.1.ebuild
index 5cd37b1e48f..4905fd6ce89 100644
--- a/app-crypt/gcr/gcr-3.28.1.ebuild
+++ b/app-crypt/gcr/gcr-3.28.1.ebuild
@@ -16,7 +16,7 @@ SLOT="0/1" # subslot = suffix of libgcr-3
IUSE="debug gtk +introspection +vala"
REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
COMMON_DEPEND="
>=app-crypt/p11-kit-0.19
diff --git a/app-crypt/gcr/gcr-3.34.0-r1.ebuild b/app-crypt/gcr/gcr-3.34.0-r1.ebuild
index e217990941b..67d593bfb64 100644
--- a/app-crypt/gcr/gcr-3.34.0-r1.ebuild
+++ b/app-crypt/gcr/gcr-3.34.0-r1.ebuild
@@ -18,7 +18,7 @@ IUSE="debug gtk +introspection +vala"
RESTRICT="!test? ( test )"
REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
COMMON_DEPEND="
>=app-crypt/p11-kit-0.19
diff --git a/app-crypt/gentoo-keys/gentoo-keys-201901130136.ebuild b/app-crypt/gentoo-keys/gentoo-keys-201901130136.ebuild
index a45a2b59cef..0aa43e5417d 100644
--- a/app-crypt/gentoo-keys/gentoo-keys-201901130136.ebuild
+++ b/app-crypt/gentoo-keys/gentoo-keys-201901130136.ebuild
@@ -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 sh 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.19.ebuild b/app-crypt/gnupg/gnupg-2.2.19.ebuild
index 9705e8ae619..ba7ae751e33 100644
--- a/app-crypt/gnupg/gnupg-2.2.19.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.19.ebuild
@@ -13,7 +13,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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server"
# Existence of executables is checked during configuration.
diff --git a/app-crypt/gpgme/gpgme-1.13.0-r1.ebuild b/app-crypt/gpgme/gpgme-1.13.0-r1.ebuild
index 7457e5a8a44..69f6e1a5d5c 100644
--- a/app-crypt/gpgme/gpgme-1.13.0-r1.ebuild
+++ b/app-crypt/gpgme/gpgme-1.13.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
LICENSE="GPL-2 LGPL-2.1"
SLOT="1/11" # subslot = soname major version
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="common-lisp static-libs +cxx python qt5"
RDEPEND=">=app-crypt/gnupg-2
diff --git a/app-crypt/hashalot/hashalot-0.3-r2.ebuild b/app-crypt/hashalot/hashalot-0.3-r2.ebuild
index 5b8635b6fee..cee4ad41d7b 100644
--- a/app-crypt/hashalot/hashalot-0.3-r2.ebuild
+++ b/app-crypt/hashalot/hashalot-0.3-r2.ebuild
@@ -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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
diff --git a/app-crypt/heimdal/heimdal-7.5.0.ebuild b/app-crypt/heimdal/heimdal-7.5.0.ebuild
index d7c507879e2..890064f386b 100644
--- a/app-crypt/heimdal/heimdal-7.5.0.ebuild
+++ b/app-crypt/heimdal/heimdal-7.5.0.ebuild
@@ -14,7 +14,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 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sparc x86"
IUSE="afs +berkdb caps hdb-ldap ipv6 libressl otp +pkinit selinux ssl static-libs test X"
RESTRICT="!test? ( test )"
diff --git a/app-crypt/heimdal/heimdal-7.6.0.ebuild b/app-crypt/heimdal/heimdal-7.6.0.ebuild
index 34b364981f1..47dbdaf08f7 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 ~sh ~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/heimdal/heimdal-7.7.0-r1.ebuild b/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild
index a922bc8abb6..f62d69fb6a6 100644
--- a/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild
+++ b/app-crypt/heimdal/heimdal-7.7.0-r1.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 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="afs +berkdb caps gdbm hdb-ldap libressl +lmdb otp selinux ssl static-libs test X"
RESTRICT="!test? ( test )"
diff --git a/app-crypt/libb2/libb2-0.98.1-r1.ebuild b/app-crypt/libb2/libb2-0.98.1-r1.ebuild
index 7b03915a2f8..39092b01a57 100644
--- a/app-crypt/libb2/libb2-0.98.1-r1.ebuild
+++ b/app-crypt/libb2/libb2-0.98.1-r1.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 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs native-cflags openmp"
DEPEND="
diff --git a/app-crypt/libb2/libb2-0.98.1-r2.ebuild b/app-crypt/libb2/libb2-0.98.1-r2.ebuild
index 629a4ab1461..a9532210221 100644
--- a/app-crypt/libb2/libb2-0.98.1-r2.ebuild
+++ b/app-crypt/libb2/libb2-0.98.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 05f66c43cb2..9e9f0dfd725 100644
--- a/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild
+++ b/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild
@@ -9,7 +9,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 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 a0a005a7ac4..323228228b2 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
@@ -13,7 +13,7 @@ SRC_URI="http://web.mit.edu/kerberos/dist/krb5-appl/${MAJOR_MINOR}/${MY_P}-signe
LICENSE="openafs-krb5-a BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE=""
RDEPEND=">=app-crypt/mit-krb5-1.8.0
diff --git a/app-crypt/mit-krb5/mit-krb5-1.17-r1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.17-r1.ebuild
index 4a24d39e1ed..1fb47beb0fb 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.17-r1.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.17-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="cpu_flags_x86_aes doc +keyutils libressl lmdb nls openldap +pkinit selinux +threads test xinetd"
# Test suite requires network access
diff --git a/app-crypt/mit-krb5/mit-krb5-1.17.1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.17.1.ebuild
index a8a83d67ccf..48fb6f79c76 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.17.1.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.17.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="cpu_flags_x86_aes doc +keyutils libressl lmdb nls openldap +pkinit selinux +threads test xinetd"
RESTRICT="!test? ( test )"
diff --git a/app-crypt/mit-krb5/mit-krb5-1.18.ebuild b/app-crypt/mit-krb5/mit-krb5-1.18.ebuild
index 2c9031b2e10..57ab56ddfb3 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.18.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.18.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="cpu_flags_x86_aes doc +keyutils libressl lmdb nls openldap +pkinit selinux +threads test xinetd"
RESTRICT="!test? ( test )"
diff --git a/app-crypt/openpgp-keys-gentoo-auth/openpgp-keys-gentoo-auth-20191030.ebuild b/app-crypt/openpgp-keys-gentoo-auth/openpgp-keys-gentoo-auth-20191030.ebuild
index a6f1305ee95..da6d195dcff 100644
--- a/app-crypt/openpgp-keys-gentoo-auth/openpgp-keys-gentoo-auth-20191030.ebuild
+++ b/app-crypt/openpgp-keys-gentoo-auth/openpgp-keys-gentoo-auth-20191030.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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/~mgorny/dist/openpgp-keys/gentoo-auth.asc.${PV}.
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~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-20191030.ebuild b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20191030.ebuild
index 93dd7682d7e..165e285bae5 100644
--- a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20191030.ebuild
+++ b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20191030.ebuild
@@ -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 sh 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/p11-kit/p11-kit-0.23.19-r1.ebuild b/app-crypt/p11-kit/p11-kit-0.23.19-r1.ebuild
index 978b8822962..72d0ba7c320 100644
--- a/app-crypt/p11-kit/p11-kit-0.23.19-r1.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.23.19-r1.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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+asn1 debug +libffi +trust"
REQUIRED_USE="trust? ( asn1 )"
diff --git a/app-crypt/p11-kit/p11-kit-0.23.20-r1.ebuild b/app-crypt/p11-kit/p11-kit-0.23.20-r1.ebuild
index 385d79a3bbe..6ecc47004a9 100644
--- a/app-crypt/p11-kit/p11-kit-0.23.20-r1.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.23.20-r1.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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+asn1 debug +libffi +trust"
REQUIRED_USE="trust? ( asn1 )"
diff --git a/app-crypt/pinentry/pinentry-1.0.0-r2.ebuild b/app-crypt/pinentry/pinentry-1.0.0-r2.ebuild
index c1faf268150..e10df2291f9 100644
--- a/app-crypt/pinentry/pinentry-1.0.0-r2.ebuild
+++ b/app-crypt/pinentry/pinentry-1.0.0-r2.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 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="caps emacs gnome-keyring gtk ncurses qt5 static"
CDEPEND="
diff --git a/app-crypt/pinentry/pinentry-1.0.0-r3.ebuild b/app-crypt/pinentry/pinentry-1.0.0-r3.ebuild
index 75bff6862ba..f58c3ec1797 100644
--- a/app-crypt/pinentry/pinentry-1.0.0-r3.ebuild
+++ b/app-crypt/pinentry/pinentry-1.0.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="caps emacs gnome-keyring gtk ncurses qt5 static"
CDEPEND="
diff --git a/app-crypt/pinentry/pinentry-1.1.0-r1.ebuild b/app-crypt/pinentry/pinentry-1.1.0-r1.ebuild
index 5fa2b33a563..eafaf2f416e 100644
--- a/app-crypt/pinentry/pinentry-1.1.0-r1.ebuild
+++ b/app-crypt/pinentry/pinentry-1.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="caps emacs gnome-keyring gtk ncurses qt5 static"
CDEPEND="
diff --git a/app-crypt/pinentry/pinentry-1.1.0-r2.ebuild b/app-crypt/pinentry/pinentry-1.1.0-r2.ebuild
index 00477b8968e..2a7070e4a70 100644
--- a/app-crypt/pinentry/pinentry-1.1.0-r2.ebuild
+++ b/app-crypt/pinentry/pinentry-1.1.0-r2.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 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="caps emacs gnome-keyring fltk gtk ncurses qt5 static"
CDEPEND="
diff --git a/app-crypt/pinentry/pinentry-1.1.0-r3.ebuild b/app-crypt/pinentry/pinentry-1.1.0-r3.ebuild
index de077b82ca1..6fda080adcc 100644
--- a/app-crypt/pinentry/pinentry-1.1.0-r3.ebuild
+++ b/app-crypt/pinentry/pinentry-1.1.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="caps emacs gnome-keyring fltk gtk ncurses qt5 static"
DEPEND="
diff --git a/app-crypt/shash/shash-0.2.6-r2.ebuild b/app-crypt/shash/shash-0.2.6-r2.ebuild
index b9850e56472..64e8773c7b6 100644
--- a/app-crypt/shash/shash-0.2.6-r2.ebuild
+++ b/app-crypt/shash/shash-0.2.6-r2.ebuild
@@ -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 s390 sh 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"
DEPEND=">=app-crypt/mhash-0.8.18-r1"
diff --git a/app-crypt/shash/shash-0.2.6-r3.ebuild b/app-crypt/shash/shash-0.2.6-r3.ebuild
index 0763364decc..275ee2af470 100644
--- a/app-crypt/shash/shash-0.2.6-r3.ebuild
+++ b/app-crypt/shash/shash-0.2.6-r3.ebuild
@@ -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 ~sh 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/tpm-tools/tpm-tools-1.3.9.1-r1.ebuild b/app-crypt/tpm-tools/tpm-tools-1.3.9.1-r1.ebuild
index f92377d5791..90690f25648 100644
--- a/app-crypt/tpm-tools/tpm-tools-1.3.9.1-r1.ebuild
+++ b/app-crypt/tpm-tools/tpm-tools-1.3.9.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
LICENSE="CPL-1.0"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~m68k ~s390 ~sh x86"
+KEYWORDS="amd64 ~arm arm64 ~m68k ~s390 x86"
IUSE="libressl nls pkcs11 debug"
DEPEND=">=app-crypt/trousers-0.3.0
diff --git a/app-crypt/trousers/trousers-0.3.14-r1.ebuild b/app-crypt/trousers/trousers-0.3.14-r1.ebuild
index aecbc459d2a..b9fbfed67e7 100644
--- a/app-crypt/trousers/trousers-0.3.14-r1.ebuild
+++ b/app-crypt/trousers/trousers-0.3.14-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
LICENSE="CPL-1.0 GPL-2"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~m68k ~ppc ppc64 ~s390 ~sh x86"
+KEYWORDS="amd64 arm arm64 ~m68k ~ppc ppc64 ~s390 x86"
IUSE="doc libressl selinux" # gtk
# gtk support presently does NOT compile.
diff --git a/app-crypt/trousers/trousers-0.3.14-r2.ebuild b/app-crypt/trousers/trousers-0.3.14-r2.ebuild
index 384d8736beb..98591153d56 100644
--- a/app-crypt/trousers/trousers-0.3.14-r2.ebuild
+++ b/app-crypt/trousers/trousers-0.3.14-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
LICENSE="CPL-1.0 GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~ppc ~ppc64 ~s390 ~x86"
IUSE="doc libressl selinux" # gtk
# gtk support presently does NOT compile.
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 7b762db3389..f7fe2fd6acf 100644
--- a/app-dicts/aspell-af/aspell-af-0.50.0.ebuild
+++ b/app-dicts/aspell-af/aspell-af-0.50.0.ebuild
@@ -8,5 +8,5 @@ ASPELL_LANG="Afrikaans"
inherit aspell-dict-r1
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE=""
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 4d562fb247a..df7ff9aed2e 100644
--- a/app-dicts/aspell-be/aspell-be-0.01-r1.ebuild
+++ b/app-dicts/aspell-be/aspell-be-0.01-r1.ebuild
@@ -10,7 +10,7 @@ inherit aspell-dict-r1
SRC_URI="mirror://gnu/aspell/dict/be/aspell5-be-${PV}.tar.bz2"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE="classic"
S="${WORKDIR}/aspell5-be-${PV}"
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 de6ca72736c..31f6edab500 100644
--- a/app-dicts/aspell-bg/aspell-bg-4.1.0.ebuild
+++ b/app-dicts/aspell-bg/aspell-bg-4.1.0.ebuild
@@ -9,5 +9,5 @@ ASPELL_VERSION=6
inherit aspell-dict-r1
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE=""
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 7285d038d75..a6e645f8573 100644
--- a/app-dicts/aspell-br/aspell-br-0.50.2.ebuild
+++ b/app-dicts/aspell-br/aspell-br-0.50.2.ebuild
@@ -8,5 +8,5 @@ ASPELL_LANG="Breton"
inherit aspell-dict-r1
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE=""
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 6a4a0a3dd0d..e876ae61930 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,5 +9,5 @@ ASPELL_VERSION=6
inherit aspell-dict-r1
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE=""
diff --git a/app-dicts/aspell-cs/aspell-cs-0.60.20040614.ebuild b/app-dicts/aspell-cs/aspell-cs-0.60.20040614.ebuild
index 44abf54ff20..b2e0e60baa9 100644
--- a/app-dicts/aspell-cs/aspell-cs-0.60.20040614.ebuild
+++ b/app-dicts/aspell-cs/aspell-cs-0.60.20040614.ebuild
@@ -13,7 +13,7 @@ MY_P="aspell6-cs-20040614-1"
SRC_URI="mirror://gnu/aspell/dict/cs/${MY_P}.tar.bz2"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE=""
S=${WORKDIR}/${MY_P}
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 f59766da922..aeec3a6879b 100644
--- a/app-dicts/aspell-cy/aspell-cy-0.50.3.ebuild
+++ b/app-dicts/aspell-cy/aspell-cy-0.50.3.ebuild
@@ -8,5 +8,5 @@ ASPELL_LANG="Welsh"
inherit aspell-dict-r1
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE=""
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 4b0f7b284e7..e76531ba308 100644
--- a/app-dicts/aspell-da/aspell-da-1.7.42.ebuild
+++ b/app-dicts/aspell-da/aspell-da-1.7.42.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://da.speling.org"
SRC_URI="https://da.speling.org/filer/new_${P}.tar.bz2"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-macos"
IUSE=""
S="${WORKDIR}/new_${P}"
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 f34ad08b867..dc02e1d7800 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 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE=""
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 c4eaa17e4a0..da1c5c9103a 100644
--- a/app-dicts/aspell-de/aspell-de-0.60_pre20030222.ebuild
+++ b/app-dicts/aspell-de/aspell-de-0.60_pre20030222.ebuild
@@ -13,7 +13,7 @@ MY_P=aspell6-de-20030222-1
SRC_URI="mirror://gnu/aspell/dict/de/${MY_P}.tar.bz2"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 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=""
S=${WORKDIR}/${MY_P}
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 d15f8fb58a3..57321b215d9 100644
--- a/app-dicts/aspell-el/aspell-el-0.50.3.ebuild
+++ b/app-dicts/aspell-el/aspell-el-0.50.3.ebuild
@@ -8,5 +8,5 @@ ASPELL_LANG="Greek"
inherit aspell-dict-r1
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE=""
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 c4a2d7953ee..6c25382fe61 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
@@ -11,5 +11,5 @@ inherit aspell-dict-r1 versionator
SRC_URI="mirror://gnu/aspell/dict/${ASPELL_SPELLANG}/${PN%-*}${ASPELL_VERSION}-${PN#*-}-$(replace_version_separator 3 '-').tar.bz2"
LICENSE="myspell-en_CA-KevinAtkinson public-domain Princeton Ispell"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
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 3b32a43dadf..9b1f55fde3f 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,7 +14,7 @@ MY_P=aspell${ASPELL_VERSION}-${MY_P/aspell-/}
SRC_URI="mirror://gnu/aspell/dict/${ASPELL_SPELLANG}/${MY_P}.tar.bz2"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-dicts/aspell-es/aspell-es-1.11_p2.ebuild b/app-dicts/aspell-es/aspell-es-1.11_p2.ebuild
index ca93de3f82d..a052ac5d659 100644
--- a/app-dicts/aspell-es/aspell-es-1.11_p2.ebuild
+++ b/app-dicts/aspell-es/aspell-es-1.11_p2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ MY_P=aspell6-es-${PV/_p/-}
SRC_URI="mirror://gnu/aspell/dict/${ASPELL_SPELLANG}/${MY_P}.tar.bz2"
LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-dicts/aspell-es/aspell-es-1.9a.ebuild b/app-dicts/aspell-es/aspell-es-1.9a.ebuild
index b38549bd0e5..7db5ed3b7f6 100644
--- a/app-dicts/aspell-es/aspell-es-1.9a.ebuild
+++ b/app-dicts/aspell-es/aspell-es-1.9a.ebuild
@@ -13,7 +13,7 @@ MY_P="${P/aspell/aspell6}-1"
SRC_URI="mirror://gnu/aspell/dict/${ASPELL_SPELLANG}/${MY_P}.tar.bz2"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE=""
S=${WORKDIR}/${MY_P}
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 4989e6320bd..a0cccd090d6 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,5 +9,5 @@ ASPELL_VERSION=6
inherit aspell-dict-r1
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE=""
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 816b5a1865a..38ff871772f 100644
--- a/app-dicts/aspell-fi/aspell-fi-0.7.0.ebuild
+++ b/app-dicts/aspell-fi/aspell-fi-0.7.0.ebuild
@@ -9,5 +9,5 @@ ASPELL_VERSION=6
inherit aspell-dict-r1
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE=""
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 558a4561430..7c3b4edb94b 100644
--- a/app-dicts/aspell-fo/aspell-fo-0.51.0.ebuild
+++ b/app-dicts/aspell-fo/aspell-fo-0.51.0.ebuild
@@ -8,5 +8,5 @@ ASPELL_LANG="Faroese"
inherit aspell-dict-r1
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE=""
diff --git a/app-dicts/aspell-fr/aspell-fr-0.60.ebuild b/app-dicts/aspell-fr/aspell-fr-0.60.ebuild
index 30d00d9147a..b38a7e33751 100644
--- a/app-dicts/aspell-fr/aspell-fr-0.60.ebuild
+++ b/app-dicts/aspell-fr/aspell-fr-0.60.ebuild
@@ -16,7 +16,7 @@ MY_P="aspell-fr-0.50-3"
SRC_URI="mirror://gnu/aspell/dict/fr/${MY_P}.tar.bz2"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-macos"
IUSE=""
S=${WORKDIR}/${MY_P}
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 f49acfc13c4..f842b38a3bb 100644
--- a/app-dicts/aspell-ga/aspell-ga-0.50.4.ebuild
+++ b/app-dicts/aspell-ga/aspell-ga-0.50.4.ebuild
@@ -8,5 +8,5 @@ ASPELL_LANG="Irish"
inherit aspell-dict-r1
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE=""
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 6704df6d44d..ef33e8e1f0d 100644
--- a/app-dicts/aspell-gl/aspell-gl-0.5.2.ebuild
+++ b/app-dicts/aspell-gl/aspell-gl-0.5.2.ebuild
@@ -14,7 +14,7 @@ MY_P=aspell${ASPELL_VERSION}-${MY_P/aspell-/}
SRC_URI="mirror://gnu/aspell/dict/${ASPELL_SPELLANG}/${MY_P}.tar.bz2"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE=""
S=${WORKDIR}/${MY_P}
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 1d2ab4babc9..0ebad35ae78 100644
--- a/app-dicts/aspell-he/aspell-he-1.0.0.ebuild
+++ b/app-dicts/aspell-he/aspell-he-1.0.0.ebuild
@@ -9,5 +9,5 @@ ASPELL_VERSION=6
inherit aspell-dict-r1
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE=""
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 61bcbb3c50a..108b70fb869 100644
--- a/app-dicts/aspell-hr/aspell-hr-0.51.0.ebuild
+++ b/app-dicts/aspell-hr/aspell-hr-0.51.0.ebuild
@@ -8,5 +8,5 @@ ASPELL_LANG="Croatian"
inherit aspell-dict-r1
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE=""
diff --git a/app-dicts/aspell-is/aspell-is-0.51.1.0.ebuild b/app-dicts/aspell-is/aspell-is-0.51.1.0.ebuild
index 175186c3f99..d4082146e0f 100644
--- a/app-dicts/aspell-is/aspell-is-0.51.1.0.ebuild
+++ b/app-dicts/aspell-is/aspell-is-0.51.1.0.ebuild
@@ -8,5 +8,5 @@ ASPELL_LANG="Icelandic"
inherit aspell-dict-r1
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE=""
diff --git a/app-dicts/aspell-it/aspell-it-2.4.20070901.ebuild b/app-dicts/aspell-it/aspell-it-2.4.20070901.ebuild
index 8ed2d4b35b8..4c6da007c15 100644
--- a/app-dicts/aspell-it/aspell-it-2.4.20070901.ebuild
+++ b/app-dicts/aspell-it/aspell-it-2.4.20070901.ebuild
@@ -13,7 +13,7 @@ MY_P="aspell${ASPELL_VERSION}-${PN#aspell-}-${PV%.*}-${PV##*.}-0"
SRC_URI="mirror://sourceforge/linguistico/${MY_P}.tar.bz2"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-dicts/aspell-la/aspell-la-6.0.20020503.0.ebuild b/app-dicts/aspell-la/aspell-la-6.0.20020503.0.ebuild
index 6ee08a140fa..4a2b14becda 100644
--- a/app-dicts/aspell-la/aspell-la-6.0.20020503.0.ebuild
+++ b/app-dicts/aspell-la/aspell-la-6.0.20020503.0.ebuild
@@ -13,7 +13,7 @@ MY_P="aspell6-la-20020503-0"
SRC_URI="mirror://gnu/aspell/dict/la/${MY_P}.tar.bz2"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE=""
S=${WORKDIR}/${MY_P}
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 ce8b0789297..7f0a936e9da 100644
--- a/app-dicts/aspell-lt/aspell-lt-1.0.1.ebuild
+++ b/app-dicts/aspell-lt/aspell-lt-1.0.1.ebuild
@@ -13,7 +13,7 @@ MY_P="aspell6-lt-1.0-1"
SRC_URI="mirror://gnu/aspell/dict/lt/${MY_P}.tar.bz2"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE=""
S="${WORKDIR}/${MY_P}"
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 191776cb146..10c2a491967 100644
--- a/app-dicts/aspell-nl/aspell-nl-0.50.2.ebuild
+++ b/app-dicts/aspell-nl/aspell-nl-0.50.2.ebuild
@@ -8,5 +8,5 @@ ASPELL_LANG="Dutch"
inherit aspell-dict-r1
LICENSE="freedist"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
IUSE=""
diff --git a/app-dicts/aspell-no/aspell-no-0.50.2.ebuild b/app-dicts/aspell-no/aspell-no-0.50.2.ebuild
index c63a6c6accd..d3338ac4103 100644
--- a/app-dicts/aspell-no/aspell-no-0.50.2.ebuild
+++ b/app-dicts/aspell-no/aspell-no-0.50.2.ebuild
@@ -8,5 +8,5 @@ ASPELL_LANG="Norwegian"
inherit aspell-dict-r1
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE=""
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 673bcf2adde..fd4b9b2a7a9 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,7 +14,7 @@ HOMEPAGE="http://www.sjp.pl/slownik/"
SRC_URI="http://www.sjp.pl/slownik/ort/sjp-${MY_P}.tar.bz2"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE=""
S="${WORKDIR}/${MY_P}"
diff --git a/app-dicts/aspell-pt-br/aspell-pt-br-6.0.20090702.ebuild b/app-dicts/aspell-pt-br/aspell-pt-br-6.0.20090702.ebuild
index 40154555e79..dc657a8d1fb 100644
--- a/app-dicts/aspell-pt-br/aspell-pt-br-6.0.20090702.ebuild
+++ b/app-dicts/aspell-pt-br/aspell-pt-br-6.0.20090702.ebuild
@@ -13,7 +13,7 @@ MY_P="aspell6-pt_BR-20090702-0"
SRC_URI="mirror://gnu/aspell/dict/pt_BR/${MY_P}.tar.bz2"
LICENSE="LGPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE=""
S=${WORKDIR}/${MY_P}
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 c11d521c543..3a12b23bb12 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
@@ -9,7 +9,7 @@ inherit aspell-dict-r1
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE=""
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 e41da045c04..2d92baac526 100644
--- a/app-dicts/aspell-ro/aspell-ro-3.3.2.ebuild
+++ b/app-dicts/aspell-ro/aspell-ro-3.3.2.ebuild
@@ -11,5 +11,5 @@ inherit aspell-dict-r1
HOMEPAGE="http://aspell.net http://rospell.sourceforge.net/"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE=""
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 c8018a6ef6a..9f255221bc7 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 @@ MY_P="aspell6-ru-0.99f7-1"
SRC_URI="mirror://gnu/aspell/dict/ru/${MY_P}.tar.bz2"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE=""
S=${WORKDIR}/${MY_P}
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 cd5bf47bc71..bce1784accd 100644
--- a/app-dicts/aspell-sk/aspell-sk-2.01.2.ebuild
+++ b/app-dicts/aspell-sk/aspell-sk-2.01.2.ebuild
@@ -9,5 +9,5 @@ ASPELL_VERSION=6
inherit aspell-dict-r1
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE=""
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 24062321f10..41be4574326 100644
--- a/app-dicts/aspell-sl/aspell-sl-0.50.0.ebuild
+++ b/app-dicts/aspell-sl/aspell-sl-0.50.0.ebuild
@@ -8,5 +8,5 @@ ASPELL_LANG="Slovenian"
inherit aspell-dict-r1
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE=""
diff --git a/app-dicts/aspell-sr/aspell-sr-0.60.ebuild b/app-dicts/aspell-sr/aspell-sr-0.60.ebuild
index 70614b731bb..2babd41d82b 100644
--- a/app-dicts/aspell-sr/aspell-sr-0.60.ebuild
+++ b/app-dicts/aspell-sr/aspell-sr-0.60.ebuild
@@ -13,7 +13,7 @@ MY_P="aspell6-sr-0.02"
SRC_URI="http://srpski.org/aspell/${MY_P}.tar.bz2"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE=""
S="${WORKDIR}/${MY_P}"
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 78f9122c2b6..854b764cb18 100644
--- a/app-dicts/aspell-sv/aspell-sv-0.51.0.ebuild
+++ b/app-dicts/aspell-sv/aspell-sv-0.51.0.ebuild
@@ -8,5 +8,5 @@ ASPELL_LANG="Swedish"
inherit aspell-dict-r1
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
IUSE=""
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 f0ae5ee7f4a..2b6dde10e19 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,5 +9,5 @@ ASPELL_VERSION=6
inherit aspell-dict-r1
LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE=""
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 6b31b7b9da4..9b26477170a 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,5 +9,5 @@ ASPELL_VERSION=6
inherit aspell-dict-r1
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE=""
diff --git a/app-dicts/edictionary/edictionary-2.6-r1.ebuild b/app-dicts/edictionary/edictionary-2.6-r1.ebuild
index a0ae02ba223..b73480591e9 100644
--- a/app-dicts/edictionary/edictionary-2.6-r1.ebuild
+++ b/app-dicts/edictionary/edictionary-2.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
RDEPEND=""
diff --git a/app-dicts/gnome-dictionary/gnome-dictionary-3.26.1.ebuild b/app-dicts/gnome-dictionary/gnome-dictionary-3.26.1.ebuild
index 7eaaec15cf3..73c50d8d3f1 100644
--- a/app-dicts/gnome-dictionary/gnome-dictionary-3.26.1.ebuild
+++ b/app-dicts/gnome-dictionary/gnome-dictionary-3.26.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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/Dictionary"
LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
SLOT="0" # does not provide a public libgdict-1.0.so anymore
IUSE="ipv6"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="
>=dev-libs/glib-2.42:2
diff --git a/app-dicts/myspell-af/myspell-af-20080701.ebuild b/app-dicts/myspell-af/myspell-af-20080701.ebuild
index 66b666f468b..694da30b0bb 100644
--- a/app-dicts/myspell-af/myspell-af-20080701.ebuild
+++ b/app-dicts/myspell-af/myspell-af-20080701.ebuild
@@ -23,5 +23,5 @@ SRC_URI="mirror://sourceforge/aoo-extensions/1109/0/dict-af.oxt"
LICENSE="LGPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
diff --git a/app-dicts/myspell-bg/myspell-bg-4.3.ebuild b/app-dicts/myspell-bg/myspell-bg-4.3.ebuild
index ef66755921f..35e38336edc 100644
--- a/app-dicts/myspell-bg/myspell-bg-4.3.ebuild
+++ b/app-dicts/myspell-bg/myspell-bg-4.3.ebuild
@@ -27,7 +27,7 @@ SRC_URI="mirror://sourceforge/bgoffice/${MY_P}.zip"
LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
S="${WORKDIR}/${MY_P}"
diff --git a/app-dicts/myspell-ca/myspell-ca-2.3.0.ebuild b/app-dicts/myspell-ca/myspell-ca-2.3.0.ebuild
index 0129914f579..12cdf52b4bd 100644
--- a/app-dicts/myspell-ca/myspell-ca-2.3.0.ebuild
+++ b/app-dicts/myspell-ca/myspell-ca-2.3.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="http://www.softcatala.org/diccionaris/actualitzacions/OOo/catalan.oxt -
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
src_prepare() {
diff --git a/app-dicts/myspell-cs/myspell-cs-20110224.ebuild b/app-dicts/myspell-cs/myspell-cs-20110224.ebuild
index d4d9860553e..24c51039a08 100644
--- a/app-dicts/myspell-cs/myspell-cs-20110224.ebuild
+++ b/app-dicts/myspell-cs/myspell-cs-20110224.ebuild
@@ -25,5 +25,5 @@ SRC_URI="http://www.liberix.cz/doplnky/slovniky/ooo/dict-cs-2.oxt -> ${P}.zip"
LICENSE="GPL-2 MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
diff --git a/app-dicts/myspell-cy/myspell-cy-20130708.ebuild b/app-dicts/myspell-cy/myspell-cy-20130708.ebuild
index 6a15af3c04d..4c7f0b6df1f 100644
--- a/app-dicts/myspell-cy/myspell-cy-20130708.ebuild
+++ b/app-dicts/myspell-cy/myspell-cy-20130708.ebuild
@@ -22,5 +22,5 @@ SRC_URI="mirror://sourceforge/aoo-extensions/geiriadur-cy.oxt -> ${P}.oxt"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
diff --git a/app-dicts/myspell-da/myspell-da-2.3.ebuild b/app-dicts/myspell-da/myspell-da-2.3.ebuild
index 67772465388..0d050276a4f 100644
--- a/app-dicts/myspell-da/myspell-da-2.3.ebuild
+++ b/app-dicts/myspell-da/myspell-da-2.3.ebuild
@@ -24,5 +24,5 @@ SRC_URI="https://extensions.libreoffice.org/extensions/stavekontrolden-danish-di
LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
diff --git a/app-dicts/myspell-de/myspell-de-2017.01.12.ebuild b/app-dicts/myspell-de/myspell-de-2017.01.12.ebuild
index 6b9a91e5856..69996bd7832 100644
--- a/app-dicts/myspell-de/myspell-de-2017.01.12.ebuild
+++ b/app-dicts/myspell-de/myspell-de-2017.01.12.ebuild
@@ -45,7 +45,7 @@ SRC_URI="
LICENSE="GPL-3 GPL-2 LGPL-3+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
src_prepare() {
# fixing file names
diff --git a/app-dicts/myspell-de_1901/myspell-de_1901-20160403.ebuild b/app-dicts/myspell-de_1901/myspell-de_1901-20160403.ebuild
index 2f974220e4d..78a40fa8c38 100644
--- a/app-dicts/myspell-de_1901/myspell-de_1901-20160403.ebuild
+++ b/app-dicts/myspell-de_1901/myspell-de_1901-20160403.ebuild
@@ -25,7 +25,7 @@ SRC_URI="mirror://sourceforge/project/aoo-extensions/1057/8/dict-de_de-1901_olds
LICENSE="|| ( GPL-2 GPL-3 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
src_prepare() {
default
diff --git a/app-dicts/myspell-el/myspell-el-0.9.ebuild b/app-dicts/myspell-el/myspell-el-0.9.ebuild
index 240c9b144c2..6645f7ab363 100644
--- a/app-dicts/myspell-el/myspell-el-0.9.ebuild
+++ b/app-dicts/myspell-el/myspell-el-0.9.ebuild
@@ -23,5 +23,5 @@ SRC_URI="http://elspell.math.upatras.gr/files/ooffice/el_GR-${PV}.zip http://els
LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
diff --git a/app-dicts/myspell-en/myspell-en-20170101.ebuild b/app-dicts/myspell-en/myspell-en-20170101.ebuild
index 25a63321d2c..7ccb6b7cfaa 100644
--- a/app-dicts/myspell-en/myspell-en-20170101.ebuild
+++ b/app-dicts/myspell-en/myspell-en-20170101.ebuild
@@ -35,5 +35,5 @@ SRC_URI="https://extensions.libreoffice.org/extensions/english-dictionaries/${MY
LICENSE="GPL-2 LGPL-2.1 Princeton myspell-en_CA-KevinAtkinson"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
diff --git a/app-dicts/myspell-en/myspell-en-20181101.ebuild b/app-dicts/myspell-en/myspell-en-20181101.ebuild
index 0524d4def04..b2f1d7f1e9a 100644
--- a/app-dicts/myspell-en/myspell-en-20181101.ebuild
+++ b/app-dicts/myspell-en/myspell-en-20181101.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -13,7 +13,7 @@ SRC_URI="https://extensions.libreoffice.org/extensions/english-dictionaries/${MY
LICENSE="BSD MIT LGPL-3+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
PLOCALES=( "en" "en-AU" "en-CA" "en-GB" "en-US" "en-ZA" )
diff --git a/app-dicts/myspell-en/myspell-en-20190101-r1.ebuild b/app-dicts/myspell-en/myspell-en-20190101-r1.ebuild
index 291f8e29fb6..d72c1100ccc 100644
--- a/app-dicts/myspell-en/myspell-en-20190101-r1.ebuild
+++ b/app-dicts/myspell-en/myspell-en-20190101-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -13,7 +13,7 @@ SRC_URI="https://extensions.libreoffice.org/extensions/english-dictionaries/${MY
LICENSE="BSD MIT LGPL-3+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
PLOCALES=( "en" "en-AU" "en-CA" "en-GB" "en-US" "en-ZA" )
diff --git a/app-dicts/myspell-en/myspell-en-20190101.ebuild b/app-dicts/myspell-en/myspell-en-20190101.ebuild
index 41f04a62a31..077b7812f48 100644
--- a/app-dicts/myspell-en/myspell-en-20190101.ebuild
+++ b/app-dicts/myspell-en/myspell-en-20190101.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -13,7 +13,7 @@ SRC_URI="https://extensions.libreoffice.org/extensions/english-dictionaries/${MY
LICENSE="BSD MIT LGPL-3+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
PLOCALES=( "en" "en-AU" "en-CA" "en-GB" "en-US" "en-ZA" )
diff --git a/app-dicts/myspell-eo/myspell-eo-1.0-r1.ebuild b/app-dicts/myspell-eo/myspell-eo-1.0-r1.ebuild
index 68d3cced8ce..47b67b49886 100644
--- a/app-dicts/myspell-eo/myspell-eo-1.0-r1.ebuild
+++ b/app-dicts/myspell-eo/myspell-eo-1.0-r1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="mirror://sourceforge/aoo-extensions/3377/1/${PV}-dev.oxt -> ${P}.oxt"
LICENSE="GPL-2 LGPL-3 MPL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
src_prepare() {
diff --git a/app-dicts/myspell-es/myspell-es-0.7.ebuild b/app-dicts/myspell-es/myspell-es-0.7.ebuild
index 42a6bf76709..e7aeb280440 100644
--- a/app-dicts/myspell-es/myspell-es-0.7.ebuild
+++ b/app-dicts/myspell-es/myspell-es-0.7.ebuild
@@ -39,7 +39,7 @@ DESCRIPTION="Spanish dictionaries for myspell/hunspell"
HOMEPAGE="http://rla-es.forja.rediris.es/"
LICENSE="GPL-3 LGPL-3 MPL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
src_prepare() {
diff --git a/app-dicts/myspell-es/myspell-es-2.3.ebuild b/app-dicts/myspell-es/myspell-es-2.3.ebuild
index b1bd211d9ac..c382304d4d0 100644
--- a/app-dicts/myspell-es/myspell-es-2.3.ebuild
+++ b/app-dicts/myspell-es/myspell-es-2.3.ebuild
@@ -34,7 +34,7 @@ DESCRIPTION="Spanish dictionaries for myspell/hunspell"
HOMEPAGE="https://github.com/sbosio/rla-es"
LICENSE="GPL-3 LGPL-3 MPL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
src_prepare() {
diff --git a/app-dicts/myspell-et/myspell-et-20030606.ebuild b/app-dicts/myspell-et/myspell-et-20030606.ebuild
index 7c76737e9e3..14365650276 100644
--- a/app-dicts/myspell-et/myspell-et-20030606.ebuild
+++ b/app-dicts/myspell-et/myspell-et-20030606.ebuild
@@ -23,7 +23,7 @@ SRC_URI="http://www.meso.ee/~jjpp/speller/ispell-et_${PV}.tar.gz"
LICENSE="LGPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
S="${WORKDIR}/ispell-et-${PV}"
diff --git a/app-dicts/myspell-fo/myspell-fo-0.4.2.ebuild b/app-dicts/myspell-fo/myspell-fo-0.4.2.ebuild
index 442184de345..1ef6e44f540 100644
--- a/app-dicts/myspell-fo/myspell-fo-0.4.2.ebuild
+++ b/app-dicts/myspell-fo/myspell-fo-0.4.2.ebuild
@@ -26,5 +26,5 @@ SRC_URI="
LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
diff --git a/app-dicts/myspell-fr/myspell-fr-4.5-r1.ebuild b/app-dicts/myspell-fr/myspell-fr-4.5-r1.ebuild
index 51a04c57ba3..1fcb438e109 100644
--- a/app-dicts/myspell-fr/myspell-fr-4.5-r1.ebuild
+++ b/app-dicts/myspell-fr/myspell-fr-4.5-r1.ebuild
@@ -36,7 +36,7 @@ SRC_URI="
LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-linux ~x86-macos"
IUSE=""
src_prepare() {
diff --git a/app-dicts/myspell-ga/myspell-ga-20160213.ebuild b/app-dicts/myspell-ga/myspell-ga-20160213.ebuild
index ed9b5558917..dc5e961746a 100644
--- a/app-dicts/myspell-ga/myspell-ga-20160213.ebuild
+++ b/app-dicts/myspell-ga/myspell-ga-20160213.ebuild
@@ -25,5 +25,5 @@ SRC_URI="mirror://sourceforge/aoo-extensions/focloiri-gaeilge-4.8.oxt -> ${P}.ox
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
diff --git a/app-dicts/myspell-gl/myspell-gl-20131013.ebuild b/app-dicts/myspell-gl/myspell-gl-20131013.ebuild
index d38cc81187f..d436a46c8a7 100644
--- a/app-dicts/myspell-gl/myspell-gl-20131013.ebuild
+++ b/app-dicts/myspell-gl/myspell-gl-20131013.ebuild
@@ -25,5 +25,5 @@ HOMEPAGE="https://extensions.openoffice.org/en/project/corrector-ortografico-hun
SRC_URI="mirror://sourceforge/aoo-extensions/hunspell-gl-13.10.oxt -> ${P}.oxt"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
diff --git a/app-dicts/myspell-he/myspell-he-2012.08.15.ebuild b/app-dicts/myspell-he/myspell-he-2012.08.15.ebuild
index 838561ca499..5fab9fb55c8 100644
--- a/app-dicts/myspell-he/myspell-he-2012.08.15.ebuild
+++ b/app-dicts/myspell-he/myspell-he-2012.08.15.ebuild
@@ -22,5 +22,5 @@ SRC_URI="https://extensions.libreoffice.org/extensions/hebrew-he-spell-check-dic
LICENSE="GPL-2 LGPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
diff --git a/app-dicts/myspell-hr/myspell-hr-20080813.ebuild b/app-dicts/myspell-hr/myspell-hr-20080813.ebuild
index 8736471f061..1059c41bde8 100644
--- a/app-dicts/myspell-hr/myspell-hr-20080813.ebuild
+++ b/app-dicts/myspell-hr/myspell-hr-20080813.ebuild
@@ -23,5 +23,5 @@ HOMEPAGE="https://extensions.openoffice.org/en/project/croatian-dictionary-and-h
SRC_URI="mirror://sourceforge/aoo-extensions/dict-hr.oxt -> ${P}.oxt"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
diff --git a/app-dicts/myspell-hu/myspell-hu-1.6.1.ebuild b/app-dicts/myspell-hu/myspell-hu-1.6.1.ebuild
index 43ed52c72ba..d2de83f90a0 100644
--- a/app-dicts/myspell-hu/myspell-hu-1.6.1.ebuild
+++ b/app-dicts/myspell-hu/myspell-hu-1.6.1.ebuild
@@ -32,7 +32,7 @@ SRC_URI="
LICENSE="GPL-3 GPL-2 LGPL-2.1 MPL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
src_unpack() {
diff --git a/app-dicts/myspell-ia/myspell-ia-20140518.ebuild b/app-dicts/myspell-ia/myspell-ia-20140518.ebuild
index 16edc342086..3114f4b4532 100644
--- a/app-dicts/myspell-ia/myspell-ia-20140518.ebuild
+++ b/app-dicts/myspell-ia/myspell-ia-20140518.ebuild
@@ -25,5 +25,5 @@ HOMEPAGE="https://extensions.openoffice.org/en/project/interlingua-dictionario-o
SRC_URI="mirror://sourceforge/aoo-extensions/dict-ia-${MY_PV}.oxt -> ${P}.oxt"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
diff --git a/app-dicts/myspell-id/myspell-id-2.0.ebuild b/app-dicts/myspell-id/myspell-id-2.0.ebuild
index 1f766f27e98..2dfa447f9d7 100644
--- a/app-dicts/myspell-id/myspell-id-2.0.ebuild
+++ b/app-dicts/myspell-id/myspell-id-2.0.ebuild
@@ -23,5 +23,5 @@ SRC_URI="http://extensions.libreoffice.org/extension-center/indonesian-dictionar
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
diff --git a/app-dicts/myspell-is/myspell-is-2012.09.01.ebuild b/app-dicts/myspell-is/myspell-is-2012.09.01.ebuild
index c49ea8f562a..b93b843c27a 100644
--- a/app-dicts/myspell-is/myspell-is-2012.09.01.ebuild
+++ b/app-dicts/myspell-is/myspell-is-2012.09.01.ebuild
@@ -22,5 +22,5 @@ SRC_URI="http://extensions.libreoffice.org/extension-center/hunspell-is-the-icel
LICENSE="CC-BY-SA-3.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
diff --git a/app-dicts/myspell-it/myspell-it-20081129-r1.ebuild b/app-dicts/myspell-it/myspell-it-20081129-r1.ebuild
index 48491923c29..6ffb2e3e94a 100644
--- a/app-dicts/myspell-it/myspell-it-20081129-r1.ebuild
+++ b/app-dicts/myspell-it/myspell-it-20081129-r1.ebuild
@@ -25,7 +25,7 @@ SRC_URI="mirror://sourceforge/linguistico/Dizionari.IT_${PV}.oxt"
LICENSE="AGPL-3 GPL-3 LGPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
src_prepare() {
diff --git a/app-dicts/myspell-kk/myspell-kk-1.1.2.ebuild b/app-dicts/myspell-kk/myspell-kk-1.1.2.ebuild
index 9d28840331e..3e7784acf3b 100644
--- a/app-dicts/myspell-kk/myspell-kk-1.1.2.ebuild
+++ b/app-dicts/myspell-kk/myspell-kk-1.1.2.ebuild
@@ -20,6 +20,6 @@ SRC_URI="https://github.com/kergalym/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2+ LGPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
S="${WORKDIR}/${P}" # override eclass assignment
diff --git a/app-dicts/myspell-km/myspell-km-1.6.ebuild b/app-dicts/myspell-km/myspell-km-1.6.ebuild
index d069258d736..626f6748473 100644
--- a/app-dicts/myspell-km/myspell-km-1.6.ebuild
+++ b/app-dicts/myspell-km/myspell-km-1.6.ebuild
@@ -22,5 +22,5 @@ SRC_URI="http://extensions.libreoffice.org/extension-center/khmer-spelling-check
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
diff --git a/app-dicts/myspell-ku/myspell-ku-0.21.ebuild b/app-dicts/myspell-ku/myspell-ku-0.21.ebuild
index 33264b25f59..229cce87244 100644
--- a/app-dicts/myspell-ku/myspell-ku-0.21.ebuild
+++ b/app-dicts/myspell-ku/myspell-ku-0.21.ebuild
@@ -22,5 +22,5 @@ SRC_URI="mirror://sourceforge/myspellkurdish/ku_TR-${PV/./}.zip"
LICENSE="GPL-3 LGPL-3 MPL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
diff --git a/app-dicts/myspell-lt/myspell-lt-1.3.ebuild b/app-dicts/myspell-lt/myspell-lt-1.3.ebuild
index 06f28e1f0d8..6d9592272c6 100644
--- a/app-dicts/myspell-lt/myspell-lt-1.3.ebuild
+++ b/app-dicts/myspell-lt/myspell-lt-1.3.ebuild
@@ -22,5 +22,5 @@ SRC_URI="https://launchpad.net/ispell-lt/main/${PV}/+download/${P}.zip"
LICENSE="BSD LPPL-1.3b"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
diff --git a/app-dicts/myspell-lv/myspell-lv-1.3.0.ebuild b/app-dicts/myspell-lv/myspell-lv-1.3.0.ebuild
index 2df1a2cec1a..9ed47c83e98 100644
--- a/app-dicts/myspell-lv/myspell-lv-1.3.0.ebuild
+++ b/app-dicts/myspell-lv/myspell-lv-1.3.0.ebuild
@@ -23,7 +23,7 @@ SRC_URI="http://dict.dv.lv/download/lv_LV-${PV}.zip -> ${P}.zip"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
DEPEND="app-arch/unzip"
diff --git a/app-dicts/myspell-mi/myspell-mi-20060316-r1.ebuild b/app-dicts/myspell-mi/myspell-mi-20060316-r1.ebuild
index 2e4cfbfd7cd..b96f946622b 100644
--- a/app-dicts/myspell-mi/myspell-mi-20060316-r1.ebuild
+++ b/app-dicts/myspell-mi/myspell-mi-20060316-r1.ebuild
@@ -22,5 +22,5 @@ HOMEPAGE="http://lingucomponent.openoffice.org/"
SRC_URI="https://dev.gentoo.org/~jstein/dist/myspell-mi_NZ-${PV}.zip"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86"
IUSE=""
diff --git a/app-dicts/myspell-mk/myspell-mk-20091211.ebuild b/app-dicts/myspell-mk/myspell-mk-20091211.ebuild
index 9b7c1e81d73..4366553a4a7 100644
--- a/app-dicts/myspell-mk/myspell-mk-20091211.ebuild
+++ b/app-dicts/myspell-mk/myspell-mk-20091211.ebuild
@@ -22,5 +22,5 @@ HOMEPAGE="https://extensions.openoffice.org/en/project/macedonian-spellchecker-d
SRC_URI="mirror://sourceforge/aoo-extensions/dict-mk.oxt -> ${P}.oxt"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
diff --git a/app-dicts/myspell-ms/myspell-ms-20100407.ebuild b/app-dicts/myspell-ms/myspell-ms-20100407.ebuild
index e623f0b4b58..235f7aae10f 100644
--- a/app-dicts/myspell-ms/myspell-ms-20100407.ebuild
+++ b/app-dicts/myspell-ms/myspell-ms-20100407.ebuild
@@ -22,5 +22,5 @@ HOMEPAGE="https://extensions.openoffice.org/en/project/kamus-bahasa-malaysia-mal
SRC_URI="mirror://sourceforge/aoo-extensions/ms_my.oxt -> ${P}.oxt"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
diff --git a/app-dicts/myspell-nb/myspell-nb-2.0.10.ebuild b/app-dicts/myspell-nb/myspell-nb-2.0.10.ebuild
index 0f9ed28db4a..d4bd17ccd68 100644
--- a/app-dicts/myspell-nb/myspell-nb-2.0.10.ebuild
+++ b/app-dicts/myspell-nb/myspell-nb-2.0.10.ebuild
@@ -25,7 +25,7 @@ SRC_URI="https://alioth.debian.org/frs/download.php/2357/no_NO-pack2-${PV}.zip"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
src_unpack() {
diff --git a/app-dicts/myspell-nl/myspell-nl-2.10g-r1.ebuild b/app-dicts/myspell-nl/myspell-nl-2.10g-r1.ebuild
index 119e29263a1..fb4fa2600e4 100644
--- a/app-dicts/myspell-nl/myspell-nl-2.10g-r1.ebuild
+++ b/app-dicts/myspell-nl/myspell-nl-2.10g-r1.ebuild
@@ -30,7 +30,7 @@ SRC_URI="
LICENSE="BSD-2 CC-BY-3.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
src_prepare() {
diff --git a/app-dicts/myspell-nl/myspell-nl-2.10g-r2.ebuild b/app-dicts/myspell-nl/myspell-nl-2.10g-r2.ebuild
index e473b0479e7..c09c1a11c64 100644
--- a/app-dicts/myspell-nl/myspell-nl-2.10g-r2.ebuild
+++ b/app-dicts/myspell-nl/myspell-nl-2.10g-r2.ebuild
@@ -30,7 +30,7 @@ SRC_URI="
LICENSE="BSD-2 CC-BY-3.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
src_prepare() {
default
diff --git a/app-dicts/myspell-nn/myspell-nn-2.0.10.ebuild b/app-dicts/myspell-nn/myspell-nn-2.0.10.ebuild
index 757dd7659e9..649ade6a858 100644
--- a/app-dicts/myspell-nn/myspell-nn-2.0.10.ebuild
+++ b/app-dicts/myspell-nn/myspell-nn-2.0.10.ebuild
@@ -25,7 +25,7 @@ SRC_URI="https://alioth.debian.org/frs/download.php/2357/no_NO-pack2-${PV}.zip"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
src_unpack() {
diff --git a/app-dicts/myspell-pl/myspell-pl-20130306.ebuild b/app-dicts/myspell-pl/myspell-pl-20130306.ebuild
index 18683e14c6d..bf4888eed8f 100644
--- a/app-dicts/myspell-pl/myspell-pl-20130306.ebuild
+++ b/app-dicts/myspell-pl/myspell-pl-20130306.ebuild
@@ -34,7 +34,7 @@ SRC_URI="
"
LICENSE="CC-SA-1.0 LGPL-3 GPL-3 MPL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
src_unpack() {
diff --git a/app-dicts/myspell-pt-br/myspell-pt-br-3.0.0.ebuild b/app-dicts/myspell-pt-br/myspell-pt-br-3.0.0.ebuild
index 6ca0a80dab8..22ef8b1396a 100644
--- a/app-dicts/myspell-pt-br/myspell-pt-br-3.0.0.ebuild
+++ b/app-dicts/myspell-pt-br/myspell-pt-br-3.0.0.ebuild
@@ -28,5 +28,5 @@ SRC_URI="
LICENSE="LGPL-3 MPL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
diff --git a/app-dicts/myspell-pt/myspell-pt-20120420.ebuild b/app-dicts/myspell-pt/myspell-pt-20120420.ebuild
index 284e532d5e7..5d043a12260 100644
--- a/app-dicts/myspell-pt/myspell-pt-20120420.ebuild
+++ b/app-dicts/myspell-pt/myspell-pt-20120420.ebuild
@@ -31,5 +31,5 @@ SRC_URI="
LICENSE="GPL-2 MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE="+preao"
diff --git a/app-dicts/myspell-ro/myspell-ro-3.3.10.ebuild b/app-dicts/myspell-ro/myspell-ro-3.3.10.ebuild
index 6fd34fcd652..716f704fd72 100644
--- a/app-dicts/myspell-ro/myspell-ro-3.3.10.ebuild
+++ b/app-dicts/myspell-ro/myspell-ro-3.3.10.ebuild
@@ -29,5 +29,5 @@ SRC_URI="
LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
diff --git a/app-dicts/myspell-ru/myspell-ru-20150711-r2.ebuild b/app-dicts/myspell-ru/myspell-ru-20150711-r2.ebuild
index 7e88ec16e8e..92a9ca39deb 100644
--- a/app-dicts/myspell-ru/myspell-ru-20150711-r2.ebuild
+++ b/app-dicts/myspell-ru/myspell-ru-20150711-r2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://extensions.libreoffice.org/${EXT}/${DICT}/${MY_PV}/@@download/f
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux"
src_prepare() {
default
diff --git a/app-dicts/myspell-ru/myspell-ru-20180627.ebuild b/app-dicts/myspell-ru/myspell-ru-20180627.ebuild
index e9a98020323..0aa14dd5c0f 100644
--- a/app-dicts/myspell-ru/myspell-ru-20180627.ebuild
+++ b/app-dicts/myspell-ru/myspell-ru-20180627.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -20,7 +20,7 @@ SRC_URI="https://extensions.libreoffice.org/${EXT}/${DICT}/0-4.3/@@download/file
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
src_prepare() {
default
diff --git a/app-dicts/myspell-sk/myspell-sk-20110224.ebuild b/app-dicts/myspell-sk/myspell-sk-20110224.ebuild
index c0e644a71a5..5ec9cc82e1a 100644
--- a/app-dicts/myspell-sk/myspell-sk-20110224.ebuild
+++ b/app-dicts/myspell-sk/myspell-sk-20110224.ebuild
@@ -25,5 +25,5 @@ SRC_URI="http://www.liberix.cz/doplnky/slovniky/ooo/dict-sk.oxt -> ${P}.zip"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
diff --git a/app-dicts/myspell-sl/myspell-sl-2012.01.04.ebuild b/app-dicts/myspell-sl/myspell-sl-2012.01.04.ebuild
index 98d25f9a637..9719ea7d107 100644
--- a/app-dicts/myspell-sl/myspell-sl-2012.01.04.ebuild
+++ b/app-dicts/myspell-sl/myspell-sl-2012.01.04.ebuild
@@ -25,5 +25,5 @@ SRC_URI="http://extensions.libreoffice.org/extension-center/slovenian-dictionary
LICENSE="GPL-3 LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
diff --git a/app-dicts/myspell-sq/myspell-sq-1.6.4.ebuild b/app-dicts/myspell-sq/myspell-sq-1.6.4.ebuild
index 33326ca74a6..50aa1901318 100644
--- a/app-dicts/myspell-sq/myspell-sq-1.6.4.ebuild
+++ b/app-dicts/myspell-sq/myspell-sq-1.6.4.ebuild
@@ -22,7 +22,7 @@ SRC_URI="http://www.shkenca.org/shkarkime/${PN}_AL-${PV}.zip"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
S="${WORKDIR}/${PN}_AL-${PV}"
diff --git a/app-dicts/myspell-sv/myspell-sv-2.14.ebuild b/app-dicts/myspell-sv/myspell-sv-2.14.ebuild
index 3c67e9fd608..8187c4b099e 100644
--- a/app-dicts/myspell-sv/myspell-sv-2.14.ebuild
+++ b/app-dicts/myspell-sv/myspell-sv-2.14.ebuild
@@ -35,5 +35,5 @@ SRC_URI="
LICENSE="CC-BY-SA-3.0 GPL-2 LGPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
diff --git a/app-dicts/myspell-sw/myspell-sw-20110106.ebuild b/app-dicts/myspell-sw/myspell-sw-20110106.ebuild
index b45b9dbebe6..c924aeef20e 100644
--- a/app-dicts/myspell-sw/myspell-sw-20110106.ebuild
+++ b/app-dicts/myspell-sw/myspell-sw-20110106.ebuild
@@ -24,5 +24,5 @@ HOMEPAGE="https://extensions.openoffice.org/en/project/swahili-dictionary"
SRC_URI="mirror://sourceforge/aoo-extensions/dicts.sw.oxt -> ${P}.oxt"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
diff --git a/app-dicts/myspell-tn/myspell-tn-20060316.ebuild b/app-dicts/myspell-tn/myspell-tn-20060316.ebuild
index e7633b36e0c..d796496c725 100644
--- a/app-dicts/myspell-tn/myspell-tn-20060316.ebuild
+++ b/app-dicts/myspell-tn/myspell-tn-20060316.ebuild
@@ -16,4 +16,4 @@ SRC_URI="mirror://gentoo/myspell-tn_ZA-20060316.zip"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
diff --git a/app-dicts/myspell-uk/myspell-uk-1.6.5.ebuild b/app-dicts/myspell-uk/myspell-uk-1.6.5.ebuild
index 9108203f783..eb464703c52 100644
--- a/app-dicts/myspell-uk/myspell-uk-1.6.5.ebuild
+++ b/app-dicts/myspell-uk/myspell-uk-1.6.5.ebuild
@@ -25,5 +25,5 @@ SRC_URI="http://extensions.libreoffice.org/extension-center/ukrainian-spelling-d
LICENSE="GPL-3 LGPL-2.1 MPL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
diff --git a/app-dicts/myspell-zu/myspell-zu-20100126.ebuild b/app-dicts/myspell-zu/myspell-zu-20100126.ebuild
index 5f969cc35b2..0653910508c 100644
--- a/app-dicts/myspell-zu/myspell-zu-20100126.ebuild
+++ b/app-dicts/myspell-zu/myspell-zu-20100126.ebuild
@@ -24,5 +24,5 @@ HOMEPAGE="https://extensions.openoffice.org/en/project/zulu-spell-checker"
SRC_URI="mirror://sourceforge/aoo-extensions/dict-zu_za-${MY_PV}.oxt -> ${P}.oxt"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
diff --git a/app-doc/autobook/autobook-1.5.ebuild b/app-doc/autobook/autobook-1.5.ebuild
index 5d6cf849475..5f9245d9aa4 100644
--- a/app-doc/autobook/autobook-1.5.ebuild
+++ b/app-doc/autobook/autobook-1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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 sh x86"
+KEYWORDS="amd64 arm hppa ia64 m68k ppc s390 x86"
src_install() {
local HTML_DOCS=( . )
diff --git a/app-doc/devmanual/devmanual-0_pre20200207.ebuild b/app-doc/devmanual/devmanual-0_pre20200207.ebuild
index 7bea70d1e20..fdaf6ddcf5d 100644
--- a/app-doc/devmanual/devmanual-0_pre20200207.ebuild
+++ b/app-doc/devmanual/devmanual-0_pre20200207.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
else
SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${PN}"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-macos"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
fi
LICENSE="CC-BY-SA-4.0"
diff --git a/app-doc/devmanual/devmanual-9999.ebuild b/app-doc/devmanual/devmanual-9999.ebuild
index 7bea70d1e20..fdaf6ddcf5d 100644
--- a/app-doc/devmanual/devmanual-9999.ebuild
+++ b/app-doc/devmanual/devmanual-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
else
SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${PN}"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-macos"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
fi
LICENSE="CC-BY-SA-4.0"
diff --git a/app-doc/doxygen/doxygen-1.8.15.ebuild b/app-doc/doxygen/doxygen-1.8.15.ebuild
index f9f0496eaf8..3b53b8aa0de 100644
--- a/app-doc/doxygen/doxygen-1.8.15.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.15.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
SRC_URI=""
else
SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="Documentation system for most programming languages"
diff --git a/app-doc/doxygen/doxygen-1.8.16-r1.ebuild b/app-doc/doxygen/doxygen-1.8.16-r1.ebuild
index c3de40c09ae..ea2e4ff90cf 100644
--- a/app-doc/doxygen/doxygen-1.8.16-r1.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.16-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} = *9999* ]]; then
KEYWORDS="~alpha amd64 arm arm64 ia64 ppc ppc64 s390 sparc x86"
else
SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="Documentation system for most programming languages"
diff --git a/app-doc/doxygen/doxygen-1.8.17.ebuild b/app-doc/doxygen/doxygen-1.8.17.ebuild
index da2248eb1e4..e99b4196bcf 100644
--- a/app-doc/doxygen/doxygen-1.8.17.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.17.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} = *9999* ]]; then
KEYWORDS=""
else
SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="Documentation system for most programming languages"
diff --git a/app-doc/doxygen/doxygen-9999.ebuild b/app-doc/doxygen/doxygen-9999.ebuild
index 1f26a9351fe..791480437ff 100644
--- a/app-doc/doxygen/doxygen-9999.ebuild
+++ b/app-doc/doxygen/doxygen-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} = *9999* ]]; then
KEYWORDS=""
else
SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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-20200213.ebuild b/app-doc/eclass-manpages/eclass-manpages-20200213.ebuild
index edcd2696352..59de1a1883a 100644
--- a/app-doc/eclass-manpages/eclass-manpages-20200213.ebuild
+++ b/app-doc/eclass-manpages/eclass-manpages-20200213.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 sh 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/linkers-and-loaders/linkers-and-loaders-1-r1.ebuild b/app-doc/linkers-and-loaders/linkers-and-loaders-1-r1.ebuild
index 37cd7209e3d..aa5391a1bc5 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
@@ -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 sh 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/linkers-and-loaders/linkers-and-loaders-1.ebuild b/app-doc/linkers-and-loaders/linkers-and-loaders-1.ebuild
index eb37d19d7f8..1edc798f145 100644
--- a/app-doc/linkers-and-loaders/linkers-and-loaders-1.ebuild
+++ b/app-doc/linkers-and-loaders/linkers-and-loaders-1.ebuild
@@ -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 sh 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-3.ebuild b/app-doc/linux-device-drivers/linux-device-drivers-3.ebuild
index bb2198f1242..0859431130c 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-2018 Gentoo Foundation
+# Copyright 1999-2020 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 sh 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 f587bccf753..e39a7398f7a 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
@@ -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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE=""
RDEPEND=""
diff --git a/app-doc/linuxfromscratch/linuxfromscratch-7.10.ebuild b/app-doc/linuxfromscratch/linuxfromscratch-7.10.ebuild
index 3b9dcd0aa1b..f75fd0a3aee 100644
--- a/app-doc/linuxfromscratch/linuxfromscratch-7.10.ebuild
+++ b/app-doc/linuxfromscratch/linuxfromscratch-7.10.ebuild
@@ -15,7 +15,7 @@ SRC_URI="${MY_SRC}/LFS-BOOK-${PV}.tar.bz2
LICENSE="CC-BY-NC-SA-2.5 MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="htmlsingle pdf"
DEPEND=""
diff --git a/app-doc/linuxfromscratch/linuxfromscratch-8.0.ebuild b/app-doc/linuxfromscratch/linuxfromscratch-8.0.ebuild
index 7fe27496f94..3e096b8e4e6 100644
--- a/app-doc/linuxfromscratch/linuxfromscratch-8.0.ebuild
+++ b/app-doc/linuxfromscratch/linuxfromscratch-8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -24,7 +24,7 @@ SRC_URI="
LICENSE="CC-BY-NC-SA-2.5 MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="htmlsingle pdf"
DEPEND=""
diff --git a/app-doc/linuxfromscratch/linuxfromscratch-8.2.ebuild b/app-doc/linuxfromscratch/linuxfromscratch-8.2.ebuild
index 9e0ffbdbabb..d4ec1bd8180 100644
--- a/app-doc/linuxfromscratch/linuxfromscratch-8.2.ebuild
+++ b/app-doc/linuxfromscratch/linuxfromscratch-8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -24,7 +24,7 @@ SRC_URI="
LICENSE="CC-BY-NC-SA-2.5 MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="htmlsingle pdf"
DEPEND=""
diff --git a/app-doc/motif-reference-manual/motif-reference-manual-2.3.0-r2.ebuild b/app-doc/motif-reference-manual/motif-reference-manual-2.3.0-r2.ebuild
index aa7d3692c45..a7e7086cd8f 100644
--- a/app-doc/motif-reference-manual/motif-reference-manual-2.3.0-r2.ebuild
+++ b/app-doc/motif-reference-manual/motif-reference-manual-2.3.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.ics.com/openmotif/openmotif-${PV}-manual.pdf.tgz"
LICENSE="OPL"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
S="${WORKDIR}"
DOCS="*.pdf"
diff --git a/app-doc/php-docs/php-docs-20101029-r1.ebuild b/app-doc/php-docs/php-docs-20101029-r1.ebuild
index 98b31cff325..6169f3fc332 100644
--- a/app-doc/php-docs/php-docs-20101029-r1.ebuild
+++ b/app-doc/php-docs/php-docs-20101029-r1.ebuild
@@ -10,7 +10,7 @@ MY_PN="php_manual"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86"
IUSE=""
RESTRICT="strip binchecks"
diff --git a/app-doc/php-docs/php-docs-20190203.ebuild b/app-doc/php-docs/php-docs-20190203.ebuild
index e6e68e648c7..a3e303245aa 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-2019 Gentoo Authors
+# Copyright 1999-2020 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 ~sh ~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 9e0396592ed..745ba58a6d4 100644
--- a/app-doc/phrack-all/phrack-all-69.ebuild
+++ b/app-doc/phrack-all/phrack-all-69.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
LICENSE="metapackage"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh 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 39f561a49a3..8d2e38acf49 100644
--- a/app-doc/phrack/phrack-01.ebuild
+++ b/app-doc/phrack/phrack-01.ebuild
@@ -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 sh 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 39f561a49a3..8d2e38acf49 100644
--- a/app-doc/phrack/phrack-02.ebuild
+++ b/app-doc/phrack/phrack-02.ebuild
@@ -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 sh 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 39f561a49a3..8d2e38acf49 100644
--- a/app-doc/phrack/phrack-03.ebuild
+++ b/app-doc/phrack/phrack-03.ebuild
@@ -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 sh 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 39f561a49a3..8d2e38acf49 100644
--- a/app-doc/phrack/phrack-04.ebuild
+++ b/app-doc/phrack/phrack-04.ebuild
@@ -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 sh 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 39f561a49a3..8d2e38acf49 100644
--- a/app-doc/phrack/phrack-05.ebuild
+++ b/app-doc/phrack/phrack-05.ebuild
@@ -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 sh 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 39f561a49a3..8d2e38acf49 100644
--- a/app-doc/phrack/phrack-06.ebuild
+++ b/app-doc/phrack/phrack-06.ebuild
@@ -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 sh 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 39f561a49a3..8d2e38acf49 100644
--- a/app-doc/phrack/phrack-07.ebuild
+++ b/app-doc/phrack/phrack-07.ebuild
@@ -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 sh 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 39f561a49a3..8d2e38acf49 100644
--- a/app-doc/phrack/phrack-08.ebuild
+++ b/app-doc/phrack/phrack-08.ebuild
@@ -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 sh 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 39f561a49a3..8d2e38acf49 100644
--- a/app-doc/phrack/phrack-09.ebuild
+++ b/app-doc/phrack/phrack-09.ebuild
@@ -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 sh 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 852757be723..612e31124dd 100644
--- a/app-doc/phrack/phrack-10.ebuild
+++ b/app-doc/phrack/phrack-10.ebuild
@@ -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 sh 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 6f227f35e54..9ba3b283e51 100644
--- a/app-doc/phrack/phrack-11.ebuild
+++ b/app-doc/phrack/phrack-11.ebuild
@@ -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 sh 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 6f227f35e54..9ba3b283e51 100644
--- a/app-doc/phrack/phrack-12.ebuild
+++ b/app-doc/phrack/phrack-12.ebuild
@@ -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 sh 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 6f227f35e54..9ba3b283e51 100644
--- a/app-doc/phrack/phrack-13.ebuild
+++ b/app-doc/phrack/phrack-13.ebuild
@@ -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 sh 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 6f227f35e54..9ba3b283e51 100644
--- a/app-doc/phrack/phrack-14.ebuild
+++ b/app-doc/phrack/phrack-14.ebuild
@@ -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 sh 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 6f227f35e54..9ba3b283e51 100644
--- a/app-doc/phrack/phrack-15.ebuild
+++ b/app-doc/phrack/phrack-15.ebuild
@@ -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 sh 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 6f227f35e54..9ba3b283e51 100644
--- a/app-doc/phrack/phrack-16.ebuild
+++ b/app-doc/phrack/phrack-16.ebuild
@@ -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 sh 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 6f227f35e54..9ba3b283e51 100644
--- a/app-doc/phrack/phrack-17.ebuild
+++ b/app-doc/phrack/phrack-17.ebuild
@@ -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 sh 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 6f227f35e54..9ba3b283e51 100644
--- a/app-doc/phrack/phrack-18.ebuild
+++ b/app-doc/phrack/phrack-18.ebuild
@@ -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 sh 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 6f227f35e54..9ba3b283e51 100644
--- a/app-doc/phrack/phrack-19.ebuild
+++ b/app-doc/phrack/phrack-19.ebuild
@@ -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 sh 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 6f227f35e54..9ba3b283e51 100644
--- a/app-doc/phrack/phrack-20.ebuild
+++ b/app-doc/phrack/phrack-20.ebuild
@@ -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 sh 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 6f227f35e54..9ba3b283e51 100644
--- a/app-doc/phrack/phrack-21.ebuild
+++ b/app-doc/phrack/phrack-21.ebuild
@@ -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 sh 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 6f227f35e54..9ba3b283e51 100644
--- a/app-doc/phrack/phrack-22.ebuild
+++ b/app-doc/phrack/phrack-22.ebuild
@@ -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 sh 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 6f227f35e54..9ba3b283e51 100644
--- a/app-doc/phrack/phrack-23.ebuild
+++ b/app-doc/phrack/phrack-23.ebuild
@@ -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 sh 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 6f227f35e54..9ba3b283e51 100644
--- a/app-doc/phrack/phrack-24.ebuild
+++ b/app-doc/phrack/phrack-24.ebuild
@@ -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 sh 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 6f227f35e54..9ba3b283e51 100644
--- a/app-doc/phrack/phrack-25.ebuild
+++ b/app-doc/phrack/phrack-25.ebuild
@@ -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 sh 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 6f227f35e54..9ba3b283e51 100644
--- a/app-doc/phrack/phrack-26.ebuild
+++ b/app-doc/phrack/phrack-26.ebuild
@@ -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 sh 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 6f227f35e54..9ba3b283e51 100644
--- a/app-doc/phrack/phrack-27.ebuild
+++ b/app-doc/phrack/phrack-27.ebuild
@@ -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 sh 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 6f227f35e54..9ba3b283e51 100644
--- a/app-doc/phrack/phrack-28.ebuild
+++ b/app-doc/phrack/phrack-28.ebuild
@@ -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 sh 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 6f227f35e54..9ba3b283e51 100644
--- a/app-doc/phrack/phrack-29.ebuild
+++ b/app-doc/phrack/phrack-29.ebuild
@@ -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 sh 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 6f227f35e54..9ba3b283e51 100644
--- a/app-doc/phrack/phrack-30.ebuild
+++ b/app-doc/phrack/phrack-30.ebuild
@@ -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 sh 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 6f227f35e54..9ba3b283e51 100644
--- a/app-doc/phrack/phrack-31.ebuild
+++ b/app-doc/phrack/phrack-31.ebuild
@@ -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 sh 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 6f227f35e54..9ba3b283e51 100644
--- a/app-doc/phrack/phrack-32.ebuild
+++ b/app-doc/phrack/phrack-32.ebuild
@@ -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 sh 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 6f227f35e54..9ba3b283e51 100644
--- a/app-doc/phrack/phrack-33.ebuild
+++ b/app-doc/phrack/phrack-33.ebuild
@@ -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 sh 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 6f227f35e54..9ba3b283e51 100644
--- a/app-doc/phrack/phrack-34.ebuild
+++ b/app-doc/phrack/phrack-34.ebuild
@@ -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 sh 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 6f227f35e54..9ba3b283e51 100644
--- a/app-doc/phrack/phrack-35.ebuild
+++ b/app-doc/phrack/phrack-35.ebuild
@@ -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 sh 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 6f227f35e54..9ba3b283e51 100644
--- a/app-doc/phrack/phrack-36.ebuild
+++ b/app-doc/phrack/phrack-36.ebuild
@@ -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 sh 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 6f227f35e54..9ba3b283e51 100644
--- a/app-doc/phrack/phrack-37.ebuild
+++ b/app-doc/phrack/phrack-37.ebuild
@@ -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 sh 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 6f227f35e54..9ba3b283e51 100644
--- a/app-doc/phrack/phrack-38.ebuild
+++ b/app-doc/phrack/phrack-38.ebuild
@@ -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 sh 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 6f227f35e54..9ba3b283e51 100644
--- a/app-doc/phrack/phrack-39.ebuild
+++ b/app-doc/phrack/phrack-39.ebuild
@@ -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 sh 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 6f227f35e54..9ba3b283e51 100644
--- a/app-doc/phrack/phrack-40.ebuild
+++ b/app-doc/phrack/phrack-40.ebuild
@@ -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 sh 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 6f227f35e54..9ba3b283e51 100644
--- a/app-doc/phrack/phrack-41.ebuild
+++ b/app-doc/phrack/phrack-41.ebuild
@@ -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 sh 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 6f227f35e54..9ba3b283e51 100644
--- a/app-doc/phrack/phrack-42.ebuild
+++ b/app-doc/phrack/phrack-42.ebuild
@@ -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 sh 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 6f227f35e54..9ba3b283e51 100644
--- a/app-doc/phrack/phrack-43.ebuild
+++ b/app-doc/phrack/phrack-43.ebuild
@@ -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 sh 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 6f227f35e54..9ba3b283e51 100644
--- a/app-doc/phrack/phrack-44.ebuild
+++ b/app-doc/phrack/phrack-44.ebuild
@@ -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 sh 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 6f227f35e54..9ba3b283e51 100644
--- a/app-doc/phrack/phrack-45.ebuild
+++ b/app-doc/phrack/phrack-45.ebuild
@@ -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 sh 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 6f227f35e54..9ba3b283e51 100644
--- a/app-doc/phrack/phrack-46.ebuild
+++ b/app-doc/phrack/phrack-46.ebuild
@@ -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 sh 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 6f227f35e54..9ba3b283e51 100644
--- a/app-doc/phrack/phrack-47.ebuild
+++ b/app-doc/phrack/phrack-47.ebuild
@@ -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 sh 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 6f227f35e54..9ba3b283e51 100644
--- a/app-doc/phrack/phrack-48.ebuild
+++ b/app-doc/phrack/phrack-48.ebuild
@@ -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 sh 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 6f227f35e54..9ba3b283e51 100644
--- a/app-doc/phrack/phrack-49.ebuild
+++ b/app-doc/phrack/phrack-49.ebuild
@@ -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 sh 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 6f227f35e54..9ba3b283e51 100644
--- a/app-doc/phrack/phrack-50.ebuild
+++ b/app-doc/phrack/phrack-50.ebuild
@@ -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 sh 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 6f227f35e54..9ba3b283e51 100644
--- a/app-doc/phrack/phrack-51.ebuild
+++ b/app-doc/phrack/phrack-51.ebuild
@@ -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 sh 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 6f227f35e54..9ba3b283e51 100644
--- a/app-doc/phrack/phrack-52.ebuild
+++ b/app-doc/phrack/phrack-52.ebuild
@@ -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 sh 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 6f227f35e54..9ba3b283e51 100644
--- a/app-doc/phrack/phrack-53.ebuild
+++ b/app-doc/phrack/phrack-53.ebuild
@@ -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 sh 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 6f227f35e54..9ba3b283e51 100644
--- a/app-doc/phrack/phrack-54.ebuild
+++ b/app-doc/phrack/phrack-54.ebuild
@@ -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 sh 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 9dd73f53742..c81d6373349 100644
--- a/app-doc/phrack/phrack-55.ebuild
+++ b/app-doc/phrack/phrack-55.ebuild
@@ -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 sh 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 9dd73f53742..c81d6373349 100644
--- a/app-doc/phrack/phrack-56.ebuild
+++ b/app-doc/phrack/phrack-56.ebuild
@@ -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 sh 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 6f227f35e54..9ba3b283e51 100644
--- a/app-doc/phrack/phrack-57.ebuild
+++ b/app-doc/phrack/phrack-57.ebuild
@@ -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 sh 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 6f227f35e54..9ba3b283e51 100644
--- a/app-doc/phrack/phrack-58.ebuild
+++ b/app-doc/phrack/phrack-58.ebuild
@@ -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 sh 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 6f227f35e54..9ba3b283e51 100644
--- a/app-doc/phrack/phrack-59.ebuild
+++ b/app-doc/phrack/phrack-59.ebuild
@@ -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 sh 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 6f227f35e54..9ba3b283e51 100644
--- a/app-doc/phrack/phrack-60.ebuild
+++ b/app-doc/phrack/phrack-60.ebuild
@@ -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 sh 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 6f227f35e54..9ba3b283e51 100644
--- a/app-doc/phrack/phrack-61.ebuild
+++ b/app-doc/phrack/phrack-61.ebuild
@@ -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 sh 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 6f227f35e54..9ba3b283e51 100644
--- a/app-doc/phrack/phrack-62.ebuild
+++ b/app-doc/phrack/phrack-62.ebuild
@@ -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 sh 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 6f227f35e54..9ba3b283e51 100644
--- a/app-doc/phrack/phrack-63.ebuild
+++ b/app-doc/phrack/phrack-63.ebuild
@@ -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 sh 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 c17714111b5..1e9ebc007d6 100644
--- a/app-doc/phrack/phrack-64.ebuild
+++ b/app-doc/phrack/phrack-64.ebuild
@@ -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 sh 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 c17714111b5..1e9ebc007d6 100644
--- a/app-doc/phrack/phrack-65.ebuild
+++ b/app-doc/phrack/phrack-65.ebuild
@@ -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 sh 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 6f227f35e54..9ba3b283e51 100644
--- a/app-doc/phrack/phrack-66.ebuild
+++ b/app-doc/phrack/phrack-66.ebuild
@@ -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 sh 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 c17714111b5..1e9ebc007d6 100644
--- a/app-doc/phrack/phrack-67.ebuild
+++ b/app-doc/phrack/phrack-67.ebuild
@@ -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 sh 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 c17714111b5..1e9ebc007d6 100644
--- a/app-doc/phrack/phrack-68.ebuild
+++ b/app-doc/phrack/phrack-68.ebuild
@@ -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 sh 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 852757be723..612e31124dd 100644
--- a/app-doc/phrack/phrack-69.ebuild
+++ b/app-doc/phrack/phrack-69.ebuild
@@ -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 sh 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 20be533f2c7..218f164846b 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 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="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 1d6530dd749..7b00a44c2d2 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 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="html"
RDEPEND="!app-doc/pms"
diff --git a/app-doc/pms/pms-5_p20120920.ebuild b/app-doc/pms/pms-5_p20120920.ebuild
index 980f6ca16e5..97e57c9c70b 100644
--- a/app-doc/pms/pms-5_p20120920.ebuild
+++ b/app-doc/pms/pms-5_p20120920.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${MY_P}.tar.xz"
LICENSE="CC-BY-SA-3.0"
SLOT="${PV#*_p}"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="html"
BDEPEND="dev-tex/leaflet
diff --git a/app-doc/pms/pms-7_p20180430-r1.ebuild b/app-doc/pms/pms-7_p20180430-r1.ebuild
index ba9e4499c64..e16914eaad2 100644
--- a/app-doc/pms/pms-7_p20180430-r1.ebuild
+++ b/app-doc/pms/pms-7_p20180430-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
LICENSE="CC-BY-SA-3.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="html twoside"
# texlive-bibtexextra: plainurl.bst
diff --git a/app-doc/tldp-howto/tldp-howto-20120707.ebuild b/app-doc/tldp-howto/tldp-howto-20120707.ebuild
index b03ca1a9121..11064e602e8 100644
--- a/app-doc/tldp-howto/tldp-howto-20120707.ebuild
+++ b/app-doc/tldp-howto/tldp-howto-20120707.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
LICENSE="FDL-1.2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh 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/zsh-lovers/zsh-lovers-0.9.0.ebuild b/app-doc/zsh-lovers/zsh-lovers-0.9.0.ebuild
index 98b832f41c0..314c8c07721 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND="app-text/asciidoc"
diff --git a/app-doc/zsh-lovers/zsh-lovers-0.9.1.ebuild b/app-doc/zsh-lovers/zsh-lovers-0.9.1.ebuild
index 75adbfcceaf..f1b42c625a3 100644
--- a/app-doc/zsh-lovers/zsh-lovers-0.9.1.ebuild
+++ b/app-doc/zsh-lovers/zsh-lovers-0.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="https://deb.grml.org/pool/main/z/${PN}/${PN}_${PV}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND="app-text/asciidoc"
diff --git a/app-editors/emacs/emacs-23.4-r18.ebuild b/app-editors/emacs/emacs-23.4-r18.ebuild
index 259fb7f0e46..f405a60b451 100644
--- a/app-editors/emacs/emacs-23.4-r18.ebuild
+++ b/app-editors/emacs/emacs-23.4-r18.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
SLOT="23"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="alsa aqua athena dbus games gconf gif gpm gtk gzip-el jpeg kerberos livecd m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
REQUIRED_USE="?? ( aqua X )"
diff --git a/app-editors/emacs/emacs-24.5-r7.ebuild b/app-editors/emacs/emacs-24.5-r7.ebuild
index 15c84029d9a..1b7e9f6a163 100644
--- a/app-editors/emacs/emacs-24.5-r7.ebuild
+++ b/app-editors/emacs/emacs-24.5-r7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
SLOT="24"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk gtk2 gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
REQUIRED_USE="?? ( aqua X )"
diff --git a/app-editors/emacs/emacs-25.3-r6.ebuild b/app-editors/emacs/emacs-25.3-r6.ebuild
index 2003b002c9b..c5ddbb55c14 100644
--- a/app-editors/emacs/emacs-25.3-r6.ebuild
+++ b/app-editors/emacs/emacs-25.3-r6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
SLOT="25"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gtk2 gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
REQUIRED_USE="?? ( aqua X )"
diff --git a/app-editors/emacs/emacs-26.3-r1.ebuild b/app-editors/emacs/emacs-26.3-r1.ebuild
index 04d03c23f01..19d1139ed32 100644
--- a/app-editors/emacs/emacs-26.3-r1.ebuild
+++ b/app-editors/emacs/emacs-26.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
SLOT="26"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gtk2 gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
REQUIRED_USE="?? ( aqua X )"
diff --git a/app-editors/emacs/emacs-27.0.50_pre20191223.ebuild b/app-editors/emacs/emacs-27.0.50_pre20191223.ebuild
index 2a5b0f38100..751e10677ef 100644
--- a/app-editors/emacs/emacs-27.0.50_pre20191223.ebuild
+++ b/app-editors/emacs/emacs-27.0.50_pre20191223.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV##*.} = 9999 ]]; then
else
SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz
mirror://gnu-alpha/emacs/pretest/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
# FULL_VERSION keeps the full version number, which is needed in
# order to determine some path information correctly for copy/move
# operations later on
diff --git a/app-editors/emacs/emacs-27.0.90.ebuild b/app-editors/emacs/emacs-27.0.90.ebuild
index b3043e239e8..e186f82ec1a 100644
--- a/app-editors/emacs/emacs-27.0.90.ebuild
+++ b/app-editors/emacs/emacs-27.0.90.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV##*.} = 9999 ]]; then
else
SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz
mirror://gnu-alpha/emacs/pretest/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
# FULL_VERSION keeps the full version number, which is needed in
# order to determine some path information correctly for copy/move
# operations later on
diff --git a/app-editors/emacs/emacs-27.0.9999-r1.ebuild b/app-editors/emacs/emacs-27.0.9999-r1.ebuild
index b3043e239e8..e186f82ec1a 100644
--- a/app-editors/emacs/emacs-27.0.9999-r1.ebuild
+++ b/app-editors/emacs/emacs-27.0.9999-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV##*.} = 9999 ]]; then
else
SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz
mirror://gnu-alpha/emacs/pretest/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
# FULL_VERSION keeps the full version number, which is needed in
# order to determine some path information correctly for copy/move
# operations later on
diff --git a/app-editors/emacs/emacs-28.0.9999.ebuild b/app-editors/emacs/emacs-28.0.9999.ebuild
index 6f91886c2bc..ee203156341 100644
--- a/app-editors/emacs/emacs-28.0.9999.ebuild
+++ b/app-editors/emacs/emacs-28.0.9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV##*.} = 9999 ]]; then
else
SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz
mirror://gnu-alpha/emacs/pretest/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
# FULL_VERSION keeps the full version number, which is needed in
# order to determine some path information correctly for copy/move
# operations later on
diff --git a/app-editors/gedit/gedit-3.32.2-r1.ebuild b/app-editors/gedit/gedit-3.32.2-r1.ebuild
index 8e8bb61899a..1a70aeb7e31 100644
--- a/app-editors/gedit/gedit-3.32.2-r1.ebuild
+++ b/app-editors/gedit/gedit-3.32.2-r1.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
IUSE="+introspection +python gtk-doc spell vala"
REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} ) spell? ( python )"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
# X libs are not needed for OSX (aqua)
DEPEND="
diff --git a/app-editors/gedit/gedit-3.34.1.ebuild b/app-editors/gedit/gedit-3.34.1.ebuild
index 6225fb179da..bfc2b463f7d 100644
--- a/app-editors/gedit/gedit-3.34.1.ebuild
+++ b/app-editors/gedit/gedit-3.34.1.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
IUSE="+introspection +python gtk-doc spell vala"
REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} ) spell? ( python )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
# X libs are not needed for OSX (aqua)
DEPEND="
diff --git a/app-editors/hexcurse/hexcurse-1.55.ebuild b/app-editors/hexcurse/hexcurse-1.55.ebuild
index 4e42c858973..cc3483748d0 100644
--- a/app-editors/hexcurse/hexcurse-1.55.ebuild
+++ b/app-editors/hexcurse/hexcurse-1.55.ebuild
@@ -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 sh 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 656648c05e7..95d89712514 100644
--- a/app-editors/hexcurse/hexcurse-1.60.0.ebuild
+++ b/app-editors/hexcurse/hexcurse-1.60.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,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 ~sh ~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=
diff --git a/app-editors/hexedit/hexedit-1.2.13.ebuild b/app-editors/hexedit/hexedit-1.2.13.ebuild
index 65402f656ee..f06e9e63f50 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
DEPEND="sys-libs/ncurses:="
RDEPEND="${DEPEND}"
diff --git a/app-editors/nano/nano-4.2.ebuild b/app-editors/nano/nano-4.2.ebuild
index 487a1075c22..921e28d5c71 100644
--- a/app-editors/nano/nano-4.2.ebuild
+++ b/app-editors/nano/nano-4.2.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 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-editors/nano/nano-4.6.ebuild b/app-editors/nano/nano-4.6.ebuild
index 60317d66307..18a962cba39 100644
--- a/app-editors/nano/nano-4.6.ebuild
+++ b/app-editors/nano/nano-4.6.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 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-editors/nano/nano-4.8.ebuild b/app-editors/nano/nano-4.8.ebuild
index 399fdff323e..e27dda0e78d 100644
--- a/app-editors/nano/nano-4.8.ebuild
+++ b/app-editors/nano/nano-4.8.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 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-editors/nano/nano-4.9.ebuild b/app-editors/nano/nano-4.9.ebuild
index 399fdff323e..e27dda0e78d 100644
--- a/app-editors/nano/nano-4.9.ebuild
+++ b/app-editors/nano/nano-4.9.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 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-editors/nano/nano-9999.ebuild b/app-editors/nano/nano-9999.ebuild
index c3d78b31034..e27dda0e78d 100644
--- a/app-editors/nano/nano-9999.ebuild
+++ b/app-editors/nano/nano-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-editors/vim-core/vim-core-8.1.1486.ebuild b/app-editors/vim-core/vim-core-8.1.1486.ebuild
index 8011fa67275..04fd5e05d99 100644
--- a/app-editors/vim-core/vim-core-8.1.1486.ebuild
+++ b/app-editors/vim-core/vim-core-8.1.1486.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]] ; then
else
SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
- KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="vim and gvim shared files"
diff --git a/app-editors/vim-core/vim-core-8.1.1846.ebuild b/app-editors/vim-core/vim-core-8.1.1846.ebuild
index b12aef7dde9..77510bc4d15 100644
--- a/app-editors/vim-core/vim-core-8.1.1846.ebuild
+++ b/app-editors/vim-core/vim-core-8.1.1846.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]] ; then
else
SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="vim and gvim shared files"
diff --git a/app-editors/vim-core/vim-core-8.2.0055.ebuild b/app-editors/vim-core/vim-core-8.2.0055.ebuild
index 45e3680e2ef..5c1ef63c106 100644
--- a/app-editors/vim-core/vim-core-8.2.0055.ebuild
+++ b/app-editors/vim-core/vim-core-8.2.0055.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]] ; then
else
SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="vim and gvim shared files"
diff --git a/app-editors/vim-core/vim-core-8.2.0114.ebuild b/app-editors/vim-core/vim-core-8.2.0114.ebuild
index b5cbae1c222..f1e21b3cc84 100644
--- a/app-editors/vim-core/vim-core-8.2.0114.ebuild
+++ b/app-editors/vim-core/vim-core-8.2.0114.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]] ; then
else
SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="vim and gvim shared files"
diff --git a/app-editors/vim-core/vim-core-8.2.0210.ebuild b/app-editors/vim-core/vim-core-8.2.0210.ebuild
index e8ecb7550a6..d1dbef9e8f1 100644
--- a/app-editors/vim-core/vim-core-8.2.0210.ebuild
+++ b/app-editors/vim-core/vim-core-8.2.0210.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]] ; then
else
SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
https://dev.gentoo.org/~radhermit/vim/vim-8.2.0210-gentoo-patches.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="vim and gvim shared files"
diff --git a/app-editors/vim-core/vim-core-8.2.0360.ebuild b/app-editors/vim-core/vim-core-8.2.0360.ebuild
index e8ecb7550a6..d1dbef9e8f1 100644
--- a/app-editors/vim-core/vim-core-8.2.0360.ebuild
+++ b/app-editors/vim-core/vim-core-8.2.0360.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]] ; then
else
SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
https://dev.gentoo.org/~radhermit/vim/vim-8.2.0210-gentoo-patches.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="vim and gvim shared files"
diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild
index e8ecb7550a6..d1dbef9e8f1 100644
--- a/app-editors/vim-core/vim-core-9999.ebuild
+++ b/app-editors/vim-core/vim-core-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]] ; then
else
SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
https://dev.gentoo.org/~radhermit/vim/vim-8.2.0210-gentoo-patches.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="vim and gvim shared files"
diff --git a/app-editors/vim/vim-8.1.1486.ebuild b/app-editors/vim/vim-8.1.1486.ebuild
index 7030a92b7e6..941862d27bb 100644
--- a/app-editors/vim/vim-8.1.1486.ebuild
+++ b/app-editors/vim/vim-8.1.1486.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
else
SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
- KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="Vim, an improved vi-style text editor"
diff --git a/app-editors/vim/vim-8.1.1846.ebuild b/app-editors/vim/vim-8.1.1846.ebuild
index dda7aa26574..9a0bddc9ae1 100644
--- a/app-editors/vim/vim-8.1.1846.ebuild
+++ b/app-editors/vim/vim-8.1.1846.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
else
SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="Vim, an improved vi-style text editor"
diff --git a/app-editors/vim/vim-8.2.0055.ebuild b/app-editors/vim/vim-8.2.0055.ebuild
index f397bd99178..23b63cbaa93 100644
--- a/app-editors/vim/vim-8.2.0055.ebuild
+++ b/app-editors/vim/vim-8.2.0055.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
else
SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="Vim, an improved vi-style text editor"
diff --git a/app-editors/vim/vim-8.2.0114.ebuild b/app-editors/vim/vim-8.2.0114.ebuild
index 61702292639..1387a8b2a3b 100644
--- a/app-editors/vim/vim-8.2.0114.ebuild
+++ b/app-editors/vim/vim-8.2.0114.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
else
SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="Vim, an improved vi-style text editor"
diff --git a/app-editors/vim/vim-8.2.0210.ebuild b/app-editors/vim/vim-8.2.0210.ebuild
index ac2920a55c2..16d2245653a 100644
--- a/app-editors/vim/vim-8.2.0210.ebuild
+++ b/app-editors/vim/vim-8.2.0210.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
else
SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
https://dev.gentoo.org/~radhermit/vim/vim-8.2.0210-gentoo-patches.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="Vim, an improved vi-style text editor"
diff --git a/app-editors/vim/vim-8.2.0360.ebuild b/app-editors/vim/vim-8.2.0360.ebuild
index ac2920a55c2..16d2245653a 100644
--- a/app-editors/vim/vim-8.2.0360.ebuild
+++ b/app-editors/vim/vim-8.2.0360.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
else
SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
https://dev.gentoo.org/~radhermit/vim/vim-8.2.0210-gentoo-patches.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="Vim, an improved vi-style text editor"
diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild
index ac2920a55c2..16d2245653a 100644
--- a/app-editors/vim/vim-9999.ebuild
+++ b/app-editors/vim/vim-9999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
else
SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
https://dev.gentoo.org/~radhermit/vim/vim-8.2.0210-gentoo-patches.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="Vim, an improved vi-style text editor"
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 dc1226a1e6e..dbbe149d45b 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
S="${WORKDIR}/autoconf-${PV}/lib/emacs"
SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/doctest-mode/doctest-mode-0.4.ebuild b/app-emacs/doctest-mode/doctest-mode-0.4.ebuild
index 61bda5369fd..98111798738 100644
--- a/app-emacs/doctest-mode/doctest-mode-0.4.ebuild
+++ b/app-emacs/doctest-mode/doctest-mode-0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://python-mode.svn.sourceforge.net/viewvc/*checkout*/python-mode/tr
LICENSE="HPND"
SLOT="0"
-KEYWORDS="amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh x86"
+KEYWORDS="amd64 arm hppa ia64 ppc ppc64 ~s390 x86"
S="${WORKDIR}"
SITEFILE="60${PN}-gentoo.el"
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r3.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r3.ebuild
index e5b92a66d62..3cd882275b7 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r3.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="games X"
RDEPEND="games? ( acct-group/gamestat )"
diff --git a/app-emacs/emacs-daemon/emacs-daemon-0.22.ebuild b/app-emacs/emacs-daemon/emacs-daemon-0.22.ebuild
index cc425223b2d..80742a8c215 100644
--- a/app-emacs/emacs-daemon/emacs-daemon-0.22.ebuild
+++ b/app-emacs/emacs-daemon/emacs-daemon-0.22.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
SITEFILE="10${PN}-gentoo.el"
diff --git a/app-emacs/eselect-mode/eselect-mode-1.4.14.ebuild b/app-emacs/eselect-mode/eselect-mode-1.4.14.ebuild
index 2262a495ef5..5a52bacb8f9 100644
--- a/app-emacs/eselect-mode/eselect-mode-1.4.14.ebuild
+++ b/app-emacs/eselect-mode/eselect-mode-1.4.14.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${MY_P}.tar.xz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
S="${WORKDIR}/${MY_P}/misc"
SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/eselect-mode/eselect-mode-1.4.15.ebuild b/app-emacs/eselect-mode/eselect-mode-1.4.15.ebuild
index 6e07032bf85..e72b3abdcc7 100644
--- a/app-emacs/eselect-mode/eselect-mode-1.4.15.ebuild
+++ b/app-emacs/eselect-mode/eselect-mode-1.4.15.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${MY_P}.tar.xz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
S="${WORKDIR}/${MY_P}/misc"
SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/eselect-mode/eselect-mode-1.4.16.ebuild b/app-emacs/eselect-mode/eselect-mode-1.4.16.ebuild
index aff09f42da9..8942045c6bf 100644
--- a/app-emacs/eselect-mode/eselect-mode-1.4.16.ebuild
+++ b/app-emacs/eselect-mode/eselect-mode-1.4.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${MY_P}.tar.xz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
S="${WORKDIR}/${MY_P}/misc"
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 b871d8248c5..39c1ded83f4 100644
--- a/app-emacs/lua-mode/lua-mode-20151025.ebuild
+++ b/app-emacs/lua-mode/lua-mode-20151025.ebuild
@@ -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 sh 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/po-mode/po-mode-0.20.1.ebuild b/app-emacs/po-mode/po-mode-0.20.1.ebuild
index 77e3c8608a5..5e986336fed 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
S="${WORKDIR}/gettext-${PV}/gettext-tools/emacs"
ELISP_REMOVE="start-po.el"
diff --git a/app-emacs/pymacs/pymacs-0.26.ebuild b/app-emacs/pymacs/pymacs-0.26.ebuild
index ee22b01797b..392e3554c99 100644
--- a/app-emacs/pymacs/pymacs-0.26.ebuild
+++ b/app-emacs/pymacs/pymacs-0.26.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/dgentry/${PN^}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 arm ~hppa ia64 ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
#IUSE="doc"
#BDEPEND="doc? (
diff --git a/app-emacs/python-mode/python-mode-6.2.3.ebuild b/app-emacs/python-mode/python-mode-6.2.3.ebuild
index f5062acbe49..21be8e4dba2 100644
--- a/app-emacs/python-mode/python-mode-6.2.3.ebuild
+++ b/app-emacs/python-mode/python-mode-6.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${MY_P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm hppa ia64 ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
S="${WORKDIR}/${MY_P}"
SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/ruby-mode/ruby-mode-2.4.1.ebuild b/app-emacs/ruby-mode/ruby-mode-2.4.1.ebuild
index 9fb94f35090..8eab1553c73 100644
--- a/app-emacs/ruby-mode/ruby-mode-2.4.1.ebuild
+++ b/app-emacs/ruby-mode/ruby-mode-2.4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://cache.ruby-lang.org/pub/ruby/ruby-${PV}.tar.xz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
S="${WORKDIR}/ruby-${PV}/misc"
DOCS="README"
diff --git a/app-emacs/ruby-mode/ruby-mode-2.5.5.ebuild b/app-emacs/ruby-mode/ruby-mode-2.5.5.ebuild
index aab3289276d..1c367a01586 100644
--- a/app-emacs/ruby-mode/ruby-mode-2.5.5.ebuild
+++ b/app-emacs/ruby-mode/ruby-mode-2.5.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://cache.ruby-lang.org/pub/ruby/ruby-${PV}.tar.xz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
S="${WORKDIR}/ruby-${PV}/misc"
DOCS="README"
diff --git a/app-emacs/ruby-mode/ruby-mode-2.6.3.ebuild b/app-emacs/ruby-mode/ruby-mode-2.6.3.ebuild
index 6959b4080a3..42b320f0749 100644
--- a/app-emacs/ruby-mode/ruby-mode-2.6.3.ebuild
+++ b/app-emacs/ruby-mode/ruby-mode-2.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ruby/elisp/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
S="${WORKDIR}/elisp-${COMMIT}"
DOCS="README"
diff --git a/app-emacs/ruby-mode/ruby-mode-2.7.0.ebuild b/app-emacs/ruby-mode/ruby-mode-2.7.0.ebuild
index 452302bb70e..4f80894a8ad 100644
--- a/app-emacs/ruby-mode/ruby-mode-2.7.0.ebuild
+++ b/app-emacs/ruby-mode/ruby-mode-2.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ruby/elisp/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
S="${WORKDIR}/elisp-${COMMIT}"
DOCS="README"
diff --git a/app-eselect/eselect-awk/eselect-awk-0.2.ebuild b/app-eselect/eselect-awk/eselect-awk-0.2.ebuild
index 18d876f7bc9..c2b60e539f7 100644
--- a/app-eselect/eselect-awk/eselect-awk-0.2.ebuild
+++ b/app-eselect/eselect-awk/eselect-awk-0.2.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 sh sparc x86 ~amd64-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-macos"
IUSE=""
src_install() {
diff --git a/app-eselect/eselect-cblas/eselect-cblas-0.1.ebuild b/app-eselect/eselect-cblas/eselect-cblas-0.1.ebuild
index 6ab3f61ca04..6f407cfc993 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
# Need skel.bash lib
diff --git a/app-eselect/eselect-cdparanoia/eselect-cdparanoia-0.1.ebuild b/app-eselect/eselect-cdparanoia/eselect-cdparanoia-0.1.ebuild
index ca758ec34d0..d73f8dfd9b8 100644
--- a/app-eselect/eselect-cdparanoia/eselect-cdparanoia-0.1.ebuild
+++ b/app-eselect/eselect-cdparanoia/eselect-cdparanoia-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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
RDEPEND=">=app-eselect/eselect-lib-bin-symlink-0.1.1
diff --git a/app-eselect/eselect-ctags/eselect-ctags-1.18.ebuild b/app-eselect/eselect-ctags/eselect-ctags-1.18.ebuild
index 4b9a20a690f..111c05daec9 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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND=">=app-admin/eselect-1.2.3"
diff --git a/app-eselect/eselect-electron/eselect-electron-2.1.ebuild b/app-eselect/eselect-electron/eselect-electron-2.1.ebuild
index 428fa0fc7f1..a860e35738e 100644
--- a/app-eselect/eselect-electron/eselect-electron-2.1.ebuild
+++ b/app-eselect/eselect-electron/eselect-electron-2.1.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
SRC_URI="https://github.com/elprans/${PN}/archive/v${PV}.tar.gz -> eselect-electron-${PV}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x86-solaris"
IUSE=""
RDEPEND="app-admin/eselect"
diff --git a/app-eselect/eselect-emacs/eselect-emacs-1.18.ebuild b/app-eselect/eselect-emacs/eselect-emacs-1.18.ebuild
index 4a78250bc05..93a2dcc05d0 100644
--- a/app-eselect/eselect-emacs/eselect-emacs-1.18.ebuild
+++ b/app-eselect/eselect-emacs/eselect-emacs-1.18.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
RDEPEND=">=app-admin/eselect-1.2.6
~app-eselect/eselect-ctags-${PV}"
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 3904c3a6147..dec32d295ce 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 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=">=app-admin/eselect-1.2.3
diff --git a/app-eselect/eselect-iptables/eselect-iptables-20200319.ebuild b/app-eselect/eselect-iptables/eselect-iptables-20200319.ebuild
index 41982d66913..89c49dbd974 100644
--- a/app-eselect/eselect-iptables/eselect-iptables-20200319.ebuild
+++ b/app-eselect/eselect-iptables/eselect-iptables-20200319.ebuild
@@ -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 ~sh ~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-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 9e5da03b358..e34f715bc76 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="app-admin/eselect"
diff --git a/app-eselect/eselect-lua/eselect-lua-1.ebuild b/app-eselect/eselect-lua/eselect-lua-1.ebuild
index d1763726d14..321aa912069 100644
--- a/app-eselect/eselect-lua/eselect-lua-1.ebuild
+++ b/app-eselect/eselect-lua/eselect-lua-1.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=app-admin/eselect-1.2.4"
diff --git a/app-eselect/eselect-mpost/eselect-mpost-0.3.ebuild b/app-eselect/eselect-mpost/eselect-mpost-0.3.ebuild
index cbd5236c2b2..64c7cc93c07 100644
--- a/app-eselect/eselect-mpost/eselect-mpost-0.3.ebuild
+++ b/app-eselect/eselect-mpost/eselect-mpost-0.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~ppc ~ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~ppc ~ppc64 s390 sparc x86"
IUSE=""
DEPEND=""
diff --git a/app-eselect/eselect-notify-send/eselect-notify-send-0.1.ebuild b/app-eselect/eselect-notify-send/eselect-notify-send-0.1.ebuild
index beb2ab21e1c..c559c78f9d8 100644
--- a/app-eselect/eselect-notify-send/eselect-notify-send-0.1.ebuild
+++ b/app-eselect/eselect-notify-send/eselect-notify-send-0.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE=""
RDEPEND=">=app-eselect/eselect-lib-bin-symlink-0.1.1
diff --git a/app-eselect/eselect-opengl/eselect-opengl-1.3.1-r4.ebuild b/app-eselect/eselect-opengl/eselect-opengl-1.3.1-r4.ebuild
index 3fb44355b69..dac87bbb77b 100644
--- a/app-eselect/eselect-opengl/eselect-opengl-1.3.1-r4.ebuild
+++ b/app-eselect/eselect-opengl/eselect-opengl-1.3.1-r4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/opengl.eselect-${PV}.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="app-arch/xz-utils"
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 17a7ce75242..e187676dd5c 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
@@ -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 sh 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-pdftex/eselect-pdftex-0.3.ebuild b/app-eselect/eselect-pdftex/eselect-pdftex-0.3.ebuild
index 210724f4a2f..fde6c651f4d 100644
--- a/app-eselect/eselect-pdftex/eselect-pdftex-0.3.ebuild
+++ b/app-eselect/eselect-pdftex/eselect-pdftex-0.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~ppc ~ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~ppc ~ppc64 s390 sparc x86"
DEPEND=""
# Depend on texlive-core-2008 that allows usage of this module, otherwise it
diff --git a/app-eselect/eselect-php/eselect-php-0.9.4-r5.ebuild b/app-eselect/eselect-php/eselect-php-0.9.4-r5.ebuild
index 680e6b6eaf8..407a2c8c6e3 100644
--- a/app-eselect/eselect-php/eselect-php-0.9.4-r5.ebuild
+++ b/app-eselect/eselect-php/eselect-php-0.9.4-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~mjo/distfiles/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="fpm apache2"
# The "DirectoryIndex" line in 70_mod_php.conf requires mod_dir.
diff --git a/app-eselect/eselect-php/eselect-php-0.9.5.ebuild b/app-eselect/eselect-php/eselect-php-0.9.5.ebuild
index a086b76e704..a38c7b0c3c1 100644
--- a/app-eselect/eselect-php/eselect-php-0.9.5.ebuild
+++ b/app-eselect/eselect-php/eselect-php-0.9.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~mjo/distfiles/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="fpm apache2"
# The "DirectoryIndex" line in 70_mod_php.conf requires mod_dir.
diff --git a/app-eselect/eselect-php/eselect-php-0.9.6.ebuild b/app-eselect/eselect-php/eselect-php-0.9.6.ebuild
index 42267cb5ce7..d2a17e02f7a 100644
--- a/app-eselect/eselect-php/eselect-php-0.9.6.ebuild
+++ b/app-eselect/eselect-php/eselect-php-0.9.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~mjo/distfiles/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="fpm apache2"
# The "DirectoryIndex" line in 70_mod_php.conf requires mod_dir.
diff --git a/app-eselect/eselect-pinentry/eselect-pinentry-0.7.ebuild b/app-eselect/eselect-pinentry/eselect-pinentry-0.7.ebuild
index bf29b94e5cb..acad89826c8 100644
--- a/app-eselect/eselect-pinentry/eselect-pinentry-0.7.ebuild
+++ b/app-eselect/eselect-pinentry/eselect-pinentry-0.7.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 7def1cbafa7..46153e12ceb 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 3ad047e3a07..7f2369271fa 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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="Eselect module for management of multiple Python versions"
diff --git a/app-eselect/eselect-python/eselect-python-99999999.ebuild b/app-eselect/eselect-python/eselect-python-99999999.ebuild
index 4405011868a..8e05fb549b5 100644
--- a/app-eselect/eselect-python/eselect-python-99999999.ebuild
+++ b/app-eselect/eselect-python/eselect-python-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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/~floppym/dist/${P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="Eselect module for management of multiple Python versions"
diff --git a/app-eselect/eselect-repository/eselect-repository-7.ebuild b/app-eselect/eselect-repository/eselect-repository-7.ebuild
index c9c552f0556..fd7d9fabf88 100644
--- a/app-eselect/eselect-repository/eselect-repository-7.ebuild
+++ b/app-eselect/eselect-repository/eselect-repository-7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mgorny/eselect-repository/archive/v${PV}.tar.gz -> $
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
IUSE=""
REQUIRED_USE=${PYTHON_REQUIRED_USE}
diff --git a/app-eselect/eselect-ruby/eselect-ruby-20170723.ebuild b/app-eselect/eselect-ruby/eselect-ruby-20170723.ebuild
index 0fadc051437..602f7be4974 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
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 0565577dca5..43880c79bb8 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=">=app-admin/eselect-1.0.2"
diff --git a/app-eselect/eselect-ruby/eselect-ruby-20191222.ebuild b/app-eselect/eselect-ruby/eselect-ruby-20191222.ebuild
index b670fc25a0b..4a8dab5000a 100644
--- a/app-eselect/eselect-ruby/eselect-ruby-20191222.ebuild
+++ b/app-eselect/eselect-ruby/eselect-ruby-20191222.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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/~graaff/ruby-team/ruby.eselect-${PVR}.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=">=app-admin/eselect-1.0.2"
diff --git a/app-eselect/eselect-sh/eselect-sh-0.4-r2.ebuild b/app-eselect/eselect-sh/eselect-sh-0.4-r2.ebuild
index 0f90e527adb..3a515a61529 100644
--- a/app-eselect/eselect-sh/eselect-sh-0.4-r2.ebuild
+++ b/app-eselect/eselect-sh/eselect-sh-0.4-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh 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.1.9-r1.ebuild b/app-eselect/eselect-vi/eselect-vi-1.1.9-r1.ebuild
index 9ab8f8045fd..babee4ae596 100644
--- a/app-eselect/eselect-vi/eselect-vi-1.1.9-r1.ebuild
+++ b/app-eselect/eselect-vi/eselect-vi-1.1.9-r1.ebuild
@@ -9,7 +9,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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="app-admin/eselect"
diff --git a/app-eselect/eselect-vi/eselect-vi-1.1.9.ebuild b/app-eselect/eselect-vi/eselect-vi-1.1.9.ebuild
index e21a04eb18b..42cdc9aeb92 100644
--- a/app-eselect/eselect-vi/eselect-vi-1.1.9.ebuild
+++ b/app-eselect/eselect-vi/eselect-vi-1.1.9.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=">=app-admin/eselect-1.0.6"
diff --git a/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20140423.ebuild b/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20140423.ebuild
index f2c5b2f8345..ad7a8f5cc50 100644
--- a/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20140423.ebuild
+++ b/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20140423.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~junghans/dist/${P}.tar.xz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE=""
RDEPEND="app-admin/eselect"
diff --git a/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20180529.ebuild b/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20180529.ebuild
index 2ab1368aa6a..2b673664080 100644
--- a/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20180529.ebuild
+++ b/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20180529.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
RDEPEND=">=app-admin/eselect-1.4.13"
diff --git a/app-eselect/eselect-xvmc/eselect-xvmc-0.4.ebuild b/app-eselect/eselect-xvmc/eselect-xvmc-0.4.ebuild
index 180f7b10b7a..97831afc68c 100644
--- a/app-eselect/eselect-xvmc/eselect-xvmc-0.4.ebuild
+++ b/app-eselect/eselect-xvmc/eselect-xvmc-0.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh 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=""
DEPEND=""
diff --git a/app-forensics/chkrootkit/chkrootkit-0.52.ebuild b/app-forensics/chkrootkit/chkrootkit-0.52.ebuild
index d31fd473f70..5e5b6475ffc 100644
--- a/app-forensics/chkrootkit/chkrootkit-0.52.ebuild
+++ b/app-forensics/chkrootkit/chkrootkit-0.52.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.pangeia.com.br/pub/seg/pac/${P}.tar.gz -> ${P}.tar
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="+cron"
RDEPEND="cron? ( virtual/cron )"
diff --git a/app-forensics/chkrootkit/chkrootkit-0.53.ebuild b/app-forensics/chkrootkit/chkrootkit-0.53.ebuild
index f55b55e51bf..8a014462a5f 100644
--- a/app-forensics/chkrootkit/chkrootkit-0.53.ebuild
+++ b/app-forensics/chkrootkit/chkrootkit-0.53.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="ftp://ftp.pangeia.com.br/pub/seg/pac/${P}.tar.gz
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="+cron"
RDEPEND="cron? ( virtual/cron )"
diff --git a/app-i18n/man-pages-de/man-pages-de-2.12-r1.ebuild b/app-i18n/man-pages-de/man-pages-de-2.12-r1.ebuild
index 5901e1eda02..3588685c686 100644
--- a/app-i18n/man-pages-de/man-pages-de-2.12-r1.ebuild
+++ b/app-i18n/man-pages-de/man-pages-de-2.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://salsa.debian.org/manpages-de-team/manpages-de/-/archive/v${PV}/
LICENSE="GPL-3+ man-pages GPL-2+ GPL-2 BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~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-de/man-pages-de-2.12.ebuild b/app-i18n/man-pages-de/man-pages-de-2.12.ebuild
index d2837b0ad58..2cdb3cbc7fe 100644
--- a/app-i18n/man-pages-de/man-pages-de-2.12.ebuild
+++ b/app-i18n/man-pages-de/man-pages-de-2.12.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://salsa.debian.org/manpages-de-team/manpages-de/-/archive/v${PV}/
LICENSE="GPL-3+ man-pages GPL-2+ GPL-2 BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 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-de/man-pages-de-2.16.ebuild b/app-i18n/man-pages-de/man-pages-de-2.16.ebuild
index 38e5b015fea..f802bbdaabd 100644
--- a/app-i18n/man-pages-de/man-pages-de-2.16.ebuild
+++ b/app-i18n/man-pages-de/man-pages-de-2.16.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://salsa.debian.org/manpages-l10n-team/manpages-l10n/-/archive/v${
LICENSE="GPL-3+ man-pages GPL-2+ GPL-2 BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~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-fr/man-pages-fr-3.70-r1.ebuild b/app-i18n/man-pages-fr/man-pages-fr-3.70-r1.ebuild
index 5b926ac55ae..cfa288129c2 100644
--- a/app-i18n/man-pages-fr/man-pages-fr-3.70-r1.ebuild
+++ b/app-i18n/man-pages-fr/man-pages-fr-3.70-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
LICENSE="BSD GPL-2+ man-pages"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh 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"
BDEPEND="app-text/po4a"
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 31a3fb195d7..845845c3a3a 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
@@ -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 sh 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 ad5ed669802..94a91c8b2a8 100644
--- a/app-i18n/man-pages-ja/man-pages-ja-20171215.ebuild
+++ b/app-i18n/man-pages-ja/man-pages-ja-20171215.ebuild
@@ -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 ~sh 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-ja/man-pages-ja-20180315.ebuild b/app-i18n/man-pages-ja/man-pages-ja-20180315.ebuild
index 68b1c0acd44..d37c1cb8beb 100644
--- a/app-i18n/man-pages-ja/man-pages-ja-20180315.ebuild
+++ b/app-i18n/man-pages-ja/man-pages-ja-20180315.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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 ~riscv ~s390 ~sh ~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-l10n/man-pages-l10n-4.0.0.ebuild b/app-i18n/man-pages-l10n/man-pages-l10n-4.0.0.ebuild
index 92b91ac0032..bf46b86a840 100644
--- a/app-i18n/man-pages-l10n/man-pages-l10n-4.0.0.ebuild
+++ b/app-i18n/man-pages-l10n/man-pages-l10n-4.0.0.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 ~sh ~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"
# omit pt-BR and ro for now, because they each install only two man pages
MY_L10N=(de fr nl pl)
IUSE="${MY_L10N[@]/#/l10n_}"
diff --git a/app-i18n/man-pages-nl/man-pages-nl-0.13.3.ebuild b/app-i18n/man-pages-nl/man-pages-nl-0.13.3.ebuild
index 656a75f9a5e..b8f16d4b054 100644
--- a/app-i18n/man-pages-nl/man-pages-nl-0.13.3.ebuild
+++ b/app-i18n/man-pages-nl/man-pages-nl-0.13.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.nl.linux.org/pub/DOC-NL/manpages-nl/manpages-nl-${PV}.tar.gz"
LICENSE="man-pages GPL-2+ GPL-2 BSD LDP-1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 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-pl/man-pages-pl-0.7-r1.ebuild b/app-i18n/man-pages-pl/man-pages-pl-0.7-r1.ebuild
index ef7e788c0ad..822ed83e0f5 100644
--- a/app-i18n/man-pages-pl/man-pages-pl-0.7-r1.ebuild
+++ b/app-i18n/man-pages-pl/man-pages-pl-0.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/manpages-pl/${MY_PKG}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
DOCS=( AUTHORS README )
diff --git a/app-i18n/man-pages-pl/man-pages-pl-0.7.ebuild b/app-i18n/man-pages-pl/man-pages-pl-0.7.ebuild
index fa9345c5de5..63942bf92ba 100644
--- a/app-i18n/man-pages-pl/man-pages-pl-0.7.ebuild
+++ b/app-i18n/man-pages-pl/man-pages-pl-0.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/manpages-pl/${MY_PKG}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
DOCS=( AUTHORS README )
diff --git a/app-i18n/man-pages-ru/man-pages-ru-4.16.2383.2383.20180422.ebuild b/app-i18n/man-pages-ru/man-pages-ru-4.16.2383.2383.20180422.ebuild
index cd90dcee255..38d56486ee2 100644
--- a/app-i18n/man-pages-ru/man-pages-ru-4.16.2383.2383.20180422.ebuild
+++ b/app-i18n/man-pages-ru/man-pages-ru-4.16.2383.2383.20180422.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${MY_PV}.tar.bz2"
LICENSE="FDL-1.3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 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=""
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 37623674821..c7b6ca7a2d3 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
@@ -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 sh 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/nkf/nkf-2.1.3-r2.ebuild b/app-i18n/nkf/nkf-2.1.3-r2.ebuild
index 97e81188991..38edbe2eaa2 100644
--- a/app-i18n/nkf/nkf-2.1.3-r2.ebuild
+++ b/app-i18n/nkf/nkf-2.1.3-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/59912/${P}.tar.gz
LICENSE="ZLIB"
SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-macos"
+KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-macos"
IUSE="perl python l10n_ja"
src_prepare() {
diff --git a/app-i18n/nkf/nkf-2.1.4.ebuild b/app-i18n/nkf/nkf-2.1.4.ebuild
index 2735d8fc373..313a6e04ac4 100644
--- a/app-i18n/nkf/nkf-2.1.4.ebuild
+++ b/app-i18n/nkf/nkf-2.1.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/64158/${P}.tar.gz
LICENSE="ZLIB python? ( BSD )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-macos"
IUSE="perl python l10n_ja"
src_prepare() {
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 b0676279def..4707761315a 100644
--- a/app-i18n/unicode-data/unicode-data-12.0.0.ebuild
+++ b/app-i18n/unicode-data/unicode-data-12.0.0.ebuild
@@ -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 ~sh 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-12.1.0.ebuild b/app-i18n/unicode-data/unicode-data-12.1.0.ebuild
index b4b5023a986..77cce03aea3 100644
--- a/app-i18n/unicode-data/unicode-data-12.1.0.ebuild
+++ b/app-i18n/unicode-data/unicode-data-12.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://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 ~sh ~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.0.2g_p8.ebuild b/app-misc/c_rehash/c_rehash-1.0.2g_p8.ebuild
index c88fab85442..9565baaf5d8 100644
--- a/app-misc/c_rehash/c_rehash-1.0.2g_p8.ebuild
+++ b/app-misc/c_rehash/c_rehash-1.0.2g_p8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/pld-linux/openssl/archive/auto/th/${MY_P}.tar.gz"
LICENSE="openssl"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="libressl"
RDEPEND="
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 8ad71bfdefb..9bf47c373b5 100644
--- a/app-misc/c_rehash/c_rehash-1.7-r1.ebuild
+++ b/app-misc/c_rehash/c_rehash-1.7-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssl/openssl-c
LICENSE="openssl"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND="!<dev-libs/openssl-1.0.2d-r1:0"
diff --git a/app-misc/ca-certificates/ca-certificates-20190110.3.43.ebuild b/app-misc/ca-certificates/ca-certificates-20190110.3.43.ebuild
index 871207e9ae7..ca27eb293ec 100644
--- a/app-misc/ca-certificates/ca-certificates-20190110.3.43.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20190110.3.43.ebuild
@@ -59,7 +59,7 @@ fi
LICENSE="MPL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
${PRECOMPILED} || IUSE+=" cacert"
diff --git a/app-misc/datefudge/datefudge-1.22.ebuild b/app-misc/datefudge/datefudge-1.22.ebuild
index c345111b5e3..351c742a2cf 100644
--- a/app-misc/datefudge/datefudge-1.22.ebuild
+++ b/app-misc/datefudge/datefudge-1.22.ebuild
@@ -10,7 +10,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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
PATCHES=()
diff --git a/app-misc/devtodo/devtodo-0.1.20-r3.ebuild b/app-misc/devtodo/devtodo-0.1.20-r3.ebuild
index dc014e5380c..49576ad3044 100644
--- a/app-misc/devtodo/devtodo-0.1.20-r3.ebuild
+++ b/app-misc/devtodo/devtodo-0.1.20-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://swapoff.org/files/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
RDEPEND="
diff --git a/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild b/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild
index e2281c0899a..2fc32a18551 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
S="${WORKDIR}"
diff --git a/app-misc/evtest/evtest-1.33.ebuild b/app-misc/evtest/evtest-1.33.ebuild
index e282a07359a..f21bef0d01c 100644
--- a/app-misc/evtest/evtest-1.33.ebuild
+++ b/app-misc/evtest/evtest-1.33.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://cgit.freedesktop.org/evtest/snapshot/${PN}-${P}.tar.gz -> ${P}.
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
BDEPEND="virtual/pkgconfig"
diff --git a/app-misc/evtest/evtest-1.34.ebuild b/app-misc/evtest/evtest-1.34.ebuild
index f3cc4c44480..7bb2f5d466e 100644
--- a/app-misc/evtest/evtest-1.34.ebuild
+++ b/app-misc/evtest/evtest-1.34.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://cgit.freedesktop.org/evtest/snapshot/${PN}-${P}.tar.gz -> ${P}.
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
BDEPEND="virtual/pkgconfig"
diff --git a/app-misc/lockfile-progs/lockfile-progs-0.1.17.ebuild b/app-misc/lockfile-progs/lockfile-progs-0.1.17.ebuild
index 2fb294180f2..72d14a1b517 100644
--- a/app-misc/lockfile-progs/lockfile-progs-0.1.17.ebuild
+++ b/app-misc/lockfile-progs/lockfile-progs-0.1.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${PV}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ~s390 ~sh sparc x86"
+KEYWORDS="amd64 arm ~mips ppc ~s390 sparc x86"
IUSE=""
DEPEND="net-libs/liblockfile"
diff --git a/app-misc/mc/mc-4.8.24.ebuild b/app-misc/mc/mc-4.8.24.ebuild
index e83ca9c98d3..4560e5806f3 100644
--- a/app-misc/mc/mc-4.8.24.ebuild
+++ b/app-misc/mc/mc-4.8.24.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
IUSE="+edit gpm nls samba sftp +slang spell test unicode X +xdg"
REQUIRED_USE="spell? ( edit )"
diff --git a/app-misc/mc/mc-9999.ebuild b/app-misc/mc/mc-9999.ebuild
index 8366ea02b85..35e12355b85 100644
--- a/app-misc/mc/mc-9999.ebuild
+++ b/app-misc/mc/mc-9999.ebuild
@@ -15,7 +15,7 @@ MY_P=${P/_/-}
if [[ -z ${LIVE_EBUILD} ]]; then
SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
fi
DESCRIPTION="GNU Midnight Commander is a text based file manager"
diff --git a/app-misc/media-player-info/media-player-info-23.ebuild b/app-misc/media-player-info/media-player-info-23.ebuild
index 61e2ce19cd6..a55c9acc30b 100644
--- a/app-misc/media-player-info/media-player-info-23.ebuild
+++ b/app-misc/media-player-info/media-player-info-23.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
IUSE=""
# https://cgit.freedesktop.org/media-player-info/commit/?id=d83dd01a0a1df6198ee08954da1c033b88a1004b
diff --git a/app-misc/mime-types/mime-types-9.ebuild b/app-misc/mime-types/mime-types-9.ebuild
index dfc9e6ef5e3..742f2404e7e 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=""
diff --git a/app-misc/pax-utils/pax-utils-1.2.4-r1.ebuild b/app-misc/pax-utils/pax-utils-1.2.4-r1.ebuild
index 66b213c14c4..cc472149fb3 100644
--- a/app-misc/pax-utils/pax-utils-1.2.4-r1.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.2.4-r1.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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="caps debug python seccomp"
RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
diff --git a/app-misc/pax-utils/pax-utils-1.2.5.ebuild b/app-misc/pax-utils/pax-utils-1.2.5.ebuild
index 61099c97e0e..f6026808680 100644
--- a/app-misc/pax-utils/pax-utils-1.2.5.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.2.5.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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="caps debug python seccomp"
RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
diff --git a/app-misc/realpath/realpath-1.17.ebuild b/app-misc/realpath/realpath-1.17.ebuild
index d156d6f274e..a5a8553f33e 100644
--- a/app-misc/realpath/realpath-1.17.ebuild
+++ b/app-misc/realpath/realpath-1.17.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="nls"
RDEPEND="!sys-freebsd/freebsd-bin
diff --git a/app-misc/realpath/realpath-1.18.ebuild b/app-misc/realpath/realpath-1.18.ebuild
index 34ce163c9a3..b697b59c3a4 100644
--- a/app-misc/realpath/realpath-1.18.ebuild
+++ b/app-misc/realpath/realpath-1.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="nls"
RDEPEND="
diff --git a/app-misc/screen/screen-4.6.1.ebuild b/app-misc/screen/screen-4.6.1.ebuild
index ba249d7955c..00e1892a798 100644
--- a/app-misc/screen/screen-4.6.1.ebuild
+++ b/app-misc/screen/screen-4.6.1.ebuild
@@ -13,7 +13,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 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
else
EGIT_REPO_URI="git://git.savannah.gnu.org/screen.git"
EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on
diff --git a/app-misc/screen/screen-4.6.2-r1.ebuild b/app-misc/screen/screen-4.6.2-r1.ebuild
index d7aa2d42548..78ad3a3ee13 100644
--- a/app-misc/screen/screen-4.6.2-r1.ebuild
+++ b/app-misc/screen/screen-4.6.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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.7.0.ebuild b/app-misc/screen/screen-4.7.0.ebuild
index ed3b4f141d5..1733c678f32 100644
--- a/app-misc/screen/screen-4.7.0.ebuild
+++ b/app-misc/screen/screen-4.7.0.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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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.ebuild b/app-misc/screen/screen-4.8.0.ebuild
index 46dcafe98e1..d1ff2cd8003 100644
--- a/app-misc/screen/screen-4.8.0.ebuild
+++ b/app-misc/screen/screen-4.8.0.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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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-9999.ebuild b/app-misc/screen/screen-9999.ebuild
index aa12bdddbbb..f1d31c30f53 100644
--- a/app-misc/screen/screen-9999.ebuild
+++ b/app-misc/screen/screen-9999.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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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-2.9a.ebuild b/app-misc/tmux/tmux-2.9a.ebuild
index d311f73111b..2707e29486b 100644
--- a/app-misc/tmux/tmux-2.9a.ebuild
+++ b/app-misc/tmux/tmux-2.9a.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 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
S="${WORKDIR}/${P/_/-}"
fi
diff --git a/app-misc/tmux/tmux-3.0a.ebuild b/app-misc/tmux/tmux-3.0a.ebuild
index 2d07251c2cd..4c2b37a6aab 100644
--- a/app-misc/tmux/tmux-3.0a.ebuild
+++ b/app-misc/tmux/tmux-3.0a.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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="https://github.com/tmux/tmux/releases/download/${PV}/${P/_/-}.tar.gz"
[[ "${PV}" == *_rc* ]] || \
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
S="${WORKDIR}/${P/_/-}"
fi
diff --git a/app-misc/tmux/tmux-9999.ebuild b/app-misc/tmux/tmux-9999.ebuild
index 350d8121d21..9b59adfc622 100644
--- a/app-misc/tmux/tmux-9999.ebuild
+++ b/app-misc/tmux/tmux-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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="https://github.com/tmux/tmux/releases/download/$(ver_cut 1-2)/${P/_/-}.tar.gz"
[[ "${PV}" == *_rc* ]] || \
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 8cd128d2503..4816396a044 100644
--- a/app-misc/zisofs-tools/zisofs-tools-1.0.8.ebuild
+++ b/app-misc/zisofs-tools/zisofs-tools-1.0.8.ebuild
@@ -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 sh 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/demerge/demerge-0.047-r3.ebuild b/app-portage/demerge/demerge-0.047-r3.ebuild
index cfcc30cb01d..acd6ace3871 100644
--- a/app-portage/demerge/demerge-0.047-r3.ebuild
+++ b/app-portage/demerge/demerge-0.047-r3.ebuild
@@ -8,7 +8,7 @@ SRC_URI="http://download.mpsna.de/opensource/demerge/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ppc ~ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ia64 ppc ~ppc64 sparc x86"
IUSE=""
DEPEND="dev-lang/perl
diff --git a/app-portage/eix/eix-0.33.9-r1.ebuild b/app-portage/eix/eix-0.33.9-r1.ebuild
index ca0dba09d33..d081ff42fe3 100644
--- a/app-portage/eix/eix-0.33.9-r1.ebuild
+++ b/app-portage/eix/eix-0.33.9-r1.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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug doc nls sqlite"
BOTHDEPEND="nls? ( virtual/libintl )
diff --git a/app-portage/elt-patches/elt-patches-20170317.ebuild b/app-portage/elt-patches/elt-patches-20170317.ebuild
index fcaf698769c..fd57faab13b 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 da5a31790d9..15f3f2b8748 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 eecac5fc6f1..b7b7416ba99 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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-20170826.1.ebuild b/app-portage/elt-patches/elt-patches-20170826.1.ebuild
index c5db7595bcc..98f318e07e4 100644
--- a/app-portage/elt-patches/elt-patches-20170826.1.ebuild
+++ b/app-portage/elt-patches/elt-patches-20170826.1.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 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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-r2.ebuild b/app-portage/esearch/esearch-1.3-r2.ebuild
index ec4868bfb1b..1a3d974ded0 100644
--- a/app-portage/esearch/esearch-1.3-r2.ebuild
+++ b/app-portage/esearch/esearch-1.3-r2.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
SLOT="0"
IUSE="l10n_fr l10n_it"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
DEPEND="sys-apps/portage"
RDEPEND="${DEPEND}"
diff --git a/app-portage/g-cpan/g-cpan-0.16.5.ebuild b/app-portage/g-cpan/g-cpan-0.16.5.ebuild
index 2d33871b862..869a51fab0f 100644
--- a/app-portage/g-cpan/g-cpan-0.16.5.ebuild
+++ b/app-portage/g-cpan/g-cpan-0.16.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz
LICENSE="|| ( Artistic GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
DEPEND="dev-lang/perl
diff --git a/app-portage/g-cpan/g-cpan-0.16.6.ebuild b/app-portage/g-cpan/g-cpan-0.16.6.ebuild
index 876c6180f0f..ea01a673c5c 100644
--- a/app-portage/g-cpan/g-cpan-0.16.6.ebuild
+++ b/app-portage/g-cpan/g-cpan-0.16.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
SRC_URI=""
else
SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
fi
DESCRIPTION="g-cpan: generate and install CPAN modules using portage"
diff --git a/app-portage/g-cpan/g-cpan-0.16.7.ebuild b/app-portage/g-cpan/g-cpan-0.16.7.ebuild
index c8552409d5f..08fa0acb5fb 100644
--- a/app-portage/g-cpan/g-cpan-0.16.7.ebuild
+++ b/app-portage/g-cpan/g-cpan-0.16.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
SRC_URI=""
else
SRC_URI="https://github.com/gentoo-perl/g-cpan/releases/download/v${PV}/${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
fi
DESCRIPTION="Autogenerate and install ebuilds for CPAN modules"
diff --git a/app-portage/g-cpan/g-cpan-0.16.9-r1.ebuild b/app-portage/g-cpan/g-cpan-0.16.9-r1.ebuild
index 97bac08d329..9565dc0c587 100644
--- a/app-portage/g-cpan/g-cpan-0.16.9-r1.ebuild
+++ b/app-portage/g-cpan/g-cpan-0.16.9-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
SRC_URI=""
else
SRC_URI="https://github.com/gentoo-perl/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+ KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
fi
DESCRIPTION="Autogenerate and install ebuilds for CPAN modules"
diff --git a/app-portage/g-cpan/g-cpan-9999.ebuild b/app-portage/g-cpan/g-cpan-9999.ebuild
index fdd2d32c286..5fad97abc0e 100644
--- a/app-portage/g-cpan/g-cpan-9999.ebuild
+++ b/app-portage/g-cpan/g-cpan-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
SRC_URI=""
else
SRC_URI="https://github.com/gentoo-perl/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
fi
DESCRIPTION="Autogenerate and install ebuilds for CPAN modules"
diff --git a/app-portage/gemato/gemato-14.3.ebuild b/app-portage/gemato/gemato-14.3.ebuild
index 7903d882e70..745fd857b1d 100644
--- a/app-portage/gemato/gemato-14.3.ebuild
+++ b/app-portage/gemato/gemato-14.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 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"
IUSE="+blake2 bzip2 +gpg lzma sha3 tools"
RDEPEND="
diff --git a/app-portage/genlop/genlop-0.30.10-r1.ebuild b/app-portage/genlop/genlop-0.30.10-r1.ebuild
index 07c073cc888..fb97cdbd841 100644
--- a/app-portage/genlop/genlop-0.30.10-r1.ebuild
+++ b/app-portage/genlop/genlop-0.30.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-solaris"
IUSE=""
DEPEND="dev-lang/perl
diff --git a/app-portage/genlop/genlop-0.30.10-r2.ebuild b/app-portage/genlop/genlop-0.30.10-r2.ebuild
index 7db93fb7ad0..e6ac19fafb6 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 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-solaris"
IUSE=""
DEPEND="dev-lang/perl
diff --git a/app-portage/genlop/genlop-0.30.9-r1.ebuild b/app-portage/genlop/genlop-0.30.9-r1.ebuild
index 0121d8a678a..bacc3a81a2c 100644
--- a/app-portage/genlop/genlop-0.30.9-r1.ebuild
+++ b/app-portage/genlop/genlop-0.30.9-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo//${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE=""
DEPEND="dev-lang/perl
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.6.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.6.ebuild
index 46a21780e94..6d63072f6be 100644
--- a/app-portage/gentoolkit/gentoolkit-0.4.6.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.4.6.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
SLOT="0"
IUSE=""
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND="
sys-apps/portage[${PYTHON_USEDEP}]"
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.7.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.7.ebuild
index e4162f13322..34ae357f65d 100644
--- a/app-portage/gentoolkit/gentoolkit-0.4.7.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.4.7.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
SLOT="0"
IUSE=""
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND="
sys-apps/portage[${PYTHON_USEDEP}]"
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.8.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.8.ebuild
index e4162f13322..34ae357f65d 100644
--- a/app-portage/gentoolkit/gentoolkit-0.4.8.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.4.8.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
SLOT="0"
IUSE=""
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND="
sys-apps/portage[${PYTHON_USEDEP}]"
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.3.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.3.ebuild
index 9558fdd285e..0c7a0e344be 100644
--- a/app-portage/mirrorselect/mirrorselect-2.2.3.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-2.2.3.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-2"
SLOT="0"
IUSE=""
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
RDEPEND="
dev-util/dialog
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.4-r1.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.4-r1.ebuild
index bfbde93a084..1d1f69c96d2 100644
--- a/app-portage/mirrorselect/mirrorselect-2.2.4-r1.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-2.2.4-r1.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-2"
SLOT="0"
IUSE=""
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc ~x86"
RDEPEND="
dev-util/dialog
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.6-r1.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.6-r1.ebuild
index 38b3bb9d9f5..79815ece5cf 100644
--- a/app-portage/mirrorselect/mirrorselect-2.2.6-r1.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-2.2.6-r1.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-2"
SLOT="0"
IUSE="ipv6"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
RDEPEND="
dev-util/dialog
diff --git a/app-portage/portage-utils/portage-utils-0.74.ebuild b/app-portage/portage-utils/portage-utils-0.74.ebuild
index fb7c0283313..e920041c89b 100644
--- a/app-portage/portage-utils/portage-utils-0.74.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.74.ebuild
@@ -12,7 +12,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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="nls static"
RDEPEND="dev-libs/iniparser:0"
diff --git a/app-portage/portage-utils/portage-utils-0.80.ebuild b/app-portage/portage-utils/portage-utils-0.80.ebuild
index bd869d8d1f0..700c17783db 100644
--- a/app-portage/portage-utils/portage-utils-0.80.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.80.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git"
else
SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
RDEPEND="
diff --git a/app-portage/portage-utils/portage-utils-0.86.ebuild b/app-portage/portage-utils/portage-utils-0.86.ebuild
index d1e5d7ff75f..30461bad45e 100644
--- a/app-portage/portage-utils/portage-utils-0.86.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.86.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git"
else
SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
RDEPEND="
diff --git a/app-portage/portage-utils/portage-utils-9999.ebuild b/app-portage/portage-utils/portage-utils-9999.ebuild
index 16f7d2ac659..aa5f157c1b9 100644
--- a/app-portage/portage-utils/portage-utils-9999.ebuild
+++ b/app-portage/portage-utils/portage-utils-9999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git"
else
SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
RDEPEND="
diff --git a/app-portage/repoman/repoman-2.3.16.ebuild b/app-portage/repoman/repoman-2.3.16.ebuild
index 5257354e7c8..f5892762baa 100644
--- a/app-portage/repoman/repoman-2.3.16.ebuild
+++ b/app-portage/repoman/repoman-2.3.16.ebuild
@@ -14,7 +14,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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
diff --git a/app-portage/repoman/repoman-2.3.20.ebuild b/app-portage/repoman/repoman-2.3.20.ebuild
index 7308d367e69..65c4f7d4eb1 100644
--- a/app-portage/repoman/repoman-2.3.20.ebuild
+++ b/app-portage/repoman/repoman-2.3.20.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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
diff --git a/app-portage/repoman/repoman-2.3.21.ebuild b/app-portage/repoman/repoman-2.3.21.ebuild
index 00c74119bc3..43a2b3082a4 100644
--- a/app-portage/repoman/repoman-2.3.21.ebuild
+++ b/app-portage/repoman/repoman-2.3.21.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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
diff --git a/app-portage/repoman/repoman-2.3.22.ebuild b/app-portage/repoman/repoman-2.3.22.ebuild
index 00c74119bc3..43a2b3082a4 100644
--- a/app-portage/repoman/repoman-2.3.22.ebuild
+++ b/app-portage/repoman/repoman-2.3.22.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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
diff --git a/app-portage/repoman/repoman-9999.ebuild b/app-portage/repoman/repoman-9999.ebuild
index bf3bbc925f1..ac8c1532d0e 100644
--- a/app-portage/repoman/repoman-9999.ebuild
+++ b/app-portage/repoman/repoman-9999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
S="${WORKDIR}/${P}/repoman"
else
SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/${P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
diff --git a/app-portage/ufed/ufed-0.94.ebuild b/app-portage/ufed/ufed-0.94.ebuild
index 867d502350c..09561205eaa 100644
--- a/app-portage/ufed/ufed-0.94.ebuild
+++ b/app-portage/ufed/ufed-0.94.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/ufed.git"
else
SRC_URI="https://gitweb.gentoo.org/proj/ufed.git/snapshot/${P}.tar.bz2"
- KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh 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
inherit autotools out-of-source
diff --git a/app-portage/ufed/ufed-0.95.ebuild b/app-portage/ufed/ufed-0.95.ebuild
index 62eb8a49ad5..7b1d8fd7fad 100644
--- a/app-portage/ufed/ufed-0.95.ebuild
+++ b/app-portage/ufed/ufed-0.95.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/ufed.git"
else
SRC_URI="https://gitweb.gentoo.org/proj/ufed.git/snapshot/${P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~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
inherit autotools out-of-source
diff --git a/app-portage/ufed/ufed-9999.ebuild b/app-portage/ufed/ufed-9999.ebuild
index e076a131b1d..ecf6d270bd5 100644
--- a/app-portage/ufed/ufed-9999.ebuild
+++ b/app-portage/ufed/ufed-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/ufed.git"
else
SRC_URI="https://gitweb.gentoo.org/proj/ufed.git/snapshot/${P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
fi
inherit autotools out-of-source
diff --git a/app-shells/bash-completion/bash-completion-2.10.ebuild b/app-shells/bash-completion/bash-completion-2.10.ebuild
index b7f92eb8702..4590260fcee 100644
--- a/app-shells/bash-completion/bash-completion-2.10.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.10.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
IUSE="+eselect test"
RESTRICT="test"
diff --git a/app-shells/bash-completion/bash-completion-2.9-r1.ebuild b/app-shells/bash-completion/bash-completion-2.9-r1.ebuild
index 0be4bfcf37f..6d55006c9f7 100644
--- a/app-shells/bash-completion/bash-completion-2.9-r1.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.9-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
IUSE="+eselect test"
RESTRICT="test"
diff --git a/app-shells/bash/bash-2.05b_p13.ebuild b/app-shells/bash/bash-2.05b_p13.ebuild
index 82c731d649f..acd029e8f3a 100644
--- a/app-shells/bash/bash-2.05b_p13.ebuild
+++ b/app-shells/bash/bash-2.05b_p13.ebuild
@@ -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 sh 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 d668b9488b6..2d124ef9052 100644
--- a/app-shells/bash/bash-3.0_p22.ebuild
+++ b/app-shells/bash/bash-3.0_p22.ebuild
@@ -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 sh 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 4b36d515967..d64b5e08e35 100644
--- a/app-shells/bash/bash-3.1_p23.ebuild
+++ b/app-shells/bash/bash-3.1_p23.ebuild
@@ -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 sh 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 9a282724c02..49481dcc5fc 100644
--- a/app-shells/bash/bash-3.2_p57.ebuild
+++ b/app-shells/bash/bash-3.2_p57.ebuild
@@ -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 sh 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 5f9de7a05e4..c900aafa2ba 100644
--- a/app-shells/bash/bash-4.0_p44.ebuild
+++ b/app-shells/bash/bash-4.0_p44.ebuild
@@ -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 sh 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 e420136d4d5..f8993613b29 100644
--- a/app-shells/bash/bash-4.1_p17.ebuild
+++ b/app-shells/bash/bash-4.1_p17.ebuild
@@ -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 sh 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 b0332823540..d4ac0a9827a 100644
--- a/app-shells/bash/bash-4.2_p53.ebuild
+++ b/app-shells/bash/bash-4.2_p53.ebuild
@@ -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 sh 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 9554bd27ba5..30aca4b0dae 100644
--- a/app-shells/bash/bash-4.3_p48-r2.ebuild
+++ b/app-shells/bash/bash-4.3_p48-r2.ebuild
@@ -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 sh 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-r1.ebuild b/app-shells/bash/bash-4.4_p23-r1.ebuild
index 867a266dbcd..f450ee69853 100644
--- a/app-shells/bash/bash-4.4_p23-r1.ebuild
+++ b/app-shells/bash/bash-4.4_p23-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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
DEPEND="
diff --git a/app-shells/bash/bash-5.0_p11.ebuild b/app-shells/bash/bash-5.0_p11.ebuild
index bdce76098cb..1cb910d9157 100644
--- a/app-shells/bash/bash-5.0_p11.ebuild
+++ b/app-shells/bash/bash-5.0_p11.ebuild
@@ -46,7 +46,7 @@ fi
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
DEPEND="
diff --git a/app-shells/bash/bash-5.0_p16.ebuild b/app-shells/bash/bash-5.0_p16.ebuild
index bdce76098cb..1cb910d9157 100644
--- a/app-shells/bash/bash-5.0_p16.ebuild
+++ b/app-shells/bash/bash-5.0_p16.ebuild
@@ -46,7 +46,7 @@ fi
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
DEPEND="
diff --git a/app-shells/dash/dash-0.5.10.1-r2.ebuild b/app-shells/dash/dash-0.5.10.1-r2.ebuild
index 09d6f32c73f..16020298e80 100644
--- a/app-shells/dash/dash-0.5.10.1-r2.ebuild
+++ b/app-shells/dash/dash-0.5.10.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -19,7 +19,7 @@ fi
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="libedit static vanilla"
RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )"
diff --git a/app-shells/dash/dash-0.5.10.2-r1.ebuild b/app-shells/dash/dash-0.5.10.2-r1.ebuild
index 877c0771557..f04c97dff90 100644
--- a/app-shells/dash/dash-0.5.10.2-r1.ebuild
+++ b/app-shells/dash/dash-0.5.10.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://gondor.apana.org.au/~herbert/dash/files/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="libedit static"
BDEPEND="virtual/pkgconfig"
diff --git a/app-shells/dash/dash-0.5.10.2.ebuild b/app-shells/dash/dash-0.5.10.2.ebuild
index 4935f47043a..4610e631867 100644
--- a/app-shells/dash/dash-0.5.10.2.ebuild
+++ b/app-shells/dash/dash-0.5.10.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -19,7 +19,7 @@ fi
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="libedit static vanilla"
RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )"
diff --git a/app-shells/dash/dash-0.5.9.1-r3.ebuild b/app-shells/dash/dash-0.5.9.1-r3.ebuild
index 3bb8502baaa..dd60e4a8048 100644
--- a/app-shells/dash/dash-0.5.9.1-r3.ebuild
+++ b/app-shells/dash/dash-0.5.9.1-r3.ebuild
@@ -19,7 +19,7 @@ fi
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="libedit static vanilla"
RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )"
diff --git a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20180302.ebuild b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20180302.ebuild
index fe0d3af5665..73aeba023a6 100644
--- a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20180302.ebuild
+++ b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20180302.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
IUSE=""
src_install() {
diff --git a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20190211.ebuild b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20190211.ebuild
index 6d55f70fdeb..8a686b16031 100644
--- a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20190211.ebuild
+++ b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20190211.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
src_install() {
emake DESTDIR="${D}" install \
diff --git a/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20180228.ebuild b/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20180228.ebuild
index 0f79d7908bf..c35409e2ff1 100644
--- a/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20180228.ebuild
+++ b/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20180228.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]] ; then
EGIT_REPO_URI="https://github.com/gentoo/gentoo-zsh-completions.git"
else
SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
fi
DESCRIPTION="Gentoo specific zsh completion support (includes emerge and ebuild commands)"
diff --git a/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-99999999.ebuild b/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-99999999.ebuild
index 8d75cc2beaf..b18c4680afb 100644
--- a/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-99999999.ebuild
+++ b/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-99999999.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]] ; then
EGIT_REPO_URI="https://github.com/gentoo/gentoo-zsh-completions.git"
else
SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
+ KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
fi
DESCRIPTION="Gentoo specific zsh completion support (includes emerge and ebuild commands)"
diff --git a/app-shells/mksh/mksh-57-r2.ebuild b/app-shells/mksh/mksh-57-r2.ebuild
index f828053fb85..de7b1c4037a 100644
--- a/app-shells/mksh/mksh-57-r2.ebuild
+++ b/app-shells/mksh/mksh-57-r2.ebuild
@@ -14,7 +14,7 @@ if [[ $PV = 9999 ]]; then
KEYWORDS="amd64 arm ppc ppc64 sparc x86"
else
SRC_URI="https://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
- KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~sh sparc x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
fi
DESCRIPTION="MirBSD Korn Shell"
diff --git a/app-shells/mksh/mksh-9999.ebuild b/app-shells/mksh/mksh-9999.ebuild
index ff84abaff24..39f20f3921c 100644
--- a/app-shells/mksh/mksh-9999.ebuild
+++ b/app-shells/mksh/mksh-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ if [[ $PV = 9999 ]]; then
KEYWORDS=""
else
SRC_URI="https://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
fi
DESCRIPTION="MirBSD Korn Shell"
diff --git a/app-shells/push/push-2.0-r1.ebuild b/app-shells/push/push-2.0-r1.ebuild
index 02beb3e3b74..16f643e0fce 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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
IUSE=""
src_install() {
diff --git a/app-shells/quoter/quoter-3.0_p2-r1.ebuild b/app-shells/quoter/quoter-3.0_p2-r1.ebuild
index 4c8b9a03f92..f95ed146433 100644
--- a/app-shells/quoter/quoter-3.0_p2-r1.ebuild
+++ b/app-shells/quoter/quoter-3.0_p2-r1.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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
src_configure() {
tc-export CC
diff --git a/app-shells/sash/sash-3.8.ebuild b/app-shells/sash/sash-3.8.ebuild
index c9e88e0c3df..c3694898b71 100644
--- a/app-shells/sash/sash-3.8.ebuild
+++ b/app-shells/sash/sash-3.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.canb.auug.org.au/~dbell/programs/${P}.tar.gz"
LICENSE="sash"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="static"
DEPEND="
diff --git a/app-shells/tcsh/tcsh-6.20.00.ebuild b/app-shells/tcsh/tcsh-6.20.00.ebuild
index d02c0a5fa38..840ee34ea23 100644
--- a/app-shells/tcsh/tcsh-6.20.00.ebuild
+++ b/app-shells/tcsh/tcsh-6.20.00.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="nls doc"
RESTRICT="test"
diff --git a/app-shells/tcsh/tcsh-6.21.00-r1.ebuild b/app-shells/tcsh/tcsh-6.21.00-r1.ebuild
index 8adadc2e6cc..98eb5f00250 100644
--- a/app-shells/tcsh/tcsh-6.21.00-r1.ebuild
+++ b/app-shells/tcsh/tcsh-6.21.00-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="nls doc"
RESTRICT="test"
diff --git a/app-shells/zsh/zsh-5.8.ebuild b/app-shells/zsh/zsh-5.8.ebuild
index 38bb5002a8f..6f9bd72d01f 100644
--- a/app-shells/zsh/zsh-5.8.ebuild
+++ b/app-shells/zsh/zsh-5.8.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]] ; then
inherit git-r3
EGIT_REPO_URI="https://git.code.sf.net/p/zsh/code"
else
- KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SRC_URI="https://www.zsh.org/pub/${P}.tar.xz
https://www.zsh.org/pub/old/${P}.tar.xz
mirror://sourceforge/${PN}/${P}.tar.xz
diff --git a/app-shells/zsh/zsh-9999.ebuild b/app-shells/zsh/zsh-9999.ebuild
index 503a4d64a9e..05ebb94bf2e 100644
--- a/app-shells/zsh/zsh-9999.ebuild
+++ b/app-shells/zsh/zsh-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]] ; then
inherit git-r3
EGIT_REPO_URI="https://git.code.sf.net/p/zsh/code"
else
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SRC_URI="https://www.zsh.org/pub/${P}.tar.xz
https://www.zsh.org/pub/old/${P}.tar.xz
mirror://sourceforge/${PN}/${P}.tar.xz
diff --git a/app-text/a2ps/a2ps-4.14-r6.ebuild b/app-text/a2ps/a2ps-4.14-r6.ebuild
index c8d8627a3fb..4ee83a5be66 100644
--- a/app-text/a2ps/a2ps-4.14-r6.ebuild
+++ b/app-text/a2ps/a2ps-4.14-r6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="cjk emacs latex nls static-libs userland_BSD userland_GNU vanilla"
RESTRICT=test
diff --git a/app-text/asciidoc/asciidoc-8.6.10_p20181016-r1.ebuild b/app-text/asciidoc/asciidoc-8.6.10_p20181016-r1.ebuild
index efbd0590a06..6d265ef7636 100644
--- a/app-text/asciidoc/asciidoc-8.6.10_p20181016-r1.ebuild
+++ b/app-text/asciidoc/asciidoc-8.6.10_p20181016-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A plain text human readable/writable document format"
HOMEPAGE="http://asciidoc.org/ https://github.com/asciidoc/asciidoc-py3/"
MY_COMMIT="618f6e6f6b558ed1e5f2588cd60a5a6b4f881ca0"
SRC_URI="https://github.com/${PN}/${PN}-py3/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
LICENSE="GPL-2"
SLOT="0"
diff --git a/app-text/asciidoc/asciidoc-9.0.0_rc1.ebuild b/app-text/asciidoc/asciidoc-9.0.0_rc1.ebuild
index 1b8ec0e44bf..ea4593547f4 100644
--- a/app-text/asciidoc/asciidoc-9.0.0_rc1.ebuild
+++ b/app-text/asciidoc/asciidoc-9.0.0_rc1.ebuild
@@ -10,7 +10,7 @@ inherit autotools eutils python-single-r1 readme.gentoo-r1
DESCRIPTION="A plain text human readable/writable document format"
HOMEPAGE="http://asciidoc.org/ https://github.com/asciidoc/asciidoc-py3/"
SRC_URI="https://github.com/${PN}/${PN}-py3/archive/9.0.0rc1.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
LICENSE="GPL-2"
SLOT="0"
diff --git a/app-text/aspell/aspell-0.60.8.ebuild b/app-text/aspell/aspell-0.60.8.ebuild
index 574877c3e70..ab7922be71d 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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="nls unicode"
PDEPEND="app-dicts/aspell-en"
diff --git a/app-text/bdf2psf/bdf2psf-1.104.ebuild b/app-text/bdf2psf/bdf2psf-1.104.ebuild
index 2967a819854..279dd8ff28d 100644
--- a/app-text/bdf2psf/bdf2psf-1.104.ebuild
+++ b/app-text/bdf2psf/bdf2psf-1.104.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://debian/pool/main/c/console-setup/console-setup_${PV}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
DEPEND=""
diff --git a/app-text/bdf2psf/bdf2psf-1.155.ebuild b/app-text/bdf2psf/bdf2psf-1.155.ebuild
index f0e61fad5df..96a51f59dd1 100644
--- a/app-text/bdf2psf/bdf2psf-1.155.ebuild
+++ b/app-text/bdf2psf/bdf2psf-1.155.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://debian/pool/main/c/console-setup/console-setup_${PV}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
DEPEND=""
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 caf0c3de402..8b150c59eb8 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="|| ( sys-apps/util-linux app-misc/getopt )
diff --git a/app-text/delta/delta-20060803-r1.ebuild b/app-text/delta/delta-20060803-r1.ebuild
index ef32cd107c2..5c317d2b6ed 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 sh sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
IUSE=""
DEPEND="dev-lang/perl"
diff --git a/app-text/djvu/djvu-3.5.27-r1.ebuild b/app-text/djvu/djvu-3.5.27-r1.ebuild
index c4490945b7c..2df213efbbf 100644
--- a/app-text/djvu/djvu-3.5.27-r1.ebuild
+++ b/app-text/djvu/djvu-3.5.27-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://downloads.sourceforge.net/djvu/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh 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="debug doc jpeg tiff xml"
PATCHES=( "${FILESDIR}"/fix-CVE-2019-18804.patch )
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 6b19112deec..ce1f5100f4b 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 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 ~x86-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 b69fa8f0543..4b927063e61 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 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 ~x86-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 b69fa8f0543..4b927063e61 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 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 ~x86-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 b69fa8f0543..4b927063e61 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 ~x86-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 b69fa8f0543..4b927063e61 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 ~x86-macos ~sparc-solaris ~x64-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 32c3117aed4..a7ac86f9513 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 ~x86-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 0def1fedbbe..de506bc5624 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 ~x86-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 145ec104e96..2e948292efd 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 ~x86-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 975af302d34..3e8cd8f026f 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 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 ~x86-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-r3.ebuild b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r3.ebuild
index 70f4774fcfe..ab09525dd86 100644
--- a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r3.ebuild
+++ b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r3.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 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
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 101f0126aeb..7df9a3bd062 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 efe0a9420bc..516da50ee6c 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 efe0a9420bc..516da50ee6c 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 bd9de69531c..6fe1c33f6dd 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 bd9de69531c..6fe1c33f6dd 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 a0b73766c56..fe4a942cd55 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 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~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 876ddef8cab..1b03107b1ae 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 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~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 2ae5c467691..2216185cfd6 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 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~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.78.0.ebuild b/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.78.0.ebuild
index 9200c3ffbfe..0d17462da8a 100644
--- a/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.78.0.ebuild
+++ b/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.78.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm 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 a40eea364f2..bc1b3f70b78 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 bed4292f597..d6d913e5b33 100644
--- a/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild
+++ b/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild
@@ -11,7 +11,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 sh sparc x86 ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~riscv s390 sparc x86 ~x86-linux ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
LICENSE="MIT"
diff --git a/app-text/dos2unix/dos2unix-7.3.5.ebuild b/app-text/dos2unix/dos2unix-7.3.5.ebuild
index aa1c956e98e..58dc06e93d2 100644
--- a/app-text/dos2unix/dos2unix-7.3.5.ebuild
+++ b/app-text/dos2unix/dos2unix-7.3.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
IUSE="debug nls test"
RDEPEND="
diff --git a/app-text/dos2unix/dos2unix-7.4.1.ebuild b/app-text/dos2unix/dos2unix-7.4.1.ebuild
index d57d4c02b28..74ad112aa73 100644
--- a/app-text/dos2unix/dos2unix-7.4.1.ebuild
+++ b/app-text/dos2unix/dos2unix-7.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
IUSE="debug nls test"
RDEPEND="
diff --git a/app-text/dos2unix/dos2unix-7.4.2_beta1.ebuild b/app-text/dos2unix/dos2unix-7.4.2_beta1.ebuild
index 6338a7ec381..21a971f34ce 100644
--- a/app-text/dos2unix/dos2unix-7.4.2_beta1.ebuild
+++ b/app-text/dos2unix/dos2unix-7.4.2_beta1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="BSD-2"
SLOT="0"
[[ "${PV}" == *_beta* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
IUSE="debug nls test"
RDEPEND="
diff --git a/app-text/dvipng/dvipng-1.15-r1.ebuild b/app-text/dvipng/dvipng-1.15-r1.ebuild
index a920fd418f3..d10a741b257 100644
--- a/app-text/dvipng/dvipng-1.15-r1.ebuild
+++ b/app-text/dvipng/dvipng-1.15-r1.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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="truetype test"
RESTRICT="!test? ( test )"
diff --git a/app-text/dvipsk/dvipsk-5.999_p20190410.ebuild b/app-text/dvipsk/dvipsk-5.999_p20190410.ebuild
index 9858e39f860..5a1353aa16b 100644
--- a/app-text/dvipsk/dvipsk-5.999_p20190410.ebuild
+++ b/app-text/dvipsk/dvipsk-5.999_p20190410.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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc source"
DEPEND=">=dev-libs/kpathsea-6.2.1"
diff --git a/app-text/dvisvgm/dvisvgm-2.1.3.ebuild b/app-text/dvisvgm/dvisvgm-2.1.3.ebuild
index 8a726d9a21d..db1d74a8bbc 100644
--- a/app-text/dvisvgm/dvisvgm-2.1.3.ebuild
+++ b/app-text/dvisvgm/dvisvgm-2.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="test"
# Tests don't work from $WORKDIR: kpathsea tries to search in relative
# directories from where the binary is executed.
diff --git a/app-text/dvisvgm/dvisvgm-2.6.1.ebuild b/app-text/dvisvgm/dvisvgm-2.6.1.ebuild
index 72b86f9d9eb..72a976d24bc 100644
--- a/app-text/dvisvgm/dvisvgm-2.6.1.ebuild
+++ b/app-text/dvisvgm/dvisvgm-2.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="test"
# Tests don't work from $WORKDIR: kpathsea tries to search in relative
# directories from where the binary is executed.
diff --git a/app-text/dvisvgm/dvisvgm-2.7.ebuild b/app-text/dvisvgm/dvisvgm-2.7.ebuild
index f127b193134..043fe1d0dbe 100644
--- a/app-text/dvisvgm/dvisvgm-2.7.ebuild
+++ b/app-text/dvisvgm/dvisvgm-2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="test"
# Tests don't work from $WORKDIR: kpathsea tries to search in relative
# directories from where the binary is executed.
diff --git a/app-text/enchant/enchant-1.6.1-r1.ebuild b/app-text/enchant/enchant-1.6.1-r1.ebuild
index 284ca6473b8..402d047f775 100644
--- a/app-text/enchant/enchant-1.6.1-r1.ebuild
+++ b/app-text/enchant/enchant-1.6.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/AbiWord/enchant/releases/download/${PN}-${MY_PV}/${P
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="aspell +hunspell static-libs test"
RESTRICT="!test? ( test )"
diff --git a/app-text/enchant/enchant-2.2.7.ebuild b/app-text/enchant/enchant-2.2.7.ebuild
index e9756f02d23..ffa052358fa 100644
--- a/app-text/enchant/enchant-2.2.7.ebuild
+++ b/app-text/enchant/enchant-2.2.7.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz
LICENSE="LGPL-2.1+"
SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="aspell +hunspell"
REQUIRED_USE="|| ( hunspell aspell )"
diff --git a/app-text/epspdf/epspdf-0.6.0-r1.ebuild b/app-text/epspdf/epspdf-0.6.0-r1.ebuild
index 4fc0c21c278..efeae440fdc 100644
--- a/app-text/epspdf/epspdf-0.6.0-r1.ebuild
+++ b/app-text/epspdf/epspdf-0.6.0-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 hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc tk"
RDEPEND="!<dev-texlive/texlive-pictures-2011-r1
diff --git a/app-text/epspdf/epspdf-0.6.3-r1.ebuild b/app-text/epspdf/epspdf-0.6.3-r1.ebuild
index a4c25c3c9ad..7b1952a9e40 100644
--- a/app-text/epspdf/epspdf-0.6.3-r1.ebuild
+++ b/app-text/epspdf/epspdf-0.6.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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.26.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.26.ebuild
index 2ed247cdde2..a653365a467 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.26.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.26.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
LICENSE="AGPL-3 CPL-1.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh 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/ghostscript-gpl/ghostscript-gpl-9.50.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.50.ebuild
index 67f570317f8..edbbb9a9e7d 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.50.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.50.ebuild
@@ -22,7 +22,7 @@ fi
LICENSE="AGPL-3 CPL-1.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh 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/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild
index 60cfd313fe1..3e250c98d42 100644
--- a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild
+++ b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeDocUtils"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r2.ebuild b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r2.ebuild
index 6918862deac..3c71f93f45f 100644
--- a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r2.ebuild
+++ b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeDocUtils"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-text/highlight/highlight-3.42-r1.ebuild b/app-text/highlight/highlight-3.42-r1.ebuild
index cf8e1f2455c..d327e3f5d5e 100644
--- a/app-text/highlight/highlight-3.42-r1.ebuild
+++ b/app-text/highlight/highlight-3.42-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh 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="examples qt5"
RDEPEND="
diff --git a/app-text/htmltidy/htmltidy-20090325-r2.ebuild b/app-text/htmltidy/htmltidy-20090325-r2.ebuild
index 4d2158e9659..a77ad9fba37 100644
--- a/app-text/htmltidy/htmltidy-20090325-r2.ebuild
+++ b/app-text/htmltidy/htmltidy-20090325-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="debug doc static-libs"
DEPEND="doc? ( app-doc/doxygen )"
diff --git a/app-text/hunspell/hunspell-1.7.0-r1.ebuild b/app-text/hunspell/hunspell-1.7.0-r1.ebuild
index 272ebcc1de9..429b995dbed 100644
--- a/app-text/hunspell/hunspell-1.7.0-r1.ebuild
+++ b/app-text/hunspell/hunspell-1.7.0-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/hunspell"
SLOT="0/$(ver_cut 1-2)"
LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
IUSE="ncurses nls readline static-libs"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
ncurses? ( sys-libs/ncurses:0= )
diff --git a/app-text/iso-codes/iso-codes-4.4.ebuild b/app-text/iso-codes/iso-codes-4.4.ebuild
index 314a26fed20..83e2a1d86f5 100644
--- a/app-text/iso-codes/iso-codes-4.4.ebuild
+++ b/app-text/iso-codes/iso-codes-4.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://salsa.debian.org/${PN}-team/${PN}/-/archive/${P}/${PN}-${P}.tar
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
BDEPEND="${PYTHON_DEPS}
sys-devel/gettext
diff --git a/app-text/jadetex/jadetex-3.13-r8.ebuild b/app-text/jadetex/jadetex-3.13-r8.ebuild
index cc5856fae3c..251b850406d 100644
--- a/app-text/jadetex/jadetex-3.13-r8.ebuild
+++ b/app-text/jadetex/jadetex-3.13-r8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/jadetex/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
RESTRICT="test"
DEPEND=">=app-text/openjade-1.3.1
diff --git a/app-text/lcdf-typetools/lcdf-typetools-2.106.ebuild b/app-text/lcdf-typetools/lcdf-typetools-2.106.ebuild
index 0b4ba648a60..726c17b494a 100644
--- a/app-text/lcdf-typetools/lcdf-typetools-2.106.ebuild
+++ b/app-text/lcdf-typetools/lcdf-typetools-2.106.ebuild
@@ -8,7 +8,7 @@ inherit toolchain-funcs flag-o-matic
DESCRIPTION="Font utilities for eg manipulating OTF"
SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
HOMEPAGE="http://www.lcdf.org/type/#typetools"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
LICENSE="GPL-2"
IUSE="+kpathsea"
diff --git a/app-text/lcdf-typetools/lcdf-typetools-2.107.ebuild b/app-text/lcdf-typetools/lcdf-typetools-2.107.ebuild
index 8e7a134d43b..54e4b30c16d 100644
--- a/app-text/lcdf-typetools/lcdf-typetools-2.107.ebuild
+++ b/app-text/lcdf-typetools/lcdf-typetools-2.107.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -8,7 +8,7 @@ inherit toolchain-funcs flag-o-matic
DESCRIPTION="Font utilities for eg manipulating OTF"
SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
HOMEPAGE="http://www.lcdf.org/type/#typetools"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
LICENSE="GPL-2"
IUSE="+kpathsea"
diff --git a/app-text/lcdf-typetools/lcdf-typetools-2.108.ebuild b/app-text/lcdf-typetools/lcdf-typetools-2.108.ebuild
index c3cb17fb388..54e4b30c16d 100644
--- a/app-text/lcdf-typetools/lcdf-typetools-2.108.ebuild
+++ b/app-text/lcdf-typetools/lcdf-typetools-2.108.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -8,7 +8,7 @@ inherit toolchain-funcs flag-o-matic
DESCRIPTION="Font utilities for eg manipulating OTF"
SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
HOMEPAGE="http://www.lcdf.org/type/#typetools"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
LICENSE="GPL-2"
IUSE="+kpathsea"
diff --git a/app-text/lesspipe/lesspipe-1.83-r1.ebuild b/app-text/lesspipe/lesspipe-1.83-r1.ebuild
index 9664f1de12e..cd9ccf523af 100644
--- a/app-text/lesspipe/lesspipe-1.83-r1.ebuild
+++ b/app-text/lesspipe/lesspipe-1.83-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -9,7 +9,7 @@ SRC_URI="https://www-zeuthen.desy.de/~friebel/unix/less/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="dev-lang/perl"
diff --git a/app-text/lesspipe/lesspipe-1.83.ebuild b/app-text/lesspipe/lesspipe-1.83.ebuild
index 7ef07ab95e0..3e31b8755cb 100644
--- a/app-text/lesspipe/lesspipe-1.83.ebuild
+++ b/app-text/lesspipe/lesspipe-1.83.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -9,7 +9,7 @@ SRC_URI="https://www-zeuthen.desy.de/~friebel/unix/less/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="dev-lang/perl"
diff --git a/app-text/lesspipe/lesspipe-1.84.ebuild b/app-text/lesspipe/lesspipe-1.84.ebuild
index 30ad4194969..6d1b0a34f4c 100644
--- a/app-text/lesspipe/lesspipe-1.84.ebuild
+++ b/app-text/lesspipe/lesspipe-1.84.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/wofr06/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="dev-lang/perl"
diff --git a/app-text/libpaper/libpaper-1.1.24_p5.ebuild b/app-text/libpaper/libpaper-1.1.24_p5.ebuild
index e0a0c079edb..122ec44380a 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 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-text/libpaper/libpaper-1.1.28.ebuild b/app-text/libpaper/libpaper-1.1.28.ebuild
index 54a62d4f557..72c0661922c 100644
--- a/app-text/libpaper/libpaper-1.1.28.ebuild
+++ b/app-text/libpaper/libpaper-1.1.28.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/libp/libpaper/${P/-/_}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DOCS=( README ChangeLog debian/changelog )
diff --git a/app-text/lv/lv-4.51-r4.ebuild b/app-text/lv/lv-4.51-r4.ebuild
index e70e508e42a..590f89d9e79 100644
--- a/app-text/lv/lv-4.51-r4.ebuild
+++ b/app-text/lv/lv-4.51-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ia64 ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
RDEPEND="!app-editors/levee
--git a/app-text/manpager/manpager-1.ebuild b/app-text/manpager/manpager-1.ebuild
index 1b22d1a0fea..7972b34ef63 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 sh 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=""
S=${WORKDIR}
diff --git a/app-text/openjade/openjade-1.3.2-r9.ebuild b/app-text/openjade/openjade-1.3.2-r9.ebuild
index 90499b54db4..e33bda1fd89 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 c6dfd3456cf..e8d1ced04b4 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc nls static-libs test"
RESTRICT="!test? ( test )"
diff --git a/app-text/opensp/opensp-1.5.2-r6.ebuild b/app-text/opensp/opensp-1.5.2-r6.ebuild
index 0af226ca688..f34b25fcdc5 100644
--- a/app-text/opensp/opensp-1.5.2-r6.ebuild
+++ b/app-text/opensp/opensp-1.5.2-r6.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 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc elibc_glibc nls static-libs test"
RESTRICT="!test? ( test )"
diff --git a/app-text/passivetex/passivetex-1.25-r1.ebuild b/app-text/passivetex/passivetex-1.25-r1.ebuild
index 59491a44d24..49ecd1791be 100644
--- a/app-text/passivetex/passivetex-1.25-r1.ebuild
+++ b/app-text/passivetex/passivetex-1.25-r1.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${PN}
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh 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"
IUSE=""
RDEPEND="virtual/latex-base
diff --git a/app-text/pdfjam/pdfjam-2.08-r1.ebuild b/app-text/pdfjam/pdfjam-2.08-r1.ebuild
index fe68622c60a..e6e36d7db75 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE=""
S="${WORKDIR}"/${PN}
diff --git a/app-text/po4a/po4a-0.47-r1.ebuild b/app-text/po4a/po4a-0.47-r1.ebuild
index 3d48ba48214..ad2a4373370 100644
--- a/app-text/po4a/po4a-0.47-r1.ebuild
+++ b/app-text/po4a/po4a-0.47-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://debian/pool/main/p/po4a/${PN}_${PV}.orig.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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-macos ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/app-text/po4a/po4a-0.56.ebuild b/app-text/po4a/po4a-0.56.ebuild
index 3cf5d3d570b..a3747855af4 100644
--- a/app-text/po4a/po4a-0.56.ebuild
+++ b/app-text/po4a/po4a-0.56.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -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 ~riscv ~s390 ~sh ~sparc ~x86 ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/app-text/po4a/po4a-0.57.ebuild b/app-text/po4a/po4a-0.57.ebuild
index 8c24e87cabc..1292f24f256 100644
--- a/app-text/po4a/po4a-0.57.ebuild
+++ b/app-text/po4a/po4a-0.57.ebuild
@@ -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 ~riscv ~s390 ~sh ~sparc ~x86 ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/app-text/poppler-data/poppler-data-0.4.9.ebuild b/app-text/poppler-data/poppler-data-0.4.9.ebuild
index 844ef3a5b61..82c30e8ae3e 100644
--- a/app-text/poppler-data/poppler-data-0.4.9.ebuild
+++ b/app-text/poppler-data/poppler-data-0.4.9.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 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE=""
diff --git a/app-text/poppler/poppler-0.82.0.ebuild b/app-text/poppler/poppler-0.82.0.ebuild
index 712cef5ecd6..6287711b5fc 100644
--- a/app-text/poppler/poppler-0.82.0.ebuild
+++ b/app-text/poppler/poppler-0.82.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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0/92" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
fi
diff --git a/app-text/poppler/poppler-0.85.0.ebuild b/app-text/poppler/poppler-0.85.0.ebuild
index df88b2af6ff..de604471cea 100644
--- a/app-text/poppler/poppler-0.85.0.ebuild
+++ b/app-text/poppler/poppler-0.85.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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0/95" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
fi
diff --git a/app-text/poppler/poppler-0.86.1.ebuild b/app-text/poppler/poppler-0.86.1.ebuild
index 10134014b2d..c0cbd8d01cc 100644
--- a/app-text/poppler/poppler-0.86.1.ebuild
+++ b/app-text/poppler/poppler-0.86.1.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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0/97" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
fi
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index 10134014b2d..c0cbd8d01cc 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0/97" # 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 1641d4605df..b725c41840f 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
app-text/ghostscript-gpl
diff --git a/app-text/ps2pkm/ps2pkm-1.8_p20190410.ebuild b/app-text/ps2pkm/ps2pkm-1.8_p20190410.ebuild
index b3c76732a61..06ef84fd8c0 100644
--- a/app-text/ps2pkm/ps2pkm-1.8_p20190410.ebuild
+++ b/app-text/ps2pkm/ps2pkm-1.8_p20190410.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-libs/kpathsea-6.2.1"
diff --git a/app-text/psutils/psutils-1.17-r3.ebuild b/app-text/psutils/psutils-1.17-r3.ebuild
index 8aca2e46858..bfb21325727 100644
--- a/app-text/psutils/psutils-1.17-r3.ebuild
+++ b/app-text/psutils/psutils-1.17-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV}.dfsg.orig.tar.gz"
LICENSE="psutils"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=""
diff --git a/app-text/rarian/rarian-0.8.1-r3.ebuild b/app-text/rarian/rarian-0.8.1-r3.ebuild
index 5e8874848a7..6bcb23f7166 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="static-libs"
RDEPEND="
diff --git a/app-text/recode/recode-3.6_p20-r1.ebuild b/app-text/recode/recode-3.6_p20-r1.ebuild
index 20ab82a9d8f..a66943a89fb 100644
--- a/app-text/recode/recode-3.6_p20-r1.ebuild
+++ b/app-text/recode/recode-3.6_p20-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="nls static-libs"
DEPEND="
diff --git a/app-text/recode/recode-3.7_pre20140303.ebuild b/app-text/recode/recode-3.7_pre20140303.ebuild
index 1f34cb0889a..3de99c002b0 100644
--- a/app-text/recode/recode-3.7_pre20140303.ebuild
+++ b/app-text/recode/recode-3.7_pre20140303.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pinard/Recode/archive/${REV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="nls static-libs"
DEPEND="
diff --git a/app-text/rman/rman-3.2-r1.ebuild b/app-text/rman/rman-3.2-r1.ebuild
index 0c3568967b9..b92fd0fe45d 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RESTRICT="test"
diff --git a/app-text/sablotron/sablotron-1.0.3-r1.ebuild b/app-text/sablotron/sablotron-1.0.3-r1.ebuild
index 7e43917ffce..36d63cdf77e 100644
--- a/app-text/sablotron/sablotron-1.0.3-r1.ebuild
+++ b/app-text/sablotron/sablotron-1.0.3-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://download-1.gingerall.cz/download/sablot/${MY_P}.tar.gz"
# Sablotron can optionally be built under GPL, using MPL for now
LICENSE="MPL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh 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="perl"
RDEPEND=">=dev-libs/expat-1.95.6-r1"
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 8def0bd6ac7..346abcdaf25 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 ~x86-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 81067c555b9..9ea0af35c9b 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=""
diff --git a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r15.ebuild b/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r15.ebuild
index 1f132e06300..093f48ff4f4 100644
--- a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r15.ebuild
+++ b/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r15.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="jadetex"
RDEPEND="${PYTHON_DEPS}
diff --git a/app-text/t1utils/t1utils-1.41-r2.ebuild b/app-text/t1utils/t1utils-1.41-r2.ebuild
index 0fa3dcfe9ae..2e113f56695 100644
--- a/app-text/t1utils/t1utils-1.41-r2.ebuild
+++ b/app-text/t1utils/t1utils-1.41-r2.ebuild
@@ -8,7 +8,7 @@ inherit autotools
DESCRIPTION="Type 1 Font utilities"
SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
HOMEPAGE="http://www.lcdf.org/type/#t1utils"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
LICENSE="BSD"
IUSE=""
diff --git a/app-text/teckit/teckit-2.5.6.ebuild b/app-text/teckit/teckit-2.5.6.ebuild
index 22ca3114d84..dec9c4452bb 100644
--- a/app-text/teckit/teckit-2.5.6.ebuild
+++ b/app-text/teckit/teckit-2.5.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/silnrsi/teckit/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="|| ( CPL-0.5 LGPL-2.1 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
RDEPEND="sys-libs/zlib
diff --git a/app-text/texi2html/texi2html-5.0-r1.ebuild b/app-text/texi2html/texi2html-5.0-r1.ebuild
index d7cc5396602..d8a6fcfb91c 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="unicode"
RESTRICT="test" #411523
diff --git a/app-text/texlive-core/texlive-core-2019-r10.ebuild b/app-text/texlive-core/texlive-core-2019-r10.ebuild
index 397b2dadaa9..2b748bc0ab3 100644
--- a/app-text/texlive-core/texlive-core-2019-r10.ebuild
+++ b/app-text/texlive-core/texlive-core-2019-r10.ebuild
@@ -72,7 +72,7 @@ for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
done
SRC_URI="${SRC_URI} )"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="cjk X doc source tk +luajittex xetex"
TEXMF_PATH=/usr/share/texmf-dist
diff --git a/app-text/texlive/texlive-2019-r1.ebuild b/app-text/texlive/texlive-2019-r1.ebuild
index 0422bc6cd89..15c749d7d00 100644
--- a/app-text/texlive/texlive-2019-r1.ebuild
+++ b/app-text/texlive/texlive-2019-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
LICENSE="metapackage"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="cjk context detex dvi2tty extra epspdf games graphics
humanities jadetex luatex metapost music pdfannotextractor png pstricks publishers
science tex4ht texi2html truetype xetex xindy xml X"
diff --git a/app-text/tidy-html5/tidy-html5-5.6.0.ebuild b/app-text/tidy-html5/tidy-html5-5.6.0.ebuild
index dbdb1283d9b..e28881451ee 100644
--- a/app-text/tidy-html5/tidy-html5-5.6.0.ebuild
+++ b/app-text/tidy-html5/tidy-html5-5.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/htacg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
RDEPEND="!app-text/htmltidy"
diff --git a/app-text/tree/tree-1.7.0-r1.ebuild b/app-text/tree/tree-1.7.0-r1.ebuild
index 635e6867844..b76daa598d9 100644
--- a/app-text/tree/tree-1.7.0-r1.ebuild
+++ b/app-text/tree/tree-1.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE=""
RDEPEND="!=sci-biology/meme-4.8.1"
diff --git a/app-text/tree/tree-1.7.0.ebuild b/app-text/tree/tree-1.7.0.ebuild
index 6da7793733b..184a13c57ba 100644
--- a/app-text/tree/tree-1.7.0.ebuild
+++ b/app-text/tree/tree-1.7.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 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE=""
RDEPEND="!=sci-biology/meme-4.8.1"
diff --git a/app-text/tree/tree-1.8.0.ebuild b/app-text/tree/tree-1.8.0.ebuild
index 4737aa83e4e..849ce56f1ca 100644
--- a/app-text/tree/tree-1.8.0.ebuild
+++ b/app-text/tree/tree-1.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE=""
RDEPEND=""
diff --git a/app-text/ttf2pk2/ttf2pk2-2.0_p20190410.ebuild b/app-text/ttf2pk2/ttf2pk2-2.0_p20190410.ebuild
index 6528f2d15c0..8f558cb1e35 100644
--- a/app-text/ttf2pk2/ttf2pk2-2.0_p20190410.ebuild
+++ b/app-text/ttf2pk2/ttf2pk2-2.0_p20190410.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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/unrtf/unrtf-0.21.10.ebuild b/app-text/unrtf/unrtf-0.21.10.ebuild
index d792e532e39..9dcec42d755 100644
--- a/app-text/unrtf/unrtf-0.21.10.ebuild
+++ b/app-text/unrtf/unrtf-0.21.10.ebuild
@@ -9,5 +9,5 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
IUSE=""
diff --git a/app-text/unrtf/unrtf-0.21.9.ebuild b/app-text/unrtf/unrtf-0.21.9.ebuild
index 4ba96a959dd..4f1cf0e9239 100644
--- a/app-text/unrtf/unrtf-0.21.9.ebuild
+++ b/app-text/unrtf/unrtf-0.21.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
IUSE=""
src_prepare() {
diff --git a/app-text/vlna/vlna-1.5.ebuild b/app-text/vlna/vlna-1.5.ebuild
index f2013ad1936..67d89a56eea 100644
--- a/app-text/vlna/vlna-1.5.ebuild
+++ b/app-text/vlna/vlna-1.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="ftp://math.feld.cvut.cz/pub/olsak/vlna/${P}.tar.gz"
LICENSE="Artistic"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
src_install() {
diff --git a/app-text/wdiff/wdiff-1.2.2-r1.ebuild b/app-text/wdiff/wdiff-1.2.2-r1.ebuild
index b1cbdec41d1..376f5b78c21 100644
--- a/app-text/wdiff/wdiff-1.2.2-r1.ebuild
+++ b/app-text/wdiff/wdiff-1.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
IUSE="experimental test"
RESTRICT="!test? ( test )"
diff --git a/app-text/wdiff/wdiff-1.2.2.ebuild b/app-text/wdiff/wdiff-1.2.2.ebuild
index dacb0166e5b..fa6dc34f933 100644
--- a/app-text/wdiff/wdiff-1.2.2.ebuild
+++ b/app-text/wdiff/wdiff-1.2.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
IUSE="experimental test"
RESTRICT="!test? ( test )"
diff --git a/app-text/wgetpaste/wgetpaste-2.28-r2.ebuild b/app-text/wgetpaste/wgetpaste-2.28-r2.ebuild
index bd76f271f68..8871ee6720e 100644
--- a/app-text/wgetpaste/wgetpaste-2.28-r2.ebuild
+++ b/app-text/wgetpaste/wgetpaste-2.28-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://wgetpaste.zlin.dk/${P}.tar.bz2"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="+ssl"
DEPEND=""
diff --git a/app-text/wgetpaste/wgetpaste-2.29-r1.ebuild b/app-text/wgetpaste/wgetpaste-2.29-r1.ebuild
index 75d49b5d1b3..2ccbde84f84 100644
--- a/app-text/wgetpaste/wgetpaste-2.29-r1.ebuild
+++ b/app-text/wgetpaste/wgetpaste-2.29-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -9,7 +9,7 @@ SRC_URI="http://wgetpaste.zlin.dk/${P}.tar.bz2"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="+ssl"
DEPEND=""
diff --git a/app-text/xdvik/xdvik-22.87.03-r1.ebuild b/app-text/xdvik/xdvik-22.87.03-r1.ebuild
index 8213ab39753..9319b233768 100644
--- a/app-text/xdvik/xdvik-22.87.03-r1.ebuild
+++ b/app-text/xdvik/xdvik-22.87.03-r1.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="DVI previewer for X Window System"
HOMEPAGE="http://xdvi.sourceforge.net/"
SRC_URI="mirror://sourceforge/xdvi/${P}.tar.gz"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+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"
SLOT="0"
LICENSE="GPL-2"
IUSE="motif neXt Xaw3d emacs"
diff --git a/app-text/xdvik/xdvik-22.87.03-r2.ebuild b/app-text/xdvik/xdvik-22.87.03-r2.ebuild
index 5ec22d077c6..49accc94ae4 100644
--- a/app-text/xdvik/xdvik-22.87.03-r2.ebuild
+++ b/app-text/xdvik/xdvik-22.87.03-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -8,7 +8,7 @@ DESCRIPTION="DVI previewer for X Window System"
HOMEPAGE="http://xdvi.sourceforge.net/"
SRC_URI="mirror://sourceforge/xdvi/${P}.tar.gz"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+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"
SLOT="0"
LICENSE="GPL-2"
IUSE="motif neXt Xaw3d emacs"
diff --git a/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild b/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
index 48e432677af..c2ad4628c94 100644
--- a/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
+++ b/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/xmlstar/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
RDEPEND="
dev-libs/libxml2
diff --git a/app-text/xmlto/xmlto-0.0.28-r1.ebuild b/app-text/xmlto/xmlto-0.0.28-r1.ebuild
index a1209c4c9d5..6f7859d5310 100644
--- a/app-text/xmlto/xmlto-0.0.28-r1.ebuild
+++ b/app-text/xmlto/xmlto-0.0.28-r1.ebuild
@@ -10,7 +10,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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 c382ed87f3c..9dca52fb8db 100644
--- a/app-text/yelp-tools/yelp-tools-3.32.2.ebuild
+++ b/app-text/yelp-tools/yelp-tools-3.32.2.ebuild
@@ -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 ~sh 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/dhcpd-syntax/dhcpd-syntax-20030825-r1.ebuild b/app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r1.ebuild
index 169e7bfcd75..66a31bcedc0 100644
--- a/app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r1.ebuild
+++ b/app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r1.ebuild
@@ -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 sh 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 e8548cbda14..3b5e318751d 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 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
DEPEND="!<app-vim/gentoo-syntax-20070506"
RDEPEND="${DEPEND}"
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-20200120.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-20200120.ebuild
index b0a3d25cfe2..808521014ec 100644
--- a/app-vim/gentoo-syntax/gentoo-syntax-20200120.ebuild
+++ b/app-vim/gentoo-syntax/gentoo-syntax-20200120.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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 2938c5c29ec..c1815d909f5 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
diff --git a/app-vim/ntp-syntax/ntp-syntax-20031001-r1.ebuild b/app-vim/ntp-syntax/ntp-syntax-20031001-r1.ebuild
index 5a90c195203..24a4ef01877 100644
--- a/app-vim/ntp-syntax/ntp-syntax-20031001-r1.ebuild
+++ b/app-vim/ntp-syntax/ntp-syntax-20031001-r1.ebuild
@@ -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 sh 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/atkmm/atkmm-2.28.0.ebuild b/dev-cpp/atkmm/atkmm-2.28.0.ebuild
index 7aa82f9f4e7..b4abd71cbd1 100644
--- a/dev-cpp/atkmm/atkmm-2.28.0.ebuild
+++ b/dev-cpp/atkmm/atkmm-2.28.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.gtkmm.org"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
IUSE="doc"
COMMON_DEPEND="
diff --git a/dev-cpp/cairomm/cairomm-1.12.0-r1.ebuild b/dev-cpp/cairomm/cairomm-1.12.0-r1.ebuild
index 327a515e90d..0ca4ad0c999 100644
--- a/dev-cpp/cairomm/cairomm-1.12.0-r1.ebuild
+++ b/dev-cpp/cairomm/cairomm-1.12.0-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://cairographics.org/cairomm/"
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="aqua doc +svg X"
RDEPEND="
diff --git a/dev-cpp/gconfmm/gconfmm-2.28.3-r1.ebuild b/dev-cpp/gconfmm/gconfmm-2.28.3-r1.ebuild
index f26eea03b28..31a3a520d3c 100644
--- a/dev-cpp/gconfmm/gconfmm-2.28.3-r1.ebuild
+++ b/dev-cpp/gconfmm/gconfmm-2.28.3-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gtkmm.org"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 sparc x86"
IUSE="doc"
RDEPEND="
diff --git a/dev-cpp/gflags/gflags-2.2.0.ebuild b/dev-cpp/gflags/gflags-2.2.0.ebuild
index f66d0706187..6bf713cbeae 100644
--- a/dev-cpp/gflags/gflags-2.2.0.ebuild
+++ b/dev-cpp/gflags/gflags-2.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/gflags/gflags.git"
else
SRC_URI="https://github.com/gflags/gflags/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~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
DESCRIPTION="Google's C++ argument parsing library"
diff --git a/dev-cpp/gflags/gflags-2.2.1-r1.ebuild b/dev-cpp/gflags/gflags-2.2.1-r1.ebuild
index ba91e0c6d75..3a7f4b44bc0 100644
--- a/dev-cpp/gflags/gflags-2.2.1-r1.ebuild
+++ b/dev-cpp/gflags/gflags-2.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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://github.com/gflags/gflags"
else
SRC_URI="https://github.com/gflags/gflags/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~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
DESCRIPTION="Google's C++ argument parsing library"
diff --git a/dev-cpp/gflags/gflags-2.2.1.ebuild b/dev-cpp/gflags/gflags-2.2.1.ebuild
index 5db32895326..5425bbe89ab 100644
--- a/dev-cpp/gflags/gflags-2.2.1.ebuild
+++ b/dev-cpp/gflags/gflags-2.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/gflags/gflags"
else
SRC_URI="https://github.com/gflags/gflags/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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
DESCRIPTION="Google's C++ argument parsing library"
diff --git a/dev-cpp/gflags/gflags-9999.ebuild b/dev-cpp/gflags/gflags-9999.ebuild
index 60c68630cba..e8121a0281a 100644
--- a/dev-cpp/gflags/gflags-9999.ebuild
+++ b/dev-cpp/gflags/gflags-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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://github.com/gflags/gflags"
else
SRC_URI="https://github.com/gflags/gflags/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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
DESCRIPTION="Google's C++ argument parsing library"
diff --git a/dev-cpp/glibmm/glibmm-2.60.1.ebuild b/dev-cpp/glibmm/glibmm-2.60.1.ebuild
index 8647553c6a7..cd232fc6ebc 100644
--- a/dev-cpp/glibmm/glibmm-2.60.1.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.60.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.gtkmm.org"
LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
SLOT="2"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="doc debug test"
RESTRICT="!test? ( test )"
diff --git a/dev-cpp/glibmm/glibmm-2.62.0.ebuild b/dev-cpp/glibmm/glibmm-2.62.0.ebuild
index e960ee6c618..105f3c349b6 100644
--- a/dev-cpp/glibmm/glibmm-2.62.0.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.62.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.gtkmm.org"
LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="doc debug test"
RESTRICT="!test? ( test )"
diff --git a/dev-cpp/glog/glog-0.3.4-r1.ebuild b/dev-cpp/glog/glog-0.3.4-r1.ebuild
index a824fdc5f5f..8691df884e6 100644
--- a/dev-cpp/glog/glog-0.3.4-r1.ebuild
+++ b/dev-cpp/glog/glog-0.3.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="gflags static-libs test unwind"
RESTRICT="test"
diff --git a/dev-cpp/glog/glog-0.4.0.ebuild b/dev-cpp/glog/glog-0.4.0.ebuild
index 197e80a7491..13bdb8f4772 100644
--- a/dev-cpp/glog/glog-0.4.0.ebuild
+++ b/dev-cpp/glog/glog-0.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="gflags static-libs test"
RESTRICT="test"
diff --git a/dev-cpp/gtest/gtest-1.10.0.ebuild b/dev-cpp/gtest/gtest-1.10.0.ebuild
index 0b947a853db..12d496c44be 100644
--- a/dev-cpp/gtest/gtest-1.10.0.ebuild
+++ b/dev-cpp/gtest/gtest-1.10.0.ebuild
@@ -20,7 +20,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 ~sh ~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"
S="${WORKDIR}"/googletest-${MY_PV}
fi
diff --git a/dev-cpp/gtest/gtest-1.8.0-r1.ebuild b/dev-cpp/gtest/gtest-1.8.0-r1.ebuild
index 9944f7eff03..4f6feddb9e7 100644
--- a/dev-cpp/gtest/gtest-1.8.0-r1.ebuild
+++ b/dev-cpp/gtest/gtest-1.8.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/google/googletest/archive/release-${PV}.tar.gz -> ${
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh 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="doc examples test"
RESTRICT="!test? ( test )"
diff --git a/dev-cpp/gtest/gtest-1.8.0.ebuild b/dev-cpp/gtest/gtest-1.8.0.ebuild
index 1c2aa8c9576..2d1d2af328f 100644
--- a/dev-cpp/gtest/gtest-1.8.0.ebuild
+++ b/dev-cpp/gtest/gtest-1.8.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/google/googletest/archive/release-${PV}.tar.gz -> ${
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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="doc examples test"
RESTRICT="!test? ( test )"
diff --git a/dev-cpp/gtest/gtest-1.8.1-r1.ebuild b/dev-cpp/gtest/gtest-1.8.1-r1.ebuild
index 5d8eb193189..030ed3477e9 100644
--- a/dev-cpp/gtest/gtest-1.8.1-r1.ebuild
+++ b/dev-cpp/gtest/gtest-1.8.1-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
EGIT_REPO_URI="https://github.com/google/googletest"
else
SRC_URI="https://github.com/google/googletest/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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"
S="${WORKDIR}"/googletest-release-${PV}
fi
diff --git a/dev-cpp/gtest/gtest-1.8.1.ebuild b/dev-cpp/gtest/gtest-1.8.1.ebuild
index 586c7e0c69d..4c66697b04a 100644
--- a/dev-cpp/gtest/gtest-1.8.1.ebuild
+++ b/dev-cpp/gtest/gtest-1.8.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
EGIT_REPO_URI="https://github.com/google/googletest"
else
SRC_URI="https://github.com/google/googletest/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~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"
S="${WORKDIR}"/googletest-release-${PV}
fi
diff --git a/dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild b/dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild
index 444f70e2534..d4a84ab5928 100644
--- a/dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild
+++ b/dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild
@@ -20,7 +20,7 @@ else
MY_PV=${GOOGLETEST_COMMIT}
fi
SRC_URI="https://github.com/google/googletest/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh 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"
S="${WORKDIR}"/googletest-${MY_PV}
fi
diff --git a/dev-cpp/gtest/gtest-9999.ebuild b/dev-cpp/gtest/gtest-9999.ebuild
index 8efe9ee6516..753803041fc 100644
--- a/dev-cpp/gtest/gtest-9999.ebuild
+++ b/dev-cpp/gtest/gtest-9999.ebuild
@@ -19,7 +19,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 ~sh ~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"
S="${WORKDIR}"/googletest-${MY_PV}
fi
diff --git a/dev-cpp/gtkmm/gtkmm-2.24.5.ebuild b/dev-cpp/gtkmm/gtkmm-2.24.5.ebuild
index 719b4a6451a..c5abb39412e 100644
--- a/dev-cpp/gtkmm/gtkmm-2.24.5.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-2.24.5.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gtkmm.org"
LICENSE="LGPL-2.1+"
SLOT="2.4"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
IUSE="doc examples test"
RESTRICT="!test? ( test )"
diff --git a/dev-cpp/gtkmm/gtkmm-3.24.2.ebuild b/dev-cpp/gtkmm/gtkmm-3.24.2.ebuild
index dd0b8617928..a6626dbad9b 100644
--- a/dev-cpp/gtkmm/gtkmm-3.24.2.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-3.24.2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.gtkmm.org"
LICENSE="LGPL-2.1+"
SLOT="3.0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="aqua doc test wayland X"
REQUIRED_USE="|| ( aqua wayland X )"
diff --git a/dev-cpp/libglademm/libglademm-2.6.7-r2.ebuild b/dev-cpp/libglademm/libglademm-2.6.7-r2.ebuild
index b08904124e7..d7866303111 100644
--- a/dev-cpp/libglademm/libglademm-2.6.7-r2.ebuild
+++ b/dev-cpp/libglademm/libglademm-2.6.7-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.gtkmm.org"
LICENSE="LGPL-2.1+"
SLOT="2.4"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86"
IUSE="doc examples"
RDEPEND="
diff --git a/dev-cpp/libgnomecanvasmm/libgnomecanvasmm-2.26.0-r1.ebuild b/dev-cpp/libgnomecanvasmm/libgnomecanvasmm-2.26.0-r1.ebuild
index 9ff86f5e4b2..06046d22227 100644
--- a/dev-cpp/libgnomecanvasmm/libgnomecanvasmm-2.26.0-r1.ebuild
+++ b/dev-cpp/libgnomecanvasmm/libgnomecanvasmm-2.26.0-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.gtkmm.org"
LICENSE="LGPL-2.1"
SLOT="2.6"
-KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 sparc x86"
IUSE="doc examples"
RDEPEND="
diff --git a/dev-cpp/mm-common/mm-common-0.9.12.ebuild b/dev-cpp/mm-common/mm-common-0.9.12.ebuild
index 5000f18771c..74506878137 100644
--- a/dev-cpp/mm-common/mm-common-0.9.12.ebuild
+++ b/dev-cpp/mm-common/mm-common-0.9.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtkmm.org/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE=""
RDEPEND=""
diff --git a/dev-cpp/pangomm/pangomm-2.42.0.ebuild b/dev-cpp/pangomm/pangomm-2.42.0.ebuild
index 39d26918714..306256907b9 100644
--- a/dev-cpp/pangomm/pangomm-2.42.0.ebuild
+++ b/dev-cpp/pangomm/pangomm-2.42.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.gtkmm.org"
LICENSE="LGPL-2.1+"
SLOT="1.4"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
IUSE="doc"
COMMON_DEPEND="
diff --git a/dev-cpp/pangomm/pangomm-2.42.1.ebuild b/dev-cpp/pangomm/pangomm-2.42.1.ebuild
index cf6f1cb6d36..d5782929da0 100644
--- a/dev-cpp/pangomm/pangomm-2.42.1.ebuild
+++ b/dev-cpp/pangomm/pangomm-2.42.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.gtkmm.org"
LICENSE="LGPL-2.1+"
SLOT="1.4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
IUSE="doc"
COMMON_DEPEND="
diff --git a/dev-db/cdb/cdb-0.75-r4.ebuild b/dev-db/cdb/cdb-0.75-r4.ebuild
index d920b71070b..782ce3108a7 100644
--- a/dev-db/cdb/cdb-0.75-r4.ebuild
+++ b/dev-db/cdb/cdb-0.75-r4.ebuild
@@ -4,7 +4,7 @@
EAPI=5
inherit eutils multilib toolchain-funcs
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh 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"
DESCRIPTION="Fast, reliable, simple package for creating and reading constant databases"
HOMEPAGE="http://cr.yp.to/cdb.html"
diff --git a/dev-db/freetds/freetds-1.00.558.ebuild b/dev-db/freetds/freetds-1.00.558.ebuild
index 02a3bdc59d6..4e8d93eddcb 100644
--- a/dev-db/freetds/freetds-1.00.558.ebuild
+++ b/dev-db/freetds/freetds-1.00.558.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 ~sh 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 ae04117dd8f..e422c4554bf 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 @@ HOMEPAGE="http://libdbi-drivers.sourceforge.net/"
LICENSE="LGPL-2.1"
IUSE="doc firebird mysql oci8 postgres +sqlite static-libs"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
SLOT=0
REQUIRED_USE="|| ( mysql postgres sqlite firebird oci8 )"
RESTRICT="firebird? ( bindist )"
diff --git a/dev-db/libdbi-drivers/libdbi-drivers-0.9.0.ebuild b/dev-db/libdbi-drivers/libdbi-drivers-0.9.0.ebuild
index c7be46520a8..e6b0e2f6fff 100644
--- a/dev-db/libdbi-drivers/libdbi-drivers-0.9.0.ebuild
+++ b/dev-db/libdbi-drivers/libdbi-drivers-0.9.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://libdbi-drivers.sourceforge.net/"
LICENSE="LGPL-2.1"
IUSE="doc firebird mysql oci8 postgres +sqlite static-libs"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
SLOT=0
REQUIRED_USE="|| ( mysql postgres sqlite firebird oci8 )"
RESTRICT="firebird? ( bindist )"
diff --git a/dev-db/libdbi/libdbi-0.9.0.ebuild b/dev-db/libdbi/libdbi-0.9.0.ebuild
index d1248c13979..e840fd1408c 100644
--- a/dev-db/libdbi/libdbi-0.9.0.ebuild
+++ b/dev-db/libdbi/libdbi-0.9.0.ebuild
@@ -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 sh 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.ebuild b/dev-db/libiodbc/libiodbc-3.52.12.ebuild
index c6527ce5381..9057999bd02 100644
--- a/dev-db/libiodbc/libiodbc-3.52.12.ebuild
+++ b/dev-db/libiodbc/libiodbc-3.52.12.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="ODBC Interface for Linux"
HOMEPAGE="http://www.iodbc.org/"
SRC_URI="https://github.com/openlink/${MY_PN}/archive/v${PV}.zip -> ${P}.zip"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sh 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/lmdb/lmdb-0.9.23.ebuild b/dev-db/lmdb/lmdb-0.9.23.ebuild
index daa6fe22a3a..474ee951810 100644
--- a/dev-db/lmdb/lmdb-0.9.23.ebuild
+++ b/dev-db/lmdb/lmdb-0.9.23.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/LMDB/lmdb/archive/LMDB_${PV}.tar.gz"
LICENSE="OPENLDAP"
SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="static-libs"
DEPEND=""
diff --git a/dev-db/lmdb/lmdb-0.9.24.ebuild b/dev-db/lmdb/lmdb-0.9.24.ebuild
index 722f6a866f1..3c22a2223a4 100644
--- a/dev-db/lmdb/lmdb-0.9.24.ebuild
+++ b/dev-db/lmdb/lmdb-0.9.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/LMDB/lmdb/archive/${MY_P}.tar.gz"
LICENSE="OPENLDAP"
SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="static-libs"
DEPEND=""
diff --git a/dev-db/m17n-db/m17n-db-1.7.0.ebuild b/dev-db/m17n-db/m17n-db-1.7.0.ebuild
index cf08437e11d..14410056fc3 100644
--- a/dev-db/m17n-db/m17n-db-1.7.0.ebuild
+++ b/dev-db/m17n-db/m17n-db-1.7.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://nongnu/m17n/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
IUSE=""
DEPEND="sys-devel/gettext"
diff --git a/dev-db/m17n-db/m17n-db-1.8.0.ebuild b/dev-db/m17n-db/m17n-db-1.8.0.ebuild
index 634bd2d2a0e..035eec6709d 100644
--- a/dev-db/m17n-db/m17n-db-1.8.0.ebuild
+++ b/dev-db/m17n-db/m17n-db-1.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -9,7 +9,7 @@ SRC_URI="mirror://nongnu/m17n/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
DEPEND="sys-devel/gettext"
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-6.1.11-r2.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-6.1.11-r2.ebuild
index f3cc45992f7..5b3d674dd09 100644
--- a/dev-db/mysql-connector-c/mysql-connector-c-6.1.11-r2.ebuild
+++ b/dev-db/mysql-connector-c/mysql-connector-c-6.1.11-r2.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-2"
SRC_URI="https://dev.mysql.com/get/Downloads/Connector-C/${P}-src.tar.gz"
S="${WORKDIR}/${P}-src"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
SUBSLOT="18"
SLOT="0/${SUBSLOT}"
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.19.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.19.ebuild
index 1523f51698a..b81406ba63b 100644
--- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.19.ebuild
+++ b/dev-db/mysql-connector-c/mysql-connector-c-8.0.19.ebuild
@@ -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 ~sh 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-init-scripts/mysql-init-scripts-2.3-r3.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r3.ebuild
index dc9de6dbeda..915b1df4219 100644
--- a/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r3.ebuild
+++ b/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
DEPEND=""
diff --git a/dev-db/pgxnclient/pgxnclient-1.2-r1.ebuild b/dev-db/pgxnclient/pgxnclient-1.2-r1.ebuild
index 641d88b4024..476f29b4530 100644
--- a/dev-db/pgxnclient/pgxnclient-1.2-r1.ebuild
+++ b/dev-db/pgxnclient/pgxnclient-1.2-r1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="PostgreSQL Extension Network Client"
HOMEPAGE="http://pgxnclient.projects.postgresql.org/ https://pypi.org/project/pgxnclient"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
LICENSE="BSD"
SLOT="0"
diff --git a/dev-db/pgxnclient/pgxnclient-1.2.1.ebuild b/dev-db/pgxnclient/pgxnclient-1.2.1.ebuild
index 91d190c091d..3ab85dc3dcf 100644
--- a/dev-db/pgxnclient/pgxnclient-1.2.1.ebuild
+++ b/dev-db/pgxnclient/pgxnclient-1.2.1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="PostgreSQL Extension Network Client"
HOMEPAGE="http://pgxnclient.projects.postgresql.org/ https://pypi.org/project/pgxnclient"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
LICENSE="BSD"
SLOT="0"
diff --git a/dev-db/postgresql/postgresql-10.10.ebuild b/dev-db/postgresql/postgresql-10.10.ebuild
index 6c03bb2241b..2153cb49c70 100644
--- a/dev-db/postgresql/postgresql-10.10.ebuild
+++ b/dev-db/postgresql/postgresql-10.10.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x86-solaris"
SLOT=$(ver_cut 1)
diff --git a/dev-db/postgresql/postgresql-10.11.ebuild b/dev-db/postgresql/postgresql-10.11.ebuild
index 9f3d5ddf573..56d9679aa84 100644
--- a/dev-db/postgresql/postgresql-10.11.ebuild
+++ b/dev-db/postgresql/postgresql-10.11.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x86-solaris"
SLOT=$(ver_cut 1)
diff --git a/dev-db/postgresql/postgresql-10.12.ebuild b/dev-db/postgresql/postgresql-10.12.ebuild
index 9f3d5ddf573..56d9679aa84 100644
--- a/dev-db/postgresql/postgresql-10.12.ebuild
+++ b/dev-db/postgresql/postgresql-10.12.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x86-solaris"
SLOT=$(ver_cut 1)
diff --git a/dev-db/postgresql/postgresql-10.9.ebuild b/dev-db/postgresql/postgresql-10.9.ebuild
index 940433efaf4..cfee2355eb5 100644
--- a/dev-db/postgresql/postgresql-10.9.ebuild
+++ b/dev-db/postgresql/postgresql-10.9.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x86-solaris"
SLOT=$(ver_cut 1)
diff --git a/dev-db/postgresql/postgresql-11.4.ebuild b/dev-db/postgresql/postgresql-11.4.ebuild
index cf90681a368..b56906e7c6a 100644
--- a/dev-db/postgresql/postgresql-11.4.ebuild
+++ b/dev-db/postgresql/postgresql-11.4.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT=$(ver_cut 1)
diff --git a/dev-db/postgresql/postgresql-11.5.ebuild b/dev-db/postgresql/postgresql-11.5.ebuild
index 8ebae4b309d..7ecfb7bea1f 100644
--- a/dev-db/postgresql/postgresql-11.5.ebuild
+++ b/dev-db/postgresql/postgresql-11.5.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT=$(ver_cut 1)
diff --git a/dev-db/postgresql/postgresql-11.6.ebuild b/dev-db/postgresql/postgresql-11.6.ebuild
index e702844d73e..4a199cac73c 100644
--- a/dev-db/postgresql/postgresql-11.6.ebuild
+++ b/dev-db/postgresql/postgresql-11.6.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT=$(ver_cut 1)
diff --git a/dev-db/postgresql/postgresql-11.7.ebuild b/dev-db/postgresql/postgresql-11.7.ebuild
index e702844d73e..4a199cac73c 100644
--- a/dev-db/postgresql/postgresql-11.7.ebuild
+++ b/dev-db/postgresql/postgresql-11.7.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT=$(ver_cut 1)
diff --git a/dev-db/postgresql/postgresql-12.0.ebuild b/dev-db/postgresql/postgresql-12.0.ebuild
index 08c2785b3cc..49dd313ec7e 100644
--- a/dev-db/postgresql/postgresql-12.0.ebuild
+++ b/dev-db/postgresql/postgresql-12.0.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT=$(ver_cut 1)
diff --git a/dev-db/postgresql/postgresql-12.1.ebuild b/dev-db/postgresql/postgresql-12.1.ebuild
index 2bd65b5c4eb..b10c128dd8e 100644
--- a/dev-db/postgresql/postgresql-12.1.ebuild
+++ b/dev-db/postgresql/postgresql-12.1.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT=$(ver_cut 1)
diff --git a/dev-db/postgresql/postgresql-12.2.ebuild b/dev-db/postgresql/postgresql-12.2.ebuild
index 2bd65b5c4eb..b10c128dd8e 100644
--- a/dev-db/postgresql/postgresql-12.2.ebuild
+++ b/dev-db/postgresql/postgresql-12.2.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT=$(ver_cut 1)
diff --git a/dev-db/postgresql/postgresql-9.4.22-r1.ebuild b/dev-db/postgresql/postgresql-9.4.22-r1.ebuild
index f2d7377aa7a..2f5d0dd70e4 100644
--- a/dev-db/postgresql/postgresql-9.4.22-r1.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.22-r1.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x86-solaris"
SLOT=$(ver_cut 1-2)
diff --git a/dev-db/postgresql/postgresql-9.4.22.ebuild b/dev-db/postgresql/postgresql-9.4.22.ebuild
index 823e2994450..4416c144939 100644
--- a/dev-db/postgresql/postgresql-9.4.22.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.22.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user versionator
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x86-solaris"
SLOT="$(get_version_component_range 1-2)"
diff --git a/dev-db/postgresql/postgresql-9.4.23.ebuild b/dev-db/postgresql/postgresql-9.4.23.ebuild
index c15fb2d1335..50f5fde6c63 100644
--- a/dev-db/postgresql/postgresql-9.4.23.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.23.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x86-solaris"
SLOT=$(ver_cut 1-2)
diff --git a/dev-db/postgresql/postgresql-9.4.24.ebuild b/dev-db/postgresql/postgresql-9.4.24.ebuild
index f2d7377aa7a..2f5d0dd70e4 100644
--- a/dev-db/postgresql/postgresql-9.4.24.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.24.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x86-solaris"
SLOT=$(ver_cut 1-2)
diff --git a/dev-db/postgresql/postgresql-9.4.25.ebuild b/dev-db/postgresql/postgresql-9.4.25.ebuild
index cd7aa335a25..77a7dedec0b 100644
--- a/dev-db/postgresql/postgresql-9.4.25.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.25.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x86-solaris"
SLOT=$(ver_cut 1-2)
diff --git a/dev-db/postgresql/postgresql-9.4.26.ebuild b/dev-db/postgresql/postgresql-9.4.26.ebuild
index f324c7f92bf..b89c51a5f51 100644
--- a/dev-db/postgresql/postgresql-9.4.26.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.26.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x86-solaris"
SLOT=$(ver_cut 1-2)
diff --git a/dev-db/postgresql/postgresql-9.5.17-r1.ebuild b/dev-db/postgresql/postgresql-9.5.17-r1.ebuild
index e6b0669554f..2616c4614cc 100644
--- a/dev-db/postgresql/postgresql-9.5.17-r1.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.17-r1.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x86-solaris"
SLOT=$(ver_cut 1-2)
diff --git a/dev-db/postgresql/postgresql-9.5.17.ebuild b/dev-db/postgresql/postgresql-9.5.17.ebuild
index 354fc7b272e..6c2d024f9fc 100644
--- a/dev-db/postgresql/postgresql-9.5.17.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.17.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user versionator
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x86-solaris"
SLOT="$(get_version_component_range 1-2)"
diff --git a/dev-db/postgresql/postgresql-9.5.18.ebuild b/dev-db/postgresql/postgresql-9.5.18.ebuild
index 41d7c9a608c..2eda15b3755 100644
--- a/dev-db/postgresql/postgresql-9.5.18.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.18.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x86-solaris"
SLOT=$(ver_cut 1-2)
diff --git a/dev-db/postgresql/postgresql-9.5.19.ebuild b/dev-db/postgresql/postgresql-9.5.19.ebuild
index e6b0669554f..2616c4614cc 100644
--- a/dev-db/postgresql/postgresql-9.5.19.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.19.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x86-solaris"
SLOT=$(ver_cut 1-2)
diff --git a/dev-db/postgresql/postgresql-9.5.20.ebuild b/dev-db/postgresql/postgresql-9.5.20.ebuild
index d0f85a5e61b..94285f1b83e 100644
--- a/dev-db/postgresql/postgresql-9.5.20.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.20.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x86-solaris"
SLOT=$(ver_cut 1-2)
diff --git a/dev-db/postgresql/postgresql-9.5.21.ebuild b/dev-db/postgresql/postgresql-9.5.21.ebuild
index e6b0669554f..2616c4614cc 100644
--- a/dev-db/postgresql/postgresql-9.5.21.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.21.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x86-solaris"
SLOT=$(ver_cut 1-2)
diff --git a/dev-db/postgresql/postgresql-9.6.13-r1.ebuild b/dev-db/postgresql/postgresql-9.6.13-r1.ebuild
index 89c5a79f5ba..800e0b2727e 100644
--- a/dev-db/postgresql/postgresql-9.6.13-r1.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.13-r1.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT=$(ver_cut 1-2)
diff --git a/dev-db/postgresql/postgresql-9.6.13.ebuild b/dev-db/postgresql/postgresql-9.6.13.ebuild
index f5aa0ed6754..4f971a68049 100644
--- a/dev-db/postgresql/postgresql-9.6.13.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.13.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user versionator
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="$(get_version_component_range 1-2)"
diff --git a/dev-db/postgresql/postgresql-9.6.14.ebuild b/dev-db/postgresql/postgresql-9.6.14.ebuild
index 93826bb9f95..5b7fcd4491f 100644
--- a/dev-db/postgresql/postgresql-9.6.14.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.14.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT=$(ver_cut 1-2)
diff --git a/dev-db/postgresql/postgresql-9.6.15.ebuild b/dev-db/postgresql/postgresql-9.6.15.ebuild
index 89c5a79f5ba..800e0b2727e 100644
--- a/dev-db/postgresql/postgresql-9.6.15.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.15.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT=$(ver_cut 1-2)
diff --git a/dev-db/postgresql/postgresql-9.6.16.ebuild b/dev-db/postgresql/postgresql-9.6.16.ebuild
index d8d9249313a..44861aa6794 100644
--- a/dev-db/postgresql/postgresql-9.6.16.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.16.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT=$(ver_cut 1-2)
diff --git a/dev-db/postgresql/postgresql-9.6.17.ebuild b/dev-db/postgresql/postgresql-9.6.17.ebuild
index d8d9249313a..44861aa6794 100644
--- a/dev-db/postgresql/postgresql-9.6.17.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.17.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT=$(ver_cut 1-2)
diff --git a/dev-db/qdbm/qdbm-1.8.78-r2.ebuild b/dev-db/qdbm/qdbm-1.8.78-r2.ebuild
index fd4bb34bf1c..8ddf77ceb9e 100644
--- a/dev-db/qdbm/qdbm-1.8.78-r2.ebuild
+++ b/dev-db/qdbm/qdbm-1.8.78-r2.ebuild
@@ -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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86"
IUSE="bzip2 cxx debug java lzo perl ruby zlib"
RDEPEND="bzip2? ( app-arch/bzip2 )
diff --git a/dev-db/sqlite/sqlite-3.29.0.ebuild b/dev-db/sqlite/sqlite-3.29.0.ebuild
index 95cb4a1db81..d13366988fe 100644
--- a/dev-db/sqlite/sqlite-3.29.0.ebuild
+++ b/dev-db/sqlite/sqlite-3.29.0.ebuild
@@ -25,7 +25,7 @@ fi
LICENSE="public-domain"
SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
if [[ "${PV}" == "9999" ]]; then
PROPERTIES="live"
diff --git a/dev-db/sqlite/sqlite-3.30.1.ebuild b/dev-db/sqlite/sqlite-3.30.1.ebuild
index 23589edb917..69318319b95 100644
--- a/dev-db/sqlite/sqlite-3.30.1.ebuild
+++ b/dev-db/sqlite/sqlite-3.30.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -25,7 +25,7 @@ fi
LICENSE="public-domain"
SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
if [[ "${PV}" == "9999" ]]; then
PROPERTIES="live"
diff --git a/dev-db/sqlite/sqlite-3.31.1.ebuild b/dev-db/sqlite/sqlite-3.31.1.ebuild
index 007f014230c..8d6247b686f 100644
--- a/dev-db/sqlite/sqlite-3.31.1.ebuild
+++ b/dev-db/sqlite/sqlite-3.31.1.ebuild
@@ -25,7 +25,7 @@ fi
LICENSE="public-domain"
SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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.7.ebuild b/dev-db/unixODBC/unixODBC-2.3.7.ebuild
index de936530758..f57680dde24 100644
--- a/dev-db/unixODBC/unixODBC-2.3.7.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.3.7.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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+minimal odbcmanual static-libs unicode"
RDEPEND="
diff --git a/dev-java/protobuf-java/protobuf-java-3.10.1.ebuild b/dev-java/protobuf-java/protobuf-java-3.10.1.ebuild
index e24c58d532c..1389952ec4b 100644
--- a/dev-java/protobuf-java/protobuf-java-3.10.1.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2008-2019 Gentoo Authors
+# Copyright 2008-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -23,7 +23,7 @@ fi
LICENSE="BSD"
SLOT="0/21"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~sh x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE=""
BDEPEND="~dev-libs/protobuf-${PV}
diff --git a/dev-java/protobuf-java/protobuf-java-3.11.2.ebuild b/dev-java/protobuf-java/protobuf-java-3.11.2.ebuild
index 2dd111153a0..d7ecb43e823 100644
--- a/dev-java/protobuf-java/protobuf-java-3.11.2.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.11.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2008-2019 Gentoo Authors
+# Copyright 2008-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -23,7 +23,7 @@ fi
LICENSE="BSD"
SLOT="0/22"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE=""
BDEPEND="~dev-libs/protobuf-${PV}
diff --git a/dev-java/protobuf-java/protobuf-java-3.11.4.ebuild b/dev-java/protobuf-java/protobuf-java-3.11.4.ebuild
index b126ee2eb8d..0d5d98cde22 100644
--- a/dev-java/protobuf-java/protobuf-java-3.11.4.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.11.4.ebuild
@@ -23,7 +23,7 @@ fi
LICENSE="BSD"
SLOT="0/22"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~sh x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE=""
BDEPEND="~dev-libs/protobuf-${PV}
diff --git a/dev-lang/bff/bff-1.0.5.ebuild b/dev-lang/bff/bff-1.0.5.ebuild
index 152dde43bbb..58f67f979f3 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-2019 Gentoo Authors
+# Copyright 1999-2020 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 sh x86"
+KEYWORDS="amd64 arm ia64 m68k ppc ppc64 s390 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-lang/jimtcl/jimtcl-0.76.ebuild b/dev-lang/jimtcl/jimtcl-0.76.ebuild
index 0c046194691..64ca59df29e 100644
--- a/dev-lang/jimtcl/jimtcl-0.76.ebuild
+++ b/dev-lang/jimtcl/jimtcl-0.76.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then
else
inherit vcs-snapshot
SRC_URI="https://github.com/msteveb/jimtcl/zipball/${PV} -> ${P}.zip"
- KEYWORDS="amd64 arm ~arm64 ~m68k ~mips ~s390 ~sh x86"
+ KEYWORDS="amd64 arm ~arm64 ~m68k ~mips ~s390 x86"
fi
DESCRIPTION="Small footprint implementation of Tcl programming language"
diff --git a/dev-lang/jimtcl/jimtcl-0.78-r2.ebuild b/dev-lang/jimtcl/jimtcl-0.78-r2.ebuild
index 7a48165e307..9b531ea12ea 100644
--- a/dev-lang/jimtcl/jimtcl-0.78-r2.ebuild
+++ b/dev-lang/jimtcl/jimtcl-0.78-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -6,7 +6,7 @@ EAPI="7"
inherit eutils
SRC_URI="https://github.com/msteveb/jimtcl/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~mips ~s390 ~sh ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~mips ~s390 ~x86"
DESCRIPTION="Small footprint implementation of Tcl programming language"
HOMEPAGE="http://jim.tcl.tk/"
diff --git a/dev-lang/lua/lua-5.1.5-r100.ebuild b/dev-lang/lua/lua-5.1.5-r100.ebuild
index a94ae714cf6..6cc21a60ce8 100644
--- a/dev-lang/lua/lua-5.1.5-r100.ebuild
+++ b/dev-lang/lua/lua-5.1.5-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
LICENSE="MIT"
SLOT="5.1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+deprecated emacs readline static"
RDEPEND="readline? ( >=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}] )
diff --git a/dev-lang/lua/lua-5.1.5-r101.ebuild b/dev-lang/lua/lua-5.1.5-r101.ebuild
index 2752c9d3f7e..26b64301f83 100644
--- a/dev-lang/lua/lua-5.1.5-r101.ebuild
+++ b/dev-lang/lua/lua-5.1.5-r101.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
LICENSE="MIT"
SLOT="5.1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+deprecated emacs readline static"
RDEPEND="readline? ( >=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}] )
diff --git a/dev-lang/lua/lua-5.1.5-r102.ebuild b/dev-lang/lua/lua-5.1.5-r102.ebuild
index a1285b5ea77..3324637d037 100644
--- a/dev-lang/lua/lua-5.1.5-r102.ebuild
+++ b/dev-lang/lua/lua-5.1.5-r102.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
LICENSE="MIT"
SLOT="5.1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+deprecated emacs readline static"
RDEPEND="readline? ( >=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}] )
diff --git a/dev-lang/lua/lua-5.1.5-r103.ebuild b/dev-lang/lua/lua-5.1.5-r103.ebuild
index 2fddd839eca..fcdaba404b5 100644
--- a/dev-lang/lua/lua-5.1.5-r103.ebuild
+++ b/dev-lang/lua/lua-5.1.5-r103.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
LICENSE="MIT"
SLOT="5.1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+deprecated emacs readline static"
RDEPEND="readline? ( >=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}] )
diff --git a/dev-lang/lua/lua-5.1.5-r4.ebuild b/dev-lang/lua/lua-5.1.5-r4.ebuild
index 6c2d8de2bdb..be34e19ab31 100644
--- a/dev-lang/lua/lua-5.1.5-r4.ebuild
+++ b/dev-lang/lua/lua-5.1.5-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+deprecated emacs readline static"
RDEPEND="readline? ( >=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}] )"
diff --git a/dev-lang/lua/lua-5.1.5-r5.ebuild b/dev-lang/lua/lua-5.1.5-r5.ebuild
index 3ef185cef35..bd982069373 100644
--- a/dev-lang/lua/lua-5.1.5-r5.ebuild
+++ b/dev-lang/lua/lua-5.1.5-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+deprecated emacs readline doc"
RDEPEND="readline? ( >=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}] )"
diff --git a/dev-lang/lua/lua-5.2.3-r1.ebuild b/dev-lang/lua/lua-5.2.3-r1.ebuild
index ea3c4de6125..7e93c849bb2 100644
--- a/dev-lang/lua/lua-5.2.3-r1.ebuild
+++ b/dev-lang/lua/lua-5.2.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
LICENSE="MIT"
SLOT="5.2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+deprecated emacs readline static"
RDEPEND="readline? ( sys-libs/readline:0= )
diff --git a/dev-lang/lua/lua-5.2.3-r2.ebuild b/dev-lang/lua/lua-5.2.3-r2.ebuild
index 486551e908b..5665ddef904 100644
--- a/dev-lang/lua/lua-5.2.3-r2.ebuild
+++ b/dev-lang/lua/lua-5.2.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
LICENSE="MIT"
SLOT="5.2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+deprecated emacs readline static"
RDEPEND="readline? ( sys-libs/readline:0= )
diff --git a/dev-lang/lua/lua-5.2.3-r3.ebuild b/dev-lang/lua/lua-5.2.3-r3.ebuild
index db6e87a6269..889a162b0e6 100644
--- a/dev-lang/lua/lua-5.2.3-r3.ebuild
+++ b/dev-lang/lua/lua-5.2.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
LICENSE="MIT"
SLOT="5.2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+deprecated emacs readline static"
RDEPEND="readline? ( sys-libs/readline:0= )
diff --git a/dev-lang/lua/lua-5.2.3.ebuild b/dev-lang/lua/lua-5.2.3.ebuild
index 06d5e005376..4a3d0421233 100644
--- a/dev-lang/lua/lua-5.2.3.ebuild
+++ b/dev-lang/lua/lua-5.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
LICENSE="MIT"
SLOT="5.2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux"
IUSE="+deprecated emacs readline static"
RDEPEND="readline? ( sys-libs/readline:0= )
diff --git a/dev-lang/lua/lua-5.2.4-r1.ebuild b/dev-lang/lua/lua-5.2.4-r1.ebuild
index 9c9a43b0628..726c0c00ecb 100644
--- a/dev-lang/lua/lua-5.2.4-r1.ebuild
+++ b/dev-lang/lua/lua-5.2.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="5.2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+deprecated emacs readline static test test-complete"
RESTRICT="!test? ( test )"
diff --git a/dev-lang/lua/lua-5.2.4-r2.ebuild b/dev-lang/lua/lua-5.2.4-r2.ebuild
index 6a28240ccea..af89f22a59c 100644
--- a/dev-lang/lua/lua-5.2.4-r2.ebuild
+++ b/dev-lang/lua/lua-5.2.4-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="5.2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+deprecated emacs readline static test test-complete"
RESTRICT="!test? ( test )"
diff --git a/dev-lang/lua/lua-5.2.4.ebuild b/dev-lang/lua/lua-5.2.4.ebuild
index 00d64576127..13c512925ff 100644
--- a/dev-lang/lua/lua-5.2.4.ebuild
+++ b/dev-lang/lua/lua-5.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="5.2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+deprecated emacs readline static test test-complete"
RESTRICT="!test? ( test )"
diff --git a/dev-lang/lua/lua-5.3.3-r1.ebuild b/dev-lang/lua/lua-5.3.3-r1.ebuild
index d9d3d697400..fdd72a0c0c8 100644
--- a/dev-lang/lua/lua-5.3.3-r1.ebuild
+++ b/dev-lang/lua/lua-5.3.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
LICENSE="MIT"
SLOT="5.3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+deprecated emacs readline static"
RDEPEND="readline? ( sys-libs/readline:0= )
diff --git a/dev-lang/lua/lua-5.3.3-r2.ebuild b/dev-lang/lua/lua-5.3.3-r2.ebuild
index 9f1e88dca52..629104cf608 100644
--- a/dev-lang/lua/lua-5.3.3-r2.ebuild
+++ b/dev-lang/lua/lua-5.3.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
LICENSE="MIT"
SLOT="5.3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+deprecated emacs readline static"
RDEPEND="readline? ( sys-libs/readline:0= )
diff --git a/dev-lang/lua/lua-5.3.3.ebuild b/dev-lang/lua/lua-5.3.3.ebuild
index cf0f88ce5ad..04a18b45f76 100644
--- a/dev-lang/lua/lua-5.3.3.ebuild
+++ b/dev-lang/lua/lua-5.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
LICENSE="MIT"
SLOT="5.3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+deprecated emacs readline static"
RDEPEND="readline? ( sys-libs/readline:0= )
diff --git a/dev-lang/lua/lua-5.3.5-r1.ebuild b/dev-lang/lua/lua-5.3.5-r1.ebuild
index de85ecaa336..42cfd8a332a 100644
--- a/dev-lang/lua/lua-5.3.5-r1.ebuild
+++ b/dev-lang/lua/lua-5.3.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="5.3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+deprecated emacs readline static test test-complete"
RESTRICT="!test? ( test )"
diff --git a/dev-lang/lua/lua-5.3.5-r2.ebuild b/dev-lang/lua/lua-5.3.5-r2.ebuild
index af6dbd999ef..954451da521 100644
--- a/dev-lang/lua/lua-5.3.5-r2.ebuild
+++ b/dev-lang/lua/lua-5.3.5-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="5.3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+deprecated emacs readline static test test-complete"
RESTRICT="!test? ( test )"
diff --git a/dev-lang/lua/lua-5.3.5.ebuild b/dev-lang/lua/lua-5.3.5.ebuild
index 672f6d77cf1..963fb72c4f3 100644
--- a/dev-lang/lua/lua-5.3.5.ebuild
+++ b/dev-lang/lua/lua-5.3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="5.3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+deprecated emacs readline static test test-complete"
RESTRICT="!test? ( test )"
diff --git a/dev-lang/perl/perl-5.30.1.ebuild b/dev-lang/perl/perl-5.30.1.ebuild
index 933d2a85e02..98d30c52bc4 100644
--- a/dev-lang/perl/perl-5.30.1.ebuild
+++ b/dev-lang/perl/perl-5.30.1.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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
IUSE="berkdb debug doc gdbm ithreads"
diff --git a/dev-lang/php/php-7.2.26.ebuild b/dev-lang/php/php-7.2.26.ebuild
index 52361ca04b9..c4def991edb 100644
--- a/dev-lang/php/php-7.2.26.ebuild
+++ b/dev-lang/php/php-7.2.26.ebuild
@@ -18,7 +18,7 @@ LICENSE="PHP-3.01
unicode? ( BSD-2 LGPL-2.1 )"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
# We can build the following SAPIs in the given order
SAPIS="embed cli cgi fpm apache2 phpdbg"
diff --git a/dev-lang/php/php-7.2.27.ebuild b/dev-lang/php/php-7.2.27.ebuild
index db36a046d76..056c5646346 100644
--- a/dev-lang/php/php-7.2.27.ebuild
+++ b/dev-lang/php/php-7.2.27.ebuild
@@ -18,7 +18,7 @@ LICENSE="PHP-3.01
unicode? ( BSD-2 LGPL-2.1 )"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
# We can build the following SAPIs in the given order
SAPIS="embed cli cgi fpm apache2 phpdbg"
diff --git a/dev-lang/php/php-7.2.28-r1.ebuild b/dev-lang/php/php-7.2.28-r1.ebuild
index 006a45e5a01..ef14d9e0c70 100644
--- a/dev-lang/php/php-7.2.28-r1.ebuild
+++ b/dev-lang/php/php-7.2.28-r1.ebuild
@@ -18,7 +18,7 @@ LICENSE="PHP-3.01
unicode? ( BSD-2 LGPL-2.1 )"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
# We can build the following SAPIs in the given order
SAPIS="embed cli cgi fpm apache2 phpdbg"
diff --git a/dev-lang/php/php-7.2.29.ebuild b/dev-lang/php/php-7.2.29.ebuild
index edebabbc48f..5081ff94e10 100644
--- a/dev-lang/php/php-7.2.29.ebuild
+++ b/dev-lang/php/php-7.2.29.ebuild
@@ -18,7 +18,7 @@ LICENSE="PHP-3.01
unicode? ( BSD-2 LGPL-2.1 )"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
# We can build the following SAPIs in the given order
SAPIS="embed cli cgi fpm apache2 phpdbg"
diff --git a/dev-lang/php/php-7.3.13.ebuild b/dev-lang/php/php-7.3.13.ebuild
index 1af2767e310..dd4cbb65c89 100644
--- a/dev-lang/php/php-7.3.13.ebuild
+++ b/dev-lang/php/php-7.3.13.ebuild
@@ -19,7 +19,7 @@ LICENSE="PHP-3.01
unicode? ( BSD-2 LGPL-2.1 )"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/dev-lang/php/php-7.3.14.ebuild b/dev-lang/php/php-7.3.14.ebuild
index ebe16ceac61..5d9c1b047c0 100644
--- a/dev-lang/php/php-7.3.14.ebuild
+++ b/dev-lang/php/php-7.3.14.ebuild
@@ -19,7 +19,7 @@ LICENSE="PHP-3.01
unicode? ( BSD-2 LGPL-2.1 )"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/dev-lang/php/php-7.3.15-r1.ebuild b/dev-lang/php/php-7.3.15-r1.ebuild
index a6695efe4a8..1da71421d29 100644
--- a/dev-lang/php/php-7.3.15-r1.ebuild
+++ b/dev-lang/php/php-7.3.15-r1.ebuild
@@ -19,7 +19,7 @@ LICENSE="PHP-3.01
unicode? ( BSD-2 LGPL-2.1 )"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/dev-lang/php/php-7.3.16.ebuild b/dev-lang/php/php-7.3.16.ebuild
index 9ddab1c44a4..06fd2a7f0fe 100644
--- a/dev-lang/php/php-7.3.16.ebuild
+++ b/dev-lang/php/php-7.3.16.ebuild
@@ -19,7 +19,7 @@ LICENSE="PHP-3.01
unicode? ( BSD-2 LGPL-2.1 )"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/dev-lang/php/php-7.4.3-r1.ebuild b/dev-lang/php/php-7.4.3-r1.ebuild
index 9c40a80acc1..22fd5918501 100644
--- a/dev-lang/php/php-7.4.3-r1.ebuild
+++ b/dev-lang/php/php-7.4.3-r1.ebuild
@@ -21,7 +21,7 @@ LICENSE="PHP-3.01
unicode? ( BSD-2 LGPL-2.1 )"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/dev-lang/php/php-7.4.4.ebuild b/dev-lang/php/php-7.4.4.ebuild
index 5c069425fc7..0258e95c0e5 100644
--- a/dev-lang/php/php-7.4.4.ebuild
+++ b/dev-lang/php/php-7.4.4.ebuild
@@ -21,7 +21,7 @@ LICENSE="PHP-3.01
unicode? ( BSD-2 LGPL-2.1 )"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/dev-lang/python-exec/python-exec-2.4.6-r1.ebuild b/dev-lang/python-exec/python-exec-2.4.6-r1.ebuild
index b51dd86b670..b06dfcf3fb3 100644
--- a/dev-lang/python-exec/python-exec-2.4.6-r1.ebuild
+++ b/dev-lang/python-exec/python-exec-2.4.6-r1.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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# Internal Python project hack. Do not copy it. Ever.
IUSE="${_PYTHON_ALL_IMPLS[@]/#/python_targets_}"
diff --git a/dev-lang/python/python-2.7.17-r1.ebuild b/dev-lang/python/python-2.7.17-r1.ebuild
index 544e46b4ffc..87a23fa5fb6 100644
--- a/dev-lang/python/python-2.7.17-r1.ebuild
+++ b/dev-lang/python/python-2.7.17-r1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="PSF-2"
SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
IUSE="-berkdb bluetooth build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
# Do not add a dependency on dev-lang/python to this ebuild.
diff --git a/dev-lang/python/python-3.6.10.ebuild b/dev-lang/python/python-3.6.10.ebuild
index de99e27a738..fabe76bc113 100644
--- a/dev-lang/python/python-3.6.10.ebuild
+++ b/dev-lang/python/python-3.6.10.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="PSF-2"
SLOT="${PYVER}/${PYVER}m"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml"
RESTRICT="!test? ( test )"
diff --git a/dev-lang/python/python-3.7.6.ebuild b/dev-lang/python/python-3.7.6.ebuild
index d8edf940185..35666215d46 100644
--- a/dev-lang/python/python-3.7.6.ebuild
+++ b/dev-lang/python/python-3.7.6.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="PSF-2"
SLOT="${PYVER}/${PYVER}m"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
RESTRICT="!test? ( test )"
diff --git a/dev-lang/python/python-3.7.7.ebuild b/dev-lang/python/python-3.7.7.ebuild
index 6ad2817ec1e..2874e32c85e 100644
--- a/dev-lang/python/python-3.7.7.ebuild
+++ b/dev-lang/python/python-3.7.7.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="PSF-2"
SLOT="${PYVER}/${PYVER}m"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
RESTRICT="!test? ( test )"
diff --git a/dev-lang/python/python-3.8.2.ebuild b/dev-lang/python/python-3.8.2.ebuild
index 831650e0d93..edf2079cfe5 100644
--- a/dev-lang/python/python-3.8.2.ebuild
+++ b/dev-lang/python/python-3.8.2.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="PSF-2"
SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
RESTRICT="!test? ( test )"
diff --git a/dev-lang/python/python-3.9.0_alpha4.ebuild b/dev-lang/python/python-3.9.0_alpha4.ebuild
index cf3bb88ec5b..c0e9c0256eb 100644
--- a/dev-lang/python/python-3.9.0_alpha4.ebuild
+++ b/dev-lang/python/python-3.9.0_alpha4.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="PSF-2"
SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
RESTRICT="!test? ( test )"
diff --git a/dev-lang/python/python-3.9.0_alpha5.ebuild b/dev-lang/python/python-3.9.0_alpha5.ebuild
index cf3bb88ec5b..c0e9c0256eb 100644
--- a/dev-lang/python/python-3.9.0_alpha5.ebuild
+++ b/dev-lang/python/python-3.9.0_alpha5.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="PSF-2"
SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
RESTRICT="!test? ( test )"
diff --git a/dev-lang/ruby/ruby-2.4.9.ebuild b/dev-lang/ruby/ruby-2.4.9.ebuild
index a50be1bcc73..cad91f76d1f 100644
--- a/dev-lang/ruby/ruby-2.4.9.ebuild
+++ b/dev-lang/ruby/ruby-2.4.9.ebuild
@@ -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 ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~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/ruby/ruby-2.5.7.ebuild b/dev-lang/ruby/ruby-2.5.7.ebuild
index afecac45abe..51940695a40 100644
--- a/dev-lang/ruby/ruby-2.5.7.ebuild
+++ b/dev-lang/ruby/ruby-2.5.7.ebuild
@@ -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 ~ia64 ~mips ~ppc ~ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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/ruby/ruby-2.6.5.ebuild b/dev-lang/ruby/ruby-2.6.5.ebuild
index 0c21ba4a05f..d8c52f1d99a 100644
--- a/dev-lang/ruby/ruby-2.6.5.ebuild
+++ b/dev-lang/ruby/ruby-2.6.5.ebuild
@@ -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 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit libressl +rdoc rubytests socks5 +ssl static-libs tk xemacs"
RDEPEND="
diff --git a/dev-lang/ruby/ruby-2.7.0.ebuild b/dev-lang/ruby/ruby-2.7.0.ebuild
index a19fc97ffdf..79b2785eb9f 100644
--- a/dev-lang/ruby/ruby-2.7.0.ebuild
+++ b/dev-lang/ruby/ruby-2.7.0.ebuild
@@ -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 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit libressl +rdoc rubytests socks5 +ssl static-libs tk xemacs"
RDEPEND="
diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5-r6.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r6.ebuild
index 97c9250c732..bc4e8cab567 100644
--- a/dev-lang/spidermonkey/spidermonkey-1.8.5-r6.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.5-r6.ebuild
@@ -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 ~sh 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-1.8.5-r7.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r7.ebuild
index ade3e165d14..56d837d3c85 100644
--- a/dev-lang/spidermonkey/spidermonkey-1.8.5-r7.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.5-r7.ebuild
@@ -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 ~sh 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-1.8.5-r9.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r9.ebuild
index e5db814edbc..c22af086cef 100644
--- a/dev-lang/spidermonkey/spidermonkey-1.8.5-r9.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.5-r9.ebuild
@@ -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 ~sh ~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-17.0.0-r5.ebuild b/dev-lang/spidermonkey/spidermonkey-17.0.0-r5.ebuild
index 475da252e6e..7f28ec8e9d6 100644
--- a/dev-lang/spidermonkey/spidermonkey-17.0.0-r5.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-17.0.0-r5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://archive.mozilla.org/pub/js/${MY_PN}${PV}.tar.gz
LICENSE="NPL-1.1"
SLOT="17"
# "MIPS, MacroAssembler is not supported" wrt #491294 for -mips
-KEYWORDS="~alpha amd64 arm -hppa ia64 -mips ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm -hppa ia64 -mips ppc ppc64 ~s390 ~sparc x86"
IUSE="debug jit minimal static-libs test"
REQUIRED_USE="debug? ( jit )"
diff --git a/dev-lang/spidermonkey/spidermonkey-38.3.0.ebuild b/dev-lang/spidermonkey/spidermonkey-38.3.0.ebuild
index 16421949c1e..dd9c2fc7f84 100644
--- a/dev-lang/spidermonkey/spidermonkey-38.3.0.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-38.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.mozilla.org/pub/${PN}/releases/${PV}/${MY_P}.tar.bz2
LICENSE="NPL-1.1"
SLOT="38"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
IUSE="debug +jit minimal static-libs +system-icu test"
RESTRICT="!test? ( test ) ia64? ( test )"
diff --git a/dev-lang/spidermonkey/spidermonkey-45.0.2.ebuild b/dev-lang/spidermonkey/spidermonkey-45.0.2.ebuild
index 11e769bf720..e1093fef43d 100644
--- a/dev-lang/spidermonkey/spidermonkey-45.0.2.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-45.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.mozilla.org/pub/${PN}/releases/${PV}/${MY_P}.tar.bz2
LICENSE="NPL-1.1"
SLOT="45"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="debug +jit minimal static-libs +system-icu test"
RESTRICT="!test? ( test ) ia64? ( test )"
diff --git a/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1-r1.ebuild b/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1-r1.ebuild
index b8945962069..60b24598dbd 100644
--- a/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1-r1.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1-r1.ebuild
@@ -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 ~sh ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86"
IUSE="debug minimal +system-icu test"
RESTRICT="!test? ( test ) ia64? ( test )"
diff --git a/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1.ebuild b/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1.ebuild
index 0590c89489d..825f583c637 100644
--- a/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1.ebuild
@@ -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 ~sh x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 x86"
IUSE="debug minimal +system-icu test"
RESTRICT="!test? ( test ) ia64? ( test )"
diff --git a/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r2.ebuild b/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r2.ebuild
index 7513a877f33..284e01b0a37 100644
--- a/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r2.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r2.ebuild
@@ -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 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE="debug +jit minimal +system-icu test"
RESTRICT="!test? ( test ) ia64? ( test )"
diff --git a/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r3.ebuild b/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r3.ebuild
index d1998882f82..5054d72cc08 100644
--- a/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r3.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r3.ebuild
@@ -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 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="debug +jit minimal +system-icu test"
RESTRICT="!test? ( test ) ia64? ( test )"
diff --git a/dev-lang/swig/swig-3.0.12.ebuild b/dev-lang/swig/swig-3.0.12.ebuild
index f158bcc66d0..4ea24513bcc 100644
--- a/dev-lang/swig/swig-3.0.12.ebuild
+++ b/dev-lang/swig/swig-3.0.12.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-3+ BSD BSD-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="ccache doc pcre"
RESTRICT="test"
diff --git a/dev-lang/swig/swig-4.0.0.ebuild b/dev-lang/swig/swig-4.0.0.ebuild
index 03e27a6bade..bcce897c1e2 100644
--- a/dev-lang/swig/swig-4.0.0.ebuild
+++ b/dev-lang/swig/swig-4.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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.gz"
LICENSE="GPL-3+ BSD BSD-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="ccache doc pcre"
RESTRICT="test"
diff --git a/dev-lang/tcl/tcl-8.5.17-r1.ebuild b/dev-lang/tcl/tcl-8.5.17-r1.ebuild
index 01a13bc4d66..26113228673 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 ~x86-macos ~m68k-mint ~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 9ada3ac3d34..013b58a81d4 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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/tcl/tcl-8.6.9.ebuild b/dev-lang/tcl/tcl-8.6.9.ebuild
index 87df3a5cb0c..27b6a02f271 100644
--- a/dev-lang/tcl/tcl-8.6.9.ebuild
+++ b/dev-lang/tcl/tcl-8.6.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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.5.17-r1.ebuild b/dev-lang/tk/tk-8.5.17-r1.ebuild
index b0486aff3bc..a996f3b08c0 100644
--- a/dev-lang/tk/tk-8.5.17-r1.ebuild
+++ b/dev-lang/tk/tk-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 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug threads truetype aqua xscreensaver"
RESTRICT="!test? ( test )"
diff --git a/dev-lang/tk/tk-8.6.8.ebuild b/dev-lang/tk/tk-8.6.8.ebuild
index 4b7a31bc49d..ce41fd4e162 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug +threads truetype aqua xscreensaver"
RESTRICT="!test? ( test )"
diff --git a/dev-lang/tk/tk-8.6.9.1.ebuild b/dev-lang/tk/tk-8.6.9.1.ebuild
index 16702c8e62e..310921dfa9f 100644
--- a/dev-lang/tk/tk-8.6.9.1.ebuild
+++ b/dev-lang/tk/tk-8.6.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug +threads truetype aqua xscreensaver"
RESTRICT="!test? ( test )"
diff --git a/dev-lang/tk/tk-8.6.9.ebuild b/dev-lang/tk/tk-8.6.9.ebuild
index 58ac00cffbb..c0a38ce62ff 100644
--- a/dev-lang/tk/tk-8.6.9.ebuild
+++ b/dev-lang/tk/tk-8.6.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 5daf060e922..1b93dd629d9 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 ~sh 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.16.ebuild b/dev-lang/vala/vala-0.40.16.ebuild
index bae76372e3c..6dbbe82a284 100644
--- a/dev-lang/vala/vala-0.40.16.ebuild
+++ b/dev-lang/vala/vala-0.40.16.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 ~sh 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.18.ebuild b/dev-lang/vala/vala-0.40.18.ebuild
index 194841657f7..b4b7cb7fc1a 100644
--- a/dev-lang/vala/vala-0.40.18.ebuild
+++ b/dev-lang/vala/vala-0.40.18.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 ~sh 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.19.ebuild b/dev-lang/vala/vala-0.40.19.ebuild
index 7c2127f2ddb..661aaba4756 100644
--- a/dev-lang/vala/vala-0.40.19.ebuild
+++ b/dev-lang/vala/vala-0.40.19.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 ~sh ~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 f371932b83b..68c35f94001 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 ~sh 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.9.ebuild b/dev-lang/vala/vala-0.44.9.ebuild
index 72f2583d807..3642dfffbd1 100644
--- a/dev-lang/vala/vala-0.44.9.ebuild
+++ b/dev-lang/vala/vala-0.44.9.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 ~sh 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.6.ebuild b/dev-lang/vala/vala-0.46.6.ebuild
index 2a72c15ce37..afe20bbc8ab 100644
--- a/dev-lang/vala/vala-0.46.6.ebuild
+++ b/dev-lang/vala/vala-0.46.6.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 ~sh ~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.1.ebuild b/dev-lang/vala/vala-0.48.1.ebuild
index e7477d18c54..1f7c05bd15c 100644
--- a/dev-lang/vala/vala-0.48.1.ebuild
+++ b/dev-lang/vala/vala-0.48.1.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 ~sh ~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/apr-util/apr-util-1.6.1-r3.ebuild b/dev-libs/apr-util/apr-util-1.6.1-r3.ebuild
index b6dd184ad04..af472f72c26 100644
--- a/dev-libs/apr-util/apr-util-1.6.1-r3.ebuild
+++ b/dev-libs/apr-util/apr-util-1.6.1-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="berkdb doc gdbm ldap libressl mysql nss odbc openssl postgres sqlite static-libs"
#RESTRICT="test"
diff --git a/dev-libs/apr/apr-1.6.3-r4.ebuild b/dev-libs/apr/apr-1.6.3-r4.ebuild
index 26562e3e084..0e3c81ac6ee 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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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.6.5-r1.ebuild b/dev-libs/apr/apr-1.6.5-r1.ebuild
index 84509fe2a09..5ecccc4f584 100644
--- a/dev-libs/apr/apr-1.6.5-r1.ebuild
+++ b/dev-libs/apr/apr-1.6.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 3680f8ae00a..078b517bdb3 100644
--- a/dev-libs/apr/apr-1.7.0-r1.ebuild
+++ b/dev-libs/apr/apr-1.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 46d09e450e6..0da5645ab6f 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 ~sh sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="virtual/pkgconfig"
diff --git a/dev-libs/atk/atk-2.32.0.ebuild b/dev-libs/atk/atk-2.32.0.ebuild
index 969ff91be7e..e02f81297bb 100644
--- a/dev-libs/atk/atk-2.32.0.ebuild
+++ b/dev-libs/atk/atk-2.32.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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="gtk-doc +introspection"
RDEPEND="
diff --git a/dev-libs/atk/atk-2.34.1.ebuild b/dev-libs/atk/atk-2.34.1.ebuild
index 7b6ef0410e7..4e54ebb066d 100644
--- a/dev-libs/atk/atk-2.34.1.ebuild
+++ b/dev-libs/atk/atk-2.34.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="gtk-doc +introspection"
RDEPEND="
diff --git a/dev-libs/atk/atk-2.35.1.ebuild b/dev-libs/atk/atk-2.35.1.ebuild
index 1464646871e..4e54ebb066d 100644
--- a/dev-libs/atk/atk-2.35.1.ebuild
+++ b/dev-libs/atk/atk-2.35.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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="gtk-doc +introspection"
RDEPEND="
diff --git a/dev-libs/boost/boost-1.72.0-r1.ebuild b/dev-libs/boost/boost-1.72.0-r1.ebuild
index 024bfbd5114..0b76e3fd937 100644
--- a/dev-libs/boost/boost-1.72.0-r1.ebuild
+++ b/dev-libs/boost/boost-1.72.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar
LICENSE="Boost-1.0"
SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python static-libs +threads tools zlib zstd"
REQUIRED_USE="
mpi? ( threads )
diff --git a/dev-libs/cgilib/cgilib-0.7-r1.ebuild b/dev-libs/cgilib/cgilib-0.7-r1.ebuild
index c6a0b25bac1..6e66f738380 100644
--- a/dev-libs/cgilib/cgilib-0.7-r1.ebuild
+++ b/dev-libs/cgilib/cgilib-0.7-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.infodrom.org/projects/cgilib/download/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh 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.10.0-r1.ebuild b/dev-libs/check/check-0.10.0-r1.ebuild
index 5ebd3f07b8c..c59cd61cf12 100644
--- a/dev-libs/check/check-0.10.0-r1.ebuild
+++ b/dev-libs/check/check-0.10.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs subunit"
RDEPEND="
diff --git a/dev-libs/check/check-0.12.0.ebuild b/dev-libs/check/check-0.12.0.ebuild
index 5650c949313..bcebc3559c1 100644
--- a/dev-libs/check/check-0.12.0.ebuild
+++ b/dev-libs/check/check-0.12.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lib${PN}/${PN}/archive/${PV}.tar.gz -> ${P}-github.t
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs subunit"
RDEPEND="
diff --git a/dev-libs/check/check-0.14.0-r2.ebuild b/dev-libs/check/check-0.14.0-r2.ebuild
index a4f75b01671..9f06143d72f 100644
--- a/dev-libs/check/check-0.14.0-r2.ebuild
+++ b/dev-libs/check/check-0.14.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/lib${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc subunit test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/check/check-0.14.0.ebuild b/dev-libs/check/check-0.14.0.ebuild
index f894fc49cf5..1cef2d76372 100644
--- a/dev-libs/check/check-0.14.0.ebuild
+++ b/dev-libs/check/check-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lib${PN}/${PN}/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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc static-libs subunit test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/cloog/cloog-0.18.1.ebuild b/dev-libs/cloog/cloog-0.18.1.ebuild
index 72669e7fee5..6f3d6ee5293 100644
--- a/dev-libs/cloog/cloog-0.18.1.ebuild
+++ b/dev-libs/cloog/cloog-0.18.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.bastoul.net/cloog/pages/download/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0/4"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE="static-libs"
RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]
diff --git a/dev-libs/cloog/cloog-0.18.4.ebuild b/dev-libs/cloog/cloog-0.18.4.ebuild
index 32de5f51804..ef22cd4b022 100644
--- a/dev-libs/cloog/cloog-0.18.4.ebuild
+++ b/dev-libs/cloog/cloog-0.18.4.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999 ]] ; then
EGIT_REPO_URI="git://repo.or.cz/cloog.git"
inherit autotools git-r3
else
- KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+ KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
SRC_URI="http://www.bastoul.net/cloog/pages/download/${P}.tar.gz"
fi
diff --git a/dev-libs/cloog/cloog-9999.ebuild b/dev-libs/cloog/cloog-9999.ebuild
index e7da11ae632..c85bd46b030 100644
--- a/dev-libs/cloog/cloog-9999.ebuild
+++ b/dev-libs/cloog/cloog-9999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999 ]] ; then
inherit autotools git-r3
EGIT_REPO_URI="https://repo.or.cz/cloog.git"
else
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
SRC_URI="http://www.bastoul.net/cloog/pages/download/${P}.tar.gz"
fi
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r2.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r2.ebuild
index cece28d6510..759c4acdfa5 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r2.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r2.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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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/cyrus-sasl/cyrus-sasl-2.1.27-r3.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r3.ebuild
index f05ffcd69bb..44b5d159dcf 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r3.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r3.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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 cf5982b8669..ba403ca6ba0 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
IUSE="debug static-libs test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/ding-libs/ding-libs-0.5.0.ebuild b/dev-libs/ding-libs/ding-libs-0.5.0.ebuild
index 19a7325e01d..cdb31fb55d8 100644
--- a/dev-libs/ding-libs/ding-libs-0.5.0.ebuild
+++ b/dev-libs/ding-libs/ding-libs-0.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -11,7 +11,7 @@ SRC_URI="https://releases.pagure.org/SSSD/${PN}/${P}.tar.gz"
LICENSE="LGPL-3 GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux"
IUSE="test static-libs"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/ding-libs/ding-libs-0.6.0.ebuild b/dev-libs/ding-libs/ding-libs-0.6.0.ebuild
index 6870b2e56da..5e2ceb06213 100644
--- a/dev-libs/ding-libs/ding-libs-0.6.0.ebuild
+++ b/dev-libs/ding-libs/ding-libs-0.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="https://releases.pagure.org/SSSD/${PN}/${P}.tar.gz"
LICENSE="LGPL-3 GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux"
IUSE="test static-libs"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/ding-libs/ding-libs-0.6.1.ebuild b/dev-libs/ding-libs/ding-libs-0.6.1.ebuild
index c6905456ae7..84d0e497875 100644
--- a/dev-libs/ding-libs/ding-libs-0.6.1.ebuild
+++ b/dev-libs/ding-libs/ding-libs-0.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://releases.pagure.org/SSSD/${PN}/${P}.tar.gz"
LICENSE="LGPL-3 GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux"
IUSE="test static-libs"
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 a71094b282e..2924e36f6d7 100644
--- a/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild
+++ b/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://dmalloc.com/releases/${P}.tgz"
LICENSE="CC-BY-SA-3.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE="static-libs threads"
DEPEND="sys-apps/texinfo"
diff --git a/dev-libs/elfutils/elfutils-0.176-r1.ebuild b/dev-libs/elfutils/elfutils-0.176-r1.ebuild
index 6bce547ba81..b464805ecda 100644
--- a/dev-libs/elfutils/elfutils-0.176-r1.ebuild
+++ b/dev-libs/elfutils/elfutils-0.176-r1.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 sh 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"
RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
diff --git a/dev-libs/elfutils/elfutils-0.177.ebuild b/dev-libs/elfutils/elfutils-0.177.ebuild
index 72f7e6e9cac..16919d7eb3f 100644
--- a/dev-libs/elfutils/elfutils-0.177.ebuild
+++ b/dev-libs/elfutils/elfutils-0.177.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 sh 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"
RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
diff --git a/dev-libs/elfutils/elfutils-0.178.ebuild b/dev-libs/elfutils/elfutils-0.178.ebuild
index f6a0ba093e2..78a7c8af0d7 100644
--- a/dev-libs/elfutils/elfutils-0.178.ebuild
+++ b/dev-libs/elfutils/elfutils-0.178.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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 ~sh ~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"
RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
diff --git a/dev-libs/eventlog/eventlog-0.2.12.ebuild b/dev-libs/eventlog/eventlog-0.2.12.ebuild
index 1632d5adb46..4892509cd2e 100644
--- a/dev-libs/eventlog/eventlog-0.2.12.ebuild
+++ b/dev-libs/eventlog/eventlog-0.2.12.ebuild
@@ -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 sh sparc x86 ~m68k-mint"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~m68k-mint"
IUSE="static-libs"
DEPEND=""
diff --git a/dev-libs/expat/expat-2.2.8.ebuild b/dev-libs/expat/expat-2.2.8.ebuild
index c4a851cc829..1f0b70cb9c7 100644
--- a/dev-libs/expat/expat-2.2.8.ebuild
+++ b/dev-libs/expat/expat-2.2.8.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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="elibc_FreeBSD examples static-libs unicode"
BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
diff --git a/dev-libs/expat/expat-2.2.9.ebuild b/dev-libs/expat/expat-2.2.9.ebuild
index 208b078a9cf..2da0a2ea35e 100644
--- a/dev-libs/expat/expat-2.2.9.ebuild
+++ b/dev-libs/expat/expat-2.2.9.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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="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 2cf2e56dae2..995d8bb5adb 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="html"
S="${WORKDIR}/${PN}-2.4.1-SNAP-0910052249"
diff --git a/dev-libs/fribidi/fribidi-1.0.8.ebuild b/dev-libs/fribidi/fribidi-1.0.8.ebuild
index 901daca87d6..cb00d578e55 100644
--- a/dev-libs/fribidi/fribidi-1.0.8.ebuild
+++ b/dev-libs/fribidi/fribidi-1.0.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/fribidi/fribidi/releases/download/v${PV}/${P}.tar.bz
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
RDEPEND=""
diff --git a/dev-libs/fribidi/fribidi-1.0.9.ebuild b/dev-libs/fribidi/fribidi-1.0.9.ebuild
index f4c914bcaff..d5d6d8545b9 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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
RDEPEND=""
diff --git a/dev-libs/geoip/geoip-1.6.10.ebuild b/dev-libs/geoip/geoip-1.6.10.ebuild
index 7566429f097..4d2af765f4d 100644
--- a/dev-libs/geoip/geoip-1.6.10.ebuild
+++ b/dev-libs/geoip/geoip-1.6.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
# 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 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
IUSE="static-libs"
RESTRICT="test"
diff --git a/dev-libs/geoip/geoip-1.6.11.ebuild b/dev-libs/geoip/geoip-1.6.11.ebuild
index d04916ff860..71439b1600a 100644
--- a/dev-libs/geoip/geoip-1.6.11.ebuild
+++ b/dev-libs/geoip/geoip-1.6.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
# 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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
IUSE="static-libs"
RESTRICT="test"
diff --git a/dev-libs/geoip/geoip-1.6.12.ebuild b/dev-libs/geoip/geoip-1.6.12.ebuild
index d04916ff860..71439b1600a 100644
--- a/dev-libs/geoip/geoip-1.6.12.ebuild
+++ b/dev-libs/geoip/geoip-1.6.12.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
# 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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
IUSE="static-libs"
RESTRICT="test"
diff --git a/dev-libs/geoip/geoip-1.6.9-r1.ebuild b/dev-libs/geoip/geoip-1.6.9-r1.ebuild
index 9e74ca88f0c..a84eb4cd397 100644
--- a/dev-libs/geoip/geoip-1.6.9-r1.ebuild
+++ b/dev-libs/geoip/geoip-1.6.9-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
# 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 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
IUSE="static-libs"
RESTRICT="test"
diff --git a/dev-libs/glib/glib-2.60.7-r1.ebuild b/dev-libs/glib/glib-2.60.7-r1.ebuild
index 7e1043af3b8..42951e63828 100644
--- a/dev-libs/glib/glib-2.60.7-r1.ebuild
+++ b/dev-libs/glib/glib-2.60.7-r1.ebuild
@@ -14,7 +14,7 @@ SLOT="2"
IUSE="dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr"
RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh 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/glib/glib-2.60.7-r2.ebuild b/dev-libs/glib/glib-2.60.7-r2.ebuild
index 892b66e3348..e9d905d6c65 100644
--- a/dev-libs/glib/glib-2.60.7-r2.ebuild
+++ b/dev-libs/glib/glib-2.60.7-r2.ebuild
@@ -14,7 +14,7 @@ SLOT="2"
IUSE="dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr"
RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh 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/glib/glib-2.60.7.ebuild b/dev-libs/glib/glib-2.60.7.ebuild
index acac06c0e7a..75a15e55b52 100644
--- a/dev-libs/glib/glib-2.60.7.ebuild
+++ b/dev-libs/glib/glib-2.60.7.ebuild
@@ -14,7 +14,7 @@ SLOT="2"
IUSE="dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr"
RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh 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/glib/glib-2.62.5.ebuild b/dev-libs/glib/glib-2.62.5.ebuild
index 33a36d9a296..9ea54486720 100644
--- a/dev-libs/glib/glib-2.62.5.ebuild
+++ b/dev-libs/glib/glib-2.62.5.ebuild
@@ -14,7 +14,7 @@ SLOT="2"
IUSE="dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr"
RESTRICT="!test? ( test )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~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/glib/glib-2.62.6.ebuild b/dev-libs/glib/glib-2.62.6.ebuild
index 33a36d9a296..9ea54486720 100644
--- a/dev-libs/glib/glib-2.62.6.ebuild
+++ b/dev-libs/glib/glib-2.62.6.ebuild
@@ -14,7 +14,7 @@ SLOT="2"
IUSE="dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr"
RESTRICT="!test? ( test )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~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/glib/glib-2.64.1.ebuild b/dev-libs/glib/glib-2.64.1.ebuild
index 33ba76e4199..15d5ed1eac0 100644
--- a/dev-libs/glib/glib-2.64.1.ebuild
+++ b/dev-libs/glib/glib-2.64.1.ebuild
@@ -14,7 +14,7 @@ SLOT="2"
IUSE="dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr"
RESTRICT="!test? ( test )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~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-4.3.2-r1.ebuild b/dev-libs/gmp/gmp-4.3.2-r1.ebuild
index ecca5313f52..e8a84aa9838 100644
--- a/dev-libs/gmp/gmp-4.3.2-r1.ebuild
+++ b/dev-libs/gmp/gmp-4.3.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
LICENSE="LGPL-3"
SLOT="3"
-KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE=""
DEPEND="sys-devel/m4"
diff --git a/dev-libs/gmp/gmp-6.1.2-r1.ebuild b/dev-libs/gmp/gmp-6.1.2-r1.ebuild
index 07acc08c278..b26356aa24f 100644
--- a/dev-libs/gmp/gmp-6.1.2-r1.ebuild
+++ b/dev-libs/gmp/gmp-6.1.2-r1.ebuild
@@ -18,7 +18,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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+asm doc cxx pic static-libs"
DEPEND="sys-devel/m4
diff --git a/dev-libs/gmp/gmp-6.1.2.ebuild b/dev-libs/gmp/gmp-6.1.2.ebuild
index e53e3ff4488..1c93b139ce9 100644
--- a/dev-libs/gmp/gmp-6.1.2.ebuild
+++ b/dev-libs/gmp/gmp-6.1.2.ebuild
@@ -18,7 +18,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 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+asm doc cxx pic static-libs"
DEPEND="sys-devel/m4
diff --git a/dev-libs/gmp/gmp-6.2.0-r1.ebuild b/dev-libs/gmp/gmp-6.2.0-r1.ebuild
index c25f31fbdef..ebe02da4173 100644
--- a/dev-libs/gmp/gmp-6.2.0-r1.ebuild
+++ b/dev-libs/gmp/gmp-6.2.0-r1.ebuild
@@ -18,7 +18,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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+asm doc cxx pic static-libs"
BDEPEND="sys-devel/m4
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.60.2.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.60.2.ebuild
index 88bd1c79143..a8ed1adc016 100644
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.60.2.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.60.2.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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="!<${CATEGORY}/${PN/-common}-${PV}"
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 70eb0234f5d..08b6851ff4f 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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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.0.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.64.0.ebuild
index 70eb0234f5d..08b6851ff4f 100644
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.64.0.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.64.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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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.60.2-r1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.60.2-r1.ebuild
index 11a8f0904dd..077d63d8cfc 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.60.2-r1.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.60.2-r1.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
${PYTHON_REQUIRED_USE}
test? ( cairo )
"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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.62.0.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.62.0.ebuild
index 36d5872fa61..a20b75b001c 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.62.0.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.62.0.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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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.0.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.64.0.ebuild
index a2bd4c827a0..9cb429ff7fc 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.64.0.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.64.0.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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# virtual/pkgconfig needed at runtime, bug #505408
RDEPEND="
diff --git a/dev-libs/icu/icu-65.1-r1.ebuild b/dev-libs/icu/icu-65.1-r1.ebuild
index e022b4c1743..d06c10ea516 100644
--- a/dev-libs/icu/icu-65.1-r1.ebuild
+++ b/dev-libs/icu/icu-65.1-r1.ebuild
@@ -14,7 +14,7 @@ LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="debug doc examples static-libs"
BDEPEND="${PYTHON_DEPS}
diff --git a/dev-libs/icu/icu-66.1.ebuild b/dev-libs/icu/icu-66.1.ebuild
index 68f2ffa561d..5a6d0068ddb 100644
--- a/dev-libs/icu/icu-66.1.ebuild
+++ b/dev-libs/icu/icu-66.1.ebuild
@@ -14,7 +14,7 @@ LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="debug doc examples static-libs"
BDEPEND="${PYTHON_DEPS}
diff --git a/dev-libs/iniparser/iniparser-3.1-r1.ebuild b/dev-libs/iniparser/iniparser-3.1-r1.ebuild
index ba2f2f89afb..66552e4f9e2 100644
--- a/dev-libs/iniparser/iniparser-3.1-r1.ebuild
+++ b/dev-libs/iniparser/iniparser-3.1-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://ndevilla.free.fr/iniparser/"
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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc examples static-libs"
DEPEND="doc? ( app-doc/doxygen )
diff --git a/dev-libs/iniparser/iniparser-3.1-r2.ebuild b/dev-libs/iniparser/iniparser-3.1-r2.ebuild
index 3d8e93facd0..cb25e429b9d 100644
--- a/dev-libs/iniparser/iniparser-3.1-r2.ebuild
+++ b/dev-libs/iniparser/iniparser-3.1-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://ndevilla.free.fr/iniparser/"
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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc examples static-libs"
DEPEND="doc? ( app-doc/doxygen )
diff --git a/dev-libs/iniparser/iniparser-4.1.ebuild b/dev-libs/iniparser/iniparser-4.1.ebuild
index 060ad3e13df..02c8405c8e5 100644
--- a/dev-libs/iniparser/iniparser-4.1.ebuild
+++ b/dev-libs/iniparser/iniparser-4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc examples static-libs"
DEPEND="doc? ( app-doc/doxygen )"
diff --git a/dev-libs/isl/isl-0.12.2.ebuild b/dev-libs/isl/isl-0.12.2.ebuild
index 76aa97b4e86..56cd3ccf3d6 100644
--- a/dev-libs/isl/isl-0.12.2.ebuild
+++ b/dev-libs/isl/isl-0.12.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://isl.gforge.inria.fr/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0/10"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE="static-libs"
RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/isl/isl-0.21.ebuild b/dev-libs/isl/isl-0.21.ebuild
index 2821cbff119..adea10cb6c5 100644
--- a/dev-libs/isl/isl-0.21.ebuild
+++ b/dev-libs/isl/isl-0.21.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz"
LICENSE="LGPL-2.1"
SLOT="0/21"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
IUSE="static-libs"
RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/isl/isl-0.22.1.ebuild b/dev-libs/isl/isl-0.22.1.ebuild
index 55b3f3069fe..f5c9d370a9e 100644
--- a/dev-libs/isl/isl-0.22.1.ebuild
+++ b/dev-libs/isl/isl-0.22.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz"
LICENSE="LGPL-2.1"
SLOT="0/22"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
IUSE="static-libs"
RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/ivykis/ivykis-0.42.3-r1.ebuild b/dev-libs/ivykis/ivykis-0.42.3-r1.ebuild
index e0aebbab9fb..7db976fa42c 100644
--- a/dev-libs/ivykis/ivykis-0.42.3-r1.ebuild
+++ b/dev-libs/ivykis/ivykis-0.42.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/buytenh/ivykis/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="static-libs"
PATCHES=(
diff --git a/dev-libs/ivykis/ivykis-0.42.4.ebuild b/dev-libs/ivykis/ivykis-0.42.4.ebuild
index 2fa7fe93551..cd7cc043d43 100644
--- a/dev-libs/ivykis/ivykis-0.42.4.ebuild
+++ b/dev-libs/ivykis/ivykis-0.42.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/buytenh/ivykis/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="static-libs"
src_prepare() {
diff --git a/dev-libs/jansson/jansson-2.10.ebuild b/dev-libs/jansson/jansson-2.10.ebuild
index 91cd027284c..4aa36294f64 100644
--- a/dev-libs/jansson/jansson-2.10.ebuild
+++ b/dev-libs/jansson/jansson-2.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.digip.org/jansson/releases/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE="doc static-libs"
DEPEND="doc? ( >=dev-python/sphinx-1.0.4 )"
diff --git a/dev-libs/jansson/jansson-2.11.ebuild b/dev-libs/jansson/jansson-2.11.ebuild
index 79d94140e7b..32494423b21 100644
--- a/dev-libs/jansson/jansson-2.11.ebuild
+++ b/dev-libs/jansson/jansson-2.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.digip.org/jansson/releases/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
IUSE="doc static-libs"
DEPEND="doc? ( >=dev-python/sphinx-1.0.4 )"
diff --git a/dev-libs/jansson/jansson-2.12.ebuild b/dev-libs/jansson/jansson-2.12.ebuild
index 3e01e915f9e..1525fd69182 100644
--- a/dev-libs/jansson/jansson-2.12.ebuild
+++ b/dev-libs/jansson/jansson-2.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://www.digip.org/jansson/releases/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="doc static-libs"
BDEPEND="doc? ( >=dev-python/sphinx-1.0.4 )"
diff --git a/dev-libs/json-c/json-c-0.12.ebuild b/dev-libs/json-c/json-c-0.12.ebuild
index e8e8e27870e..b74e3dda973 100644
--- a/dev-libs/json-c/json-c-0.12.ebuild
+++ b/dev-libs/json-c/json-c-0.12.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://s3.amazonaws.com/json-c_releases/releases/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh 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 static-libs"
RDEPEND=""
diff --git a/dev-libs/json-c/json-c-0.13.1-r1.ebuild b/dev-libs/json-c/json-c-0.13.1-r1.ebuild
index 509b92f69e4..ec1d02662b4 100644
--- a/dev-libs/json-c/json-c-0.13.1-r1.ebuild
+++ b/dev-libs/json-c/json-c-0.13.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://s3.amazonaws.com/json-c_releases/releases/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/4"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh 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 static-libs"
src_prepare() {
diff --git a/dev-libs/kpathsea/kpathsea-6.3.1_p20190410.ebuild b/dev-libs/kpathsea/kpathsea-6.3.1_p20190410.ebuild
index 4185e5de873..473fa560fcc 100644
--- a/dev-libs/kpathsea/kpathsea-6.3.1_p20190410.ebuild
+++ b/dev-libs/kpathsea/kpathsea-6.3.1_p20190410.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz
LICENSE="GPL-2"
SLOT="0/${PV%_p*}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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/libIDL/libIDL-0.8.14-r2.ebuild b/dev-libs/libIDL/libIDL-0.8.14-r2.ebuild
index 4fc9b8ac533..ba62dbaf420 100644
--- a/dev-libs/libIDL/libIDL-0.8.14-r2.ebuild
+++ b/dev-libs/libIDL/libIDL-0.8.14-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gnome.org/"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND=">=dev-libs/glib-2.44.1-r1:2[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libaio/libaio-0.3.110.ebuild b/dev-libs/libaio/libaio-0.3.110.ebuild
index 439965c439d..6d820eda7d9 100644
--- a/dev-libs/libaio/libaio-0.3.110.ebuild
+++ b/dev-libs/libaio/libaio-0.3.110.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/liba/${PN}/${PN}_${PV}.orig.tar.gz -> ${P}.ta
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 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 test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libaio/libaio-0.3.111.ebuild b/dev-libs/libaio/libaio-0.3.111.ebuild
index 9249c039bb1..904ebacb9c9 100644
--- a/dev-libs/libaio/libaio-0.3.111.ebuild
+++ b/dev-libs/libaio/libaio-0.3.111.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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://pagure.io/${PN}/archive/${P}/${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~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/libaio/libaio-0.3.112.ebuild b/dev-libs/libaio/libaio-0.3.112.ebuild
index 735248f1f05..6ddf6077967 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-2019 Gentoo Authors
+# Copyright 1999-2020 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 ~sh ~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/libaio/libaio-9999.ebuild b/dev-libs/libaio/libaio-9999.ebuild
index 735248f1f05..6ddf6077967 100644
--- a/dev-libs/libaio/libaio-9999.ebuild
+++ b/dev-libs/libaio/libaio-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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 ~sh ~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.1-r1.ebuild b/dev-libs/libassuan/libassuan-2.5.1-r1.ebuild
index 1243768e5c1..640a53fdf86 100644
--- a/dev-libs/libassuan/libassuan-2.5.1-r1.ebuild
+++ b/dev-libs/libassuan/libassuan-2.5.1-r1.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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
RDEPEND=">=dev-libs/libgpg-error-1.8"
diff --git a/dev-libs/libassuan/libassuan-2.5.1.ebuild b/dev-libs/libassuan/libassuan-2.5.1.ebuild
index 1a8109df4d8..909c3b0f2ef 100644
--- a/dev-libs/libassuan/libassuan-2.5.1.ebuild
+++ b/dev-libs/libassuan/libassuan-2.5.1.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 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
RDEPEND=">=dev-libs/libgpg-error-1.8"
diff --git a/dev-libs/libassuan/libassuan-2.5.3.ebuild b/dev-libs/libassuan/libassuan-2.5.3.ebuild
index 1b0d8da1bfc..1671afd4437 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
RDEPEND=">=dev-libs/libgpg-error-1.8"
diff --git a/dev-libs/libatasmart/libatasmart-0.19_p5.ebuild b/dev-libs/libatasmart/libatasmart-0.19_p5.ebuild
index 449170f1955..d9e913a113d 100644
--- a/dev-libs/libatasmart/libatasmart-0.19_p5.ebuild
+++ b/dev-libs/libatasmart/libatasmart-0.19_p5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/liba/${PN}/${PN}_${PV/_p*}.orig.tar.xz
LICENSE="LGPL-2.1"
SLOT="0/4"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE="static-libs"
RDEPEND="virtual/libudev:="
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 6a3865385ea..1957b2f62e6 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
multilib_src_configure() {
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1-r1.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1-r1.ebuild
index 28a0a70e8c0..6bbdddbe6fa 100644
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1-r1.ebuild
+++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.gz"
# clause "or later" so we use LGPL-2.1 without +
LICENSE="GPL-3+ GPL-2+ LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="+cxx static-libs test"
RDEPEND="app-eselect/eselect-cdparanoia
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2-r2.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2-r2.ebuild
index 54e5cdb5e9b..83e80955296 100644
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2-r2.ebuild
+++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.gz"
# clause "or later" so we use LGPL-2.1 without +
LICENSE="GPL-3+ GPL-2+ LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="+cxx static-libs test"
RDEPEND="app-eselect/eselect-cdparanoia
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.0-r1.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.0-r1.ebuild
index 9b8b8529a07..3eb24cff049 100644
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.0-r1.ebuild
+++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.bz2"
# clause "or later" so we use LGPL-2.1 without +
LICENSE="GPL-3+ GPL-2+ LGPL-2.1"
SLOT="0/2" # soname version
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="+cxx static-libs test"
RDEPEND="app-eselect/eselect-cdparanoia
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild
index 8fad8161738..07355295da2 100644
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild
+++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.bz2"
# clause "or later" so we use LGPL-2.1 without +
LICENSE="GPL-3+ GPL-2+ LGPL-2.1"
SLOT="0/2" # soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="+cxx static-libs test"
RDEPEND="app-eselect/eselect-cdparanoia
diff --git a/dev-libs/libcdio/libcdio-0.93.ebuild b/dev-libs/libcdio/libcdio-0.93.ebuild
index 31c42088318..3b66194047a 100644
--- a/dev-libs/libcdio/libcdio-0.93.ebuild
+++ b/dev-libs/libcdio/libcdio-0.93.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0/15" # subslot is based on SONAME
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="cddb +cxx minimal static-libs test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libcdio/libcdio-0.94-r1.ebuild b/dev-libs/libcdio/libcdio-0.94-r1.ebuild
index ef0f8bb5554..0d6b19f7aba 100644
--- a/dev-libs/libcdio/libcdio-0.94-r1.ebuild
+++ b/dev-libs/libcdio/libcdio-0.94-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0/16" # subslot is based on SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="cddb +cxx minimal static-libs test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libcdio/libcdio-1.1.0.ebuild b/dev-libs/libcdio/libcdio-1.1.0.ebuild
index 7b824590b87..c785aac9ec4 100644
--- a/dev-libs/libcdio/libcdio-1.1.0.ebuild
+++ b/dev-libs/libcdio/libcdio-1.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0/17" # subslot is based on SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="cddb +cxx minimal static-libs test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild b/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild
index 7f8eb2330a7..c66a8c10b01 100644
--- a/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild
+++ b/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0/18" # subslot is based on SONAME
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="cddb +cxx minimal static-libs test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libcdio/libcdio-2.0.0.ebuild b/dev-libs/libcdio/libcdio-2.0.0.ebuild
index 3db7be661d6..7b6709a5337 100644
--- a/dev-libs/libcdio/libcdio-2.0.0.ebuild
+++ b/dev-libs/libcdio/libcdio-2.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0/18" # subslot is based on SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="cddb +cxx minimal static-libs test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libcdio/libcdio-2.1.0-r1.ebuild b/dev-libs/libcdio/libcdio-2.1.0-r1.ebuild
index 57d91978786..1579b07933c 100644
--- a/dev-libs/libcdio/libcdio-2.1.0-r1.ebuild
+++ b/dev-libs/libcdio/libcdio-2.1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0/19" # subslot is based on SONAME
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="cddb +cxx minimal static-libs test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libcroco/libcroco-0.6.13.ebuild b/dev-libs/libcroco/libcroco-0.6.13.ebuild
index 15ba17b5137..2ef6547e5e4 100644
--- a/dev-libs/libcroco/libcroco-0.6.13.ebuild
+++ b/dev-libs/libcroco/libcroco-0.6.13.ebuild
@@ -11,7 +11,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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 8afbb96151d..fe13ba638d8 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 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE="doc examples static-libs"
RDEPEND=""
diff --git a/dev-libs/libedit/libedit-20191211.3.1.ebuild b/dev-libs/libedit/libedit-20191211.3.1.ebuild
index f8cf9dedd9a..20286525012 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="static-libs"
RDEPEND=">=sys-libs/ncurses-5.9-r3[static-libs?,${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libev/libev-4.25.ebuild b/dev-libs/libev/libev-4.25.ebuild
index 6b1226544f3..879a584aaad 100644
--- a/dev-libs/libev/libev-4.25.ebuild
+++ b/dev-libs/libev/libev-4.25.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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="elibc_glibc static-libs"
# Bug #283558
diff --git a/dev-libs/libev/libev-4.27.ebuild b/dev-libs/libev/libev-4.27.ebuild
index 73465111656..437b8463d1c 100644
--- a/dev-libs/libev/libev-4.27.ebuild
+++ b/dev-libs/libev/libev-4.27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="elibc_glibc static-libs"
# Bug #283558
diff --git a/dev-libs/libev/libev-4.31.ebuild b/dev-libs/libev/libev-4.31.ebuild
index 6a609941c4d..349394f957c 100644
--- a/dev-libs/libev/libev-4.31.ebuild
+++ b/dev-libs/libev/libev-4.31.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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="elibc_glibc static-libs"
# Bug #283558
diff --git a/dev-libs/libevdev/libevdev-1.8.0.ebuild b/dev-libs/libevdev/libevdev-1.8.0.ebuild
index c3b2cd42dba..3cdb1145b0a 100644
--- a/dev-libs/libevdev/libevdev-1.8.0.ebuild
+++ b/dev-libs/libevdev/libevdev-1.8.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
inherit autotools git-r3
else
SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
fi
LICENSE="MIT"
diff --git a/dev-libs/libevdev/libevdev-1.9.0.ebuild b/dev-libs/libevdev/libevdev-1.9.0.ebuild
index c975e202b80..7fbea6d971f 100644
--- a/dev-libs/libevdev/libevdev-1.9.0.ebuild
+++ b/dev-libs/libevdev/libevdev-1.9.0.ebuild
@@ -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 ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
fi
LICENSE="MIT"
diff --git a/dev-libs/libevdev/libevdev-9999.ebuild b/dev-libs/libevdev/libevdev-9999.ebuild
index c975e202b80..7fbea6d971f 100644
--- a/dev-libs/libevdev/libevdev-9999.ebuild
+++ b/dev-libs/libevdev/libevdev-9999.ebuild
@@ -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 ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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 853cbcb852b..a4491d74305 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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="debug libressl +ssl static-libs test +threads"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libevent/libevent-2.1.8.ebuild b/dev-libs/libevent/libevent-2.1.8.ebuild
index b816912c9b3..079a9f01517 100644
--- a/dev-libs/libevent/libevent-2.1.8.ebuild
+++ b/dev-libs/libevent/libevent-2.1.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/release-${PV}-stable/$
LICENSE="BSD"
# libevent-2.1.so.6
SLOT="0/2.1-6"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="debug libressl +ssl static-libs test +threads"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libffi-compat/libffi-compat-3.2.1-r3.ebuild b/dev-libs/libffi-compat/libffi-compat-3.2.1-r3.ebuild
index 3aeec76d338..8e6973d9985 100644
--- a/dev-libs/libffi-compat/libffi-compat-3.2.1-r3.ebuild
+++ b/dev-libs/libffi-compat/libffi-compat-3.2.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="ftp://sourceware.org/pub/libffi/libffi-${PV}.tar.gz"
LICENSE="MIT"
SLOT="6" # libffi.so.6
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug pax_kernel test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libffi/libffi-3.2.1.ebuild b/dev-libs/libffi/libffi-3.2.1.ebuild
index 30044695403..f83069ff9dd 100644
--- a/dev-libs/libffi/libffi-3.2.1.ebuild
+++ b/dev-libs/libffi/libffi-3.2.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://sourceware.org/pub/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug pax_kernel static-libs test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libffi/libffi-3.3-r1.ebuild b/dev-libs/libffi/libffi-3.3-r1.ebuild
index cc62b274697..cbc8682f8c1 100644
--- a/dev-libs/libffi/libffi-3.3-r1.ebuild
+++ b/dev-libs/libffi/libffi-3.3-r1.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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ~ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug pax_kernel static-libs test test-bhaible"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libffi/libffi-3.3_rc0.ebuild b/dev-libs/libffi/libffi-3.3_rc0.ebuild
index 4f2b06d98c0..fd81e05abb4 100644
--- a/dev-libs/libffi/libffi-3.3_rc0.ebuild
+++ b/dev-libs/libffi/libffi-3.3_rc0.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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug pax_kernel static-libs test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libgamin/libgamin-0.1.10-r5.ebuild b/dev-libs/libgamin/libgamin-0.1.10-r5.ebuild
index 026a01a6645..bafc94031c1 100644
--- a/dev-libs/libgamin/libgamin-0.1.10-r5.ebuild
+++ b/dev-libs/libgamin/libgamin-0.1.10-r5.ebuild
@@ -18,7 +18,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="debug kernel_linux python static-libs"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/libgcrypt-compat/libgcrypt-compat-1.5.6.ebuild b/dev-libs/libgcrypt-compat/libgcrypt-compat-1.5.6.ebuild
index a52e734e183..73e53e817c2 100644
--- a/dev-libs/libgcrypt-compat/libgcrypt-compat-1.5.6.ebuild
+++ b/dev-libs/libgcrypt-compat/libgcrypt-compat-1.5.6.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gnupg.org/"
SRC_URI="mirror://gnupg/${MY_PN}/${MY_P}.tar.bz2"
LICENSE="LGPL-2.1 MIT"
SLOT="11" # soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND=">=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}]
!dev-libs/libgcrypt:0/11
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.3-r1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.3-r1.ebuild
index 5821d4f4f90..6960c8192bc 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.3-r1.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.3-r1.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 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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.3.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.3.ebuild
index 9421ee98f64..6dc1e6a8fa8 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.3.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.3.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 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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.4.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.4.ebuild
index b3008df69b1..9344031d1c8 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.4.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.4.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 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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.5.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.5.ebuild
index 1a36bd5e114..6ac071b8655 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.5.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.5.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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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/libgee/libgee-0.20.2.ebuild b/dev-libs/libgee/libgee-0.20.2.ebuild
index dd9b2a05e56..1a67e969931 100644
--- a/dev-libs/libgee/libgee-0.20.2.ebuild
+++ b/dev-libs/libgee/libgee-0.20.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Libgee"
LICENSE="LGPL-2.1+"
SLOT="0.8/2"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sh sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~x86-linux"
IUSE="+introspection"
# FIXME: add doc support, requires valadoc
diff --git a/dev-libs/libgee/libgee-0.20.3.ebuild b/dev-libs/libgee/libgee-0.20.3.ebuild
index 45b254a5fe7..ed497404f76 100644
--- a/dev-libs/libgee/libgee-0.20.3.ebuild
+++ b/dev-libs/libgee/libgee-0.20.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Libgee"
LICENSE="LGPL-2.1+"
SLOT="0.8/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
IUSE="+introspection"
# FIXME: add doc support, requires valadoc
diff --git a/dev-libs/libgee/libgee-0.6.8.ebuild b/dev-libs/libgee/libgee-0.6.8.ebuild
index 074af22a3a5..a757ce0507f 100644
--- a/dev-libs/libgee/libgee-0.6.8.ebuild
+++ b/dev-libs/libgee/libgee-0.6.8.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://live.gnome.org/Libgee"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sh sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~x86-linux"
IUSE="+introspection"
RDEPEND=">=dev-libs/glib-2.12:2
diff --git a/dev-libs/libgpg-error/libgpg-error-1.36.ebuild b/dev-libs/libgpg-error/libgpg-error-1.36.ebuild
index 691a8cda6f6..8ac9b991b0c 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.36.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.36.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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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.37.ebuild b/dev-libs/libgpg-error/libgpg-error-1.37.ebuild
index 382f00f81ae..f6fa282fbe0 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.37.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.37.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 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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/libgweather/libgweather-3.32.2-r1.ebuild b/dev-libs/libgweather/libgweather-3.32.2-r1.ebuild
index 4f7159085e8..69480d04c53 100644
--- a/dev-libs/libgweather/libgweather-3.32.2-r1.ebuild
+++ b/dev-libs/libgweather/libgweather-3.32.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ SLOT="2/3-15-2" # subslot = 3-(libgweather-3 soname suffix) w/ temporary -2 suff
IUSE="glade gtk-doc +introspection +vala"
REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
RDEPEND="
>=dev-libs/glib-2.44.0:2
diff --git a/dev-libs/libgweather/libgweather-3.34.0.ebuild b/dev-libs/libgweather/libgweather-3.34.0.ebuild
index c92f920bd9e..b5bcac02d64 100644
--- a/dev-libs/libgweather/libgweather-3.34.0.ebuild
+++ b/dev-libs/libgweather/libgweather-3.34.0.ebuild
@@ -15,7 +15,7 @@ SLOT="2/3-16-2" # subslot = 3-(libgweather-3 soname suffix) w/ temporary -2 suff
IUSE="glade gtk-doc +introspection +vala"
REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
RDEPEND="
>=dev-libs/glib-2.44.0:2
diff --git a/dev-libs/libiconv/libiconv-1.15.ebuild b/dev-libs/libiconv/libiconv-1.15.ebuild
index aaf62348371..146ebfa7209 100644
--- a/dev-libs/libiconv/libiconv-1.15.ebuild
+++ b/dev-libs/libiconv/libiconv-1.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/libiconv/${P}.tar.gz"
LICENSE="LGPL-2+ GPL-3+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="prefix static-libs"
DEPEND="!sys-libs/glibc
diff --git a/dev-libs/libintl/libintl-0.19.7.ebuild b/dev-libs/libintl/libintl-0.19.7.ebuild
index 224c4bf6cac..fb946caf7c8 100644
--- a/dev-libs/libintl/libintl-0.19.7.ebuild
+++ b/dev-libs/libintl/libintl-0.19.7.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 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="static-libs +threads"
DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libintl/libintl-0.19.8.1.ebuild b/dev-libs/libintl/libintl-0.19.8.1.ebuild
index 46979d49bd6..1c3ed2a171c 100644
--- a/dev-libs/libintl/libintl-0.19.8.1.ebuild
+++ b/dev-libs/libintl/libintl-0.19.8.1.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 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="static-libs +threads"
DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libintl/libintl-0.20.1.ebuild b/dev-libs/libintl/libintl-0.20.1.ebuild
index 0f9caedd75c..381e47de63d 100644
--- a/dev-libs/libintl/libintl-0.20.1.ebuild
+++ b/dev-libs/libintl/libintl-0.20.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Note: Keep version bumps in sync with sys-devel/gettext.
@@ -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 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="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 58ef15f2506..7598274c712 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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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.3.5-r2.ebuild b/dev-libs/libksba/libksba-1.3.5-r2.ebuild
index fa41b9b6619..eb6afc87408 100644
--- a/dev-libs/libksba/libksba-1.3.5-r2.ebuild
+++ b/dev-libs/libksba/libksba-1.3.5-r2.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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
RDEPEND=">=dev-libs/libgpg-error-1.8"
diff --git a/dev-libs/liblinear/liblinear-210-r1.ebuild b/dev-libs/liblinear/liblinear-210-r1.ebuild
index f190623db67..c2e8b01e132 100644
--- a/dev-libs/liblinear/liblinear-210-r1.ebuild
+++ b/dev-libs/liblinear/liblinear-210-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cjlin1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0/3"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
src_prepare() {
sed -i \
diff --git a/dev-libs/liblinear/liblinear-221.ebuild b/dev-libs/liblinear/liblinear-221.ebuild
index 18f397fed81..b99f3d0ac3d 100644
--- a/dev-libs/liblinear/liblinear-221.ebuild
+++ b/dev-libs/liblinear/liblinear-221.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/cjlin1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
src_prepare() {
default
diff --git a/dev-libs/liblinear/liblinear-230.ebuild b/dev-libs/liblinear/liblinear-230.ebuild
index 18f397fed81..b99f3d0ac3d 100644
--- a/dev-libs/liblinear/liblinear-230.ebuild
+++ b/dev-libs/liblinear/liblinear-230.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/cjlin1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
src_prepare() {
default
diff --git a/dev-libs/libltdl/libltdl-2.4.6.ebuild b/dev-libs/libltdl/libltdl-2.4.6.ebuild
index 87edfbde910..4a1f5435531 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 ca386380334..a374078fc2e 100644
--- a/dev-libs/liblzw/liblzw-0.2-r1.ebuild
+++ b/dev-libs/liblzw/liblzw-0.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/freestdf/${P}.tar.lzma"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="amd64 arm hppa ia64 m68k s390 sh x86"
+KEYWORDS="amd64 arm hppa ia64 m68k s390 x86"
src_configure() {
econf --disable-static
diff --git a/dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild b/dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild
index eef390237e0..1d5be2eaf57 100644
--- a/dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild
+++ b/dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mcrypt/${P}.tar.gz"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
DOCS=(
AUTHORS NEWS README THANKS TODO ChangeLog
diff --git a/dev-libs/libmemcached/libmemcached-1.0.18-r3.ebuild b/dev-libs/libmemcached/libmemcached-1.0.18-r3.ebuild
index 1f40b4db698..6afab9cd1f6 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 5c2ad6908d0..e19c5753275 100644
--- a/dev-libs/libmix/libmix-2.05-r7.ebuild
+++ b/dev-libs/libmix/libmix-2.05-r7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://mixter.void.ru/${P/.}.tgz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux"
IUSE="static-libs"
S=${WORKDIR}/${PN}-v${PV}
diff --git a/dev-libs/libnatspec/libnatspec-0.2.6-r1.ebuild b/dev-libs/libnatspec/libnatspec-0.2.6-r1.ebuild
index a4a0b4b4499..c3c8ae9ebdf 100644
--- a/dev-libs/libnatspec/libnatspec-0.2.6-r1.ebuild
+++ b/dev-libs/libnatspec/libnatspec-0.2.6-r1.ebuild
@@ -13,7 +13,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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE="doc python"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/libnatspec/libnatspec-0.3.0.ebuild b/dev-libs/libnatspec/libnatspec-0.3.0.ebuild
index 4f28ced3576..7f7c3c02228 100644
--- a/dev-libs/libnatspec/libnatspec-0.3.0.ebuild
+++ b/dev-libs/libnatspec/libnatspec-0.3.0.ebuild
@@ -13,7 +13,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 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
IUSE="doc python"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/libnl/libnl-1.1.4-r1.ebuild b/dev-libs/libnl/libnl-1.1.4-r1.ebuild
index 39205ce0c9c..b421d2bac3e 100644
--- a/dev-libs/libnl/libnl-1.1.4-r1.ebuild
+++ b/dev-libs/libnl/libnl-1.1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.infradead.org/~tgr/libnl/"
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 ~sh ~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-1.1.4.ebuild b/dev-libs/libnl/libnl-1.1.4.ebuild
index c37b2df60aa..328dcd036cf 100644
--- a/dev-libs/libnl/libnl-1.1.4.ebuild
+++ b/dev-libs/libnl/libnl-1.1.4.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.infradead.org/~tgr/libnl/"
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 sh 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.4.0.ebuild b/dev-libs/libnl/libnl-3.4.0.ebuild
index 5d321fe6abf..32b4d953e37 100644
--- a/dev-libs/libnl/libnl-3.4.0.ebuild
+++ b/dev-libs/libnl/libnl-3.4.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
"
LICENSE="LGPL-2.1 utils? ( GPL-2 )"
SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh 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="
diff --git a/dev-libs/libnl/libnl-3.5.0.ebuild b/dev-libs/libnl/libnl-3.5.0.ebuild
index be977647afa..314e0b54a40 100644
--- a/dev-libs/libnl/libnl-3.5.0.ebuild
+++ b/dev-libs/libnl/libnl-3.5.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
"
LICENSE="LGPL-2.1 utils? ( GPL-2 )"
SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~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="
diff --git a/dev-libs/liboil/liboil-0.3.17-r2.ebuild b/dev-libs/liboil/liboil-0.3.17-r2.ebuild
index c9895368d9c..088aa5f773a 100644
--- a/dev-libs/liboil/liboil-0.3.17-r2.ebuild
+++ b/dev-libs/liboil/liboil-0.3.17-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://liboil.freedesktop.org/download/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0.3"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="+examples static-libs test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libotf/libotf-0.9.13.ebuild b/dev-libs/libotf/libotf-0.9.13.ebuild
index e29f42708af..c2ed2bcad62 100644
--- a/dev-libs/libotf/libotf-0.9.13.ebuild
+++ b/dev-libs/libotf/libotf-0.9.13.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://nongnu/m17n/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
IUSE="static-libs X"
RDEPEND=">=media-libs/freetype-2.4.9
diff --git a/dev-libs/libotf/libotf-0.9.16.ebuild b/dev-libs/libotf/libotf-0.9.16.ebuild
index e0066ed99ca..0ed54fe7664 100644
--- a/dev-libs/libotf/libotf-0.9.16.ebuild
+++ b/dev-libs/libotf/libotf-0.9.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://nongnu/m17n/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="static-libs X"
RDEPEND=">=media-libs/freetype-2.4.9
diff --git a/dev-libs/libp11/libp11-0.4.10.ebuild b/dev-libs/libp11/libp11-0.4.10.ebuild
index 6832b90b1e8..801072f65da 100644
--- a/dev-libs/libp11/libp11-0.4.10.ebuild
+++ b/dev-libs/libp11/libp11-0.4.10.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE="libressl bindist doc static-libs"
RDEPEND="
diff --git a/dev-libs/libpcre/libpcre-8.42.ebuild b/dev-libs/libpcre/libpcre-8.42.ebuild
index 5e863a9f565..d91ccb56ea7 100644
--- a/dev-libs/libpcre/libpcre-8.42.ebuild
+++ b/dev-libs/libpcre/libpcre-8.42.ebuild
@@ -18,7 +18,7 @@ fi
LICENSE="BSD"
SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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/libpcre/libpcre-8.43.ebuild b/dev-libs/libpcre/libpcre-8.43.ebuild
index 65e976ed381..fc383e0f677 100644
--- a/dev-libs/libpcre/libpcre-8.43.ebuild
+++ b/dev-libs/libpcre/libpcre-8.43.ebuild
@@ -18,7 +18,7 @@ fi
LICENSE="BSD"
SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
REQUIRED_USE="readline? ( !libedit )
libedit? ( !readline )"
diff --git a/dev-libs/libpcre/libpcre-8.44.ebuild b/dev-libs/libpcre/libpcre-8.44.ebuild
index 8ee80c2f8d4..05f4f351f39 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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="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.33-r1.ebuild b/dev-libs/libpcre2/libpcre2-10.33-r1.ebuild
index de02e189095..35e2e8342fa 100644
--- a/dev-libs/libpcre2/libpcre2-10.33-r1.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.33-r1.ebuild
@@ -21,7 +21,7 @@ fi
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
REQUIRED_USE="?? ( libedit readline )"
diff --git a/dev-libs/libpcre2/libpcre2-10.34.ebuild b/dev-libs/libpcre2/libpcre2-10.34.ebuild
index c04bb553139..350a1fbc161 100644
--- a/dev-libs/libpcre2/libpcre2-10.34.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.34.ebuild
@@ -25,7 +25,7 @@ fi
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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.4.2.ebuild b/dev-libs/libpipeline/libpipeline-1.4.2.ebuild
index 9b443f35b3f..f3b682a0546 100644
--- a/dev-libs/libpipeline/libpipeline-1.4.2.ebuild
+++ b/dev-libs/libpipeline/libpipeline-1.4.2.ebuild
@@ -11,7 +11,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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="static-libs test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libpipeline/libpipeline-1.5.1.ebuild b/dev-libs/libpipeline/libpipeline-1.5.1.ebuild
index cc7c85267de..6e3df06cbb3 100644
--- a/dev-libs/libpipeline/libpipeline-1.5.1.ebuild
+++ b/dev-libs/libpipeline/libpipeline-1.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="static-libs test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libpipeline/libpipeline-1.5.2.ebuild b/dev-libs/libpipeline/libpipeline-1.5.2.ebuild
index 13712dd3cc6..cf85c127806 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
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 beb5ad06595..a12ac71f82d 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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
multilib_src_configure() {
diff --git a/dev-libs/libpwquality/libpwquality-1.4.1.ebuild b/dev-libs/libpwquality/libpwquality-1.4.1.ebuild
index efa1303d34d..9eb44b58827 100644
--- a/dev-libs/libpwquality/libpwquality-1.4.1.ebuild
+++ b/dev-libs/libpwquality/libpwquality-1.4.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
LICENSE="|| ( BSD GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="pam python static-libs"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/libpwquality/libpwquality-1.4.2.ebuild b/dev-libs/libpwquality/libpwquality-1.4.2.ebuild
index 329bfc57dbb..9b8b4cd3b4a 100644
--- a/dev-libs/libpwquality/libpwquality-1.4.2.ebuild
+++ b/dev-libs/libpwquality/libpwquality-1.4.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
LICENSE="|| ( BSD GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="pam python static-libs"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/libsigc++/libsigc++-1.2.7.ebuild b/dev-libs/libsigc++/libsigc++-1.2.7.ebuild
index 79f21524187..6f66426c431 100644
--- a/dev-libs/libsigc++/libsigc++-1.2.7.ebuild
+++ b/dev-libs/libsigc++/libsigc++-1.2.7.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://libsigc.sourceforge.net/"
LICENSE="GPL-2 LGPL-2.1+"
SLOT="1.2"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
IUSE=""
DEPEND="sys-devel/m4"
diff --git a/dev-libs/libsigc++/libsigc++-2.10.1.ebuild b/dev-libs/libsigc++/libsigc++-2.10.1.ebuild
index de897f1a40b..62c34abee69 100644
--- a/dev-libs/libsigc++/libsigc++-2.10.1.ebuild
+++ b/dev-libs/libsigc++/libsigc++-2.10.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://libsigc.sourceforge.net/"
LICENSE="LGPL-2.1+"
SLOT="2"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc static-libs test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libsigsegv/libsigsegv-2.11.ebuild b/dev-libs/libsigsegv/libsigsegv-2.11.ebuild
index aff78bfa71f..fa79af0fe71 100644
--- a/dev-libs/libsigsegv/libsigsegv-2.11.ebuild
+++ b/dev-libs/libsigsegv/libsigsegv-2.11.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/libsigsegv/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
src_configure() {
diff --git a/dev-libs/libsigsegv/libsigsegv-2.12-r1.ebuild b/dev-libs/libsigsegv/libsigsegv-2.12-r1.ebuild
index b96708a8c48..037b0cac7db 100644
--- a/dev-libs/libsigsegv/libsigsegv-2.12-r1.ebuild
+++ b/dev-libs/libsigsegv/libsigsegv-2.12-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/libsigsegv/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
PATCHES=(
diff --git a/dev-libs/libsigsegv/libsigsegv-2.12.ebuild b/dev-libs/libsigsegv/libsigsegv-2.12.ebuild
index 7087b3ad69e..32fa3a7acb3 100644
--- a/dev-libs/libsigsegv/libsigsegv-2.12.ebuild
+++ b/dev-libs/libsigsegv/libsigsegv-2.12.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/libsigsegv/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
src_configure() {
diff --git a/dev-libs/libtasn1/libtasn1-4.13.ebuild b/dev-libs/libtasn1/libtasn1-4.13.ebuild
index 0f119064870..876f9d89ecc 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 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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.15.0-r1.ebuild b/dev-libs/libtasn1/libtasn1-4.15.0-r1.ebuild
index e3e7c7a5174..ea29654ea97 100644
--- a/dev-libs/libtasn1/libtasn1-4.15.0-r1.ebuild
+++ b/dev-libs/libtasn1/libtasn1-4.15.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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="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 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 a2542fee79b..e7b90542d4c 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 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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.1.0.ebuild b/dev-libs/libtommath/libtommath-1.1.0.ebuild
index a8999f221b1..91ad87e7e82 100644
--- a/dev-libs/libtommath/libtommath-1.1.0.ebuild
+++ b/dev-libs/libtommath/libtommath-1.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libtom/libtommath/releases/download/v${PV}/ltm-${PV}
LICENSE="WTFPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 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="doc examples static-libs"
src_prepare() {
diff --git a/dev-libs/libunique/libunique-1.1.6-r2.ebuild b/dev-libs/libunique/libunique-1.1.6-r2.ebuild
index 57808ea31a8..09cc79bdc3a 100644
--- a/dev-libs/libunique/libunique-1.1.6-r2.ebuild
+++ b/dev-libs/libunique/libunique-1.1.6-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Attic/LibUnique"
LICENSE="LGPL-2.1"
SLOT="1"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="debug dbus +introspection"
RDEPEND="
diff --git a/dev-libs/libunique/libunique-3.0.2-r1.ebuild b/dev-libs/libunique/libunique-3.0.2-r1.ebuild
index c20d503efe8..965d88509c0 100644
--- a/dev-libs/libunique/libunique-3.0.2-r1.ebuild
+++ b/dev-libs/libunique/libunique-3.0.2-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Attic/LibUnique"
LICENSE="LGPL-2.1"
SLOT="3"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="debug +introspection"
RDEPEND="
diff --git a/dev-libs/libunistring/libunistring-0.9.10.ebuild b/dev-libs/libunistring/libunistring-0.9.10.ebuild
index 4eb279332cc..0785b86f6d4 100644
--- a/dev-libs/libunistring/libunistring-0.9.10.ebuild
+++ b/dev-libs/libunistring/libunistring-0.9.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="LGPL-3 GPL-3"
SLOT="0/2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~x86-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 e897bb23b76..db7e8eb1599 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="debug examples static-libs"
RDEPEND=">=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}]
diff --git a/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild b/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild
index ad93edb9e68..e30cd7e8ffd 100644
--- a/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild
+++ b/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="debug examples static-libs"
RDEPEND=">=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}]
diff --git a/dev-libs/libusb/libusb-1.0.19-r1.ebuild b/dev-libs/libusb/libusb-1.0.19-r1.ebuild
index 7cf17e72c2e..2c16cf53f14 100644
--- a/dev-libs/libusb/libusb-1.0.19-r1.ebuild
+++ b/dev-libs/libusb/libusb-1.0.19-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="debug doc examples static-libs test udev"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libusb/libusb-1.0.21-r1.ebuild b/dev-libs/libusb/libusb-1.0.21-r1.ebuild
index c1625a994f1..c9d163189ed 100644
--- a/dev-libs/libusb/libusb-1.0.21-r1.ebuild
+++ b/dev-libs/libusb/libusb-1.0.21-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="debug doc examples static-libs test udev"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libusb/libusb-1.0.22.ebuild b/dev-libs/libusb/libusb-1.0.22.ebuild
index 0035ca645d3..8627f3050da 100644
--- a/dev-libs/libusb/libusb-1.0.22.ebuild
+++ b/dev-libs/libusb/libusb-1.0.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="debug doc examples static-libs test udev"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libusb/libusb-1.0.23-r1.ebuild b/dev-libs/libusb/libusb-1.0.23-r1.ebuild
index d3f9f5bd26c..8aadb3658e9 100644
--- a/dev-libs/libusb/libusb-1.0.23-r1.ebuild
+++ b/dev-libs/libusb/libusb-1.0.23-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="debug doc examples static-libs test udev"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libverto/libverto-0.2.5-r1.ebuild b/dev-libs/libverto/libverto-0.2.5-r1.ebuild
index fe760c44484..c4535264f03 100644
--- a/dev-libs/libverto/libverto-0.2.5-r1.ebuild
+++ b/dev-libs/libverto/libverto-0.2.5-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 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
IUSE="glib +libev libevent tevent +threads static-libs"
# file collisions
diff --git a/dev-libs/libverto/libverto-0.3.0.ebuild b/dev-libs/libverto/libverto-0.3.0.ebuild
index e2fcf850ff0..7786a2f773c 100644
--- a/dev-libs/libverto/libverto-0.3.0.ebuild
+++ b/dev-libs/libverto/libverto-0.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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 ~sh ~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"
# file collisions
diff --git a/dev-libs/libverto/libverto-0.3.1.ebuild b/dev-libs/libverto/libverto-0.3.1.ebuild
index 382aef72f9d..883f3b2cfe0 100644
--- a/dev-libs/libverto/libverto-0.3.1.ebuild
+++ b/dev-libs/libverto/libverto-0.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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 ~sh ~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"
DEPEND="glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] )
diff --git a/dev-libs/libxml2/libxml2-2.9.9-r2.ebuild b/dev-libs/libxml2/libxml2-2.9.9-r2.ebuild
index 2084604da2a..18b2d16edf2 100644
--- a/dev-libs/libxml2/libxml2-2.9.9-r2.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.9-r2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.xmlsoft.org/"
LICENSE="MIT"
SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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.9-r3.ebuild b/dev-libs/libxml2/libxml2-2.9.9-r3.ebuild
index 16ff46e3a08..1a9bc5285cf 100644
--- a/dev-libs/libxml2/libxml2-2.9.9-r3.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.9-r3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.xmlsoft.org/"
LICENSE="MIT"
SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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/libxslt/libxslt-1.1.33-r1.ebuild b/dev-libs/libxslt/libxslt-1.1.33-r1.ebuild
index 9bdfe0eeb2b..898750b4456 100644
--- a/dev-libs/libxslt/libxslt-1.1.33-r1.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.33-r1.ebuild
@@ -14,7 +14,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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="crypt debug examples python static-libs elibc_Darwin"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/libyaml/libyaml-0.2.2.ebuild b/dev-libs/libyaml/libyaml-0.2.2.ebuild
index b14887e5863..15c446ddda3 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 ee838a21567..c65baccf479 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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 07349024b7a..d025e030c7b 100644
--- a/dev-libs/mm/mm-1.4.2-r2.ebuild
+++ b/dev-libs/mm/mm-1.4.2-r2.ebuild
@@ -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 sh 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.1.0-r1.ebuild b/dev-libs/mpc/mpc-1.1.0-r1.ebuild
index d4018e68454..3a4ff3b484a 100644
--- a/dev-libs/mpc/mpc-1.1.0-r1.ebuild
+++ b/dev-libs/mpc/mpc-1.1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0/3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
DEPEND=">=dev-libs/gmp-5.0.0:0=[${MULTILIB_USEDEP},static-libs?]
diff --git a/dev-libs/mpfr/mpfr-4.0.2.ebuild b/dev-libs/mpfr/mpfr-4.0.2.ebuild
index 30badfcc384..82f2059cbca 100644
--- a/dev-libs/mpfr/mpfr-4.0.2.ebuild
+++ b/dev-libs/mpfr/mpfr-4.0.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.mpfr.org/mpfr-${MY_PV}/${MY_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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
RDEPEND=">=dev-libs/gmp-5.0.0[${MULTILIB_USEDEP},static-libs?]"
diff --git a/dev-libs/nettle/nettle-3.4.1.ebuild b/dev-libs/nettle/nettle-3.4.1.ebuild
index 5344846a122..96e5142e0a0 100644
--- a/dev-libs/nettle/nettle-3.4.1.ebuild
+++ b/dev-libs/nettle/nettle-3.4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="|| ( LGPL-3 LGPL-2.1 )"
SLOT="0/6.2" # subslot = libnettle soname version, .2 as broke ABI bug#601512 then fixed
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc +gmp neon static-libs test cpu_flags_x86_aes"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/nettle/nettle-3.5.1.ebuild b/dev-libs/nettle/nettle-3.5.1.ebuild
index 9d9314d3edc..47028eee562 100644
--- a/dev-libs/nettle/nettle-3.5.1.ebuild
+++ b/dev-libs/nettle/nettle-3.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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="|| ( LGPL-3 LGPL-2.1 )"
SLOT="0/7" # subslot = libnettle soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc +gmp neon static-libs test cpu_flags_x86_aes cpu_flags_x86_sha"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/npth/npth-1.3.ebuild b/dev-libs/npth/npth-1.3.ebuild
index bbfe74c8ba5..0f86636fe5c 100644
--- a/dev-libs/npth/npth-1.3.ebuild
+++ b/dev-libs/npth/npth-1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
src_prepare() {
diff --git a/dev-libs/npth/npth-1.4.ebuild b/dev-libs/npth/npth-1.4.ebuild
index 02fb9ddf559..92a5c882ed2 100644
--- a/dev-libs/npth/npth-1.4.ebuild
+++ b/dev-libs/npth/npth-1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
src_prepare() {
diff --git a/dev-libs/npth/npth-1.5.ebuild b/dev-libs/npth/npth-1.5.ebuild
index 1b693d5d093..b0c65eb0cfd 100644
--- a/dev-libs/npth/npth-1.5.ebuild
+++ b/dev-libs/npth/npth-1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
src_prepare() {
diff --git a/dev-libs/npth/npth-1.6-r1.ebuild b/dev-libs/npth/npth-1.6-r1.ebuild
index 4d8bd423b46..1c585d54845 100644
--- a/dev-libs/npth/npth-1.6-r1.ebuild
+++ b/dev-libs/npth/npth-1.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
src_prepare() {
diff --git a/dev-libs/npth/npth-1.6.ebuild b/dev-libs/npth/npth-1.6.ebuild
index 5a27ef7f9b0..07b25df2295 100644
--- a/dev-libs/npth/npth-1.6.ebuild
+++ b/dev-libs/npth/npth-1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
src_prepare() {
diff --git a/dev-libs/nspr/nspr-4.20.ebuild b/dev-libs/nspr/nspr-4.20.ebuild
index 657772d7720..7acc7bcb527 100644
--- a/dev-libs/nspr/nspr-4.20.ebuild
+++ b/dev-libs/nspr/nspr-4.20.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 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="debug"
MULTILIB_CHOST_TOOLS=(
diff --git a/dev-libs/nspr/nspr-4.22.ebuild b/dev-libs/nspr/nspr-4.22.ebuild
index 1be7b478b6f..984ee7b34ca 100644
--- a/dev-libs/nspr/nspr-4.22.ebuild
+++ b/dev-libs/nspr/nspr-4.22.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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="debug elibc_musl"
MULTILIB_CHOST_TOOLS=(
diff --git a/dev-libs/nspr/nspr-4.24.ebuild b/dev-libs/nspr/nspr-4.24.ebuild
index 1f11ed37ec1..0c02c60c9fb 100644
--- a/dev-libs/nspr/nspr-4.24.ebuild
+++ b/dev-libs/nspr/nspr-4.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="debug elibc_musl"
MULTILIB_CHOST_TOOLS=(
diff --git a/dev-libs/nspr/nspr-4.25.ebuild b/dev-libs/nspr/nspr-4.25.ebuild
index 5e8409383bb..2ca2b567a7f 100644
--- a/dev-libs/nspr/nspr-4.25.ebuild
+++ b/dev-libs/nspr/nspr-4.25.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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="debug elibc_musl"
MULTILIB_CHOST_TOOLS=(
diff --git a/dev-libs/nss/nss-3.47.1-r1.ebuild b/dev-libs/nss/nss-3.47.1-r1.ebuild
index d2546d20cf5..8c5fc05e76c 100644
--- a/dev-libs/nss/nss-3.47.1-r1.ebuild
+++ b/dev-libs/nss/nss-3.47.1-r1.ebuild
@@ -19,7 +19,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 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="cacert +nss-pem utils"
BDEPEND="
>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
diff --git a/dev-libs/nss/nss-3.48-r1.ebuild b/dev-libs/nss/nss-3.48-r1.ebuild
index 124eca85b0b..5767fbe73c3 100644
--- a/dev-libs/nss/nss-3.48-r1.ebuild
+++ b/dev-libs/nss/nss-3.48-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -19,7 +19,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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="cacert +nss-pem utils"
BDEPEND="
>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
diff --git a/dev-libs/nss/nss-3.49.2.ebuild b/dev-libs/nss/nss-3.49.2.ebuild
index bec0e4b6e2f..5767fbe73c3 100644
--- a/dev-libs/nss/nss-3.49.2.ebuild
+++ b/dev-libs/nss/nss-3.49.2.ebuild
@@ -19,7 +19,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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="cacert +nss-pem utils"
BDEPEND="
>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
diff --git a/dev-libs/nss/nss-3.50-r1.ebuild b/dev-libs/nss/nss-3.50-r1.ebuild
index b6a9c7b9594..b1c3b3f782f 100644
--- a/dev-libs/nss/nss-3.50-r1.ebuild
+++ b/dev-libs/nss/nss-3.50-r1.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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="cacert utils"
BDEPEND="
>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
diff --git a/dev-libs/nss/nss-3.51.ebuild b/dev-libs/nss/nss-3.51.ebuild
index 7427324642c..453150dc4b5 100644
--- a/dev-libs/nss/nss-3.51.ebuild
+++ b/dev-libs/nss/nss-3.51.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 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="cacert utils"
BDEPEND="
>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
diff --git a/dev-libs/oniguruma/oniguruma-6.9.4.ebuild b/dev-libs/oniguruma/oniguruma-6.9.4.ebuild
index 1e0acc68298..68ec68761c0 100644
--- a/dev-libs/oniguruma/oniguruma-6.9.4.ebuild
+++ b/dev-libs/oniguruma/oniguruma-6.9.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2003-2019 Gentoo Authors
+# Copyright 2003-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -21,7 +21,7 @@ fi
LICENSE="BSD-2"
SLOT="0/5"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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-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 fbc214e2fde..a14bc6aeed9 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 sh 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/opensc/opensc-0.20.0.ebuild b/dev-libs/opensc/opensc-0.20.0.ebuild
index 3a0f653e208..baba16a3657 100644
--- a/dev-libs/opensc/opensc-0.20.0.ebuild
+++ b/dev-libs/opensc/opensc-0.20.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/OpenSC/OpenSC/releases/download/${PV}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~m68k ppc ppc64 ~s390 ~sparc x86"
IUSE="ctapi doc libressl openct notify +pcsc-lite readline secure-messaging ssl test zlib"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/openssl-compat/openssl-compat-0.9.8z_p8-r1.ebuild b/dev-libs/openssl-compat/openssl-compat-0.9.8z_p8-r1.ebuild
index 6516e0257f2..ba39e4f76d4 100644
--- a/dev-libs/openssl-compat/openssl-compat-0.9.8z_p8-r1.ebuild
+++ b/dev-libs/openssl-compat/openssl-compat-0.9.8z_p8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# this ebuild is only for the libcrypto.so.0.9.8 and libssl.so.0.9.8 SONAME for ABI compat
@@ -18,7 +18,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
LICENSE="openssl"
SLOT="0.9.8"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
IUSE="bindist gmp kerberos cpu_flags_x86_sse2 test zlib"
RESTRICT="!bindist? ( bindist )
test"
diff --git a/dev-libs/openssl-compat/openssl-compat-1.0.2u.ebuild b/dev-libs/openssl-compat/openssl-compat-1.0.2u.ebuild
index 7e0327f824c..25a816cf47d 100644
--- a/dev-libs/openssl-compat/openssl-compat-1.0.2u.ebuild
+++ b/dev-libs/openssl-compat/openssl-compat-1.0.2u.ebuild
@@ -37,7 +37,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
LICENSE="openssl"
SLOT="1.0.0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~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 )
diff --git a/dev-libs/openssl/openssl-1.0.2u.ebuild b/dev-libs/openssl/openssl-1.0.2u.ebuild
index 74f92d2e307..de4d2ac7d12 100644
--- a/dev-libs/openssl/openssl-1.0.2u.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2u.ebuild
@@ -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 sh 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.0l.ebuild b/dev-libs/openssl/openssl-1.1.0l.ebuild
index 1d5afcf680c..7e8ec91525c 100644
--- a/dev-libs/openssl/openssl-1.1.0l.ebuild
+++ b/dev-libs/openssl/openssl-1.1.0l.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -26,7 +26,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
LICENSE="openssl"
SLOT="0/1.1" # .so version of libssl/libcrypto
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~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/openssl/openssl-1.1.1d-r3.ebuild b/dev-libs/openssl/openssl-1.1.1d-r3.ebuild
index 97a1002fac7..e439c02394b 100644
--- a/dev-libs/openssl/openssl-1.1.1d-r3.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1d-r3.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 sh 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/openssl/openssl-1.1.1e.ebuild b/dev-libs/openssl/openssl-1.1.1e.ebuild
index ee289080943..ccc0cbc5d58 100644
--- a/dev-libs/openssl/openssl-1.1.1e.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1e.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 ~sh ~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/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild
index ae03e3b394e..5ca525b85a9 100644
--- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild
+++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -23,7 +23,7 @@ SRC_URI="ftp://ftp.ossp.org/pkg/lib/uuid/${MY_P}.tar.gz"
LICENSE="ISC"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="+cxx perl php static-libs"
DEPEND="perl? ( dev-lang/perl:= )"
diff --git a/dev-libs/pakchois/pakchois-0.4-r2.ebuild b/dev-libs/pakchois/pakchois-0.4-r2.ebuild
index e6f2b13f061..66ea744cd12 100644
--- a/dev-libs/pakchois/pakchois-0.4-r2.ebuild
+++ b/dev-libs/pakchois/pakchois-0.4-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.manyfish.co.uk/pakchois/${P}.tar.gz"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="nls"
multilib_src_configure() {
diff --git a/dev-libs/pkcs11-helper/pkcs11-helper-1.25.1.ebuild b/dev-libs/pkcs11-helper/pkcs11-helper-1.25.1.ebuild
index 8640e84a923..938b024f9c4 100644
--- a/dev-libs/pkcs11-helper/pkcs11-helper-1.25.1.ebuild
+++ b/dev-libs/pkcs11-helper/pkcs11-helper-1.25.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.bz2"
LICENSE="|| ( BSD GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
IUSE="bindist doc gnutls libressl nss static-libs"
RDEPEND="
diff --git a/dev-libs/popt/popt-1.16-r2.ebuild b/dev-libs/popt/popt-1.16-r2.ebuild
index d3f03ec51fe..18735a4db3f 100644
--- a/dev-libs/popt/popt-1.16-r2.ebuild
+++ b/dev-libs/popt/popt-1.16-r2.ebuild
@@ -10,7 +10,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 sh 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/ppl/ppl-1.1.ebuild b/dev-libs/ppl/ppl-1.1.ebuild
index 242c50accd9..dd84d6c337c 100644
--- a/dev-libs/ppl/ppl-1.1.ebuild
+++ b/dev-libs/ppl/ppl-1.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://bugseng.com/products/ppl/download/ftp/releases/${PV}/${P}.tar.xz
LICENSE="GPL-3"
SLOT="0/4.13" # SONAMEs
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~sparc-solaris"
IUSE="+cxx doc lpsol pch static-libs test"
RDEPEND=">=dev-libs/gmp-6[cxx]
diff --git a/dev-libs/ppl/ppl-1.2-r1.ebuild b/dev-libs/ppl/ppl-1.2-r1.ebuild
index 12b2ca6d037..6980ae7142c 100644
--- a/dev-libs/ppl/ppl-1.2-r1.ebuild
+++ b/dev-libs/ppl/ppl-1.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://bugseng.com/products/ppl/download/ftp/releases/${PV}/${P}.tar.xz
LICENSE="GPL-3"
SLOT="0/4.14" # SONAMEs
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~sparc-solaris"
IUSE="+cxx doc lpsol pch static-libs test"
RDEPEND=">=dev-libs/gmp-6[cxx]
diff --git a/dev-libs/ppl/ppl-1.2.ebuild b/dev-libs/ppl/ppl-1.2.ebuild
index 02423503552..09855e01f5a 100644
--- a/dev-libs/ppl/ppl-1.2.ebuild
+++ b/dev-libs/ppl/ppl-1.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://bugseng.com/products/ppl/download/ftp/releases/${PV}/${P}.tar.xz
LICENSE="GPL-3"
SLOT="0/4.14" # SONAMEs
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~sparc-solaris"
IUSE="+cxx doc lpsol pch static-libs test"
RDEPEND=">=dev-libs/gmp-6[cxx]
diff --git a/dev-libs/protobuf/protobuf-3.10.1.ebuild b/dev-libs/protobuf/protobuf-3.10.1.ebuild
index d6dc5a9ed60..2a3ed069508 100644
--- a/dev-libs/protobuf/protobuf-3.10.1.ebuild
+++ b/dev-libs/protobuf/protobuf-3.10.1.ebuild
@@ -22,7 +22,7 @@ fi
LICENSE="BSD"
SLOT="0/21"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="emacs examples static-libs test zlib"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/protobuf/protobuf-3.11.2.ebuild b/dev-libs/protobuf/protobuf-3.11.2.ebuild
index d8d5e5fa70a..44c26d8d35e 100644
--- a/dev-libs/protobuf/protobuf-3.11.2.ebuild
+++ b/dev-libs/protobuf/protobuf-3.11.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2008-2019 Gentoo Authors
+# Copyright 2008-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -22,7 +22,7 @@ fi
LICENSE="BSD"
SLOT="0/22"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="emacs examples static-libs test zlib"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/protobuf/protobuf-3.11.4.ebuild b/dev-libs/protobuf/protobuf-3.11.4.ebuild
index 4fe1fe35a20..de484358806 100644
--- a/dev-libs/protobuf/protobuf-3.11.4.ebuild
+++ b/dev-libs/protobuf/protobuf-3.11.4.ebuild
@@ -22,7 +22,7 @@ fi
LICENSE="BSD"
SLOT="0/22"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="emacs examples static-libs test zlib"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/ptexenc/ptexenc-1.3.7_p20190410.ebuild b/dev-libs/ptexenc/ptexenc-1.3.7_p20190410.ebuild
index 2d288bd3a91..9e9d39078fc 100644
--- a/dev-libs/ptexenc/ptexenc-1.3.7_p20190410.ebuild
+++ b/dev-libs/ptexenc/ptexenc-1.3.7_p20190410.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
IUSE="iconv static-libs"
DEPEND="iconv? ( virtual/libiconv )
diff --git a/dev-libs/uulib/uulib-0.5.20-r1.ebuild b/dev-libs/uulib/uulib-0.5.20-r1.ebuild
index ebe7e4e5d0f..5e0b2a6a6ea 100644
--- a/dev-libs/uulib/uulib-0.5.20-r1.ebuild
+++ b/dev-libs/uulib/uulib-0.5.20-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.fpx.de/fp/Software/UUDeview/download/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ~ppc64 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ~ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
S=${WORKDIR}/${MY_P}/${PN}
diff --git a/dev-libs/vala-common/vala-common-0.44.11.ebuild b/dev-libs/vala-common/vala-common-0.44.11.ebuild
index 00a243155e0..8f9f97c1c10 100644
--- a/dev-libs/vala-common/vala-common-0.44.11.ebuild
+++ b/dev-libs/vala-common/vala-common-0.44.11.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 ~sh 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.44.9.ebuild b/dev-libs/vala-common/vala-common-0.44.9.ebuild
index 96c1966d1bf..46a2940b92b 100644
--- a/dev-libs/vala-common/vala-common-0.44.9.ebuild
+++ b/dev-libs/vala-common/vala-common-0.44.9.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 ~sh 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.46.6.ebuild b/dev-libs/vala-common/vala-common-0.46.6.ebuild
index d55cd027cf5..ee55cfcad10 100644
--- a/dev-libs/vala-common/vala-common-0.46.6.ebuild
+++ b/dev-libs/vala-common/vala-common-0.46.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 ~sh ~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.1.ebuild b/dev-libs/vala-common/vala-common-0.48.1.ebuild
index d55cd027cf5..ee55cfcad10 100644
--- a/dev-libs/vala-common/vala-common-0.48.1.ebuild
+++ b/dev-libs/vala-common/vala-common-0.48.1.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 ~sh ~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.18.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.18.ebuild
index bd6753dc6d7..c9e44f5f952 100644
--- a/dev-libs/wayland-protocols/wayland-protocols-1.18.ebuild
+++ b/dev-libs/wayland-protocols/wayland-protocols-1.18.ebuild
@@ -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 s390 ~sh sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
fi
LICENSE="MIT"
diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.19.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.19.ebuild
index 85d20d4e9e3..8eed22822b4 100644
--- a/dev-libs/wayland-protocols/wayland-protocols-1.19.ebuild
+++ b/dev-libs/wayland-protocols/wayland-protocols-1.19.ebuild
@@ -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 ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
fi
LICENSE="MIT"
diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.20.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.20.ebuild
index 85d20d4e9e3..8eed22822b4 100644
--- a/dev-libs/wayland-protocols/wayland-protocols-1.20.ebuild
+++ b/dev-libs/wayland-protocols/wayland-protocols-1.20.ebuild
@@ -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 ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
fi
LICENSE="MIT"
diff --git a/dev-libs/wayland-protocols/wayland-protocols-9999.ebuild b/dev-libs/wayland-protocols/wayland-protocols-9999.ebuild
index 85d20d4e9e3..8eed22822b4 100644
--- a/dev-libs/wayland-protocols/wayland-protocols-9999.ebuild
+++ b/dev-libs/wayland-protocols/wayland-protocols-9999.ebuild
@@ -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 ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
fi
LICENSE="MIT"
diff --git a/dev-libs/wayland/wayland-1.17.0.ebuild b/dev-libs/wayland/wayland-1.17.0.ebuild
index 23c1ccd0275..46d6e410633 100644
--- a/dev-libs/wayland/wayland-1.17.0.ebuild
+++ b/dev-libs/wayland/wayland-1.17.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
inherit git-r3
else
SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
fi
inherit autotools libtool multilib-minimal toolchain-funcs
diff --git a/dev-libs/wayland/wayland-1.18.0.ebuild b/dev-libs/wayland/wayland-1.18.0.ebuild
index ca127148e08..4e06cf8a7a0 100644
--- a/dev-libs/wayland/wayland-1.18.0.ebuild
+++ b/dev-libs/wayland/wayland-1.18.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
inherit git-r3
else
SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
fi
inherit autotools libtool multilib-minimal toolchain-funcs
diff --git a/dev-libs/wayland/wayland-9999.ebuild b/dev-libs/wayland/wayland-9999.ebuild
index ca127148e08..4e06cf8a7a0 100644
--- a/dev-libs/wayland/wayland-9999.ebuild
+++ b/dev-libs/wayland/wayland-9999.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
inherit git-r3
else
SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
fi
inherit autotools libtool multilib-minimal toolchain-funcs
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.39.11-r1.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.39.11-r1.ebuild
index 9968972e18e..62f07f5aa99 100644
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.39.11-r1.ebuild
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.39.11-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="abyss +cgi +curl +cxx +libxml2 threads test tools"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/yaz/yaz-3.0.53.ebuild b/dev-libs/yaz/yaz-3.0.53.ebuild
index 81d6963f591..5b955684542 100644
--- a/dev-libs/yaz/yaz-3.0.53.ebuild
+++ b/dev-libs/yaz/yaz-3.0.53.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://ftp.indexdata.dk/pub/${PN}/${P}.tar.gz"
LICENSE="BSD GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86"
IUSE="debug icu libressl tcpd ziffy"
RDEPEND="dev-libs/libxml2
diff --git a/dev-libs/zziplib/zziplib-0.13.69-r1.ebuild b/dev-libs/zziplib/zziplib-0.13.69-r1.ebuild
index 2157af9f0a5..175257bd5b5 100644
--- a/dev-libs/zziplib/zziplib-0.13.69-r1.ebuild
+++ b/dev-libs/zziplib/zziplib-0.13.69-r1.ebuild
@@ -15,7 +15,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"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc sdl static-libs test"
RESTRICT="!test? ( test )"
diff --git a/dev-lua/lutok/lutok-0.4-r1.ebuild b/dev-lua/lutok/lutok-0.4-r1.ebuild
index 32250c1a373..fd3896c626a 100644
--- a/dev-lua/lutok/lutok-0.4-r1.ebuild
+++ b/dev-lua/lutok/lutok-0.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jmmv/lutok/releases/download/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-lua/lutok/lutok-0.4-r2.ebuild b/dev-lua/lutok/lutok-0.4-r2.ebuild
index 104c598e507..42aefd393be 100644
--- a/dev-lua/lutok/lutok-0.4-r2.ebuild
+++ b/dev-lua/lutok/lutok-0.4-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/jmmv/lutok/releases/download/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Algorithm-Diff/Algorithm-Diff-1.190.300.ebuild b/dev-perl/Algorithm-Diff/Algorithm-Diff-1.190.300.ebuild
index 040d553285e..1aa6b00572d 100644
--- a/dev-perl/Algorithm-Diff/Algorithm-Diff-1.190.300.ebuild
+++ b/dev-perl/Algorithm-Diff/Algorithm-Diff-1.190.300.ebuild
@@ -10,7 +10,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 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/dev-perl/Alien-Build/Alien-Build-1.790.0.ebuild b/dev-perl/Alien-Build/Alien-Build-1.790.0.ebuild
index c12c3c4042c..d97c4a19b3a 100644
--- a/dev-perl/Alien-Build/Alien-Build-1.790.0.ebuild
+++ b/dev-perl/Alien-Build/Alien-Build-1.790.0.ebuild
@@ -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 ~sh ~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.90.0.ebuild b/dev-perl/Alien-Libxml2/Alien-Libxml2-0.90.0.ebuild
index e241131d281..f9eb9a0f0c0 100644
--- a/dev-perl/Alien-Libxml2/Alien-Libxml2-0.90.0.ebuild
+++ b/dev-perl/Alien-Libxml2/Alien-Libxml2-0.90.0.ebuild
@@ -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 ~sh ~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/App-pwhich/App-pwhich-1.150.0.ebuild b/dev-perl/App-pwhich/App-pwhich-1.150.0.ebuild
index 306eb410881..df62823b560 100644
--- a/dev-perl/App-pwhich/App-pwhich-1.150.0.ebuild
+++ b/dev-perl/App-pwhich/App-pwhich-1.150.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 b9fe8fbbce4..cbd3066db25 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Authen-NTLM/Authen-NTLM-1.90.0-r1.ebuild b/dev-perl/Authen-NTLM/Authen-NTLM-1.90.0-r1.ebuild
index 452dea9898c..2c6aa75de7d 100644
--- a/dev-perl/Authen-NTLM/Authen-NTLM-1.90.0-r1.ebuild
+++ b/dev-perl/Authen-NTLM/Authen-NTLM-1.90.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="An NTLM authentication module"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ~ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Authen-PAM/Authen-PAM-0.160.0-r1.ebuild b/dev-perl/Authen-PAM/Authen-PAM-0.160.0-r1.ebuild
index 687730564f2..ef853a674b9 100644
--- a/dev-perl/Authen-PAM/Authen-PAM-0.160.0-r1.ebuild
+++ b/dev-perl/Authen-PAM/Authen-PAM-0.160.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Interface to PAM library"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86"
IUSE=""
RDEPEND="sys-libs/pam"
diff --git a/dev-perl/Authen-PAM/Authen-PAM-0.160.0-r2.ebuild b/dev-perl/Authen-PAM/Authen-PAM-0.160.0-r2.ebuild
index 75f571bab66..ea2809feba5 100644
--- a/dev-perl/Authen-PAM/Authen-PAM-0.160.0-r2.ebuild
+++ b/dev-perl/Authen-PAM/Authen-PAM-0.160.0-r2.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Interface to PAM library"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sh 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-r1.ebuild b/dev-perl/Authen-SASL/Authen-SASL-2.160.0-r1.ebuild
index b5e6ebdc1a9..e2743266a4f 100644
--- a/dev-perl/Authen-SASL/Authen-SASL-2.160.0-r1.ebuild
+++ b/dev-perl/Authen-SASL/Authen-SASL-2.160.0-r1.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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="kerberos"
DEPEND="dev-perl/Digest-HMAC
diff --git a/dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.240.0.ebuild b/dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.240.0.ebuild
index a13d1b4a6bc..71b281f2ccc 100644
--- a/dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.240.0.ebuild
+++ b/dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.240.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Execute code after a scope finished compilation"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/BSD-Resource/BSD-Resource-1.291.100.ebuild b/dev-perl/BSD-Resource/BSD-Resource-1.291.100.ebuild
index a396a76f6ba..7b12bc7d310 100644
--- a/dev-perl/BSD-Resource/BSD-Resource-1.291.100.ebuild
+++ b/dev-perl/BSD-Resource/BSD-Resource-1.291.100.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Perl module for BSD process resource limit and priority functions"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86"
IUSE=""
DEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/dev-perl/Bit-Vector/Bit-Vector-7.400.0.ebuild b/dev-perl/Bit-Vector/Bit-Vector-7.400.0.ebuild
index f18f8b68a36..4f47d7ea628 100644
--- a/dev-perl/Bit-Vector/Bit-Vector-7.400.0.ebuild
+++ b/dev-perl/Bit-Vector/Bit-Vector-7.400.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Efficient bit vector, set of integers and big int math library"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="
diff --git a/dev-perl/CGI-Fast/CGI-Fast-2.130.0.ebuild b/dev-perl/CGI-Fast/CGI-Fast-2.130.0.ebuild
index 290c1464384..6cf623ccd41 100644
--- a/dev-perl/CGI-Fast/CGI-Fast-2.130.0.ebuild
+++ b/dev-perl/CGI-Fast/CGI-Fast-2.130.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="CGI Interface for Fast CGI"
SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~m68k ~mips ppc ~ppc64 ~s390 ~sh x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~hppa ~m68k ~mips ppc ~ppc64 ~s390 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/CGI/CGI-4.220.0.ebuild b/dev-perl/CGI/CGI-4.220.0.ebuild
index bd07a2903a2..6237b46025f 100644
--- a/dev-perl/CGI/CGI-4.220.0.ebuild
+++ b/dev-perl/CGI/CGI-4.220.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Simple Common Gateway Interface Class"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/CGI/CGI-4.400.0.ebuild b/dev-perl/CGI/CGI-4.400.0.ebuild
index 02ad506a158..1130f57ba1a 100644
--- a/dev-perl/CGI/CGI-4.400.0.ebuild
+++ b/dev-perl/CGI/CGI-4.400.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Simple Common Gateway Interface Class"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/CPAN-Meta-Check/CPAN-Meta-Check-0.14.0.ebuild b/dev-perl/CPAN-Meta-Check/CPAN-Meta-Check-0.14.0.ebuild
index 31ffb325ebc..7ef263a3e4e 100644
--- a/dev-perl/CPAN-Meta-Check/CPAN-Meta-Check-0.14.0.ebuild
+++ b/dev-perl/CPAN-Meta-Check/CPAN-Meta-Check-0.14.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Verify requirements in a CPAN::Meta object"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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-r1.ebuild b/dev-perl/Cache-Memcached/Cache-Memcached-1.300.0-r1.ebuild
index 0afe2b54aae..5c33a603c11 100644
--- a/dev-perl/Cache-Memcached/Cache-Memcached-1.300.0-r1.ebuild
+++ b/dev-perl/Cache-Memcached/Cache-Memcached-1.300.0-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Perl API for memcached"
HOMEPAGE="http://www.danga.com/memcached/ https://metacpan.org/release/Cache-Memcached"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE=""
DEPEND="dev-perl/String-CRC32"
diff --git a/dev-perl/Canary-Stability/Canary-Stability-2012.0.0.ebuild b/dev-perl/Canary-Stability/Canary-Stability-2012.0.0.ebuild
index d19437efb8f..f5ec339856f 100644
--- a/dev-perl/Canary-Stability/Canary-Stability-2012.0.0.ebuild
+++ b/dev-perl/Canary-Stability/Canary-Stability-2012.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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=""
diff --git a/dev-perl/Capture-Tiny/Capture-Tiny-0.460.0.ebuild b/dev-perl/Capture-Tiny/Capture-Tiny-0.460.0.ebuild
index 59b4bec6a7e..180a3a16ae0 100644
--- a/dev-perl/Capture-Tiny/Capture-Tiny-0.460.0.ebuild
+++ b/dev-perl/Capture-Tiny/Capture-Tiny-0.460.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 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
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 d0c61e127c3..68f66b35a16 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Carp-Clan/Carp-Clan-6.60.0.ebuild b/dev-perl/Carp-Clan/Carp-Clan-6.60.0.ebuild
index d8a33fdbfff..16bf8b8815d 100644
--- a/dev-perl/Carp-Clan/Carp-Clan-6.60.0.ebuild
+++ b/dev-perl/Carp-Clan/Carp-Clan-6.60.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Report errors from perspective of caller of a clan of modules"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Class-Data-Inheritable/Class-Data-Inheritable-0.80.0-r2.ebuild b/dev-perl/Class-Data-Inheritable/Class-Data-Inheritable-0.80.0-r2.ebuild
index 597cd28d5ec..f6ecf62664e 100644
--- a/dev-perl/Class-Data-Inheritable/Class-Data-Inheritable-0.80.0-r2.ebuild
+++ b/dev-perl/Class-Data-Inheritable/Class-Data-Inheritable-0.80.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Inheritable, overridable class data"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
export OPTIMIZE="${CFLAGS}"
diff --git a/dev-perl/Class-Factory-Util/Class-Factory-Util-1.700.0-r2.ebuild b/dev-perl/Class-Factory-Util/Class-Factory-Util-1.700.0-r2.ebuild
index 59ea23388d3..5376e1cbc50 100644
--- a/dev-perl/Class-Factory-Util/Class-Factory-Util-1.700.0-r2.ebuild
+++ b/dev-perl/Class-Factory-Util/Class-Factory-Util-1.700.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Provide utility methods for factory classes"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x86-solaris"
IUSE=""
RDEPEND=""
diff --git a/dev-perl/Class-Inspector/Class-Inspector-1.320.0.ebuild b/dev-perl/Class-Inspector/Class-Inspector-1.320.0.ebuild
index 5ccf71a9cc8..164ea12804b 100644
--- a/dev-perl/Class-Inspector/Class-Inspector-1.320.0.ebuild
+++ b/dev-perl/Class-Inspector/Class-Inspector-1.320.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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Class-Load/Class-Load-0.240.0.ebuild b/dev-perl/Class-Load/Class-Load-0.240.0.ebuild
index 1030d2f83f7..ed906418536 100644
--- a/dev-perl/Class-Load/Class-Load-0.240.0.ebuild
+++ b/dev-perl/Class-Load/Class-Load-0.240.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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Class-MakeMethods/Class-MakeMethods-1.10.0-r1.ebuild b/dev-perl/Class-MakeMethods/Class-MakeMethods-1.10.0-r1.ebuild
index d76c9c7e15c..10d1f7daa2f 100644
--- a/dev-perl/Class-MakeMethods/Class-MakeMethods-1.10.0-r1.ebuild
+++ b/dev-perl/Class-MakeMethods/Class-MakeMethods-1.10.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Automated method creation module for Perl"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc s390 sh sparc x86 ~ppc-aix ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc s390 sparc x86 ~ppc-aix ~x86-solaris"
IUSE=""
PATCHES=( "${FILESDIR}/${P}-perl526.patch" )
diff --git a/dev-perl/Class-MethodMaker/Class-MethodMaker-2.240.0.ebuild b/dev-perl/Class-MethodMaker/Class-MethodMaker-2.240.0.ebuild
index 3c0271d6f38..7b14d986000 100644
--- a/dev-perl/Class-MethodMaker/Class-MethodMaker-2.240.0.ebuild
+++ b/dev-perl/Class-MethodMaker/Class-MethodMaker-2.240.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module eutils
DESCRIPTION="Create generic methods for OO Perl"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
DEPEND="
diff --git a/dev-perl/Class-Singleton/Class-Singleton-1.500.0.ebuild b/dev-perl/Class-Singleton/Class-Singleton-1.500.0.ebuild
index b10d0edce32..d322268ef4e 100644
--- a/dev-perl/Class-Singleton/Class-Singleton-1.500.0.ebuild
+++ b/dev-perl/Class-Singleton/Class-Singleton-1.500.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Implementation of a Singleton class"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="
diff --git a/dev-perl/Class-Tiny/Class-Tiny-1.6.0.ebuild b/dev-perl/Class-Tiny/Class-Tiny-1.6.0.ebuild
index bd5f3c0c342..db3e03a222c 100644
--- a/dev-perl/Class-Tiny/Class-Tiny-1.6.0.ebuild
+++ b/dev-perl/Class-Tiny/Class-Tiny-1.6.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Minimalist class construction"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
LICENSE="Apache-2.0"
IUSE="test minimal"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Convert-ASN1/Convert-ASN1-0.270.0.ebuild b/dev-perl/Convert-ASN1/Convert-ASN1-0.270.0.ebuild
index 5967c33598e..72dd7a8e91c 100644
--- a/dev-perl/Convert-ASN1/Convert-ASN1-0.270.0.ebuild
+++ b/dev-perl/Convert-ASN1/Convert-ASN1-0.270.0.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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Convert-UUlib/Convert-UUlib-1.400.0-r1.ebuild b/dev-perl/Convert-UUlib/Convert-UUlib-1.400.0-r1.ebuild
index d6c63be334d..15f55c9be8d 100644
--- a/dev-perl/Convert-UUlib/Convert-UUlib-1.400.0-r1.ebuild
+++ b/dev-perl/Convert-UUlib/Convert-UUlib-1.400.0-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A Perl interface to the uulib library"
LICENSE="Artistic GPL-2" # needs both
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sparc x86"
IUSE=""
SRC_TEST="do"
diff --git a/dev-perl/Convert-UUlib/Convert-UUlib-1.500.0-r1.ebuild b/dev-perl/Convert-UUlib/Convert-UUlib-1.500.0-r1.ebuild
index b8891a6d81f..775874190c7 100644
--- a/dev-perl/Convert-UUlib/Convert-UUlib-1.500.0-r1.ebuild
+++ b/dev-perl/Convert-UUlib/Convert-UUlib-1.500.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="A Perl interface to the uulib library"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="system-uulib test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-3.23.900.ebuild b/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-3.23.900.ebuild
index 02330ae763f..259b24a44d9 100644
--- a/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-3.23.900.ebuild
+++ b/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-3.23.900.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Crypt-IDEA/Crypt-IDEA-1.100.0-r1.ebuild b/dev-perl/Crypt-IDEA/Crypt-IDEA-1.100.0-r1.ebuild
index 4a8e0cc66a2..4bfdaeb46d7 100644
--- a/dev-perl/Crypt-IDEA/Crypt-IDEA-1.100.0-r1.ebuild
+++ b/dev-perl/Crypt-IDEA/Crypt-IDEA-1.100.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ DESCRIPTION="An implementation of the IDEA symmetric-key block cipher"
LICENSE="Crypt-IDEA"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Crypt-IDEA/Crypt-IDEA-1.100.0.ebuild b/dev-perl/Crypt-IDEA/Crypt-IDEA-1.100.0.ebuild
index 35df2a76e2c..7456af30f7a 100644
--- a/dev-perl/Crypt-IDEA/Crypt-IDEA-1.100.0.ebuild
+++ b/dev-perl/Crypt-IDEA/Crypt-IDEA-1.100.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Parse and save PGP packet streams"
LICENSE="Crypt-IDEA"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
SRC_TEST="do"
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 6753088e356..66ebad64358 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 c82c9fa7040..fe3a1eb762d 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 19e9b32cda2..7c37f104acf 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 46b71907baf..8db1345b1f4 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 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE=""
SRC_TEST="do"
diff --git a/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.720.0-r1.ebuild b/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.720.0-r1.ebuild
index b97297d3c14..e007ef2a897 100644
--- a/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.720.0-r1.ebuild
+++ b/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.720.0-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="OpenSSL support for LWP"
LICENSE="Artistic-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="libressl test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.720.0-r2.ebuild b/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.720.0-r2.ebuild
index 94ae8b3e6ac..74b238e3890 100644
--- a/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.720.0-r2.ebuild
+++ b/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.720.0-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="OpenSSL support for LWP"
LICENSE="Artistic-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="libressl test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Crypt-SmbHash/Crypt-SmbHash-0.120.0-r1.ebuild b/dev-perl/Crypt-SmbHash/Crypt-SmbHash-0.120.0-r1.ebuild
index 48d107ab5ab..bd35c92f81f 100644
--- a/dev-perl/Crypt-SmbHash/Crypt-SmbHash-0.120.0-r1.ebuild
+++ b/dev-perl/Crypt-SmbHash/Crypt-SmbHash-0.120.0-r1.ebuild
@@ -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 sh 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/Crypt-SmbHash/Crypt-SmbHash-0.120.0-r2.ebuild b/dev-perl/Crypt-SmbHash/Crypt-SmbHash-0.120.0-r2.ebuild
index ea7168483ef..ae179b7b30a 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
@@ -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 sh 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/Crypt-Twofish/Crypt-Twofish-2.170.0-r1.ebuild b/dev-perl/Crypt-Twofish/Crypt-Twofish-2.170.0-r1.ebuild
index 39165dbb2c9..d4a55168c79 100644
--- a/dev-perl/Crypt-Twofish/Crypt-Twofish-2.170.0-r1.ebuild
+++ b/dev-perl/Crypt-Twofish/Crypt-Twofish-2.170.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="The Twofish Encryption Algorithm"
SLOT="0"
-KEYWORDS="amd64 ia64 ~ppc ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ia64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE=""
PATCHES=("${FILESDIR}/no-dot-inc.patch")
SRC_TEST="do"
diff --git a/dev-perl/Curses/Curses-1.360.0.ebuild b/dev-perl/Curses/Curses-1.360.0.ebuild
index 763f19043be..f7dc8ec825f 100644
--- a/dev-perl/Curses/Curses-1.360.0.ebuild
+++ b/dev-perl/Curses/Curses-1.360.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Curses interface modules for Perl"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 ~sh 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/DBD-Pg/DBD-Pg-3.10.0.ebuild b/dev-perl/DBD-Pg/DBD-Pg-3.10.0.ebuild
index 65b6b954e06..73a65778dca 100644
--- a/dev-perl/DBD-Pg/DBD-Pg-3.10.0.ebuild
+++ b/dev-perl/DBD-Pg/DBD-Pg-3.10.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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="
diff --git a/dev-perl/DBD-Pg/DBD-Pg-3.5.3.ebuild b/dev-perl/DBD-Pg/DBD-Pg-3.5.3.ebuild
index 075bde7df43..b826d836b0c 100644
--- a/dev-perl/DBD-Pg/DBD-Pg-3.5.3.ebuild
+++ b/dev-perl/DBD-Pg/DBD-Pg-3.5.3.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="PostgreSQL database driver for the DBI module"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE=""
RDEPEND="
diff --git a/dev-perl/DBD-Pg/DBD-Pg-3.6.2.ebuild b/dev-perl/DBD-Pg/DBD-Pg-3.6.2.ebuild
index 9ff1a13521d..de57811eaea 100644
--- a/dev-perl/DBD-Pg/DBD-Pg-3.6.2.ebuild
+++ b/dev-perl/DBD-Pg/DBD-Pg-3.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="PostgreSQL database driver for the DBI module"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE=""
RDEPEND="
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 029a23ee1a4..4823a0ad7d1 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ae952076049..b21442dd077 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 8af396b1015..c9b4b27021f 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ab33ff5b2b8..c53a3163c1b 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="test +ssl"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/DBI/DBI-1.637.0.ebuild b/dev-perl/DBI/DBI-1.637.0.ebuild
index 8e12a1ed046..5f4a8811026 100644
--- a/dev-perl/DBI/DBI-1.637.0.ebuild
+++ b/dev-perl/DBI/DBI-1.637.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module eutils
DESCRIPTION="Database independent interface for Perl"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 fef0a8965f8..5c85c4a3abb 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 38dc76dc75a..41e9e3b1edb 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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="elibc_musl test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Date-Pcalc/Date-Pcalc-6.100.0-r1.ebuild b/dev-perl/Date-Pcalc/Date-Pcalc-6.100.0-r1.ebuild
index b286459d8dc..c31d2d11619 100644
--- a/dev-perl/Date-Pcalc/Date-Pcalc-6.100.0-r1.ebuild
+++ b/dev-perl/Date-Pcalc/Date-Pcalc-6.100.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Gregorian calendar date calculations"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~m68k ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~m68k ppc ~ppc64 ~s390 ~sparc x86"
IUSE=""
DEPEND=">=dev-perl/Bit-Vector-7
diff --git a/dev-perl/DateTime-Format-Builder/DateTime-Format-Builder-0.810.0-r1.ebuild b/dev-perl/DateTime-Format-Builder/DateTime-Format-Builder-0.810.0-r1.ebuild
index 24e2b05d91d..bd46b74bb31 100644
--- a/dev-perl/DateTime-Format-Builder/DateTime-Format-Builder-0.810.0-r1.ebuild
+++ b/dev-perl/DateTime-Format-Builder/DateTime-Format-Builder-0.810.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Create DateTime parser classes and objects"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc x86 ~ppc-aix ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~ppc-aix ~x86-solaris"
IUSE=""
RDEPEND="dev-perl/DateTime
diff --git a/dev-perl/DateTime-Format-DateParse/DateTime-Format-DateParse-0.50.0-r1.ebuild b/dev-perl/DateTime-Format-DateParse/DateTime-Format-DateParse-0.50.0-r1.ebuild
index 0a83147e33b..c251d397cce 100644
--- a/dev-perl/DateTime-Format-DateParse/DateTime-Format-DateParse-0.50.0-r1.ebuild
+++ b/dev-perl/DateTime-Format-DateParse/DateTime-Format-DateParse-0.50.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Parses Date::Parse compatible formats"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND=">=dev-perl/DateTime-0.29
diff --git a/dev-perl/DateTime-Format-ISO8601/DateTime-Format-ISO8601-0.80.0-r1.ebuild b/dev-perl/DateTime-Format-ISO8601/DateTime-Format-ISO8601-0.80.0-r1.ebuild
index 7ee4c5a3e50..3bb525f0d80 100644
--- a/dev-perl/DateTime-Format-ISO8601/DateTime-Format-ISO8601-0.80.0-r1.ebuild
+++ b/dev-perl/DateTime-Format-ISO8601/DateTime-Format-ISO8601-0.80.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Parses ISO8601 formats"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~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/DateTime-Format-Strptime/DateTime-Format-Strptime-1.740.0.ebuild b/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.740.0.ebuild
index c9839dd7ceb..1a258f4f53e 100644
--- a/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.740.0.ebuild
+++ b/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.740.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="Parse and Format DateTimes using Strptime"
LICENSE="Artistic-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/DateTime-Locale/DateTime-Locale-0.460.0.ebuild b/dev-perl/DateTime-Locale/DateTime-Locale-0.460.0.ebuild
index 2ea99f8eb99..4db819b5c83 100644
--- a/dev-perl/DateTime-Locale/DateTime-Locale-0.460.0.ebuild
+++ b/dev-perl/DateTime-Locale/DateTime-Locale-0.460.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Localization support for DateTime"
LICENSE="|| ( Artistic GPL-2 ) unicode"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/DateTime-Locale/DateTime-Locale-1.160.0.ebuild b/dev-perl/DateTime-Locale/DateTime-Locale-1.160.0.ebuild
index 103a63febdc..1c292c9550f 100644
--- a/dev-perl/DateTime-Locale/DateTime-Locale-1.160.0.ebuild
+++ b/dev-perl/DateTime-Locale/DateTime-Locale-1.160.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ DESCRIPTION="Localization support for DateTime"
LICENSE="|| ( Artistic GPL-2+ ) unicode"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/DateTime-Locale/DateTime-Locale-1.20.0.ebuild b/dev-perl/DateTime-Locale/DateTime-Locale-1.20.0.ebuild
index c710edacf9e..89dd0b89ff5 100644
--- a/dev-perl/DateTime-Locale/DateTime-Locale-1.20.0.ebuild
+++ b/dev-perl/DateTime-Locale/DateTime-Locale-1.20.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="Localization support for DateTime"
LICENSE="|| ( Artistic GPL-2+ ) unicode"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/DateTime-Locale/DateTime-Locale-1.30.0.ebuild b/dev-perl/DateTime-Locale/DateTime-Locale-1.30.0.ebuild
index 0f6af5d62f5..0d004d55456 100644
--- a/dev-perl/DateTime-Locale/DateTime-Locale-1.30.0.ebuild
+++ b/dev-perl/DateTime-Locale/DateTime-Locale-1.30.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ DESCRIPTION="Localization support for DateTime"
LICENSE="|| ( Artistic GPL-2+ ) unicode"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/DateTime-Locale/DateTime-Locale-1.50.0.ebuild b/dev-perl/DateTime-Locale/DateTime-Locale-1.50.0.ebuild
index 38923a9e3e1..7abc37a9ecf 100644
--- a/dev-perl/DateTime-Locale/DateTime-Locale-1.50.0.ebuild
+++ b/dev-perl/DateTime-Locale/DateTime-Locale-1.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ DESCRIPTION="Localization support for DateTime"
LICENSE="|| ( Artistic GPL-2+ ) unicode"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/DateTime-TimeZone/DateTime-TimeZone-1.930.0.ebuild b/dev-perl/DateTime-TimeZone/DateTime-TimeZone-1.930.0.ebuild
index 58f2dcb1879..7d50961a37c 100644
--- a/dev-perl/DateTime-TimeZone/DateTime-TimeZone-1.930.0.ebuild
+++ b/dev-perl/DateTime-TimeZone/DateTime-TimeZone-1.930.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Time zone object base class and factory"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/DateTime-TimeZone/DateTime-TimeZone-1.940.0.ebuild b/dev-perl/DateTime-TimeZone/DateTime-TimeZone-1.940.0.ebuild
index af4020db329..eb5da009239 100644
--- a/dev-perl/DateTime-TimeZone/DateTime-TimeZone-1.940.0.ebuild
+++ b/dev-perl/DateTime-TimeZone/DateTime-TimeZone-1.940.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Time zone object base class and factory"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/DateTime-TimeZone/DateTime-TimeZone-2.10.0.ebuild b/dev-perl/DateTime-TimeZone/DateTime-TimeZone-2.10.0.ebuild
index 380269e2bac..569ca87f956 100644
--- a/dev-perl/DateTime-TimeZone/DateTime-TimeZone-2.10.0.ebuild
+++ b/dev-perl/DateTime-TimeZone/DateTime-TimeZone-2.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Time zone object base class and factory"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/DateTime-TimeZone/DateTime-TimeZone-2.130.0.ebuild b/dev-perl/DateTime-TimeZone/DateTime-TimeZone-2.130.0.ebuild
index 07098ec689b..60134266127 100644
--- a/dev-perl/DateTime-TimeZone/DateTime-TimeZone-2.130.0.ebuild
+++ b/dev-perl/DateTime-TimeZone/DateTime-TimeZone-2.130.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Time zone object base class and factory"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/DateTime/DateTime-1.200.0.ebuild b/dev-perl/DateTime/DateTime-1.200.0.ebuild
index 72acf5fd57d..20130cb60de 100644
--- a/dev-perl/DateTime/DateTime-1.200.0.ebuild
+++ b/dev-perl/DateTime/DateTime-1.200.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A date and time object"
LICENSE="Artistic-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/DateTime/DateTime-1.210.0.ebuild b/dev-perl/DateTime/DateTime-1.210.0.ebuild
index 65a51c19356..75e1761c770 100644
--- a/dev-perl/DateTime/DateTime-1.210.0.ebuild
+++ b/dev-perl/DateTime/DateTime-1.210.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="A date and time object"
LICENSE="Artistic-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/DateTime/DateTime-1.280.0.ebuild b/dev-perl/DateTime/DateTime-1.280.0.ebuild
index 61ccbd16874..29b3174f354 100644
--- a/dev-perl/DateTime/DateTime-1.280.0.ebuild
+++ b/dev-perl/DateTime/DateTime-1.280.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="A date and time object"
LICENSE="Artistic-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/DateTime/DateTime-1.440.0.ebuild b/dev-perl/DateTime/DateTime-1.440.0.ebuild
index e8bb9bbcc68..2af77e27b57 100644
--- a/dev-perl/DateTime/DateTime-1.440.0.ebuild
+++ b/dev-perl/DateTime/DateTime-1.440.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="A date and time object"
LICENSE="Artistic-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Devel-CallChecker/Devel-CallChecker-0.8.0.ebuild b/dev-perl/Devel-CallChecker/Devel-CallChecker-0.8.0.ebuild
index 742e28b737e..0c9451ccd3e 100644
--- a/dev-perl/Devel-CallChecker/Devel-CallChecker-0.8.0.ebuild
+++ b/dev-perl/Devel-CallChecker/Devel-CallChecker-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="Custom OP checking attached to subroutines"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Devel-Caller/Devel-Caller-2.60.0.ebuild b/dev-perl/Devel-Caller/Devel-Caller-2.60.0.ebuild
index d8a7ccab6fb..22ddcc57c96 100644
--- a/dev-perl/Devel-Caller/Devel-Caller-2.60.0.ebuild
+++ b/dev-perl/Devel-Caller/Devel-Caller-2.60.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Meatier versions of caller"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="dev-perl/PadWalker"
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 4091d80464f..c01fd0c564b 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 801938276e3..01c7710138c 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-2019 Gentoo Authors
+# Copyright 1999-2020 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 ~sh ~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/Devel-LexAlias/Devel-LexAlias-0.50.0.ebuild b/dev-perl/Devel-LexAlias/Devel-LexAlias-0.50.0.ebuild
index 3977cc88336..cd666b5a95e 100644
--- a/dev-perl/Devel-LexAlias/Devel-LexAlias-0.50.0.ebuild
+++ b/dev-perl/Devel-LexAlias/Devel-LexAlias-0.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Alias lexical variables"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-perl/Devel-Caller-2.03"
diff --git a/dev-perl/Devel-StackTrace/Devel-StackTrace-2.20.0.ebuild b/dev-perl/Devel-StackTrace/Devel-StackTrace-2.20.0.ebuild
index 9fa07506d56..7da7fdbcd7e 100644
--- a/dev-perl/Devel-StackTrace/Devel-StackTrace-2.20.0.ebuild
+++ b/dev-perl/Devel-StackTrace/Devel-StackTrace-2.20.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="An object representing a stack trace"
LICENSE="Artistic-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Devel-Symdump/Devel-Symdump-2.180.0.ebuild b/dev-perl/Devel-Symdump/Devel-Symdump-2.180.0.ebuild
index a943149a629..fc9dc923649 100644
--- a/dev-perl/Devel-Symdump/Devel-Symdump-2.180.0.ebuild
+++ b/dev-perl/Devel-Symdump/Devel-Symdump-2.180.0.ebuild
@@ -10,7 +10,7 @@ inherit versionator perl-module
DESCRIPTION="Dump symbol names or the symbol table"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 46d1c8887d2..35174c55db0 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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-CRC/Digest-CRC-0.210.0.ebuild b/dev-perl/Digest-CRC/Digest-CRC-0.210.0.ebuild
index d8998ad606c..54a9cc6d90a 100644
--- a/dev-perl/Digest-CRC/Digest-CRC-0.210.0.ebuild
+++ b/dev-perl/Digest-CRC/Digest-CRC-0.210.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Generic CRC function"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux"
IUSE=""
RDEPEND=""
diff --git a/dev-perl/Digest-CRC/Digest-CRC-0.220.0_p2.ebuild b/dev-perl/Digest-CRC/Digest-CRC-0.220.0_p2.ebuild
index cf36dff4d37..52f1873e0ee 100644
--- a/dev-perl/Digest-CRC/Digest-CRC-0.220.0_p2.ebuild
+++ b/dev-perl/Digest-CRC/Digest-CRC-0.220.0_p2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-0.22"
DESCRIPTION="Generic CRC function"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux"
IUSE=""
RDEPEND=""
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 fcbfeabbf35..c22216e0379 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 cc3b2a65385..c6111019c1d 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
@@ -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 sh 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 b50f1b043cf..8ff006d47b7 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 8feaa8f911c..b526f7aac7e 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 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 aa3ea551bb5..0ba8381dfca 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/DynaLoader-Functions/DynaLoader-Functions-0.3.0.ebuild b/dev-perl/DynaLoader-Functions/DynaLoader-Functions-0.3.0.ebuild
index 3e8aa7fad06..4431ef01bee 100644
--- a/dev-perl/DynaLoader-Functions/DynaLoader-Functions-0.3.0.ebuild
+++ b/dev-perl/DynaLoader-Functions/DynaLoader-Functions-0.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="Deconstructed Dynamic C Library Loading"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 264817cb6ce..b22c06beb42 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 15722317b10..24e22e181b6 100644
--- a/dev-perl/Encode-EUCJPASCII/Encode-EUCJPASCII-0.30.0.ebuild
+++ b/dev-perl/Encode-EUCJPASCII/Encode-EUCJPASCII-0.30.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 ~sh ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
PERL_RM_FILES=( "t/pod.t" )
--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 4889a87c83f..ef4bb8b05ae 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 ~sh ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="virtual/perl-Encode"
diff --git a/dev-perl/Encode-Locale/Encode-Locale-1.30.0-r1.ebuild b/dev-perl/Encode-Locale/Encode-Locale-1.30.0-r1.ebuild
index b7dc7823e34..70b9ccfad91 100644
--- a/dev-perl/Encode-Locale/Encode-Locale-1.30.0-r1.ebuild
+++ b/dev-perl/Encode-Locale/Encode-Locale-1.30.0-r1.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 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
SRC_TEST=do
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 4339f46229c..967bbd3dbd6 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Error/Error-0.170.240.ebuild b/dev-perl/Error/Error-0.170.240.ebuild
index 0aee38d4ae9..aed32b382d0 100644
--- a/dev-perl/Error/Error-0.170.240.ebuild
+++ b/dev-perl/Error/Error-0.170.240.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 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 da17873fc73..8aaf5ff8cf9 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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Eval-Closure/Eval-Closure-0.140.0.ebuild b/dev-perl/Eval-Closure/Eval-Closure-0.140.0.ebuild
index be7897b8f00..65596d6409a 100644
--- a/dev-perl/Eval-Closure/Eval-Closure-0.140.0.ebuild
+++ b/dev-perl/Eval-Closure/Eval-Closure-0.140.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="safely and cleanly create closures via string eval"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test minimal"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Exception-Class/Exception-Class-1.430.0.ebuild b/dev-perl/Exception-Class/Exception-Class-1.430.0.ebuild
index 51b58d52a49..8dfd5faf925 100644
--- a/dev-perl/Exception-Class/Exception-Class-1.430.0.ebuild
+++ b/dev-perl/Exception-Class/Exception-Class-1.430.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="A module that allows you to declare real exception classes in Perl"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 62bdfa988a5..fdb59fd9bc5 100644
--- a/dev-perl/Expect/Expect-1.350.0.ebuild
+++ b/dev-perl/Expect/Expect-1.350.0.ebuild
@@ -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 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
IUSE="test minimal"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Exporter-Tiny/Exporter-Tiny-1.2.1.ebuild b/dev-perl/Exporter-Tiny/Exporter-Tiny-1.2.1.ebuild
index 9c657276607..e444c00bb6d 100644
--- a/dev-perl/Exporter-Tiny/Exporter-Tiny-1.2.1.ebuild
+++ b/dev-perl/Exporter-Tiny/Exporter-Tiny-1.2.1.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="An exporter with the features of Sub::Exporter but only core dependencies"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
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 96cb536ba97..c0fd7552d23 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 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/ExtUtils-Depends/ExtUtils-Depends-0.404.0.ebuild b/dev-perl/ExtUtils-Depends/ExtUtils-Depends-0.404.0.ebuild
index eda84021312..fe04a818a92 100644
--- a/dev-perl/ExtUtils-Depends/ExtUtils-Depends-0.404.0.ebuild
+++ b/dev-perl/ExtUtils-Depends/ExtUtils-Depends-0.404.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Easily build XS extensions that depend on XS extensions"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE=""
RDEPEND="
diff --git a/dev-perl/ExtUtils-Depends/ExtUtils-Depends-0.405.0.ebuild b/dev-perl/ExtUtils-Depends/ExtUtils-Depends-0.405.0.ebuild
index 3dfa07670e5..85602becdfa 100644
--- a/dev-perl/ExtUtils-Depends/ExtUtils-Depends-0.405.0.ebuild
+++ b/dev-perl/ExtUtils-Depends/ExtUtils-Depends-0.405.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Easily build XS extensions that depend on XS extensions"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/ExtUtils-F77/ExtUtils-F77-1.200.0-r1.ebuild b/dev-perl/ExtUtils-F77/ExtUtils-F77-1.200.0-r1.ebuild
index 1522d551321..716b1feb02c 100644
--- a/dev-perl/ExtUtils-F77/ExtUtils-F77-1.200.0-r1.ebuild
+++ b/dev-perl/ExtUtils-F77/ExtUtils-F77-1.200.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Facilitate use of FORTRAN from Perl/XS code"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="virtual/perl-File-Spec
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 97ca5a715c9..d56f019d233 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 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 3f3fa151b23..b4b098c68c4 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 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 b6e5420bf2a..6aab90b247a 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 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 a865fdb0025..4886358f8ee 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 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 095345611d2..d9df2096725 100644
--- a/dev-perl/FFI-CheckLib/FFI-CheckLib-0.250.0.ebuild
+++ b/dev-perl/FFI-CheckLib/FFI-CheckLib-0.250.0.ebuild
@@ -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 ~sh ~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/File-BaseDir/File-BaseDir-0.30.0-r1.ebuild b/dev-perl/File-BaseDir/File-BaseDir-0.30.0-r1.ebuild
index 5ca3484268f..d2cf3bf9f05 100644
--- a/dev-perl/File-BaseDir/File-BaseDir-0.30.0-r1.ebuild
+++ b/dev-perl/File-BaseDir/File-BaseDir-0.30.0-r1.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 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
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 fc20ad87aad..1b01d23b54b 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/File-Copy-Recursive/File-Copy-Recursive-0.380.0-r1.ebuild b/dev-perl/File-Copy-Recursive/File-Copy-Recursive-0.380.0-r1.ebuild
index 6678df85882..7d15b6927cd 100644
--- a/dev-perl/File-Copy-Recursive/File-Copy-Recursive-0.380.0-r1.ebuild
+++ b/dev-perl/File-Copy-Recursive/File-Copy-Recursive-0.380.0-r1.ebuild
@@ -10,6 +10,6 @@ inherit perl-module
DESCRIPTION="uses File::Copy to recursively copy dirs"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
SRC_TEST="do"
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 3e0af276fe4..b7189c7fb8f 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 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/File-DesktopEntry/File-DesktopEntry-0.40.0-r1.ebuild b/dev-perl/File-DesktopEntry/File-DesktopEntry-0.40.0-r1.ebuild
index fb961279286..326e2b7596c 100644
--- a/dev-perl/File-DesktopEntry/File-DesktopEntry-0.40.0-r1.ebuild
+++ b/dev-perl/File-DesktopEntry/File-DesktopEntry-0.40.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Object to handle .desktop files"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~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 5fa6f945293..da311b38aee 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Alternative interface to File::Find"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 6bb856914f2..3c9b59d7cd7 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="
diff --git a/dev-perl/File-MimeInfo/File-MimeInfo-0.270.0.ebuild b/dev-perl/File-MimeInfo/File-MimeInfo-0.270.0.ebuild
index b66419610b5..17c8eca325c 100644
--- a/dev-perl/File-MimeInfo/File-MimeInfo-0.270.0.ebuild
+++ b/dev-perl/File-MimeInfo/File-MimeInfo-0.270.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 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
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 4c51aceb0b4..fc02420245c 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 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/File-Remove/File-Remove-1.570.0.ebuild b/dev-perl/File-Remove/File-Remove-1.570.0.ebuild
index c20c94e2420..96cee92e809 100644
--- a/dev-perl/File-Remove/File-Remove-1.570.0.ebuild
+++ b/dev-perl/File-Remove/File-Remove-1.570.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Remove files and directories"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 3111deb6d70..f45071607d0 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 5baab395f5e..c4806f9a277 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 364f0cf0a08..381694e98e7 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 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/File-Slurp/File-Slurp-9999.190.0-r1.ebuild b/dev-perl/File-Slurp/File-Slurp-9999.190.0-r1.ebuild
index ff7358d1dbf..d6d2e005699 100644
--- a/dev-perl/File-Slurp/File-Slurp-9999.190.0-r1.ebuild
+++ b/dev-perl/File-Slurp/File-Slurp-9999.190.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Efficient Reading/Writing of Complete Files"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
SRC_TEST="do"
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 261dc8eb22f..cb879a9bbe2 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 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/File-Slurper/File-Slurper-0.10.0.ebuild b/dev-perl/File-Slurper/File-Slurper-0.10.0.ebuild
index 3b82f788160..9667049480e 100644
--- a/dev-perl/File-Slurper/File-Slurper-0.10.0.ebuild
+++ b/dev-perl/File-Slurper/File-Slurper-0.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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, sane and efficient module to slurp a file"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ppc ~ppc64 ~s390 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
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 2603ea13c2d..3f067408978 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test +pwhich"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/File-Which/File-Which-1.90.0-r1.ebuild b/dev-perl/File-Which/File-Which-1.90.0-r1.ebuild
index d12481bc0ba..899740a340e 100644
--- a/dev-perl/File-Which/File-Which-1.90.0-r1.ebuild
+++ b/dev-perl/File-Which/File-Which-1.90.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Perl module implementing 'which' internally"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="test"
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 f4571cf3a49..8763b510e35 100644
--- a/dev-perl/File-chdir/File-chdir-0.101.100.ebuild
+++ b/dev-perl/File-chdir/File-chdir-0.101.100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Filter/Filter-1.570.0.ebuild b/dev-perl/Filter/Filter-1.570.0.ebuild
index 6664714d02f..a575d458b62 100644
--- a/dev-perl/Filter/Filter-1.570.0.ebuild
+++ b/dev-perl/Filter/Filter-1.570.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Interface for creation of Perl Filters"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="
diff --git a/dev-perl/Font-TTF/Font-TTF-1.20.0-r1.ebuild b/dev-perl/Font-TTF/Font-TTF-1.20.0-r1.ebuild
index f40d2786188..6e4cbed2948 100644
--- a/dev-perl/Font-TTF/Font-TTF-1.20.0-r1.ebuild
+++ b/dev-perl/Font-TTF/Font-TTF-1.20.0-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="module for compiling and altering fonts"
LICENSE="Artistic-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86"
IUSE=""
RDEPEND="
diff --git a/dev-perl/Font-TTF/Font-TTF-1.60.0.ebuild b/dev-perl/Font-TTF/Font-TTF-1.60.0.ebuild
index 0bbf0f0e94b..06bf508d525 100644
--- a/dev-perl/Font-TTF/Font-TTF-1.60.0.ebuild
+++ b/dev-perl/Font-TTF/Font-TTF-1.60.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="module for compiling and altering fonts"
LICENSE="Artistic-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE=""
RDEPEND="
diff --git a/dev-perl/GD/GD-2.560.0-r1.ebuild b/dev-perl/GD/GD-2.560.0-r1.ebuild
index f23b938d636..85c7b61f896 100644
--- a/dev-perl/GD/GD-2.560.0-r1.ebuild
+++ b/dev-perl/GD/GD-2.560.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Interface to Thomas Boutell's gd library"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="animgif gif jpeg png truetype xpm"
PATCHES=(
"${FILESDIR}/${P}-rt106594.patch"
diff --git a/dev-perl/GD/GD-2.560.0-r2.ebuild b/dev-perl/GD/GD-2.560.0-r2.ebuild
index 1a2b7e260f0..f8fac1a9a8b 100644
--- a/dev-perl/GD/GD-2.560.0-r2.ebuild
+++ b/dev-perl/GD/GD-2.560.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Interface to Thomas Boutell's gd library"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="animgif gif jpeg png truetype xpm"
PATCHES=(
"${FILESDIR}/${P}-rt106594.patch"
diff --git a/dev-perl/GD/GD-2.660.0.ebuild b/dev-perl/GD/GD-2.660.0.ebuild
index 891e7f4cde8..2fb7daf03e8 100644
--- a/dev-perl/GD/GD-2.660.0.ebuild
+++ b/dev-perl/GD/GD-2.660.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Interface to Thomas Boutell's gd library"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="animgif fcgi gif jpeg png truetype xpm"
RDEPEND="
diff --git a/dev-perl/GSSAPI/GSSAPI-0.280.0-r1.ebuild b/dev-perl/GSSAPI/GSSAPI-0.280.0-r1.ebuild
index 91cc9b41caf..50c5bcd354d 100644
--- a/dev-perl/GSSAPI/GSSAPI-0.280.0-r1.ebuild
+++ b/dev-perl/GSSAPI/GSSAPI-0.280.0-r1.ebuild
@@ -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 sh 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 f90614abe99..8d913152ea1 100644
--- a/dev-perl/Geo-IP/Geo-IP-1.510.0.ebuild
+++ b/dev-perl/Geo-IP/Geo-IP-1.510.0.ebuild
@@ -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 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86"
IUSE=""
DEPEND="dev-libs/geoip"
diff --git a/dev-perl/HTML-Form/HTML-Form-6.30.0-r1.ebuild b/dev-perl/HTML-Form/HTML-Form-6.30.0-r1.ebuild
index 8f7798ae246..60a42a27d9f 100644
--- a/dev-perl/HTML-Form/HTML-Form-6.30.0-r1.ebuild
+++ b/dev-perl/HTML-Form/HTML-Form-6.30.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Class that represents an HTML form element"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="
diff --git a/dev-perl/HTML-Form/HTML-Form-6.30.0-r2.ebuild b/dev-perl/HTML-Form/HTML-Form-6.30.0-r2.ebuild
index c0f6baea07f..39a3b462cb8 100644
--- a/dev-perl/HTML-Form/HTML-Form-6.30.0-r2.ebuild
+++ b/dev-perl/HTML-Form/HTML-Form-6.30.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Class that represents an HTML form element"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="
diff --git a/dev-perl/HTML-Parser/HTML-Parser-3.710.0-r1.ebuild b/dev-perl/HTML-Parser/HTML-Parser-3.710.0-r1.ebuild
index b563346f654..693af0a01c6 100644
--- a/dev-perl/HTML-Parser/HTML-Parser-3.710.0-r1.ebuild
+++ b/dev-perl/HTML-Parser/HTML-Parser-3.710.0-r1.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 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
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 5a0c5ca6e10..d1d481010a0 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 e0462e34245..e55ac991da3 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
SRC_TEST="do"
diff --git a/dev-perl/HTML-Tree/HTML-Tree-5.60.0.ebuild b/dev-perl/HTML-Tree/HTML-Tree-5.60.0.ebuild
index 7325902b2a1..754c3c6db9f 100644
--- a/dev-perl/HTML-Tree/HTML-Tree-5.60.0.ebuild
+++ b/dev-perl/HTML-Tree/HTML-Tree-5.60.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="A library to manage HTML-Tree in PERL"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/HTML-Tree/HTML-Tree-5.70.0.ebuild b/dev-perl/HTML-Tree/HTML-Tree-5.70.0.ebuild
index 4ec02c64ffe..51702de65a7 100644
--- a/dev-perl/HTML-Tree/HTML-Tree-5.70.0.ebuild
+++ b/dev-perl/HTML-Tree/HTML-Tree-5.70.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="A library to manage HTML-Tree in PERL"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
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 6314dcdd642..ec579e21d1c 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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 88e6841ba26..1f7cac0e215 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 a7fe7b25016..adaeaa1ff10 100644
--- a/dev-perl/HTTP-Daemon/HTTP-Daemon-6.60.0.ebuild
+++ b/dev-perl/HTTP-Daemon/HTTP-Daemon-6.60.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 d6dc3c3bfcc..0b17263a639 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="
diff --git a/dev-perl/HTTP-Message/HTTP-Message-6.110.0.ebuild b/dev-perl/HTTP-Message/HTTP-Message-6.110.0.ebuild
index 28fdacd80c4..8331d07a61b 100644
--- a/dev-perl/HTTP-Message/HTTP-Message-6.110.0.ebuild
+++ b/dev-perl/HTTP-Message/HTTP-Message-6.110.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 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
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 faea8e965c1..b369ba0805a 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 dfb237cd2ad..e27094d4eb0 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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="
diff --git a/dev-perl/HTTP-Negotiate/HTTP-Negotiate-6.10.0.ebuild b/dev-perl/HTTP-Negotiate/HTTP-Negotiate-6.10.0.ebuild
index 0bc10c25e98..f0a4f04d7af 100644
--- a/dev-perl/HTTP-Negotiate/HTTP-Negotiate-6.10.0.ebuild
+++ b/dev-perl/HTTP-Negotiate/HTTP-Negotiate-6.10.0.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 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 1bd16074d38..8c19ba049c7 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 f2098f41a85..f2368b81d65 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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="dev-perl/Socket6"
diff --git a/dev-perl/IO-Socket-INET6/IO-Socket-INET6-2.720.0.ebuild b/dev-perl/IO-Socket-INET6/IO-Socket-INET6-2.720.0.ebuild
index e7ecc046b3a..c1b99499c32 100644
--- a/dev-perl/IO-Socket-INET6/IO-Socket-INET6-2.720.0.ebuild
+++ b/dev-perl/IO-Socket-INET6/IO-Socket-INET6-2.720.0.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 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~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 70271bdb81f..1c8dd1f30fd 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
@@ -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 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 acf12fe8187..0ba56d0f7b9 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 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
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 70d18787586..2cb16d86255 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 6264ba9b529..bb521d843a8 100644
--- a/dev-perl/IO-Stty/IO-Stty-0.30.0.ebuild
+++ b/dev-perl/IO-Stty/IO-Stty-0.30.0.ebuild
@@ -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 ~sh 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/IO-Tty/IO-Tty-1.120.0.ebuild b/dev-perl/IO-Tty/IO-Tty-1.120.0.ebuild
index 9fd37322984..afb5afde5eb 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 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 13fd5d2e9a6..b3688abf00f 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/dev-perl/IPC-Run3/IPC-Run3-0.48.0.ebuild b/dev-perl/IPC-Run3/IPC-Run3-0.48.0.ebuild
index 177555f26b6..edb0d50e70c 100644
--- a/dev-perl/IPC-Run3/IPC-Run3-0.48.0.ebuild
+++ b/dev-perl/IPC-Run3/IPC-Run3-0.48.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Run a subprocess in batch mode (a la system)"
LICENSE="|| ( BSD-2 Artistic GPL-1+ )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
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 edf24166131..03ddff9e9b4 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 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 738c5ebea66..c3b82c579c2 100644
--- a/dev-perl/Importer/Importer-0.24.0.ebuild
+++ b/dev-perl/Importer/Importer-0.24.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Inline/Inline-0.500.0-r1.ebuild b/dev-perl/Inline/Inline-0.500.0-r1.ebuild
index 9e315f99b8c..d3ac252ee46 100644
--- a/dev-perl/Inline/Inline-0.500.0-r1.ebuild
+++ b/dev-perl/Inline/Inline-0.500.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Write Perl subroutines in other languages"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Inline/Inline-0.800.0.ebuild b/dev-perl/Inline/Inline-0.800.0.ebuild
index 27b1feebea5..4cf5b40fb18 100644
--- a/dev-perl/Inline/Inline-0.800.0.ebuild
+++ b/dev-perl/Inline/Inline-0.800.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Write Perl subroutines in other languages"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh 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/JSON-MaybeXS/JSON-MaybeXS-1.3.9.ebuild b/dev-perl/JSON-MaybeXS/JSON-MaybeXS-1.3.9.ebuild
index 47c32081315..936e1535e4e 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 8559a0909c5..348783d116d 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/JSON/JSON-2.900.0.ebuild b/dev-perl/JSON/JSON-2.900.0.ebuild
index 51d0daf902c..a304d8194d0 100644
--- a/dev-perl/JSON/JSON-2.900.0.ebuild
+++ b/dev-perl/JSON/JSON-2.900.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="JSON (JavaScript Object Notation) encoder/decoder"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/JSON/JSON-2.940.0.ebuild b/dev-perl/JSON/JSON-2.940.0.ebuild
index 86dc01555da..c4726e52ca1 100644
--- a/dev-perl/JSON/JSON-2.940.0.ebuild
+++ b/dev-perl/JSON/JSON-2.940.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="JSON (JavaScript Object Notation) encoder/decoder"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test +xs"
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 9979bd020ea..60cf4f62d2a 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 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 720d44a9e7e..59a0859b8d3 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="
diff --git a/dev-perl/LWP-Protocol-https/LWP-Protocol-https-6.60.0.ebuild b/dev-perl/LWP-Protocol-https/LWP-Protocol-https-6.60.0.ebuild
index 783698d3b88..d99a6293c2b 100644
--- a/dev-perl/LWP-Protocol-https/LWP-Protocol-https-6.60.0.ebuild
+++ b/dev-perl/LWP-Protocol-https/LWP-Protocol-https-6.60.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Provide https support for LWP::UserAgent"
SLOT="0"
IUSE=""
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
app-misc/ca-certificates
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 86895d260f5..e855c8252eb 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 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
app-misc/ca-certificates
diff --git a/dev-perl/List-AllUtils/List-AllUtils-0.140.0.ebuild b/dev-perl/List-AllUtils/List-AllUtils-0.140.0.ebuild
index 0dbe38fa5b6..5398dc3f140 100644
--- a/dev-perl/List-AllUtils/List-AllUtils-0.140.0.ebuild
+++ b/dev-perl/List-AllUtils/List-AllUtils-0.140.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Combines many List::* utility modules in one bite-sized package"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
LICENSE="Artistic-2"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/List-AllUtils/List-AllUtils-0.90.0.ebuild b/dev-perl/List-AllUtils/List-AllUtils-0.90.0.ebuild
index d7e51fce85d..30c651933f3 100644
--- a/dev-perl/List-AllUtils/List-AllUtils-0.90.0.ebuild
+++ b/dev-perl/List-AllUtils/List-AllUtils-0.90.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION='Combines List::Util and List::MoreUtils in one bite-sized package'
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.418.0.ebuild b/dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.418.0.ebuild
index 0d15ea66cb1..c90aacb79f7 100644
--- a/dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.418.0.ebuild
+++ b/dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.418.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="Compiled List::MoreUtils functions"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
# See XS.pm/LICENSE
diff --git a/dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.426.0.ebuild b/dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.426.0.ebuild
index 89d53892faa..407e89be123 100644
--- a/dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.426.0.ebuild
+++ b/dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.426.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="Compiled List::MoreUtils functions"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
# See XS.pm/LICENSE
diff --git a/dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.428.0.ebuild b/dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.428.0.ebuild
index 2e0cffcf520..aef7cee8b02 100644
--- a/dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.428.0.ebuild
+++ b/dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.428.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="Compiled List::MoreUtils functions"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
# See XS.pm/LICENSE
diff --git a/dev-perl/List-MoreUtils/List-MoreUtils-0.418.0.ebuild b/dev-perl/List-MoreUtils/List-MoreUtils-0.418.0.ebuild
index ac658417c88..f47d875f717 100644
--- a/dev-perl/List-MoreUtils/List-MoreUtils-0.418.0.ebuild
+++ b/dev-perl/List-MoreUtils/List-MoreUtils-0.418.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Provide the missing functionality from List::Util"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="test +xs"
RESTRICT="!test? ( test )"
# See MoreUtils.pm/LICENSE
diff --git a/dev-perl/List-MoreUtils/List-MoreUtils-0.419.0.ebuild b/dev-perl/List-MoreUtils/List-MoreUtils-0.419.0.ebuild
index 44aca1048d1..5137f1ac733 100644
--- a/dev-perl/List-MoreUtils/List-MoreUtils-0.419.0.ebuild
+++ b/dev-perl/List-MoreUtils/List-MoreUtils-0.419.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Provide the missing functionality from List::Util"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="test +xs"
RESTRICT="!test? ( test )"
# See MoreUtils.pm/LICENSE
diff --git a/dev-perl/List-MoreUtils/List-MoreUtils-0.426.0.ebuild b/dev-perl/List-MoreUtils/List-MoreUtils-0.426.0.ebuild
index 2b6123fcaae..154fa191a9b 100644
--- a/dev-perl/List-MoreUtils/List-MoreUtils-0.426.0.ebuild
+++ b/dev-perl/List-MoreUtils/List-MoreUtils-0.426.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Provide the missing functionality from List::Util"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="test +xs"
RESTRICT="!test? ( test )"
# See MoreUtils.pm/LICENSE
diff --git a/dev-perl/List-SomeUtils-XS/List-SomeUtils-XS-0.550.0.ebuild b/dev-perl/List-SomeUtils-XS/List-SomeUtils-XS-0.550.0.ebuild
index 23ca16bba1b..dadef1e327e 100644
--- a/dev-perl/List-SomeUtils-XS/List-SomeUtils-XS-0.550.0.ebuild
+++ b/dev-perl/List-SomeUtils-XS/List-SomeUtils-XS-0.550.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="XS implementation for List::SomeUtils"
LICENSE="Artistic-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/List-SomeUtils/List-SomeUtils-0.560.0.ebuild b/dev-perl/List-SomeUtils/List-SomeUtils-0.560.0.ebuild
index b35e5ffbff8..37e9976fbfd 100644
--- a/dev-perl/List-SomeUtils/List-SomeUtils-0.560.0.ebuild
+++ b/dev-perl/List-SomeUtils/List-SomeUtils-0.560.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="A colletion of List utilities missing from List::Util"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/List-UtilsBy/List-UtilsBy-0.100.0.ebuild b/dev-perl/List-UtilsBy/List-UtilsBy-0.100.0.ebuild
index 5505faaf1fc..b04c742c685 100644
--- a/dev-perl/List-UtilsBy/List-UtilsBy-0.100.0.ebuild
+++ b/dev-perl/List-UtilsBy/List-UtilsBy-0.100.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Higher-order list utility functions"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Locale-Codes/Locale-Codes-3.620.0.ebuild b/dev-perl/Locale-Codes/Locale-Codes-3.620.0.ebuild
index 96efa099fb3..4099105b0db 100644
--- a/dev-perl/Locale-Codes/Locale-Codes-3.620.0.ebuild
+++ b/dev-perl/Locale-Codes/Locale-Codes-3.620.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="A distribution of Perl modules to handle locale codes"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
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 7e7fa8bb02b..b199d525f93 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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Locale-PO/Locale-PO-0.270.0.ebuild b/dev-perl/Locale-PO/Locale-PO-0.270.0.ebuild
index b855e7de652..064975beed2 100644
--- a/dev-perl/Locale-PO/Locale-PO-0.270.0.ebuild
+++ b/dev-perl/Locale-PO/Locale-PO-0.270.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Perl module for manipulating .po entries from GNU gettext"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ppc ppc64 ~s390 sparc x86"
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 85b1a5533dc..161ac4c3bf3 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 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="sys-devel/gettext"
diff --git a/dev-perl/Log-Agent/Log-Agent-1.1.0.ebuild b/dev-perl/Log-Agent/Log-Agent-1.1.0.ebuild
index e483d9935a4..b1238d30d74 100644
--- a/dev-perl/Log-Agent/Log-Agent-1.1.0.ebuild
+++ b/dev-perl/Log-Agent/Log-Agent-1.1.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A general logging framework"
LICENSE="Artistic-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
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 94190b7e564..d688b3faaa0 100644
--- a/dev-perl/MIME-Charset/MIME-Charset-1.12.2.ebuild
+++ b/dev-perl/MIME-Charset/MIME-Charset-1.12.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 ~sh ~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_ja l10n_zh"
PATCHES=(
"${FILESDIR}/1.012-makefilepl.patch"
diff --git a/dev-perl/MIME-tools/MIME-tools-5.509.0.ebuild b/dev-perl/MIME-tools/MIME-tools-5.509.0.ebuild
index 8d3e4325a6a..5d8a5f60782 100644
--- a/dev-perl/MIME-tools/MIME-tools-5.509.0.ebuild
+++ b/dev-perl/MIME-tools/MIME-tools-5.509.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="A Perl module for parsing and creating MIME entities"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh 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="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/MRO-Compat/MRO-Compat-0.130.0.ebuild b/dev-perl/MRO-Compat/MRO-Compat-0.130.0.ebuild
index a07dab708f0..6829e6743d6 100644
--- a/dev-perl/MRO-Compat/MRO-Compat-0.130.0.ebuild
+++ b/dev-perl/MRO-Compat/MRO-Compat-0.130.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Lets you build groups of accessors"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Mail-DKIM/Mail-DKIM-0.410.0.ebuild b/dev-perl/Mail-DKIM/Mail-DKIM-0.410.0.ebuild
index c60fa130bf3..73ea2b23c91 100644
--- a/dev-perl/Mail-DKIM/Mail-DKIM-0.410.0.ebuild
+++ b/dev-perl/Mail-DKIM/Mail-DKIM-0.410.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Signs/verifies Internet mail using DKIM message signatures"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
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 fa3f563644d..1a00a2f493e 100644
--- a/dev-perl/Mail-DKIM/Mail-DKIM-0.440.0.ebuild
+++ b/dev-perl/Mail-DKIM/Mail-DKIM-0.440.0.ebuild
@@ -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 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Mail-IMAPClient/Mail-IMAPClient-3.390.0.ebuild b/dev-perl/Mail-IMAPClient/Mail-IMAPClient-3.390.0.ebuild
index 9e59d3e750a..59a53b7f1cf 100644
--- a/dev-perl/Mail-IMAPClient/Mail-IMAPClient-3.390.0.ebuild
+++ b/dev-perl/Mail-IMAPClient/Mail-IMAPClient-3.390.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="IMAP client module for Perl"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ppc ~ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ia64 ppc ~ppc64 ~s390 sparc x86"
IUSE="test ntlm md5 ssl zlib"
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 fdbb17336e2..e3813695c50 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
@@ -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 ~sh 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 59f1563796c..93ce6a4e718 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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Math-Round/Math-Round-0.70.0.ebuild b/dev-perl/Math-Round/Math-Round-0.70.0.ebuild
index 7c278adcaa6..af4818c6f32 100644
--- a/dev-perl/Math-Round/Math-Round-0.70.0.ebuild
+++ b/dev-perl/Math-Round/Math-Round-0.70.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Perl extension for rounding numbers"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE=""
RDEPEND=""
DEPEND="${RDEPEND}
diff --git a/dev-perl/MediaWiki-API/MediaWiki-API-0.410.0.ebuild b/dev-perl/MediaWiki-API/MediaWiki-API-0.410.0.ebuild
index 9500d1d8a8b..294614a5140 100644
--- a/dev-perl/MediaWiki-API/MediaWiki-API-0.410.0.ebuild
+++ b/dev-perl/MediaWiki-API/MediaWiki-API-0.410.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="A OO interface to the Mediawiki API"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~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/Module-Build-Tiny/Module-Build-Tiny-0.39.0.ebuild b/dev-perl/Module-Build-Tiny/Module-Build-Tiny-0.39.0.ebuild
index aa668c2db46..dc0870ac25e 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 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 774e330dd5d..daf7c72e90d 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 60494d5a5b4..ab7762b4c88 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Module-Pluggable/Module-Pluggable-5.200.0.ebuild b/dev-perl/Module-Pluggable/Module-Pluggable-5.200.0.ebuild
index 41f015f5505..73e0f153025 100644
--- a/dev-perl/Module-Pluggable/Module-Pluggable-5.200.0.ebuild
+++ b/dev-perl/Module-Pluggable/Module-Pluggable-5.200.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Automatically give your module the ability to have plugins"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~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 863b0eb1bfb..e29a87913cb 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Module-ScanDeps/Module-ScanDeps-1.230.0.ebuild b/dev-perl/Module-ScanDeps/Module-ScanDeps-1.230.0.ebuild
index cd0f724328e..5b8436d1869 100644
--- a/dev-perl/Module-ScanDeps/Module-ScanDeps-1.230.0.ebuild
+++ b/dev-perl/Module-ScanDeps/Module-ScanDeps-1.230.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Recursively scan Perl code for dependencies"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Module-ScanDeps/Module-ScanDeps-1.240.0.ebuild b/dev-perl/Module-ScanDeps/Module-ScanDeps-1.240.0.ebuild
index 5eeabae87c3..dd0b7c132f6 100644
--- a/dev-perl/Module-ScanDeps/Module-ScanDeps-1.240.0.ebuild
+++ b/dev-perl/Module-ScanDeps/Module-ScanDeps-1.240.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Recursively scan Perl code for dependencies"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
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 4450d08646c..52ea421c0c8 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 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
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 1f270a3650f..63469511095 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 fb485066204..156fc89f933 100644
--- a/dev-perl/Net-DBus/Net-DBus-1.1.0.ebuild
+++ b/dev-perl/Net-DBus/Net-DBus-1.1.0.ebuild
@@ -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 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris"
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 79323744113..6b421b8d871 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 bb020aabaa2..a3188d014c8 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
@@ -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 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86"
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 76d82dfe04b..9469dcef731 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 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
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 b8521f0e3cf..591be22535f 100644
--- a/dev-perl/Net-DNS/Net-DNS-1.130.0.ebuild
+++ b/dev-perl/Net-DNS/Net-DNS-1.130.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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 Interface to the Domain Name System"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 892c8f3f3e6..4b4424dded6 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 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 083b174922f..65c77237915 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 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="minimal test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Net-IDN-Encode/Net-IDN-Encode-2.400.0.ebuild b/dev-perl/Net-IDN-Encode/Net-IDN-Encode-2.400.0.ebuild
index 0fd979f2525..a3acbd3c532 100644
--- a/dev-perl/Net-IDN-Encode/Net-IDN-Encode-2.400.0.ebuild
+++ b/dev-perl/Net-IDN-Encode/Net-IDN-Encode-2.400.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Internationalizing Domain Names in Applications (IDNA)"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Net-IDN-Encode/Net-IDN-Encode-2.500.0.ebuild b/dev-perl/Net-IDN-Encode/Net-IDN-Encode-2.500.0.ebuild
index ef10b12823f..fbec12dfbff 100644
--- a/dev-perl/Net-IDN-Encode/Net-IDN-Encode-2.500.0.ebuild
+++ b/dev-perl/Net-IDN-Encode/Net-IDN-Encode-2.500.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Internationalizing Domain Names in Applications (IDNA)"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="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 a20b8259f75..294ed271e61 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 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 e5c999f2b21..709ec6afab9 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 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="net-dns/libidn:0="
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 05d8b0ba561..ca5df2afcfd 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
@@ -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 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86"
IUSE="ipv6"
RDEPEND="dev-perl/Net-CIDR-Lite
diff --git a/dev-perl/Net-SMTP-SSL/Net-SMTP-SSL-1.30.0.ebuild b/dev-perl/Net-SMTP-SSL/Net-SMTP-SSL-1.30.0.ebuild
index e3d299d5ad3..a276639d58b 100644
--- a/dev-perl/Net-SMTP-SSL/Net-SMTP-SSL-1.30.0.ebuild
+++ b/dev-perl/Net-SMTP-SSL/Net-SMTP-SSL-1.30.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="SSL support for Net::SMTP"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
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 f4996f7f3fd..1c8f0eabf62 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
@@ -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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Net-SSLeay/Net-SSLeay-1.820.0.ebuild b/dev-perl/Net-SSLeay/Net-SSLeay-1.820.0.ebuild
index 81a67996a85..3bb8d989c62 100644
--- a/dev-perl/Net-SSLeay/Net-SSLeay-1.820.0.ebuild
+++ b/dev-perl/Net-SSLeay/Net-SSLeay-1.820.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Perl extension for using OpenSSL"
LICENSE="openssl"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="libressl test minimal examples"
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 fcf03dcd52b..33389290fbb 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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="libressl test minimal examples"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Net-Subnet/Net-Subnet-1.30.0-r1.ebuild b/dev-perl/Net-Subnet/Net-Subnet-1.30.0-r1.ebuild
index a2dc86d924c..fedf45c30af 100644
--- a/dev-perl/Net-Subnet/Net-Subnet-1.30.0-r1.ebuild
+++ b/dev-perl/Net-Subnet/Net-Subnet-1.30.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Fast IP-in-subnet matcher for IPv4 and IPv6, CIDR or mask"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
RDEPEND="
>=dev-perl/Socket6-0.250.0
diff --git a/dev-perl/NetAddr-IP/NetAddr-IP-4.78.0.ebuild b/dev-perl/NetAddr-IP/NetAddr-IP-4.78.0.ebuild
index 6a979d86c81..961b8fc5f13 100644
--- a/dev-perl/NetAddr-IP/NetAddr-IP-4.78.0.ebuild
+++ b/dev-perl/NetAddr-IP/NetAddr-IP-4.78.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Manipulation and operations on IP addresses"
SLOT="0"
LICENSE="|| ( Artistic GPL-2 )"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE="ipv6"
RDEPEND="ipv6? ( dev-perl/Socket6 )"
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 0ee73d2a002..8e4b2ac4984 100644
--- a/dev-perl/NetAddr-IP/NetAddr-IP-4.79.0.ebuild
+++ b/dev-perl/NetAddr-IP/NetAddr-IP-4.79.0.ebuild
@@ -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 ~sh 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 c2cf52d3844..204cbc31281 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 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 84a9b165817..ef885e84272 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 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
SRC_TEST="do"
diff --git a/dev-perl/Package-Constants/Package-Constants-0.60.0.ebuild b/dev-perl/Package-Constants/Package-Constants-0.60.0.ebuild
index 2ccfc302d65..8c1e4c75a84 100644
--- a/dev-perl/Package-Constants/Package-Constants-0.60.0.ebuild
+++ b/dev-perl/Package-Constants/Package-Constants-0.60.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="List all constants declared in a package"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
SRC_TEST=do
diff --git a/dev-perl/Package-DeprecationManager/Package-DeprecationManager-0.150.0.ebuild b/dev-perl/Package-DeprecationManager/Package-DeprecationManager-0.150.0.ebuild
index a68f60726c9..ca489338733 100644
--- a/dev-perl/Package-DeprecationManager/Package-DeprecationManager-0.150.0.ebuild
+++ b/dev-perl/Package-DeprecationManager/Package-DeprecationManager-0.150.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Manage deprecation warnings for your distribution"
LICENSE="Artistic-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Package-DeprecationManager/Package-DeprecationManager-0.170.0.ebuild b/dev-perl/Package-DeprecationManager/Package-DeprecationManager-0.170.0.ebuild
index 114f4236786..3d76023fd74 100644
--- a/dev-perl/Package-DeprecationManager/Package-DeprecationManager-0.170.0.ebuild
+++ b/dev-perl/Package-DeprecationManager/Package-DeprecationManager-0.170.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Manage deprecation warnings for your distribution"
LICENSE="Artistic-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
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 cbd4bf60745..240d1663c67 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~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 d655f42c383..5d9b1f3babf 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test minimal"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/PadWalker/PadWalker-2.300.0.ebuild b/dev-perl/PadWalker/PadWalker-2.300.0.ebuild
index f3184bc88d3..3c4237148d2 100644
--- a/dev-perl/PadWalker/PadWalker-2.300.0.ebuild
+++ b/dev-perl/PadWalker/PadWalker-2.300.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="play with other peoples' lexical variables"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/dev-perl/Params-Classify/Params-Classify-0.13.0-r1.ebuild b/dev-perl/Params-Classify/Params-Classify-0.13.0-r1.ebuild
index b8bf14aab47..429c7da17b9 100644
--- a/dev-perl/Params-Classify/Params-Classify-0.13.0-r1.ebuild
+++ b/dev-perl/Params-Classify/Params-Classify-0.13.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Argument type classification"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~s390 ~sh ~sparc ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~s390 ~sparc ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Params-Classify/Params-Classify-0.15.0.ebuild b/dev-perl/Params-Classify/Params-Classify-0.15.0.ebuild
index 32e1e840407..5adf5758d41 100644
--- a/dev-perl/Params-Classify/Params-Classify-0.15.0.ebuild
+++ b/dev-perl/Params-Classify/Params-Classify-0.15.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Argument type classification"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Params-Util/Params-Util-1.60.0-r1.ebuild b/dev-perl/Params-Util/Params-Util-1.60.0-r1.ebuild
index be346e80884..f6d0909989b 100644
--- a/dev-perl/Params-Util/Params-Util-1.60.0-r1.ebuild
+++ b/dev-perl/Params-Util/Params-Util-1.60.0-r1.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 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
RDEPEND=">=virtual/perl-Scalar-List-Utils-1.18"
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 6204d787c11..3704e5faa1e 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 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Params-Validate/Params-Validate-1.290.0.ebuild b/dev-perl/Params-Validate/Params-Validate-1.290.0.ebuild
index 20fb7c2b3d7..9be835bf264 100644
--- a/dev-perl/Params-Validate/Params-Validate-1.290.0.ebuild
+++ b/dev-perl/Params-Validate/Params-Validate-1.290.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Flexible system for validation of method/function call parameters"
LICENSE="Artistic-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Params-ValidationCompiler/Params-ValidationCompiler-0.260.0.ebuild b/dev-perl/Params-ValidationCompiler/Params-ValidationCompiler-0.260.0.ebuild
index fad51bdcdf1..0d13acb0ef4 100644
--- a/dev-perl/Params-ValidationCompiler/Params-ValidationCompiler-0.260.0.ebuild
+++ b/dev-perl/Params-ValidationCompiler/Params-ValidationCompiler-0.260.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Build an optimized subroutine parameter validator once, use it forever"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
LICENSE="Artistic-2"
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 dab98affbab..1308a6995d9 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test examples"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Path-Class/Path-Class-0.360.0.ebuild b/dev-perl/Path-Class/Path-Class-0.360.0.ebuild
index 424d657bdb7..274ab2c07ea 100644
--- a/dev-perl/Path-Class/Path-Class-0.360.0.ebuild
+++ b/dev-perl/Path-Class/Path-Class-0.360.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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="test"
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 29c4faa7b7e..385efd0fa8a 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 6e972d30cbe..ee8bfc8b519 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test minimal"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Perl-Tidy/Perl-Tidy-20171214.0.0.ebuild b/dev-perl/Perl-Tidy/Perl-Tidy-20171214.0.0.ebuild
index 76b46d3be53..8aae5531373 100644
--- a/dev-perl/Perl-Tidy/Perl-Tidy-20171214.0.0.ebuild
+++ b/dev-perl/Perl-Tidy/Perl-Tidy-20171214.0.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://perltidy.sourceforge.net/ https://metacpan.org/release/Perl-Tid
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=""
diff --git a/dev-perl/Perl-Tidy/Perl-Tidy-20190915.0.0.ebuild b/dev-perl/Perl-Tidy/Perl-Tidy-20190915.0.0.ebuild
index 3b5525242e4..bbb93ea6499 100644
--- a/dev-perl/Perl-Tidy/Perl-Tidy-20190915.0.0.ebuild
+++ b/dev-perl/Perl-Tidy/Perl-Tidy-20190915.0.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://perltidy.sourceforge.net/ https://metacpan.org/release/Perl-Tid
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=""
diff --git a/dev-perl/PerlIO-gzip/PerlIO-gzip-0.190.0.ebuild b/dev-perl/PerlIO-gzip/PerlIO-gzip-0.190.0.ebuild
index 8c3bc0a0597..402b1409f72 100644
--- a/dev-perl/PerlIO-gzip/PerlIO-gzip-0.190.0.ebuild
+++ b/dev-perl/PerlIO-gzip/PerlIO-gzip-0.190.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="PerlIO layer to gzip/gunzip"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
DEPEND="sys-libs/zlib"
diff --git a/dev-perl/PerlIO-gzip/PerlIO-gzip-0.200.0.ebuild b/dev-perl/PerlIO-gzip/PerlIO-gzip-0.200.0.ebuild
index b9fe5e53151..a4be5d76a20 100644
--- a/dev-perl/PerlIO-gzip/PerlIO-gzip-0.200.0.ebuild
+++ b/dev-perl/PerlIO-gzip/PerlIO-gzip-0.200.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="PerlIO layer to gzip/gunzip"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
DEPEND="sys-libs/zlib"
diff --git a/dev-perl/PerlIO-utf8_strict/PerlIO-utf8_strict-0.7.0.ebuild b/dev-perl/PerlIO-utf8_strict/PerlIO-utf8_strict-0.7.0.ebuild
index 76e87729206..2c5250c5fad 100644
--- a/dev-perl/PerlIO-utf8_strict/PerlIO-utf8_strict-0.7.0.ebuild
+++ b/dev-perl/PerlIO-utf8_strict/PerlIO-utf8_strict-0.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="Fast and correct UTF-8 IO"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ppc ~ppc64 ~s390 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
# r: strict, warnings -> perl
diff --git a/dev-perl/PlRPC/PlRPC-0.202.0-r2.ebuild b/dev-perl/PlRPC/PlRPC-0.202.0-r2.ebuild
index 84728069933..9eb2b29e001 100644
--- a/dev-perl/PlRPC/PlRPC-0.202.0-r2.ebuild
+++ b/dev-perl/PlRPC/PlRPC-0.202.0-r2.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 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=">=virtual/perl-Storable-1.0.7
diff --git a/dev-perl/PlRPC/PlRPC-0.202.0-r3.ebuild b/dev-perl/PlRPC/PlRPC-0.202.0-r3.ebuild
index 439b3c85f11..ba7cab78b40 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 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=">=virtual/perl-Storable-1.0.7
diff --git a/dev-perl/Pod-Coverage/Pod-Coverage-0.230.0-r1.ebuild b/dev-perl/Pod-Coverage/Pod-Coverage-0.230.0-r1.ebuild
index e40ffb37057..40d6f8d9976 100644
--- a/dev-perl/Pod-Coverage/Pod-Coverage-0.230.0-r1.ebuild
+++ b/dev-perl/Pod-Coverage/Pod-Coverage-0.230.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Checks if the documentation of a module is comprehensive"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/PortageXS/PortageXS-0.02.10-r4.ebuild b/dev-perl/PortageXS/PortageXS-0.02.10-r4.ebuild
index 1ce92966425..ab41bfa7e70 100644
--- a/dev-perl/PortageXS/PortageXS-0.02.10-r4.ebuild
+++ b/dev-perl/PortageXS/PortageXS-0.02.10-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.mpsna.de/opensource/PortageXS/${P}.tar.gz"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="minimal"
SRC_TEST="do"
diff --git a/dev-perl/PortageXS/PortageXS-0.2.10-r5.ebuild b/dev-perl/PortageXS/PortageXS-0.2.10-r5.ebuild
index 4aca1732950..a647f37fe31 100644
--- a/dev-perl/PortageXS/PortageXS-0.2.10-r5.ebuild
+++ b/dev-perl/PortageXS/PortageXS-0.2.10-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://download.mpsna.de/opensource/PortageXS/${PN}-${MODULE_VERSION}.t
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="minimal"
SRC_TEST="do"
diff --git a/dev-perl/PortageXS/PortageXS-0.2.12-r1.ebuild b/dev-perl/PortageXS/PortageXS-0.2.12-r1.ebuild
index 9cb00dc7b2f..e823dafbc87 100644
--- a/dev-perl/PortageXS/PortageXS-0.2.12-r1.ebuild
+++ b/dev-perl/PortageXS/PortageXS-0.2.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -12,7 +12,7 @@ HOMEPAGE="http://search.cpan.org/~kentnl/PortageXS"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="minimal"
DEPEND="
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 8c6eae13d15..22c7d4063ac 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Readonly-XS/Readonly-XS-1.50.0-r1.ebuild b/dev-perl/Readonly-XS/Readonly-XS-1.50.0-r1.ebuild
index f87ef9b9a5f..6b1843ed652 100644
--- a/dev-perl/Readonly-XS/Readonly-XS-1.50.0-r1.ebuild
+++ b/dev-perl/Readonly-XS/Readonly-XS-1.50.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Companion module for Readonly.pm, to speed up read-only scalar variables"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
RDEPEND="dev-perl/Readonly"
diff --git a/dev-perl/Readonly/Readonly-2.0.0.ebuild b/dev-perl/Readonly/Readonly-2.0.0.ebuild
index dff06ae01a6..d171a176b0c 100644
--- a/dev-perl/Readonly/Readonly-2.0.0.ebuild
+++ b/dev-perl/Readonly/Readonly-2.0.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Facility for creating read-only scalars, arrays, hashes"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Readonly/Readonly-2.10.0.ebuild b/dev-perl/Readonly/Readonly-2.10.0.ebuild
index 153767992ab..7f73d01540b 100644
--- a/dev-perl/Readonly/Readonly-2.10.0.ebuild
+++ b/dev-perl/Readonly/Readonly-2.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Facility for creating read-only scalars, arrays, hashes"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Readonly/Readonly-2.50.0.ebuild b/dev-perl/Readonly/Readonly-2.50.0.ebuild
index 16415a94011..705860cf105 100644
--- a/dev-perl/Readonly/Readonly-2.50.0.ebuild
+++ b/dev-perl/Readonly/Readonly-2.50.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Facility for creating read-only scalars, arrays, hashes"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Ref-Util-XS/Ref-Util-XS-0.116.0.ebuild b/dev-perl/Ref-Util-XS/Ref-Util-XS-0.116.0.ebuild
index dd1fe8775b2..7b11a8688f0 100644
--- a/dev-perl/Ref-Util-XS/Ref-Util-XS-0.116.0.ebuild
+++ b/dev-perl/Ref-Util-XS/Ref-Util-XS-0.116.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="XS Implementation for Ref::Util"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
LICENSE="MIT"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Ref-Util/Ref-Util-0.203.0.ebuild b/dev-perl/Ref-Util/Ref-Util-0.203.0.ebuild
index 878935503cd..3915566834b 100644
--- a/dev-perl/Ref-Util/Ref-Util-0.203.0.ebuild
+++ b/dev-perl/Ref-Util/Ref-Util-0.203.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="Utility functions for checking references"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
LICENSE="MIT"
IUSE="test +xs"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Role-Tiny/Role-Tiny-2.0.6.ebuild b/dev-perl/Role-Tiny/Role-Tiny-2.0.6.ebuild
index 46e5e41cbd6..458a6891d34 100644
--- a/dev-perl/Role-Tiny/Role-Tiny-2.0.6.ebuild
+++ b/dev-perl/Role-Tiny/Role-Tiny-2.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Roles. Like a nouvelle cuisine portion size slice of Moose"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/SGMLSpm/SGMLSpm-1.03-r7.ebuild b/dev-perl/SGMLSpm/SGMLSpm-1.03-r7.ebuild
index 423ee9c3171..0d5f2e372ef 100644
--- a/dev-perl/SGMLSpm/SGMLSpm-1.03-r7.ebuild
+++ b/dev-perl/SGMLSpm/SGMLSpm-1.03-r7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://cpan/authors/id/D/DM/DMEGG/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
src_prepare() {
diff --git a/dev-perl/SGMLSpm/SGMLSpm-1.1-r1.ebuild b/dev-perl/SGMLSpm/SGMLSpm-1.1-r1.ebuild
index c115d9ef8d9..0cf98d7de88 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-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 d21b504afde..51b136d8be8 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Scope-Guard/Scope-Guard-0.210.0.ebuild b/dev-perl/Scope-Guard/Scope-Guard-0.210.0.ebuild
index b22146f10e6..32cce1d64f5 100644
--- a/dev-perl/Scope-Guard/Scope-Guard-0.210.0.ebuild
+++ b/dev-perl/Scope-Guard/Scope-Guard-0.210.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Lexically scoped resource management"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Set-Scalar/Set-Scalar-1.290.0.ebuild b/dev-perl/Set-Scalar/Set-Scalar-1.290.0.ebuild
index d82c7b74d1b..0d6804e2324 100644
--- a/dev-perl/Set-Scalar/Set-Scalar-1.290.0.ebuild
+++ b/dev-perl/Set-Scalar/Set-Scalar-1.290.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Scalar set operations"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
IUSE=""
SRC_TEST="do"
diff --git a/dev-perl/Shell-EnvImporter/Shell-EnvImporter-1.70.0-r2.ebuild b/dev-perl/Shell-EnvImporter/Shell-EnvImporter-1.70.0-r2.ebuild
index 34f93c0e585..5e52366fbe4 100644
--- a/dev-perl/Shell-EnvImporter/Shell-EnvImporter-1.70.0-r2.ebuild
+++ b/dev-perl/Shell-EnvImporter/Shell-EnvImporter-1.70.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Import environment variable changes from external commands or shell scripts"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-perl/Class-MethodMaker-2"
diff --git a/dev-perl/Socket6/Socket6-0.270.0.ebuild b/dev-perl/Socket6/Socket6-0.270.0.ebuild
index 01c61ba621d..054558562c3 100644
--- a/dev-perl/Socket6/Socket6-0.270.0.ebuild
+++ b/dev-perl/Socket6/Socket6-0.270.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 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~x86-macos ~x86-solaris"
IUSE=""
SRC_TEST="do"
diff --git a/dev-perl/Socket6/Socket6-0.280.0.ebuild b/dev-perl/Socket6/Socket6-0.280.0.ebuild
index bf389fe4265..d95d4657bc6 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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
src_unpack() {
diff --git a/dev-perl/Specio/Specio-0.420.0.ebuild b/dev-perl/Specio/Specio-0.420.0.ebuild
index a7692c81ff3..2d5d05838e2 100644
--- a/dev-perl/Specio/Specio-0.420.0.ebuild
+++ b/dev-perl/Specio/Specio-0.420.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="Type constraints and coercions for Perl"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test minimal"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Spiffy/Spiffy-0.460.0.ebuild b/dev-perl/Spiffy/Spiffy-0.460.0.ebuild
index e2cb8b5eddd..2d3bf76f66e 100644
--- a/dev-perl/Spiffy/Spiffy-0.460.0.ebuild
+++ b/dev-perl/Spiffy/Spiffy-0.460.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Spiffy Perl Interface Framework For You"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=virtual/perl-ExtUtils-MakeMaker-6.300.0"
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 dff86eb1497..a7da655c8fa 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 c3555a9d190..5571ac1f390 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="virtual/perl-File-Temp
diff --git a/dev-perl/String-CRC32/String-CRC32-1.500.0.ebuild b/dev-perl/String-CRC32/String-CRC32-1.500.0.ebuild
index e93178d9098..665c65ec5d2 100644
--- a/dev-perl/String-CRC32/String-CRC32-1.500.0.ebuild
+++ b/dev-perl/String-CRC32/String-CRC32-1.500.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Perl interface for cyclic redundancy check generation"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE=""
SRC_TEST=do
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 094ab5608dd..9426e9b72ea 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE=""
diff --git a/dev-perl/Sub-Exporter-Progressive/Sub-Exporter-Progressive-0.1.13.ebuild b/dev-perl/Sub-Exporter-Progressive/Sub-Exporter-Progressive-0.1.13.ebuild
index f9305a6dd62..1a09a80b7bc 100644
--- a/dev-perl/Sub-Exporter-Progressive/Sub-Exporter-Progressive-0.1.13.ebuild
+++ b/dev-perl/Sub-Exporter-Progressive/Sub-Exporter-Progressive-0.1.13.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Only use Sub::Exporter if you need it"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="
diff --git a/dev-perl/Sub-Exporter/Sub-Exporter-0.987.0.ebuild b/dev-perl/Sub-Exporter/Sub-Exporter-0.987.0.ebuild
index a8a085fe617..3edc0db474c 100644
--- a/dev-perl/Sub-Exporter/Sub-Exporter-0.987.0.ebuild
+++ b/dev-perl/Sub-Exporter/Sub-Exporter-0.987.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="A sophisticated exporter for custom-built routines"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="
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 d8943b05452..750c2e7ad6f 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 1d91eeace08..69283f0bb6d 100644
--- a/dev-perl/Sub-Info/Sub-Info-0.2.0.ebuild
+++ b/dev-perl/Sub-Info/Sub-Info-0.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 f1cc218a610..f28dbc2e90c 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Sub-Name/Sub-Name-0.150.0.ebuild b/dev-perl/Sub-Name/Sub-Name-0.150.0.ebuild
index 1433d9165e3..4c2813dae27 100644
--- a/dev-perl/Sub-Name/Sub-Name-0.150.0.ebuild
+++ b/dev-perl/Sub-Name/Sub-Name-0.150.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="(Re)name a sub"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test suggested"
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 a4648c87c04..a956d6d0f54 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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test suggested"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Sub-Name/Sub-Name-0.50.0-r1.ebuild b/dev-perl/Sub-Name/Sub-Name-0.50.0-r1.ebuild
index 2d0de674aea..3e60c932731 100644
--- a/dev-perl/Sub-Name/Sub-Name-0.50.0-r1.ebuild
+++ b/dev-perl/Sub-Name/Sub-Name-0.50.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="(Re)name a sub"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
IUSE=""
SRC_TEST=do
diff --git a/dev-perl/Sub-Quote/Sub-Quote-2.4.0.ebuild b/dev-perl/Sub-Quote/Sub-Quote-2.4.0.ebuild
index f51abb66b7f..d3fe4f2687f 100644
--- a/dev-perl/Sub-Quote/Sub-Quote-2.4.0.ebuild
+++ b/dev-perl/Sub-Quote/Sub-Quote-2.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="Efficient generation of subroutines via string eval"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test minimal"
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 50cbf223092..e11e5a28ddc 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 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 60022752d23..4f71149d6fb 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
SRC_TEST=do
diff --git a/dev-perl/Term-ReadLine-Perl/Term-ReadLine-Perl-1.30.300-r1.ebuild b/dev-perl/Term-ReadLine-Perl/Term-ReadLine-Perl-1.30.300-r1.ebuild
index eb2c0629387..15f890d50dd 100644
--- a/dev-perl/Term-ReadLine-Perl/Term-ReadLine-Perl-1.30.300-r1.ebuild
+++ b/dev-perl/Term-ReadLine-Perl/Term-ReadLine-Perl-1.30.300-r1.ebuild
@@ -12,7 +12,7 @@ inherit perl-module
DESCRIPTION="Quick implementation of readline utilities"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE=""
RDEPEND="dev-perl/TermReadKey"
diff --git a/dev-perl/Term-ReadLine-Perl/Term-ReadLine-Perl-1.30.300-r2.ebuild b/dev-perl/Term-ReadLine-Perl/Term-ReadLine-Perl-1.30.300-r2.ebuild
index d872f8d6709..a3e1bbead21 100644
--- a/dev-perl/Term-ReadLine-Perl/Term-ReadLine-Perl-1.30.300-r2.ebuild
+++ b/dev-perl/Term-ReadLine-Perl/Term-ReadLine-Perl-1.30.300-r2.ebuild
@@ -12,7 +12,7 @@ inherit perl-module
DESCRIPTION="Quick implementation of readline utilities"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE=""
PATCHES=(
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 dfcc58fbdcb..f31d69d8970 100644
--- a/dev-perl/Term-Table/Term-Table-0.8.0.ebuild
+++ b/dev-perl/Term-Table/Term-Table-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ inherit perl-module eutils
DESCRIPTION="Format a header and rows into a table"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/TermReadKey/TermReadKey-2.330.0.ebuild b/dev-perl/TermReadKey/TermReadKey-2.330.0.ebuild
index e0138bc96da..9d118d829e8 100644
--- a/dev-perl/TermReadKey/TermReadKey-2.330.0.ebuild
+++ b/dev-perl/TermReadKey/TermReadKey-2.330.0.ebuild
@@ -10,7 +10,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 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/dev-perl/TermReadKey/TermReadKey-2.370.0.ebuild b/dev-perl/TermReadKey/TermReadKey-2.370.0.ebuild
index 35471a11bd7..2b59ee18e7c 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=virtual/perl-ExtUtils-MakeMaker-6.580.0"
diff --git a/dev-perl/Test-Base/Test-Base-0.880.0.ebuild b/dev-perl/Test-Base/Test-Base-0.880.0.ebuild
index 34b728a2e7e..2b86c724db1 100644
--- a/dev-perl/Test-Base/Test-Base-0.880.0.ebuild
+++ b/dev-perl/Test-Base/Test-Base-0.880.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="A Data Driven Testing Framework"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
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 4d83a0bb1ae..c584113cba4 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 7f44e876eff..0de6fac9e71 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 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 3a3ea072f52..c7bbcd8660e 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 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 6e7d2f2bb8a..6d2796b9f0f 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 551cd4cbe91..c0fa5279664 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Test-File-ShareDir/Test-File-ShareDir-1.1.2.ebuild b/dev-perl/Test-File-ShareDir/Test-File-ShareDir-1.1.2.ebuild
index 41a5ff58acc..7a2a0e7a3ec 100644
--- a/dev-perl/Test-File-ShareDir/Test-File-ShareDir-1.1.2.ebuild
+++ b/dev-perl/Test-File-ShareDir/Test-File-ShareDir-1.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -8,7 +8,7 @@ inherit perl-module
DESCRIPTION="Create a Fake ShareDir for your modules for testing."
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 c085b1a9b7a..ab4979671ba 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 272a6161562..2837cf08f0b 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 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 5520ec02dc5..947693f039a 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 c17990fd35f..2fc1b7000bb 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 f33b3e9182f..6577508a5c3 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 7c7cad0ee95..a0ee04d9998 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 a600986c7d0..12768923286 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 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="virtual/perl-Test-Simple"
diff --git a/dev-perl/Test-Output/Test-Output-1.30.0.ebuild b/dev-perl/Test-Output/Test-Output-1.30.0.ebuild
index ae454d5f790..2f613df65b6 100644
--- a/dev-perl/Test-Output/Test-Output-1.30.0.ebuild
+++ b/dev-perl/Test-Output/Test-Output-1.30.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Utilities to test STDOUT and STDERR messages"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Test-Output/Test-Output-1.31.0.ebuild b/dev-perl/Test-Output/Test-Output-1.31.0.ebuild
index f81d34d6f5e..83663cc0575 100644
--- a/dev-perl/Test-Output/Test-Output-1.31.0.ebuild
+++ b/dev-perl/Test-Output/Test-Output-1.31.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Utilities to test STDOUT and STDERR messages"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Test-Pod-Coverage/Test-Pod-Coverage-1.100.0.ebuild b/dev-perl/Test-Pod-Coverage/Test-Pod-Coverage-1.100.0.ebuild
index 4e28930a068..5a5a8dd02f9 100644
--- a/dev-perl/Test-Pod-Coverage/Test-Pod-Coverage-1.100.0.ebuild
+++ b/dev-perl/Test-Pod-Coverage/Test-Pod-Coverage-1.100.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Check for pod coverage in your distribution"
LICENSE="Artistic-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Test-Pod/Test-Pod-1.510.0.ebuild b/dev-perl/Test-Pod/Test-Pod-1.510.0.ebuild
index 6c3671dc34f..53edadd869f 100644
--- a/dev-perl/Test-Pod/Test-Pod-1.510.0.ebuild
+++ b/dev-perl/Test-Pod/Test-Pod-1.510.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Check for POD errors in files"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
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 870332b7b01..054e6503783 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 38c1ecdd1a1..49dbf55107d 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Test-Script/Test-Script-1.180.0.ebuild b/dev-perl/Test-Script/Test-Script-1.180.0.ebuild
index 57c2bf54b66..7324afc28fc 100644
--- a/dev-perl/Test-Script/Test-Script-1.180.0.ebuild
+++ b/dev-perl/Test-Script/Test-Script-1.180.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 ~mips ppc ppc64 ~s390 ~sh 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=""
RDEPEND="
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 fef4e316d1e..a168a7b09de 100644
--- a/dev-perl/Test-Script/Test-Script-1.230.0.ebuild
+++ b/dev-perl/Test-Script/Test-Script-1.230.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Test-Taint/Test-Taint-1.60.0-r1.ebuild b/dev-perl/Test-Taint/Test-Taint-1.60.0-r1.ebuild
index 93419273821..28a3728dce7 100644
--- a/dev-perl/Test-Taint/Test-Taint-1.60.0-r1.ebuild
+++ b/dev-perl/Test-Taint/Test-Taint-1.60.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Tools to test taintedness"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
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 b2ada6d1bbf..3a856ba393a 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 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Test-Warnings/Test-Warnings-0.16.0.ebuild b/dev-perl/Test-Warnings/Test-Warnings-0.16.0.ebuild
index f2570ad7b3b..5cde84fc2f5 100644
--- a/dev-perl/Test-Warnings/Test-Warnings-0.16.0.ebuild
+++ b/dev-perl/Test-Warnings/Test-Warnings-0.16.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION='Test for warnings and the lack of them'
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Test-Warnings/Test-Warnings-0.26.0.ebuild b/dev-perl/Test-Warnings/Test-Warnings-0.26.0.ebuild
index 4fbaecc9b70..aa58fc566fb 100644
--- a/dev-perl/Test-Warnings/Test-Warnings-0.26.0.ebuild
+++ b/dev-perl/Test-Warnings/Test-Warnings-0.26.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION='Test for warnings and the lack of them'
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test suggested"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Test-Without-Module/Test-Without-Module-0.200.0.ebuild b/dev-perl/Test-Without-Module/Test-Without-Module-0.200.0.ebuild
index 72220602fc8..3d697dda3ec 100644
--- a/dev-perl/Test-Without-Module/Test-Without-Module-0.200.0.ebuild
+++ b/dev-perl/Test-Without-Module/Test-Without-Module-0.200.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Test fallback behaviour in absence of modules"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Test-YAML/Test-YAML-1.50.0.ebuild b/dev-perl/Test-YAML/Test-YAML-1.50.0.ebuild
index fcccca9117a..a1212359fbc 100644
--- a/dev-perl/Test-YAML/Test-YAML-1.50.0.ebuild
+++ b/dev-perl/Test-YAML/Test-YAML-1.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Testing Module for YAML Implementations"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="
diff --git a/dev-perl/Test-YAML/Test-YAML-1.60.0.ebuild b/dev-perl/Test-YAML/Test-YAML-1.60.0.ebuild
index 01fb1e7c1a5..f398fbb8683 100644
--- a/dev-perl/Test-YAML/Test-YAML-1.60.0.ebuild
+++ b/dev-perl/Test-YAML/Test-YAML-1.60.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Testing Module for YAML Implementations"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="
diff --git a/dev-perl/Test2-Plugin-NoWarnings/Test2-Plugin-NoWarnings-0.60.0.ebuild b/dev-perl/Test2-Plugin-NoWarnings/Test2-Plugin-NoWarnings-0.60.0.ebuild
index 545889a34f1..4e12b71dc90 100644
--- a/dev-perl/Test2-Plugin-NoWarnings/Test2-Plugin-NoWarnings-0.60.0.ebuild
+++ b/dev-perl/Test2-Plugin-NoWarnings/Test2-Plugin-NoWarnings-0.60.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="Fail if tests warn"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 bacdbf60d2d..a926c5ac53a 100644
--- a/dev-perl/Test2-Suite/Test2-Suite-0.0.77.ebuild
+++ b/dev-perl/Test2-Suite/Test2-Suite-0.0.77.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 63cbd67465e..315a9e816f0 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 8301c40176e..88aca234cf7 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-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 e8c6242b5cb..68652e6e162 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 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 d43e1faf243..ea29d0c2d21 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 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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-r1.ebuild b/dev-perl/Text-Iconv/Text-Iconv-1.700.0-r1.ebuild
index 3ec8ffcc82a..1e82e2c2df7 100644
--- a/dev-perl/Text-Iconv/Text-Iconv-1.700.0-r1.ebuild
+++ b/dev-perl/Text-Iconv/Text-Iconv-1.700.0-r1.ebuild
@@ -10,5 +10,5 @@ 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
IUSE=""
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 1bb2a67d5f6..63386c14496 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
IUSE=""
RDEPEND="virtual/libiconv"
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 05161cd5e27..9f960eaff5f 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 8dac4a7c50d..aff5a2cb343 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-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 86df11c3e9f..a7578cf10e0 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Time-Duration/Time-Duration-1.200.0.ebuild b/dev-perl/Time-Duration/Time-Duration-1.200.0.ebuild
index 0529856c2bd..f6840cd6078 100644
--- a/dev-perl/Time-Duration/Time-Duration-1.200.0.ebuild
+++ b/dev-perl/Time-Duration/Time-Duration-1.200.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Rounded or exact English expression of durations"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh 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-perl/TimeDate/TimeDate-2.300.0.ebuild b/dev-perl/TimeDate/TimeDate-2.300.0.ebuild
index f3f13e0dc1c..ebda8816401 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 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 69e4cb943bd..6a17b8edeae 100644
--- a/dev-perl/Tk/Tk-804.33.0.ebuild
+++ b/dev-perl/Tk/Tk-804.33.0.ebuild
@@ -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 ~sh 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/Tk/Tk-804.34.0.ebuild b/dev-perl/Tk/Tk-804.34.0.ebuild
index 8339fb68a79..56e5f1c8358 100644
--- a/dev-perl/Tk/Tk-804.34.0.ebuild
+++ b/dev-perl/Tk/Tk-804.34.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ DESCRIPTION="A Perl Module for Tk"
LICENSE+=" tcltk BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~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 b1a60612290..b3fe5155f23 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Try-Tiny/Try-Tiny-0.240.0.ebuild b/dev-perl/Try-Tiny/Try-Tiny-0.240.0.ebuild
index 25cc1c0f227..53ac8074441 100644
--- a/dev-perl/Try-Tiny/Try-Tiny-0.240.0.ebuild
+++ b/dev-perl/Try-Tiny/Try-Tiny-0.240.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 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test minimal"
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 1ac80ace38f..5beadbafae4 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 cf780c41d17..2ed59a2344d 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 e70225e3844..37989d9efb7 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 135a60e271f..211b365988f 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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 f7d7b42f5ce..4e590fe6ba8 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 4d9a2bcf9d6..307920794b4 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-2019 Gentoo Authors
+# Copyright 1999-2020 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 ~sh ~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-Map/Unicode-Map-0.112.0-r1.ebuild b/dev-perl/Unicode-Map/Unicode-Map-0.112.0-r1.ebuild
index 2135766cb70..d5decd0fb8b 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 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE=""
SRC_TEST="do"
diff --git a/dev-perl/Unicode-Map8/Unicode-Map8-0.130.0-r1.ebuild b/dev-perl/Unicode-Map8/Unicode-Map8-0.130.0-r1.ebuild
index a46057956b8..704011cf5c4 100644
--- a/dev-perl/Unicode-Map8/Unicode-Map8-0.130.0-r1.ebuild
+++ b/dev-perl/Unicode-Map8/Unicode-Map8-0.130.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
RDEPEND=">=dev-perl/Unicode-String-2.60.0"
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 1baf6dc6a29..b8d0c85a3f6 100644
--- a/dev-perl/Unicode-Map8/Unicode-Map8-0.130.0.ebuild
+++ b/dev-perl/Unicode-Map8/Unicode-Map8-0.130.0.ebuild
@@ -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 ~sh 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-r1.ebuild b/dev-perl/Unicode-MapUTF8/Unicode-MapUTF8-1.110.0-r1.ebuild
index 96d9aab45c6..9444da4b9ed 100644
--- a/dev-perl/Unicode-MapUTF8/Unicode-MapUTF8-1.110.0-r1.ebuild
+++ b/dev-perl/Unicode-MapUTF8/Unicode-MapUTF8-1.110.0-r1.ebuild
@@ -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 sh 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-MapUTF8/Unicode-MapUTF8-1.110.0-r2.ebuild b/dev-perl/Unicode-MapUTF8/Unicode-MapUTF8-1.110.0-r2.ebuild
index fc131e95fc0..11caa8ab978 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
@@ -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 ~sh 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 030d43ab111..eb1020783be 100644
--- a/dev-perl/Unicode-String/Unicode-String-2.100.0.ebuild
+++ b/dev-perl/Unicode-String/Unicode-String-2.100.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="String manipulation for Unicode strings"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm 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 c5db7743705..a7f1ff9108a 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 3cedac7d9f9..b7b5f0c0767 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 0d1cfcdc19f..605b58eccb4 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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
!<dev-perl/libwww-perl-6
diff --git a/dev-perl/WWW-RobotRules/WWW-RobotRules-6.20.0.ebuild b/dev-perl/WWW-RobotRules/WWW-RobotRules-6.20.0.ebuild
index d73bf294f2a..7a7a3c96c23 100644
--- a/dev-perl/WWW-RobotRules/WWW-RobotRules-6.20.0.ebuild
+++ b/dev-perl/WWW-RobotRules/WWW-RobotRules-6.20.0.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 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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-r2.ebuild b/dev-perl/X11-Protocol/X11-Protocol-0.560.0-r2.ebuild
index f4eddedb606..e30c5913eeb 100644
--- a/dev-perl/X11-Protocol/X11-Protocol-0.560.0-r2.ebuild
+++ b/dev-perl/X11-Protocol/X11-Protocol-0.560.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,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 ~sh ~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/X500-DN/X500-DN-0.290.0-r1.ebuild b/dev-perl/X500-DN/X500-DN-0.290.0-r1.ebuild
index c8b9d3f84cf..238b4c3fec8 100644
--- a/dev-perl/X500-DN/X500-DN-0.290.0-r1.ebuild
+++ b/dev-perl/X500-DN/X500-DN-0.290.0-r1.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="handle X.500 DNs (Distinguished Names), parse and format them"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ppc ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ia64 ppc ~s390 sparc x86"
IUSE=""
RDEPEND="dev-perl/Parse-RecDescent"
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 3080b9aa067..d287280bc59 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=">=dev-perl/XML-SAX-0.12"
diff --git a/dev-perl/XML-Generator/XML-Generator-1.40.0-r1.ebuild b/dev-perl/XML-Generator/XML-Generator-1.40.0-r1.ebuild
index f59f9d5d693..511c0f66a00 100644
--- a/dev-perl/XML-Generator/XML-Generator-1.40.0-r1.ebuild
+++ b/dev-perl/XML-Generator/XML-Generator-1.40.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Perl XML::Generator - A module to help in generating XML documents"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
DEPEND="dev-libs/expat"
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 79e21a0b398..7b271216b2d 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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.20.100.ebuild b/dev-perl/XML-LibXML/XML-LibXML-2.20.100.ebuild
index 1b58c7e2788..eb9c4a06e2f 100644
--- a/dev-perl/XML-LibXML/XML-LibXML-2.20.100.ebuild
+++ b/dev-perl/XML-LibXML/XML-LibXML-2.20.100.ebuild
@@ -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 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
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 524b74e988b..5e8e77b86b6 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 d51f64ba02c..2b9054b6804 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 521bd00d08f..21e429e946c 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 c8f10d72292..a4f028b00c4 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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.560.0.ebuild b/dev-perl/XML-SAX-Writer/XML-SAX-Writer-0.560.0.ebuild
index aab75676fd7..178f1825256 100644
--- a/dev-perl/XML-SAX-Writer/XML-SAX-Writer-0.560.0.ebuild
+++ b/dev-perl/XML-SAX-Writer/XML-SAX-Writer-0.560.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="SAX2 Writer"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE=""
RDEPEND="dev-perl/XML-Filter-BufferText
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 6b8cc5e7608..a561fd4edac 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 ef61cea88f9..b5d2842093c 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 c87f13e8dc4..8ca15fb9f03 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 9d2da0bba64..cf841d42cad 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 2aaf68d5c99..8ca0a27275e 100644
--- a/dev-perl/XML-Twig/XML-Twig-3.520.0.ebuild
+++ b/dev-perl/XML-Twig/XML-Twig-3.520.0.ebuild
@@ -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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="nls test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/XML-Writer/XML-Writer-0.625.0.ebuild b/dev-perl/XML-Writer/XML-Writer-0.625.0.ebuild
index bd14a8c647f..74c6cf7f3b3 100644
--- a/dev-perl/XML-Writer/XML-Writer-0.625.0.ebuild
+++ b/dev-perl/XML-Writer/XML-Writer-0.625.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="XML Writer Perl Module"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x86-linux ~x86-solaris"
IUSE="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 1ebca6faca4..c1c97eca753 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 1d51dc64478..3f5d991e5b6 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=""
diff --git a/dev-perl/YAML-PP/YAML-PP-0.18.0.ebuild b/dev-perl/YAML-PP/YAML-PP-0.18.0.ebuild
index 9c4234e17c3..0a9e567b87b 100644
--- a/dev-perl/YAML-PP/YAML-PP-0.18.0.ebuild
+++ b/dev-perl/YAML-PP/YAML-PP-0.18.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="YAML 1.2 processor in perl"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE='test'
RESTRICT="!test? ( test )"
diff --git a/dev-perl/YAML-Syck/YAML-Syck-1.300.0.ebuild b/dev-perl/YAML-Syck/YAML-Syck-1.300.0.ebuild
index 6aba2763064..ca2f96802ad 100644
--- a/dev-perl/YAML-Syck/YAML-Syck-1.300.0.ebuild
+++ b/dev-perl/YAML-Syck/YAML-Syck-1.300.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Fast, lightweight YAML loader and dumper"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
IUSE=""
SRC_TEST="do"
diff --git a/dev-perl/YAML-Syck/YAML-Syck-1.310.0.ebuild b/dev-perl/YAML-Syck/YAML-Syck-1.310.0.ebuild
index 614401579df..f652a267774 100644
--- a/dev-perl/YAML-Syck/YAML-Syck-1.310.0.ebuild
+++ b/dev-perl/YAML-Syck/YAML-Syck-1.310.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="Fast, lightweight YAML loader and dumper"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/YAML-Tiny/YAML-Tiny-1.690.0.ebuild b/dev-perl/YAML-Tiny/YAML-Tiny-1.690.0.ebuild
index a8e27298818..3ffe875d2b3 100644
--- a/dev-perl/YAML-Tiny/YAML-Tiny-1.690.0.ebuild
+++ b/dev-perl/YAML-Tiny/YAML-Tiny-1.690.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 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
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 e1707db3922..ae2618ca3c5 100644
--- a/dev-perl/YAML-Tiny/YAML-Tiny-1.730.0.ebuild
+++ b/dev-perl/YAML-Tiny/YAML-Tiny-1.730.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test minimal"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/YAML/YAML-1.150.0.ebuild b/dev-perl/YAML/YAML-1.150.0.ebuild
index 90ef0da55f6..98b3cbfb0d2 100644
--- a/dev-perl/YAML/YAML-1.150.0.ebuild
+++ b/dev-perl/YAML/YAML-1.150.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="YAML Ain't Markup Language (tm)"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/YAML/YAML-1.240.0.ebuild b/dev-perl/YAML/YAML-1.240.0.ebuild
index abb9fbb60ca..a090e8093e8 100644
--- a/dev-perl/YAML/YAML-1.240.0.ebuild
+++ b/dev-perl/YAML/YAML-1.240.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="YAML Ain't Markup Language (tm)"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/YAML/YAML-1.260.0-r1.ebuild b/dev-perl/YAML/YAML-1.260.0-r1.ebuild
index 08b4e132169..59c1e1612f7 100644
--- a/dev-perl/YAML/YAML-1.260.0-r1.ebuild
+++ b/dev-perl/YAML/YAML-1.260.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="YAML Ain't Markup Language (tm)"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
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 e7a6ed6a5bf..dba167d3624 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/dev-perl/frontier-rpc/frontier-rpc-0.07_beta4-r1.ebuild b/dev-perl/frontier-rpc/frontier-rpc-0.07_beta4-r1.ebuild
index 83807e89f31..e601eb23c13 100644
--- a/dev-perl/frontier-rpc/frontier-rpc-0.07_beta4-r1.ebuild
+++ b/dev-perl/frontier-rpc/frontier-rpc-0.07_beta4-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" http://perl-xml.sourceforge.net/xml-rpc/${MY_P}.tar.gz"
HOMEPAGE+=" http://perl-xml.sourceforge.net/xml-rpc/"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="
diff --git a/dev-perl/frontier-rpc/frontier-rpc-0.07_beta4-r2.ebuild b/dev-perl/frontier-rpc/frontier-rpc-0.07_beta4-r2.ebuild
index 5701e2bbf82..feb5888cc4f 100644
--- a/dev-perl/frontier-rpc/frontier-rpc-0.07_beta4-r2.ebuild
+++ b/dev-perl/frontier-rpc/frontier-rpc-0.07_beta4-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" http://perl-xml.sourceforge.net/xml-rpc/${DIST_NAME}-${DIST_VERSION}.
HOMEPAGE+=" http://perl-xml.sourceforge.net/xml-rpc/"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="
diff --git a/dev-perl/glib-perl/glib-perl-1.326.0.ebuild b/dev-perl/glib-perl/glib-perl-1.326.0.ebuild
index 533807d86b5..eca83a4abd9 100644
--- a/dev-perl/glib-perl/glib-perl-1.326.0.ebuild
+++ b/dev-perl/glib-perl/glib-perl-1.326.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://gtk2-perl.sf.net/ https://metacpan.org/release/Glib"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="
diff --git a/dev-perl/glib-perl/glib-perl-1.329.100.ebuild b/dev-perl/glib-perl/glib-perl-1.329.100.ebuild
index 251852417cc..0f6506a9732 100644
--- a/dev-perl/glib-perl/glib-perl-1.329.100.ebuild
+++ b/dev-perl/glib-perl/glib-perl-1.329.100.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://gtk2-perl.sf.net/ https://metacpan.org/release/Glib"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="
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 37bf9ae21ba..3c4342413be 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 663603828a3..b61004a083c 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="minimal"
RDEPEND="
diff --git a/dev-perl/libwww-perl/libwww-perl-6.150.0.ebuild b/dev-perl/libwww-perl/libwww-perl-6.150.0.ebuild
index 3b80c1ac0bf..842ecaa0757 100644
--- a/dev-perl/libwww-perl/libwww-perl-6.150.0.ebuild
+++ b/dev-perl/libwww-perl/libwww-perl-6.150.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 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="ssl"
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 eafd8df4c38..2bd353ab51e 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 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 703cba8517c..e0ddc03445a 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=">=dev-perl/XML-Parser-2.29"
diff --git a/dev-perl/namespace-autoclean/namespace-autoclean-0.280.0.ebuild b/dev-perl/namespace-autoclean/namespace-autoclean-0.280.0.ebuild
index d30e72f841d..d52f384a7ec 100644
--- a/dev-perl/namespace-autoclean/namespace-autoclean-0.280.0.ebuild
+++ b/dev-perl/namespace-autoclean/namespace-autoclean-0.280.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Keep imports out of your namespace"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/namespace-clean/namespace-clean-0.270.0.ebuild b/dev-perl/namespace-clean/namespace-clean-0.270.0.ebuild
index 308d18666d9..9469433ff5d 100644
--- a/dev-perl/namespace-clean/namespace-clean-0.270.0.ebuild
+++ b/dev-perl/namespace-clean/namespace-clean-0.270.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Keep imports and functions out of your namespace"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/pcsc-perl/pcsc-perl-1.4.14.ebuild b/dev-perl/pcsc-perl/pcsc-perl-1.4.14.ebuild
index 816fee44d1a..6d85d130ad3 100644
--- a/dev-perl/pcsc-perl/pcsc-perl-1.4.14.ebuild
+++ b/dev-perl/pcsc-perl/pcsc-perl-1.4.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ludovic.rousseau.free.fr/softwares/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 arm ~hppa ia64 ppc ppc64 ~sh ~sparc x86"
+KEYWORDS="amd64 arm ~hppa ia64 ppc ppc64 ~sparc x86"
IUSE=""
RESTRICT="test" # actually accesses the pcsc-lite daemon
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 acf2ce893d3..428c5332114 100644
--- a/dev-perl/perl-ldap/perl-ldap-0.650.0.ebuild
+++ b/dev-perl/perl-ldap/perl-ldap-0.650.0.ebuild
@@ -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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
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 860ec48989a..a77d8930c40 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 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ppc ~ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=virtual/perl-File-Spec-0.80
diff --git a/dev-php/File_Iterator/File_Iterator-1.4.2.ebuild b/dev-php/File_Iterator/File_Iterator-1.4.2.ebuild
index 10ce7d75104..8e1cd09fb6e 100644
--- a/dev-php/File_Iterator/File_Iterator-1.4.2.ebuild
+++ b/dev-php/File_Iterator/File_Iterator-1.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/File_Iterator/File_Iterator-1.4.3.ebuild b/dev-php/File_Iterator/File_Iterator-1.4.3.ebuild
index ccd2b390476..9068f607263 100644
--- a/dev-php/File_Iterator/File_Iterator-1.4.3.ebuild
+++ b/dev-php/File_Iterator/File_Iterator-1.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/File_Iterator/File_Iterator-2.0.2-r1.ebuild b/dev-php/File_Iterator/File_Iterator-2.0.2-r1.ebuild
index ed6e2925e36..b2508d50cec 100644
--- a/dev-php/File_Iterator/File_Iterator-2.0.2-r1.ebuild
+++ b/dev-php/File_Iterator/File_Iterator-2.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/File_Iterator/File_Iterator-2.0.2.ebuild b/dev-php/File_Iterator/File_Iterator-2.0.2.ebuild
index 7763457d86b..95a6e0b5b8e 100644
--- a/dev-php/File_Iterator/File_Iterator-2.0.2.ebuild
+++ b/dev-php/File_Iterator/File_Iterator-2.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.5.ebuild b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.5.ebuild
index c0a300889d8..b7c837b03aa 100644
--- a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.5.ebuild
+++ b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/Archive_Tar"
SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
# bzip2 and zlib are needed for compressed tarballs, and there's one
diff --git a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.7.ebuild b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.7.ebuild
index 14ff1089051..ec77b9463d5 100644
--- a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.7.ebuild
+++ b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/Archive_Tar"
SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
# bzip2 and zlib are needed for compressed tarballs, and there's one
diff --git a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.8.ebuild b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.8.ebuild
index 14ff1089051..ec77b9463d5 100644
--- a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.8.ebuild
+++ b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/Archive_Tar"
SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
# bzip2 and zlib are needed for compressed tarballs, and there's one
diff --git a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.9.ebuild b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.9.ebuild
index 14ff1089051..ec77b9463d5 100644
--- a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.9.ebuild
+++ b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/Archive_Tar"
SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
# bzip2 and zlib are needed for compressed tarballs, and there's one
diff --git a/dev-php/PEAR-Auth_SASL/PEAR-Auth_SASL-1.1.0.ebuild b/dev-php/PEAR-Auth_SASL/PEAR-Auth_SASL-1.1.0.ebuild
index 7a07203c6f7..33ea8f470c5 100644
--- a/dev-php/PEAR-Auth_SASL/PEAR-Auth_SASL-1.1.0.ebuild
+++ b/dev-php/PEAR-Auth_SASL/PEAR-Auth_SASL-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,6 +9,6 @@ DESCRIPTION="Abstraction of various SASL mechanism responses"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND=">=dev-php/PEAR-PEAR-1.10.1"
diff --git a/dev-php/PEAR-Cache/PEAR-Cache-1.5.6-r2.ebuild b/dev-php/PEAR-Cache/PEAR-Cache-1.5.6-r2.ebuild
index c9fb6660f27..e80e42fc7ee 100644
--- a/dev-php/PEAR-Cache/PEAR-Cache-1.5.6-r2.ebuild
+++ b/dev-php/PEAR-Cache/PEAR-Cache-1.5.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ DESCRIPTION="Framework for caching of arbitrary data"
LICENSE="PHP-2.02"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
src_install() {
diff --git a/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.1-r1.ebuild b/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.1-r1.ebuild
index b560ae6a7ce..0e9cb5279c7 100644
--- a/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.1-r1.ebuild
+++ b/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.1-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/Console_Getopt"
SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
DEPEND=""
diff --git a/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.3.ebuild b/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.3.ebuild
index 130680148c7..1f5d8be072f 100644
--- a/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.3.ebuild
+++ b/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/Console_Getopt"
SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
DEPEND=""
diff --git a/dev-php/PEAR-DB/PEAR-DB-1.9.2-r1.ebuild b/dev-php/PEAR-DB/PEAR-DB-1.9.2-r1.ebuild
index be76838871f..8297f256b1d 100644
--- a/dev-php/PEAR-DB/PEAR-DB-1.9.2-r1.ebuild
+++ b/dev-php/PEAR-DB/PEAR-DB-1.9.2-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit php-pear-r2
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
DESCRIPTION="Database abstraction layer for PHP"
LICENSE="PHP-3"
diff --git a/dev-php/PEAR-DB/PEAR-DB-1.9.3.ebuild b/dev-php/PEAR-DB/PEAR-DB-1.9.3.ebuild
index aef50db8db8..4ffad08d1fe 100644
--- a/dev-php/PEAR-DB/PEAR-DB-1.9.3.ebuild
+++ b/dev-php/PEAR-DB/PEAR-DB-1.9.3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit php-pear-r2
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
DESCRIPTION="Database abstraction layer for PHP"
LICENSE="PHP-3"
diff --git a/dev-php/PEAR-Date/PEAR-Date-1.5.0_alpha4-r1.ebuild b/dev-php/PEAR-Date/PEAR-Date-1.5.0_alpha4-r1.ebuild
index 1940f31de7f..cc7096f9194 100644
--- a/dev-php/PEAR-Date/PEAR-Date-1.5.0_alpha4-r1.ebuild
+++ b/dev-php/PEAR-Date/PEAR-Date-1.5.0_alpha4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
PEAR_PV=${PV/_alpha/a}
inherit php-pear-r2
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
DESCRIPTION="Date and Time Zone classes"
LICENSE="BSD"
diff --git a/dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild b/dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild
index 1801a859eab..aedab233c15 100644
--- a/dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild
+++ b/dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/PEAR_Exception"
SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
RDEPEND="dev-lang/php:*
diff --git a/dev-php/PEAR-File/PEAR-File-1.4.1-r1.ebuild b/dev-php/PEAR-File/PEAR-File-1.4.1-r1.ebuild
index ef6b2de704c..774fa60df67 100644
--- a/dev-php/PEAR-File/PEAR-File-1.4.1-r1.ebuild
+++ b/dev-php/PEAR-File/PEAR-File-1.4.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ DESCRIPTION="Common file and directory routines"
LICENSE="PHP-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
DEPEND="test? ( dev-php/PEAR-PEAR )"
diff --git a/dev-php/PEAR-File_Gettext/PEAR-File_Gettext-0.4.2-r1.ebuild b/dev-php/PEAR-File_Gettext/PEAR-File_Gettext-0.4.2-r1.ebuild
index 93866627df7..b4e8f406639 100644
--- a/dev-php/PEAR-File_Gettext/PEAR-File_Gettext-0.4.2-r1.ebuild
+++ b/dev-php/PEAR-File_Gettext/PEAR-File_Gettext-0.4.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,6 +9,6 @@ DESCRIPTION="GNU Gettext file parser"
LICENSE="PHP-3"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
PATCHES=( "${FILESDIR/File_Gettext-0.4.2-construct.patch}" )
diff --git a/dev-php/PEAR-HTML_Common/PEAR-HTML_Common-1.2.5-r1.ebuild b/dev-php/PEAR-HTML_Common/PEAR-HTML_Common-1.2.5-r1.ebuild
index d2391551142..257fd547761 100644
--- a/dev-php/PEAR-HTML_Common/PEAR-HTML_Common-1.2.5-r1.ebuild
+++ b/dev-php/PEAR-HTML_Common/PEAR-HTML_Common-1.2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -8,7 +8,7 @@ inherit php-pear-r2
DESCRIPTION="Base class for other HTML classes"
LICENSE="PHP-3.01"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
src_install() {
diff --git a/dev-php/PEAR-HTML_Common2/PEAR-HTML_Common2-2.1.1.ebuild b/dev-php/PEAR-HTML_Common2/PEAR-HTML_Common2-2.1.1.ebuild
index 3f9b1d0f198..f11b8a2f0e4 100644
--- a/dev-php/PEAR-HTML_Common2/PEAR-HTML_Common2-2.1.1.ebuild
+++ b/dev-php/PEAR-HTML_Common2/PEAR-HTML_Common2-2.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -8,7 +8,7 @@ inherit php-pear-r2
DESCRIPTION="Abstract base class for HTML classes (PHP5 port of PEAR-HTML_Common package)"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
DEPEND="test? ( dev-php/phpunit )"
diff --git a/dev-php/PEAR-HTML_Common2/PEAR-HTML_Common2-2.1.2.ebuild b/dev-php/PEAR-HTML_Common2/PEAR-HTML_Common2-2.1.2.ebuild
index 114741e6029..821e6e7c7fe 100644
--- a/dev-php/PEAR-HTML_Common2/PEAR-HTML_Common2-2.1.2.ebuild
+++ b/dev-php/PEAR-HTML_Common2/PEAR-HTML_Common2-2.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,7 +8,7 @@ inherit php-pear-r2
DESCRIPTION="Abstract base class for HTML classes (PHP5 port of PEAR-HTML_Common package)"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
DEPEND="test? ( dev-php/phpunit )"
diff --git a/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.3.0-r1.ebuild b/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.3.0-r1.ebuild
index 23d21031598..b0e4de89e19 100644
--- a/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.3.0-r1.ebuild
+++ b/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ DESCRIPTION="Provides an easy way to perform HTTP requests"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 ~s390 sparc x86"
IUSE="+curl +fileinfo +ssl test +zlib"
RESTRICT="!test? ( test )"
diff --git a/dev-php/PEAR-Log/PEAR-Log-1.13.1.ebuild b/dev-php/PEAR-Log/PEAR-Log-1.13.1.ebuild
index 00ac5886638..f23f29c6ad9 100644
--- a/dev-php/PEAR-Log/PEAR-Log-1.13.1.ebuild
+++ b/dev-php/PEAR-Log/PEAR-Log-1.13.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/Log"
SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE="examples test"
RESTRICT="!test? ( test )"
diff --git a/dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta5-r2.ebuild b/dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta5-r2.ebuild
index 85ea26e116e..b716056a6ab 100644
--- a/dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta5-r2.ebuild
+++ b/dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ inherit php-pear-r2
DESCRIPTION="Database Abstraction Layer"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE="mssql mysql mysqli oci8 oci8-instant-client postgres sqlite"
RDEPEND=">=dev-php/PEAR-PEAR-1.9.1"
diff --git a/dev-php/PEAR-MDB2_Driver_mssql/PEAR-MDB2_Driver_mssql-1.5.0_beta4-r1.ebuild b/dev-php/PEAR-MDB2_Driver_mssql/PEAR-MDB2_Driver_mssql-1.5.0_beta4-r1.ebuild
index 04c4281fb10..d6a8c2d4c8b 100644
--- a/dev-php/PEAR-MDB2_Driver_mssql/PEAR-MDB2_Driver_mssql-1.5.0_beta4-r1.ebuild
+++ b/dev-php/PEAR-MDB2_Driver_mssql/PEAR-MDB2_Driver_mssql-1.5.0_beta4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ inherit php-pear-r2
DESCRIPTION="Database Abstraction Layer, mssql driver"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND=">=dev-php/PEAR-MDB2-2.5.0_beta3
diff --git a/dev-php/PEAR-MDB2_Driver_mysqli/PEAR-MDB2_Driver_mysqli-1.5.0_beta4-r1.ebuild b/dev-php/PEAR-MDB2_Driver_mysqli/PEAR-MDB2_Driver_mysqli-1.5.0_beta4-r1.ebuild
index b4bb48312ec..30848540c1c 100644
--- a/dev-php/PEAR-MDB2_Driver_mysqli/PEAR-MDB2_Driver_mysqli-1.5.0_beta4-r1.ebuild
+++ b/dev-php/PEAR-MDB2_Driver_mysqli/PEAR-MDB2_Driver_mysqli-1.5.0_beta4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ inherit php-pear-r2
DESCRIPTION="Database Abstraction Layer, mysqli driver"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND=">=dev-php/PEAR-MDB2-2.5.0_beta3
diff --git a/dev-php/PEAR-MDB2_Driver_pgsql/PEAR-MDB2_Driver_pgsql-1.5.0_beta4-r1.ebuild b/dev-php/PEAR-MDB2_Driver_pgsql/PEAR-MDB2_Driver_pgsql-1.5.0_beta4-r1.ebuild
index ab98dd11eef..52220d656c6 100644
--- a/dev-php/PEAR-MDB2_Driver_pgsql/PEAR-MDB2_Driver_pgsql-1.5.0_beta4-r1.ebuild
+++ b/dev-php/PEAR-MDB2_Driver_pgsql/PEAR-MDB2_Driver_pgsql-1.5.0_beta4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ inherit php-pear-r2
DESCRIPTION="Database Abstraction Layer, pgsql driver"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND=">=dev-php/PEAR-MDB2-2.5.0_beta3
diff --git a/dev-php/PEAR-Mail/PEAR-Mail-1.4.1-r1.ebuild b/dev-php/PEAR-Mail/PEAR-Mail-1.4.1-r1.ebuild
index 494218fd4b9..9f094b186e2 100644
--- a/dev-php/PEAR-Mail/PEAR-Mail-1.4.1-r1.ebuild
+++ b/dev-php/PEAR-Mail/PEAR-Mail-1.4.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ DESCRIPTION="Class that provides multiple interfaces for sending emails"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.2-r1.ebuild b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.2-r1.ebuild
index 53daaa9d92f..f10360c531b 100644
--- a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.2-r1.ebuild
+++ b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ DESCRIPTION="Create and manipulate mime messages with PHP"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
DEPEND="test? ( dev-php/PEAR-PEAR )"
diff --git a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.4.ebuild b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.4.ebuild
index ab2b18f8acb..a88d469a1fc 100644
--- a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.4.ebuild
+++ b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -9,7 +9,7 @@ DESCRIPTION="Create and manipulate mime messages with PHP"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.6.ebuild b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.6.ebuild
index 7c2883db668..a88d469a1fc 100644
--- a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.6.ebuild
+++ b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.6.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Create and manipulate mime messages with PHP"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-php/PEAR-Mail_mimeDecode/PEAR-Mail_mimeDecode-1.5.6-r2.ebuild b/dev-php/PEAR-Mail_mimeDecode/PEAR-Mail_mimeDecode-1.5.6-r2.ebuild
index d4b0e5530aa..9638e80577d 100644
--- a/dev-php/PEAR-Mail_mimeDecode/PEAR-Mail_mimeDecode-1.5.6-r2.ebuild
+++ b/dev-php/PEAR-Mail_mimeDecode/PEAR-Mail_mimeDecode-1.5.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -8,7 +8,7 @@ inherit php-pear-r2
DESCRIPTION="Provides a class to decode mime messages (split from PEAR-Mail_Mime)"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.2-r3.ebuild b/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.2-r3.ebuild
index 38de8c197e8..4c3d065fa1b 100644
--- a/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.2-r3.ebuild
+++ b/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.2-r3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/Net_SMTP"
SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
LICENSE="PHP-3.01"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE="examples sasl"
DEPEND=""
RDEPEND="dev-lang/php:*
diff --git a/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.3.ebuild b/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.3.ebuild
index 718931d118f..ba2d4e8a2de 100644
--- a/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.3.ebuild
+++ b/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/Net_SMTP"
SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
LICENSE="PHP-3.01"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="examples sasl"
DEPEND=""
RDEPEND="dev-lang/php:*
diff --git a/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.8.1.ebuild b/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.8.1.ebuild
index bbce75d2346..56fe101e706 100644
--- a/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.8.1.ebuild
+++ b/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ DESCRIPTION="A PHP implementation of the SMTP protocol"
HOMEPAGE="https://pear.php.net/package/Net_SMTP"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="examples sasl"
DEPEND=""
RDEPEND="dev-lang/php:*
diff --git a/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.9.0.ebuild b/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.9.0.ebuild
index bbce75d2346..56fe101e706 100644
--- a/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.9.0.ebuild
+++ b/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ DESCRIPTION="A PHP implementation of the SMTP protocol"
HOMEPAGE="https://pear.php.net/package/Net_SMTP"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="examples sasl"
DEPEND=""
RDEPEND="dev-lang/php:*
diff --git a/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.2-r1.ebuild b/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.2-r1.ebuild
index df0ab0099de..94a811c9dbe 100644
--- a/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.2-r1.ebuild
+++ b/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.2-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/roundcube/Net_Sieve"
SRC_URI="https://github.com/roundcube/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE="sasl"
RDEPEND="dev-lang/php:*
diff --git a/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.4.ebuild b/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.4.ebuild
index 521fbee2dfc..42e64738753 100644
--- a/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.4.ebuild
+++ b/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/roundcube/Net_Sieve"
SRC_URI="https://github.com/roundcube/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="sasl"
RDEPEND="dev-lang/php:*
diff --git a/dev-php/PEAR-Net_Socket/PEAR-Net_Socket-1.2.2.ebuild b/dev-php/PEAR-Net_Socket/PEAR-Net_Socket-1.2.2.ebuild
index 0126c8b9e88..435d51e4df0 100644
--- a/dev-php/PEAR-Net_Socket/PEAR-Net_Socket-1.2.2.ebuild
+++ b/dev-php/PEAR-Net_Socket/PEAR-Net_Socket-1.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -8,7 +8,7 @@ inherit php-pear-r2
DESCRIPTION="PHP class interface to TCP sockets"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
DEPEND=""
RDEPEND=">=dev-php/PEAR-PEAR-1.10.1"
diff --git a/dev-php/PEAR-Net_URL/PEAR-Net_URL-1.0.15-r1.ebuild b/dev-php/PEAR-Net_URL/PEAR-Net_URL-1.0.15-r1.ebuild
index b0f41934195..6f35bf8cbd9 100644
--- a/dev-php/PEAR-Net_URL/PEAR-Net_URL-1.0.15-r1.ebuild
+++ b/dev-php/PEAR-Net_URL/PEAR-Net_URL-1.0.15-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ DESCRIPTION="Easy parsing of URLs"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
src_install() {
diff --git a/dev-php/PEAR-Net_URL2/PEAR-Net_URL2-2.2.1-r2.ebuild b/dev-php/PEAR-Net_URL2/PEAR-Net_URL2-2.2.1-r2.ebuild
index c8e4175bbe2..99ece6dd9c3 100644
--- a/dev-php/PEAR-Net_URL2/PEAR-Net_URL2-2.2.1-r2.ebuild
+++ b/dev-php/PEAR-Net_URL2/PEAR-Net_URL2-2.2.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -8,7 +8,7 @@ inherit php-pear-r2
DESCRIPTION="Easy parsing of URLs (PHP5 port of PEAR-Net_URL package)"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 ~s390 sparc x86"
IUSE=""
DOCS=( docs/6470.php docs/example.php )
diff --git a/dev-php/PEAR-OLE/PEAR-OLE-1.0.0_rc3.ebuild b/dev-php/PEAR-OLE/PEAR-OLE-1.0.0_rc3.ebuild
index 47427c4bc64..c12b49d8935 100644
--- a/dev-php/PEAR-OLE/PEAR-OLE-1.0.0_rc3.ebuild
+++ b/dev-php/PEAR-OLE/PEAR-OLE-1.0.0_rc3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,5 +11,5 @@ DESCRIPTION="Package for reading and writing OLE containers"
HOMEPAGE="https://pear.php.net/package/OLE"
LICENSE="PHP-3.01"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.6.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.6.ebuild
index 1fb1d139c3f..13b77046ad5 100644
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.6.ebuild
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.6.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="PEAR Base System"
HOMEPAGE="https://pear.php.net/package/PEAR"
SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 sparc x86"
SLOT="0"
IUSE=""
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.7.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.7.ebuild
index fc163229c00..62984cee2a8 100644
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.7.ebuild
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.7.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="PEAR Base System"
HOMEPAGE="https://pear.php.net/package/PEAR"
SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
SLOT="0"
IUSE=""
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.9.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.9.ebuild
index fc163229c00..62984cee2a8 100644
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.9.ebuild
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.9.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="PEAR Base System"
HOMEPAGE="https://pear.php.net/package/PEAR"
SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
SLOT="0"
IUSE=""
diff --git a/dev-php/PEAR-Spreadsheet_Excel_Writer/PEAR-Spreadsheet_Excel_Writer-0.9.4.ebuild b/dev-php/PEAR-Spreadsheet_Excel_Writer/PEAR-Spreadsheet_Excel_Writer-0.9.4.ebuild
index 172875c4e4e..284314c62b8 100644
--- a/dev-php/PEAR-Spreadsheet_Excel_Writer/PEAR-Spreadsheet_Excel_Writer-0.9.4.ebuild
+++ b/dev-php/PEAR-Spreadsheet_Excel_Writer/PEAR-Spreadsheet_Excel_Writer-0.9.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -8,7 +8,7 @@ inherit php-pear-r2
DESCRIPTION="Package for generating Excel spreadsheets"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
RDEPEND=">=dev-lang/php-5.4:*[iconv]
>=dev-php/PEAR-OLE-0.5-r1"
IUSE=""
diff --git a/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.1.1-r1.ebuild b/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.1.1-r1.ebuild
index 092042ac9b1..aff1685bf85 100644
--- a/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.1.1-r1.ebuild
+++ b/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.1.1-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/Structures_Graph"
SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
DEPEND=""
diff --git a/dev-php/PEAR-Validate/PEAR-Validate-0.8.5-r1.ebuild b/dev-php/PEAR-Validate/PEAR-Validate-0.8.5-r1.ebuild
index e26e198b0c9..4dd0af78925 100644
--- a/dev-php/PEAR-Validate/PEAR-Validate-0.8.5-r1.ebuild
+++ b/dev-php/PEAR-Validate/PEAR-Validate-0.8.5-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit php-pear-r2
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ppc ppc64 ~s390 sparc x86"
DESCRIPTION="Validation class"
LICENSE="BSD"
diff --git a/dev-php/PEAR-XML_Parser/PEAR-XML_Parser-1.3.7-r1.ebuild b/dev-php/PEAR-XML_Parser/PEAR-XML_Parser-1.3.7-r1.ebuild
index 64adb34b1c0..4e9d796fe2d 100644
--- a/dev-php/PEAR-XML_Parser/PEAR-XML_Parser-1.3.7-r1.ebuild
+++ b/dev-php/PEAR-XML_Parser/PEAR-XML_Parser-1.3.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ DESCRIPTION="XML parsing class based on PHP's SAX parser"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
src_test() {
diff --git a/dev-php/PEAR-XML_Parser/PEAR-XML_Parser-1.3.8.ebuild b/dev-php/PEAR-XML_Parser/PEAR-XML_Parser-1.3.8.ebuild
index 067f292a84c..0ed52ec9f9b 100644
--- a/dev-php/PEAR-XML_Parser/PEAR-XML_Parser-1.3.8.ebuild
+++ b/dev-php/PEAR-XML_Parser/PEAR-XML_Parser-1.3.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ DESCRIPTION="XML parsing class based on PHP's SAX parser"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
src_test() {
--git a/dev-php/PEAR-XML_RSS/PEAR-XML_RSS-1.1.0.ebuild b/dev-php/PEAR-XML_RSS/PEAR-XML_RSS-1.1.0.ebuild
index bd575d2b991..f564a5c6a96 100644
--- a/dev-php/PEAR-XML_RSS/PEAR-XML_RSS-1.1.0.ebuild
+++ b/dev-php/PEAR-XML_RSS/PEAR-XML_RSS-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -8,7 +8,7 @@ inherit php-pear-r2
DESCRIPTION="PHP parser for RDF and RSS documents"
LICENSE="PHP-3.01"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
# Only needs PEAR_Exception (not in the tree), not all of PEAR.
--git a/dev-php/PEAR-XML_RSS/PEAR-XML_RSS-1.1.0_alpha1.ebuild b/dev-php/PEAR-XML_RSS/PEAR-XML_RSS-1.1.0_alpha1.ebuild
index e19a5909491..69ba5c4f334 100644
--- a/dev-php/PEAR-XML_RSS/PEAR-XML_RSS-1.1.0_alpha1.ebuild
+++ b/dev-php/PEAR-XML_RSS/PEAR-XML_RSS-1.1.0_alpha1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://pear.php.net/package/XML_RSS"
SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
LICENSE="PHP-3.01"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
# Only needs PEAR_Exception (not in the tree), not all of PEAR.
diff --git a/dev-php/PEAR-XML_Serializer/PEAR-XML_Serializer-0.21.0-r1.ebuild b/dev-php/PEAR-XML_Serializer/PEAR-XML_Serializer-0.21.0-r1.ebuild
index c9a0413d9dc..4e39b4036ff 100644
--- a/dev-php/PEAR-XML_Serializer/PEAR-XML_Serializer-0.21.0-r1.ebuild
+++ b/dev-php/PEAR-XML_Serializer/PEAR-XML_Serializer-0.21.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -8,7 +8,7 @@ DESCRIPTION="Swiss-army knife for reading and writing XML files"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE="examples test"
RESTRICT="!test? ( test )"
diff --git a/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.2.ebuild b/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.2.ebuild
index 249fbef1f8e..5e92235b8cb 100644
--- a/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.2.ebuild
+++ b/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/XML_Util"
SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE="examples"
# PCRE is needed for a few calls to preg_replace and preg_match.
diff --git a/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.3.ebuild b/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.3.ebuild
index 5cbcfd31b55..1c013e52239 100644
--- a/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.3.ebuild
+++ b/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/XML_Util"
SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="examples"
# PCRE is needed for a few calls to preg_replace and preg_match.
diff --git a/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.4.ebuild b/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.4.ebuild
index 5cbcfd31b55..1c013e52239 100644
--- a/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.4.ebuild
+++ b/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/XML_Util"
SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="examples"
# PCRE is needed for a few calls to preg_replace and preg_match.
diff --git a/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-4.0.7-r2.ebuild b/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-4.0.7-r2.ebuild
index 2f76b6139f1..76d7cf7779a 100644
--- a/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-4.0.7-r2.ebuild
+++ b/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-4.0.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-7.0.10-r1.ebuild b/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-7.0.10-r1.ebuild
index ab03fa0af49..8d9aa8f32d3 100644
--- a/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-7.0.10-r1.ebuild
+++ b/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-7.0.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="test"
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/PHP_Timer/PHP_Timer-1.0.9.ebuild b/dev-php/PHP_Timer/PHP_Timer-1.0.9.ebuild
index 65be6c5fa0d..4fe52a92f14 100644
--- a/dev-php/PHP_Timer/PHP_Timer-1.0.9.ebuild
+++ b/dev-php/PHP_Timer/PHP_Timer-1.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/PHP_Timer/PHP_Timer-2.1.2-r1.ebuild b/dev-php/PHP_Timer/PHP_Timer-2.1.2-r1.ebuild
index a0785cb680f..73db2978201 100644
--- a/dev-php/PHP_Timer/PHP_Timer-2.1.2-r1.ebuild
+++ b/dev-php/PHP_Timer/PHP_Timer-2.1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/PHP_TokenStream/PHP_TokenStream-1.4.11-r1.ebuild b/dev-php/PHP_TokenStream/PHP_TokenStream-1.4.11-r1.ebuild
index 4cf938f01d8..61c1898a2f7 100644
--- a/dev-php/PHP_TokenStream/PHP_TokenStream-1.4.11-r1.ebuild
+++ b/dev-php/PHP_TokenStream/PHP_TokenStream-1.4.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/PHP_TokenStream/PHP_TokenStream-3.1.1.ebuild b/dev-php/PHP_TokenStream/PHP_TokenStream-3.1.1.ebuild
index 106234e79bf..dd4a45a8675 100644
--- a/dev-php/PHP_TokenStream/PHP_TokenStream-3.1.1.ebuild
+++ b/dev-php/PHP_TokenStream/PHP_TokenStream-3.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="test"
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/Text_Template/Text_Template-1.2.1.ebuild b/dev-php/Text_Template/Text_Template-1.2.1.ebuild
index b5ac4d6fbd9..9f1e3aef00b 100644
--- a/dev-php/Text_Template/Text_Template-1.2.1.ebuild
+++ b/dev-php/Text_Template/Text_Template-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/doctrine-instantiator/doctrine-instantiator-1.0.5.ebuild b/dev-php/doctrine-instantiator/doctrine-instantiator-1.0.5.ebuild
index 9ae6f1d8f1e..e135018345a 100644
--- a/dev-php/doctrine-instantiator/doctrine-instantiator-1.0.5.ebuild
+++ b/dev-php/doctrine-instantiator/doctrine-instantiator-1.0.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/doctrine/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.g
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/doctrine-instantiator/doctrine-instantiator-1.1.0.ebuild b/dev-php/doctrine-instantiator/doctrine-instantiator-1.1.0.ebuild
index 635b41134dd..9801eecf5b4 100644
--- a/dev-php/doctrine-instantiator/doctrine-instantiator-1.1.0.ebuild
+++ b/dev-php/doctrine-instantiator/doctrine-instantiator-1.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/doctrine/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.g
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/doctrine-instantiator/doctrine-instantiator-1.3.0.ebuild b/dev-php/doctrine-instantiator/doctrine-instantiator-1.3.0.ebuild
index 52ebd8e4eb0..6b79666dab6 100644
--- a/dev-php/doctrine-instantiator/doctrine-instantiator-1.3.0.ebuild
+++ b/dev-php/doctrine-instantiator/doctrine-instantiator-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/doctrine/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.g
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/fedora-autoloader/fedora-autoloader-0.2.1.ebuild b/dev-php/fedora-autoloader/fedora-autoloader-0.2.1.ebuild
index fd25bcc763e..5a3ef452168 100644
--- a/dev-php/fedora-autoloader/fedora-autoloader-0.2.1.ebuild
+++ b/dev-php/fedora-autoloader/fedora-autoloader-0.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/php-fedora/autoloader/archive/${PV}.tar.gz -> ${P}.t
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-php/fedora-autoloader/fedora-autoloader-1.0.0.ebuild b/dev-php/fedora-autoloader/fedora-autoloader-1.0.0.ebuild
index 0decde9fce0..ee12d3f5e31 100644
--- a/dev-php/fedora-autoloader/fedora-autoloader-1.0.0.ebuild
+++ b/dev-php/fedora-autoloader/fedora-autoloader-1.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/php-fedora/autoloader/archive/${PV}.tar.gz -> ${P}.t
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="test"
diff --git a/dev-php/fedora-autoloader/fedora-autoloader-1.0.1.ebuild b/dev-php/fedora-autoloader/fedora-autoloader-1.0.1.ebuild
index 81eea123850..144c288ef54 100644
--- a/dev-php/fedora-autoloader/fedora-autoloader-1.0.1.ebuild
+++ b/dev-php/fedora-autoloader/fedora-autoloader-1.0.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/php-fedora/autoloader/archive/${PV}.tar.gz -> ${P}.t
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="test"
diff --git a/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.0.ebuild b/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.0.ebuild
index 2891cfdd09b..3a600219501 100644
--- a/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.0.ebuild
+++ b/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/myclabs/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.1.ebuild b/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.1.ebuild
index d52dd641b45..f8f0d622d18 100644
--- a/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.1.ebuild
+++ b/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/myclabs/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.9.4.ebuild b/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.9.4.ebuild
index a1af2537399..85a4c29148a 100644
--- a/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.9.4.ebuild
+++ b/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.9.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/myclabs/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/pear/pear-1.10.1-r1.ebuild b/dev-php/pear/pear-1.10.1-r1.ebuild
index 86e5e4d071d..fd540d32ca9 100644
--- a/dev-php/pear/pear-1.10.1-r1.ebuild
+++ b/dev-php/pear/pear-1.10.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
DESCRIPTION="PEAR - PHP Extension and Application Repository"
HOMEPAGE="https://pear.php.net/"
diff --git a/dev-php/pear/pear-1.10.3.ebuild b/dev-php/pear/pear-1.10.3.ebuild
index 30e171344ed..321c226df4b 100644
--- a/dev-php/pear/pear-1.10.3.ebuild
+++ b/dev-php/pear/pear-1.10.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
DESCRIPTION="PEAR - PHP Extension and Application Repository"
HOMEPAGE="https://pear.php.net/"
diff --git a/dev-php/pecl-timezonedb/pecl-timezonedb-2019.3.ebuild b/dev-php/pecl-timezonedb/pecl-timezonedb-2019.3.ebuild
index 94ab6de33e6..ce13c87b5e7 100644
--- a/dev-php/pecl-timezonedb/pecl-timezonedb-2019.3.ebuild
+++ b/dev-php/pecl-timezonedb/pecl-timezonedb-2019.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -14,6 +14,6 @@ inherit php-ext-pecl-r3
DESCRIPTION="Timezone Database to be used with PHP's date and time functions"
LICENSE="PHP-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
PHP_EXT_ECONF_ARGS=""
diff --git a/dev-php/pecl-yaz/pecl-yaz-1.2.2-r1.ebuild b/dev-php/pecl-yaz/pecl-yaz-1.2.2-r1.ebuild
index 8ce081b12eb..62628afaecf 100644
--- a/dev-php/pecl-yaz/pecl-yaz-1.2.2-r1.ebuild
+++ b/dev-php/pecl-yaz/pecl-yaz-1.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ USE_PHP="php5-6 php7-0 php7-1 php7-2"
inherit php-ext-pecl-r3
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
DESCRIPTION="This extension implements a Z39.50 client for PHP using the YAZ toolkit"
LICENSE="BSD"
diff --git a/dev-php/pecl-yaz/pecl-yaz-1.2.3.ebuild b/dev-php/pecl-yaz/pecl-yaz-1.2.3.ebuild
index 9f0cd35777a..21295a2e6fa 100644
--- a/dev-php/pecl-yaz/pecl-yaz-1.2.3.ebuild
+++ b/dev-php/pecl-yaz/pecl-yaz-1.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3 php7-4"
inherit php-ext-pecl-r3
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
DESCRIPTION="This extension implements a Z39.50 client for PHP using the YAZ toolkit"
LICENSE="BSD"
diff --git a/dev-php/phar-io-manifest/phar-io-manifest-1.0.3.ebuild b/dev-php/phar-io-manifest/phar-io-manifest-1.0.3.ebuild
index ce651fab76f..53576524a25 100644
--- a/dev-php/phar-io-manifest/phar-io-manifest-1.0.3.ebuild
+++ b/dev-php/phar-io-manifest/phar-io-manifest-1.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/phar-io/manifest/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="examples"
S="${WORKDIR}/manifest-${PV}"
diff --git a/dev-php/phar-io-version/phar-io-version-2.0.1.ebuild b/dev-php/phar-io-version/phar-io-version-2.0.1.ebuild
index c0576cc49ef..1ddbd002159 100644
--- a/dev-php/phar-io-version/phar-io-version-2.0.1.ebuild
+++ b/dev-php/phar-io-version/phar-io-version-2.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/phar-io/version/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
S="${WORKDIR}/version-${PV}"
diff --git a/dev-php/phpdocumentor-reflection-common/phpdocumentor-reflection-common-1.0.ebuild b/dev-php/phpdocumentor-reflection-common/phpdocumentor-reflection-common-1.0.ebuild
index a1ff303c1d7..a40258c8ef5 100644
--- a/dev-php/phpdocumentor-reflection-common/phpdocumentor-reflection-common-1.0.ebuild
+++ b/dev-php/phpdocumentor-reflection-common/phpdocumentor-reflection-common-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${MY_VENDOR}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.t
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/phpdocumentor-reflection-docblock/phpdocumentor-reflection-docblock-3.1.1.ebuild b/dev-php/phpdocumentor-reflection-docblock/phpdocumentor-reflection-docblock-3.1.1.ebuild
index 78383aea327..9eba235ea3c 100644
--- a/dev-php/phpdocumentor-reflection-docblock/phpdocumentor-reflection-docblock-3.1.1.ebuild
+++ b/dev-php/phpdocumentor-reflection-docblock/phpdocumentor-reflection-docblock-3.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${MY_VENDOR}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.t
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/phpdocumentor-type-resolver/phpdocumentor-type-resolver-0.2.1.ebuild b/dev-php/phpdocumentor-type-resolver/phpdocumentor-type-resolver-0.2.1.ebuild
index c23aafba32d..03ad2516f60 100644
--- a/dev-php/phpdocumentor-type-resolver/phpdocumentor-type-resolver-0.2.1.ebuild
+++ b/dev-php/phpdocumentor-type-resolver/phpdocumentor-type-resolver-0.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${MY_VENDOR}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.t
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/phpspec-prophecy/phpspec-prophecy-1.10.0.ebuild b/dev-php/phpspec-prophecy/phpspec-prophecy-1.10.0.ebuild
index 77a6e0f02b0..bdb25fc6a8f 100644
--- a/dev-php/phpspec-prophecy/phpspec-prophecy-1.10.0.ebuild
+++ b/dev-php/phpspec-prophecy/phpspec-prophecy-1.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${MY_VENDOR}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.t
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/phpspec-prophecy/phpspec-prophecy-1.10.1.ebuild b/dev-php/phpspec-prophecy/phpspec-prophecy-1.10.1.ebuild
index 0e13a51b2a3..bdb25fc6a8f 100644
--- a/dev-php/phpspec-prophecy/phpspec-prophecy-1.10.1.ebuild
+++ b/dev-php/phpspec-prophecy/phpspec-prophecy-1.10.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${MY_VENDOR}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.t
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/phpspec-prophecy/phpspec-prophecy-1.7.0.ebuild b/dev-php/phpspec-prophecy/phpspec-prophecy-1.7.0.ebuild
index ea30e9b7474..c8c8fd93bcf 100644
--- a/dev-php/phpspec-prophecy/phpspec-prophecy-1.7.0.ebuild
+++ b/dev-php/phpspec-prophecy/phpspec-prophecy-1.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${MY_VENDOR}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/phpspec-prophecy/phpspec-prophecy-1.8.0.ebuild b/dev-php/phpspec-prophecy/phpspec-prophecy-1.8.0.ebuild
index cb4ce58cf35..37aeac8fe4f 100644
--- a/dev-php/phpspec-prophecy/phpspec-prophecy-1.8.0.ebuild
+++ b/dev-php/phpspec-prophecy/phpspec-prophecy-1.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${MY_VENDOR}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.t
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/phpspec-prophecy/phpspec-prophecy-1.9.0.ebuild b/dev-php/phpspec-prophecy/phpspec-prophecy-1.9.0.ebuild
index cb4ce58cf35..37aeac8fe4f 100644
--- a/dev-php/phpspec-prophecy/phpspec-prophecy-1.9.0.ebuild
+++ b/dev-php/phpspec-prophecy/phpspec-prophecy-1.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${MY_VENDOR}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.t
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3-r1.ebuild b/dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3-r1.ebuild
index a1d2fd9ecf6..686be65e1e3 100644
--- a/dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3-r1.ebuild
+++ b/dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/sebastianbergmann/${PN}/archive/${PV}.tar.gz -> ${P}
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
RDEPEND="dev-php/fedora-autoloader
diff --git a/dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3.ebuild b/dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3.ebuild
index bfd3cf99267..c937ba6182f 100644
--- a/dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3.ebuild
+++ b/dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/sebastianbergmann/${PN}/archive/${PV}.tar.gz -> ${P}
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND="dev-php/fedora-autoloader
diff --git a/dev-php/phpunit/phpunit-5.7.15-r3.ebuild b/dev-php/phpunit/phpunit-5.7.15-r3.ebuild
index a3a224587d3..e4de581f2e2 100644
--- a/dev-php/phpunit/phpunit-5.7.15-r3.ebuild
+++ b/dev-php/phpunit/phpunit-5.7.15-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/sebastianbergmann/${PN}/archive/${PV}.tar.gz -> ${P}
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND="dev-php/fedora-autoloader
diff --git a/dev-php/phpunit/phpunit-8.5.0.ebuild b/dev-php/phpunit/phpunit-8.5.0.ebuild
index b15fb5689e7..8cef7953bc0 100644
--- a/dev-php/phpunit/phpunit-8.5.0.ebuild
+++ b/dev-php/phpunit/phpunit-8.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/sebastianbergmann/${PN}/archive/${PV}.tar.gz -> ${P}
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
RDEPEND="dev-php/fedora-autoloader
diff --git a/dev-php/phpunit/phpunit-8.5.1.ebuild b/dev-php/phpunit/phpunit-8.5.1.ebuild
index 515d2106064..8cef7953bc0 100644
--- a/dev-php/phpunit/phpunit-8.5.1.ebuild
+++ b/dev-php/phpunit/phpunit-8.5.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/sebastianbergmann/${PN}/archive/${PV}.tar.gz -> ${P}
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
RDEPEND="dev-php/fedora-autoloader
diff --git a/dev-php/phpunit/phpunit-8.5.2.ebuild b/dev-php/phpunit/phpunit-8.5.2.ebuild
index 515d2106064..8cef7953bc0 100644
--- a/dev-php/phpunit/phpunit-8.5.2.ebuild
+++ b/dev-php/phpunit/phpunit-8.5.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/sebastianbergmann/${PN}/archive/${PV}.tar.gz -> ${P}
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
RDEPEND="dev-php/fedora-autoloader
diff --git a/dev-php/sebastian-code-unit-reverse-lookup/sebastian-code-unit-reverse-lookup-1.0.1.ebuild b/dev-php/sebastian-code-unit-reverse-lookup/sebastian-code-unit-reverse-lookup-1.0.1.ebuild
index 3dc346a203b..5ffdb1f30bd 100644
--- a/dev-php/sebastian-code-unit-reverse-lookup/sebastian-code-unit-reverse-lookup-1.0.1.ebuild
+++ b/dev-php/sebastian-code-unit-reverse-lookup/sebastian-code-unit-reverse-lookup-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-comparator/sebastian-comparator-1.2.4.ebuild b/dev-php/sebastian-comparator/sebastian-comparator-1.2.4.ebuild
index 230b9a7987d..9a116c70a6d 100644
--- a/dev-php/sebastian-comparator/sebastian-comparator-1.2.4.ebuild
+++ b/dev-php/sebastian-comparator/sebastian-comparator-1.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-comparator/sebastian-comparator-3.0.2.ebuild b/dev-php/sebastian-comparator/sebastian-comparator-3.0.2.ebuild
index cb5336b6e08..9223bafe900 100644
--- a/dev-php/sebastian-comparator/sebastian-comparator-3.0.2.ebuild
+++ b/dev-php/sebastian-comparator/sebastian-comparator-3.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-diff/sebastian-diff-1.4.1-r1.ebuild b/dev-php/sebastian-diff/sebastian-diff-1.4.1-r1.ebuild
index 069a9ecf83b..9d851e150f2 100644
--- a/dev-php/sebastian-diff/sebastian-diff-1.4.1-r1.ebuild
+++ b/dev-php/sebastian-diff/sebastian-diff-1.4.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-diff/sebastian-diff-3.0.2.ebuild b/dev-php/sebastian-diff/sebastian-diff-3.0.2.ebuild
index 20aa5303052..1376982558e 100644
--- a/dev-php/sebastian-diff/sebastian-diff-3.0.2.ebuild
+++ b/dev-php/sebastian-diff/sebastian-diff-3.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-environment/sebastian-environment-2.0.0.ebuild b/dev-php/sebastian-environment/sebastian-environment-2.0.0.ebuild
index f7b031b0807..b11bf2484d6 100644
--- a/dev-php/sebastian-environment/sebastian-environment-2.0.0.ebuild
+++ b/dev-php/sebastian-environment/sebastian-environment-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-environment/sebastian-environment-4.2.3.ebuild b/dev-php/sebastian-environment/sebastian-environment-4.2.3.ebuild
index 49b0a247a1d..96358f0ee24 100644
--- a/dev-php/sebastian-environment/sebastian-environment-4.2.3.ebuild
+++ b/dev-php/sebastian-environment/sebastian-environment-4.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-exporter/sebastian-exporter-2.0.0.ebuild b/dev-php/sebastian-exporter/sebastian-exporter-2.0.0.ebuild
index a24377f3136..62546d7ef71 100644
--- a/dev-php/sebastian-exporter/sebastian-exporter-2.0.0.ebuild
+++ b/dev-php/sebastian-exporter/sebastian-exporter-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-exporter/sebastian-exporter-3.1.2.ebuild b/dev-php/sebastian-exporter/sebastian-exporter-3.1.2.ebuild
index 380721a6128..cf83726503b 100644
--- a/dev-php/sebastian-exporter/sebastian-exporter-3.1.2.ebuild
+++ b/dev-php/sebastian-exporter/sebastian-exporter-3.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-global-state/sebastian-global-state-1.1.1.ebuild b/dev-php/sebastian-global-state/sebastian-global-state-1.1.1.ebuild
index 6012cdf2f57..047ca288aab 100644
--- a/dev-php/sebastian-global-state/sebastian-global-state-1.1.1.ebuild
+++ b/dev-php/sebastian-global-state/sebastian-global-state-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-global-state/sebastian-global-state-3.0.0.ebuild b/dev-php/sebastian-global-state/sebastian-global-state-3.0.0.ebuild
index 42c9de8f21c..9dad483f6a6 100644
--- a/dev-php/sebastian-global-state/sebastian-global-state-3.0.0.ebuild
+++ b/dev-php/sebastian-global-state/sebastian-global-state-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-object-enumerator/sebastian-object-enumerator-2.0.1.ebuild b/dev-php/sebastian-object-enumerator/sebastian-object-enumerator-2.0.1.ebuild
index 4ab07e9e2e9..b01db4e7ff6 100644
--- a/dev-php/sebastian-object-enumerator/sebastian-object-enumerator-2.0.1.ebuild
+++ b/dev-php/sebastian-object-enumerator/sebastian-object-enumerator-2.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-object-enumerator/sebastian-object-enumerator-3.0.3.ebuild b/dev-php/sebastian-object-enumerator/sebastian-object-enumerator-3.0.3.ebuild
index ec2f666727b..18dce080909 100644
--- a/dev-php/sebastian-object-enumerator/sebastian-object-enumerator-3.0.3.ebuild
+++ b/dev-php/sebastian-object-enumerator/sebastian-object-enumerator-3.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-object-reflector/sebastian-object-reflector-1.1.1.ebuild b/dev-php/sebastian-object-reflector/sebastian-object-reflector-1.1.1.ebuild
index c7d927bc2c5..34f338d4112 100644
--- a/dev-php/sebastian-object-reflector/sebastian-object-reflector-1.1.1.ebuild
+++ b/dev-php/sebastian-object-reflector/sebastian-object-reflector-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-recursion-context/sebastian-recursion-context-2.0.0.ebuild b/dev-php/sebastian-recursion-context/sebastian-recursion-context-2.0.0.ebuild
index 8590a31b02c..c468721fd64 100644
--- a/dev-php/sebastian-recursion-context/sebastian-recursion-context-2.0.0.ebuild
+++ b/dev-php/sebastian-recursion-context/sebastian-recursion-context-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-recursion-context/sebastian-recursion-context-3.0.0.ebuild b/dev-php/sebastian-recursion-context/sebastian-recursion-context-3.0.0.ebuild
index d604ca50688..e90e11f6011 100644
--- a/dev-php/sebastian-recursion-context/sebastian-recursion-context-3.0.0.ebuild
+++ b/dev-php/sebastian-recursion-context/sebastian-recursion-context-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-resource-operations/sebastian-resource-operations-1.0.0.ebuild b/dev-php/sebastian-resource-operations/sebastian-resource-operations-1.0.0.ebuild
index 0f3667dd93b..56533c47f8a 100644
--- a/dev-php/sebastian-resource-operations/sebastian-resource-operations-1.0.0.ebuild
+++ b/dev-php/sebastian-resource-operations/sebastian-resource-operations-1.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-resource-operations/sebastian-resource-operations-2.0.1.ebuild b/dev-php/sebastian-resource-operations/sebastian-resource-operations-2.0.1.ebuild
index 68a1a80abac..36986e772e7 100644
--- a/dev-php/sebastian-resource-operations/sebastian-resource-operations-2.0.1.ebuild
+++ b/dev-php/sebastian-resource-operations/sebastian-resource-operations-2.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-type/sebastian-type-1.1.3.ebuild b/dev-php/sebastian-type/sebastian-type-1.1.3.ebuild
index 4721b8b1b52..fba05ed59db 100644
--- a/dev-php/sebastian-type/sebastian-type-1.1.3.ebuild
+++ b/dev-php/sebastian-type/sebastian-type-1.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-version/sebastian-version-2.0.1.ebuild b/dev-php/sebastian-version/sebastian-version-2.0.1.ebuild
index 8d66eed9bdf..d54fa470e14 100644
--- a/dev-php/sebastian-version/sebastian-version-2.0.1.ebuild
+++ b/dev-php/sebastian-version/sebastian-version-2.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/symfony-yaml/symfony-yaml-2.1.0.ebuild b/dev-php/symfony-yaml/symfony-yaml-2.1.0.ebuild
index c43174b6532..4459f752045 100644
--- a/dev-php/symfony-yaml/symfony-yaml-2.1.0.ebuild
+++ b/dev-php/symfony-yaml/symfony-yaml-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/symfony/yaml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE="test"
RESTRICT="test"
diff --git a/dev-php/theseer-tokenizer/theseer-tokenizer-1.1.0.ebuild b/dev-php/theseer-tokenizer/theseer-tokenizer-1.1.0.ebuild
index dfed89b2df7..f55bd6c3895 100644
--- a/dev-php/theseer-tokenizer/theseer-tokenizer-1.1.0.ebuild
+++ b/dev-php/theseer-tokenizer/theseer-tokenizer-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/theseer/tokenizer/archive/${PV}.tar.gz -> ${P}.tar.g
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-php/theseer-tokenizer/theseer-tokenizer-1.1.3.ebuild b/dev-php/theseer-tokenizer/theseer-tokenizer-1.1.3.ebuild
index 5e52b63d58a..88e27eb644a 100644
--- a/dev-php/theseer-tokenizer/theseer-tokenizer-1.1.3.ebuild
+++ b/dev-php/theseer-tokenizer/theseer-tokenizer-1.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/theseer/tokenizer/archive/${PV}.tar.gz -> ${P}.tar.g
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-php/webmozart-assert/webmozart-assert-1.2.0.ebuild b/dev-php/webmozart-assert/webmozart-assert-1.2.0.ebuild
index ea11955c91f..b944823f294 100644
--- a/dev-php/webmozart-assert/webmozart-assert-1.2.0.ebuild
+++ b/dev-php/webmozart-assert/webmozart-assert-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/webmozart/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/webmozart-assert/webmozart-assert-1.4.0.ebuild b/dev-php/webmozart-assert/webmozart-assert-1.4.0.ebuild
index 77df9aa06b4..fcfe27496da 100644
--- a/dev-php/webmozart-assert/webmozart-assert-1.4.0.ebuild
+++ b/dev-php/webmozart-assert/webmozart-assert-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/webmozart/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-python/Babel/Babel-2.8.0.ebuild b/dev-python/Babel/Babel-2.8.0.ebuild
index 47fbb3db138..9d948651380 100644
--- a/dev-python/Babel/Babel-2.8.0.ebuild
+++ b/dev-python/Babel/Babel-2.8.0.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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/CacheControl/CacheControl-0.11.5.ebuild b/dev-python/CacheControl/CacheControl-0.11.5.ebuild
index 87c20ff5772..f1c3333a35b 100644
--- a/dev-python/CacheControl/CacheControl-0.11.5.ebuild
+++ b/dev-python/CacheControl/CacheControl-0.11.5.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 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="test"
RDEPEND="
diff --git a/dev-python/CacheControl/CacheControl-0.11.7.ebuild b/dev-python/CacheControl/CacheControl-0.11.7.ebuild
index da503205fb1..76edcd73fa6 100644
--- a/dev-python/CacheControl/CacheControl-0.11.7.ebuild
+++ b/dev-python/CacheControl/CacheControl-0.11.7.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 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="test"
RDEPEND="
diff --git a/dev-python/PyContracts/PyContracts-1.7.9.ebuild b/dev-python/PyContracts/PyContracts-1.7.9.ebuild
index 7a589918400..6e9b65c9a52 100644
--- a/dev-python/PyContracts/PyContracts-1.7.9.ebuild
+++ b/dev-python/PyContracts/PyContracts-1.7.9.ebuild
@@ -13,7 +13,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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RDEPEND="
diff --git a/dev-python/PyContracts/PyContracts-1.8.0.ebuild b/dev-python/PyContracts/PyContracts-1.8.0.ebuild
index d58e296b71c..8967cc6fd8b 100644
--- a/dev-python/PyContracts/PyContracts-1.8.0.ebuild
+++ b/dev-python/PyContracts/PyContracts-1.8.0.ebuild
@@ -13,7 +13,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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RDEPEND="
diff --git a/dev-python/PyContracts/PyContracts-1.8.12.ebuild b/dev-python/PyContracts/PyContracts-1.8.12.ebuild
index 4e84c247c35..69230c873c9 100644
--- a/dev-python/PyContracts/PyContracts-1.8.12.ebuild
+++ b/dev-python/PyContracts/PyContracts-1.8.12.ebuild
@@ -13,7 +13,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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/PySocks/PySocks-1.6.7.ebuild b/dev-python/PySocks/PySocks-1.6.7.ebuild
index 285c4a5759f..4b85687b330 100644
--- a/dev-python/PySocks/PySocks-1.6.7.ebuild
+++ b/dev-python/PySocks/PySocks-1.6.7.ebuild
@@ -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 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/PySocks/PySocks-1.6.8.ebuild b/dev-python/PySocks/PySocks-1.6.8.ebuild
index 0a8aee64d45..b9a6df50b64 100644
--- a/dev-python/PySocks/PySocks-1.6.8.ebuild
+++ b/dev-python/PySocks/PySocks-1.6.8.ebuild
@@ -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 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-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="test"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/PySocks/PySocks-1.7.1.ebuild b/dev-python/PySocks/PySocks-1.7.1.ebuild
index 2b159496437..33caae36a37 100644
--- a/dev-python/PySocks/PySocks-1.7.1.ebuild
+++ b/dev-python/PySocks/PySocks-1.7.1.ebuild
@@ -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 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-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"
#BDEPEND="
# test? (
diff --git a/dev-python/alabaster/alabaster-0.7.12.ebuild b/dev-python/alabaster/alabaster-0.7.12.ebuild
index ecd5763e5f2..a17623a989d 100644
--- a/dev-python/alabaster/alabaster-0.7.12.ebuild
+++ b/dev-python/alabaster/alabaster-0.7.12.ebuild
@@ -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 s390 ~sh sparc x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-solaris"
SLOT="0"
diff --git a/dev-python/apipkg/apipkg-1.5.ebuild b/dev-python/apipkg/apipkg-1.5.ebuild
index 12352545061..753e82a56b6 100644
--- a/dev-python/apipkg/apipkg-1.5.ebuild
+++ b/dev-python/apipkg/apipkg-1.5.ebuild
@@ -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 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
dev-python/setuptools_scm[${PYTHON_USEDEP}]"
diff --git a/dev-python/appdirs/appdirs-1.4.3-r1.ebuild b/dev-python/appdirs/appdirs-1.4.3-r1.ebuild
index 6b65f006eda..8785a72df4b 100644
--- a/dev-python/appdirs/appdirs-1.4.3-r1.ebuild
+++ b/dev-python/appdirs/appdirs-1.4.3-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 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
PATCHES=( "${FILESDIR}"/${PN}-1.4.3-distutils.patch )
diff --git a/dev-python/attrs/attrs-19.3.0.ebuild b/dev-python/attrs/attrs-19.3.0.ebuild
index eaf8d70d48f..3647f482909 100644
--- a/dev-python/attrs/attrs-19.3.0.ebuild
+++ b/dev-python/attrs/attrs-19.3.0.ebuild
@@ -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 s390 ~sh 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 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/dev-python/automat/automat-0.8.0.ebuild b/dev-python/automat/automat-0.8.0.ebuild
index b300527b2c6..2b2b46a851c 100644
--- a/dev-python/automat/automat-0.8.0.ebuild
+++ b/dev-python/automat/automat-0.8.0.ebuild
@@ -15,7 +15,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 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="examples"
RDEPEND="
diff --git a/dev-python/backports-abc/backports-abc-0.5.ebuild b/dev-python/backports-abc/backports-abc-0.5.ebuild
index 8412f1c25ce..6aeb649144b 100644
--- a/dev-python/backports-abc/backports-abc-0.5.ebuild
+++ b/dev-python/backports-abc/backports-abc-0.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="PSF-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh 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}/${MY_P}
diff --git a/dev-python/backports-lzma/backports-lzma-0.0.10.ebuild b/dev-python/backports-lzma/backports-lzma-0.0.10.ebuild
index ffaba327335..384f1ac16f8 100644
--- a/dev-python/backports-lzma/backports-lzma-0.0.10.ebuild
+++ b/dev-python/backports-lzma/backports-lzma-0.0.10.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 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"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/backports-lzma/backports-lzma-0.0.12.ebuild b/dev-python/backports-lzma/backports-lzma-0.0.12.ebuild
index 3ac2d260047..4c111936dad 100644
--- a/dev-python/backports-lzma/backports-lzma-0.0.12.ebuild
+++ b/dev-python/backports-lzma/backports-lzma-0.0.12.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/backports-lzma/backports-lzma-0.0.13.ebuild b/dev-python/backports-lzma/backports-lzma-0.0.13.ebuild
index 66678a8b5cd..4397cdaea2b 100644
--- a/dev-python/backports-lzma/backports-lzma-0.0.13.ebuild
+++ b/dev-python/backports-lzma/backports-lzma-0.0.13.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh 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"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.5.0.1-r1.ebuild b/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.5.0.1-r1.ebuild
index dccab47ef52..6a710f02e3d 100644
--- a/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.5.0.1-r1.ebuild
+++ b/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.5.0.1-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="PYTHON"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh 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"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
RDEPEND="dev-python/backports[${PYTHON_USEDEP}]"
diff --git a/dev-python/backports-unittest-mock/backports-unittest-mock-1.5-r1.ebuild b/dev-python/backports-unittest-mock/backports-unittest-mock-1.5-r1.ebuild
index 22685e1da97..2963a1c487d 100644
--- a/dev-python/backports-unittest-mock/backports-unittest-mock-1.5-r1.ebuild
+++ b/dev-python/backports-unittest-mock/backports-unittest-mock-1.5-r1.ebuild
@@ -18,7 +18,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 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE="test"
RDEPEND="
diff --git a/dev-python/backports/backports-1.0.ebuild b/dev-python/backports/backports-1.0.ebuild
index e2c2d71e432..82ed0a804a5 100644
--- a/dev-python/backports/backports-1.0.ebuild
+++ b/dev-python/backports/backports-1.0.ebuild
@@ -14,6 +14,6 @@ SRC_URI="https://dev.gentoo.org/~radhermit/dist/${P}.tar.gz"
LICENSE="PYTHON"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
RDEPEND="!<dev-python/backports-lzma-0.0.2-r1"
diff --git a/dev-python/bcrypt/bcrypt-3.1.6.ebuild b/dev-python/bcrypt/bcrypt-3.1.6.ebuild
index 466634c9414..21b012ea0ab 100644
--- a/dev-python/bcrypt/bcrypt-3.1.6.ebuild
+++ b/dev-python/bcrypt/bcrypt-3.1.6.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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/bcrypt/bcrypt-3.1.7-r2.ebuild b/dev-python/bcrypt/bcrypt-3.1.7-r2.ebuild
index defadbbd411..aa39233ec66 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
COMMON_DEPEND="
$(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
diff --git a/dev-python/beaker/beaker-1.8.1.ebuild b/dev-python/beaker/beaker-1.8.1.ebuild
index 5d99edd99a4..0d38cbd0b4e 100644
--- a/dev-python/beaker/beaker-1.8.1.ebuild
+++ b/dev-python/beaker/beaker-1.8.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/bbangert/beaker/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ~ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild b/dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild
index fa441ebfb75..4ca7a45e13c 100644
--- a/dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild
+++ b/dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.crummy.com/software/${MY_PN}/download/3.x/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="python-2"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
DEPEND=""
diff --git a/dev-python/bottle/bottle-0.12.18.ebuild b/dev-python/bottle/bottle-0.12.18.ebuild
index c613baf70eb..4829c4ecddf 100644
--- a/dev-python/bottle/bottle-0.12.18.ebuild
+++ b/dev-python/bottle/bottle-0.12.18.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 ~s390 ~sh 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/certifi/certifi-2019.11.28.ebuild b/dev-python/certifi/certifi-2019.11.28.ebuild
index b0a469d0da5..1b523a793e7 100644
--- a/dev-python/certifi/certifi-2019.11.28.ebuild
+++ b/dev-python/certifi/certifi-2019.11.28.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MPL-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="app-misc/ca-certificates"
diff --git a/dev-python/cffi/cffi-1.13.2.ebuild b/dev-python/cffi/cffi-1.13.2.ebuild
index 28651105490..f419ea476c7 100644
--- a/dev-python/cffi/cffi-1.13.2.ebuild
+++ b/dev-python/cffi/cffi-1.13.2.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 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/cffi/cffi-1.14.0.ebuild b/dev-python/cffi/cffi-1.14.0.ebuild
index 6327202dc16..a83abc21cea 100644
--- a/dev-python/cffi/cffi-1.14.0.ebuild
+++ b/dev-python/cffi/cffi-1.14.0.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 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 6d87a767f0e..5d9700db4a7 100644
--- a/dev-python/characteristic/characteristic-14.3.0-r3.ebuild
+++ b/dev-python/characteristic/characteristic-14.3.0-r3.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 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
IUSE="doc test"
BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/chardet/chardet-3.0.4.ebuild b/dev-python/chardet/chardet-3.0.4.ebuild
index 84c2311225a..030a203347c 100644
--- a/dev-python/chardet/chardet-3.0.4.ebuild
+++ b/dev-python/chardet/chardet-3.0.4.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 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
diff --git a/dev-python/click/click-6.7-r1.ebuild b/dev-python/click/click-6.7-r1.ebuild
index dcb5170f800..848d3e40e8a 100644
--- a/dev-python/click/click-6.7-r1.ebuild
+++ b/dev-python/click/click-6.7-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://palletsprojects.com/p/click/ https://pypi.org/project/click/"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="doc examples test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/colorama/colorama-0.3.9-r1.ebuild b/dev-python/colorama/colorama-0.3.9-r1.ebuild
index 3dfc4e38b84..2be86852043 100644
--- a/dev-python/colorama/colorama-0.3.9-r1.ebuild
+++ b/dev-python/colorama/colorama-0.3.9-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/tartley/${PN}/archive/${PV}.tar.gz -> ${P}.github.ta
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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 test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/colorama/colorama-0.4.1.ebuild b/dev-python/colorama/colorama-0.4.1.ebuild
index e6581e95a27..754c6d8cfd3 100644
--- a/dev-python/colorama/colorama-0.4.1.ebuild
+++ b/dev-python/colorama/colorama-0.4.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/tartley/${PN}/archive/${PV}.tar.gz -> ${P}.github.ta
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh 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 test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/colorama/colorama-0.4.3.ebuild b/dev-python/colorama/colorama-0.4.3.ebuild
index f1378dc689e..70d7fad01c1 100644
--- a/dev-python/colorama/colorama-0.4.3.ebuild
+++ b/dev-python/colorama/colorama-0.4.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/tartley/${PN}/archive/${PV}.tar.gz -> ${P}.github.ta
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh 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 test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/constantly/constantly-15.1.0-r1.ebuild b/dev-python/constantly/constantly-15.1.0-r1.ebuild
index 6354449cc31..2ccb51e37c9 100644
--- a/dev-python/constantly/constantly-15.1.0-r1.ebuild
+++ b/dev-python/constantly/constantly-15.1.0-r1.ebuild
@@ -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 s390 ~sh 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-python/cov-core/cov-core-1.15.0-r1.ebuild b/dev-python/cov-core/cov-core-1.15.0-r1.ebuild
index 3d8bcd7a1ab..ec1f8de1909 100644
--- a/dev-python/cov-core/cov-core-1.15.0-r1.ebuild
+++ b/dev-python/cov-core/cov-core-1.15.0-r1.ebuild
@@ -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 ~sh ~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/coverage-3.6[${PYTHON_USEDEP}]"
diff --git a/dev-python/cov-core/cov-core-1.15.0.ebuild b/dev-python/cov-core/cov-core-1.15.0.ebuild
index a950edf483f..089a80520a5 100644
--- a/dev-python/cov-core/cov-core-1.15.0.ebuild
+++ b/dev-python/cov-core/cov-core-1.15.0.ebuild
@@ -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 sh 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/coverage-3.6[${PYTHON_USEDEP}]"
diff --git a/dev-python/coverage/coverage-4.2.ebuild b/dev-python/coverage/coverage-4.2.ebuild
index a15b6170b93..70b94c5053e 100644
--- a/dev-python/coverage/coverage-4.2.ebuild
+++ b/dev-python/coverage/coverage-4.2.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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/coverage/coverage-4.5.2.ebuild b/dev-python/coverage/coverage-4.5.2.ebuild
index e16b2f690d3..c4598aecedd 100644
--- a/dev-python/coverage/coverage-4.5.2.ebuild
+++ b/dev-python/coverage/coverage-4.5.2.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 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-2.6.1.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-2.6.1.ebuild
index 5f047489a0f..3b20ccc6b1f 100644
--- a/dev-python/cryptography-vectors/cryptography-vectors-2.6.1.ebuild
+++ b/dev-python/cryptography-vectors/cryptography-vectors-2.6.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
LICENSE="|| ( Apache-2.0 BSD )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/cryptography/cryptography-2.6.1-r1.ebuild b/dev-python/cryptography/cryptography-2.6.1-r1.ebuild
index 281e405e9f4..99637ca4c42 100644
--- a/dev-python/cryptography/cryptography-2.6.1-r1.ebuild
+++ b/dev-python/cryptography/cryptography-2.6.1-r1.ebuild
@@ -14,7 +14,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 sh 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 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="libressl idna test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/cryptography/cryptography-2.8-r1.ebuild b/dev-python/cryptography/cryptography-2.8-r1.ebuild
index 2b7b392c0bd..f80669759a7 100644
--- a/dev-python/cryptography/cryptography-2.8-r1.ebuild
+++ b/dev-python/cryptography/cryptography-2.8-r1.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 s390 ~sh 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 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="libressl idna test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/cssselect/cssselect-1.1.0.ebuild b/dev-python/cssselect/cssselect-1.1.0.ebuild
index 0de99b01ac8..f00d9bce50c 100644
--- a/dev-python/cssselect/cssselect-1.1.0.ebuild
+++ b/dev-python/cssselect/cssselect-1.1.0.ebuild
@@ -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 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild b/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild
index b1631e598b4..647b6c6a40d 100644
--- a/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild
+++ b/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE=""
DEPEND=""
diff --git a/dev-python/cython/cython-0.29.14-r1.ebuild b/dev-python/cython/cython-0.29.14-r1.ebuild
index 9541156922f..793b6ebab16 100644
--- a/dev-python/cython/cython-0.29.14-r1.ebuild
+++ b/dev-python/cython/cython-0.29.14-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="emacs test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/cython/cython-0.29.15.ebuild b/dev-python/cython/cython-0.29.15.ebuild
index a0e2e94bd4b..cfbbf43c2cb 100644
--- a/dev-python/cython/cython-0.29.15.ebuild
+++ b/dev-python/cython/cython-0.29.15.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="emacs test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/dbus-python/dbus-python-1.2.4.ebuild b/dev-python/dbus-python/dbus-python-1.2.4.ebuild
index 22592fd9a38..e8532708186 100644
--- a/dev-python/dbus-python/dbus-python-1.2.4.ebuild
+++ b/dev-python/dbus-python/dbus-python-1.2.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~m68k-mint"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~m68k-mint"
IUSE="doc examples test"
RESTRICT="!test? ( test )"
# API docs generated with epydoc, which is python2-only
diff --git a/dev-python/decorator/decorator-4.3.2.ebuild b/dev-python/decorator/decorator-4.3.2.ebuild
index b607f6f0163..dd896daf00e 100644
--- a/dev-python/decorator/decorator-4.3.2.ebuild
+++ b/dev-python/decorator/decorator-4.3.2.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 ~mips ppc ppc64 s390 sh 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"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/decorator/decorator-4.4.0.ebuild b/dev-python/decorator/decorator-4.4.0.ebuild
index d5f6d4d751f..fd5910cf4b5 100644
--- a/dev-python/decorator/decorator-4.4.0.ebuild
+++ b/dev-python/decorator/decorator-4.4.0.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 ~mips ~ppc ~ppc64 ~s390 ~sh ~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"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/decorator/decorator-4.4.1.ebuild b/dev-python/decorator/decorator-4.4.1.ebuild
index 914c5289d60..cd2c0be76a6 100644
--- a/dev-python/decorator/decorator-4.4.1.ebuild
+++ b/dev-python/decorator/decorator-4.4.1.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 ~mips ppc ppc64 s390 ~sh 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"
BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/decorator/decorator-4.4.2.ebuild b/dev-python/decorator/decorator-4.4.2.ebuild
index 27010716420..88786e0fea3 100644
--- a/dev-python/decorator/decorator-4.4.2.ebuild
+++ b/dev-python/decorator/decorator-4.4.2.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 ~mips ~ppc ~ppc64 ~s390 ~sh ~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"
DOCS=( CHANGES.md )
diff --git a/dev-python/defusedxml/defusedxml-0.5.0.ebuild b/dev-python/defusedxml/defusedxml-0.5.0.ebuild
index bb5c513d3b5..c485a6a441d 100644
--- a/dev-python/defusedxml/defusedxml-0.5.0.ebuild
+++ b/dev-python/defusedxml/defusedxml-0.5.0.ebuild
@@ -11,7 +11,7 @@ inherit distutils-r1
DESCRIPTION="XML bomb protection for Python stdlib modules, an xml serialiser"
HOMEPAGE="https://bitbucket.org/tiran/defusedxml https://pypi.org/project/defusedxml/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="examples"
LICENSE="PSF-2"
diff --git a/dev-python/defusedxml/defusedxml-0.6.0.ebuild b/dev-python/defusedxml/defusedxml-0.6.0.ebuild
index 5144777cbc5..96748d55c4c 100644
--- a/dev-python/defusedxml/defusedxml-0.6.0.ebuild
+++ b/dev-python/defusedxml/defusedxml-0.6.0.ebuild
@@ -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 ppc ppc64 s390 ~sh 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/distlib/distlib-0.2.1.ebuild b/dev-python/distlib/distlib-0.2.1.ebuild
index 19cb08865a4..f61a32c6d9f 100644
--- a/dev-python/distlib/distlib-0.2.1.ebuild
+++ b/dev-python/distlib/distlib-0.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
SLOT="0"
LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh 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="app-arch/unzip"
diff --git a/dev-python/distlib/distlib-0.2.4.ebuild b/dev-python/distlib/distlib-0.2.4.ebuild
index d8c26c345b5..ad59c38fff2 100644
--- a/dev-python/distlib/distlib-0.2.4.ebuild
+++ b/dev-python/distlib/distlib-0.2.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
SLOT="0"
LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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="app-arch/unzip"
diff --git a/dev-python/dnspython/dnspython-1.15.0-r1.ebuild b/dev-python/dnspython/dnspython-1.15.0-r1.ebuild
index 951394e1211..9a67bca626a 100644
--- a/dev-python/dnspython/dnspython-1.15.0-r1.ebuild
+++ b/dev-python/dnspython/dnspython-1.15.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
LICENSE="ISC"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
IUSE="examples test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/dnspython/dnspython-1.16.0-r1.ebuild b/dev-python/dnspython/dnspython-1.16.0-r1.ebuild
index 40c49b71e96..5f5468b103f 100644
--- a/dev-python/dnspython/dnspython-1.16.0-r1.ebuild
+++ b/dev-python/dnspython/dnspython-1.16.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rthalley/dnspython/archive/v${PV}.tar.gz -> ${P}.tar
LICENSE="ISC"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
IUSE="examples test"
RDEPEND="dev-python/pycryptodome[${PYTHON_USEDEP}]
diff --git a/dev-python/dnspython/dnspython-1.16.0.ebuild b/dev-python/dnspython/dnspython-1.16.0.ebuild
index 49f1888507f..6fe8fc07c09 100644
--- a/dev-python/dnspython/dnspython-1.16.0.ebuild
+++ b/dev-python/dnspython/dnspython-1.16.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rthalley/dnspython/archive/v${PV}.tar.gz -> ${P}.tar
LICENSE="ISC"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
IUSE="examples test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/docutils-glep/docutils-glep-1.2.ebuild b/dev-python/docutils-glep/docutils-glep-1.2.ebuild
index ea6002b16be..e984ecb91a8 100644
--- a/dev-python/docutils-glep/docutils-glep-1.2.ebuild
+++ b/dev-python/docutils-glep/docutils-glep-1.2.ebuild
@@ -15,7 +15,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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/docutils/docutils-0.12.ebuild b/dev-python/docutils/docutils-0.12.ebuild
index 4c631d864f9..793195e3dfc 100644
--- a/dev-python/docutils/docutils-0.12.ebuild
+++ b/dev-python/docutils/docutils-0.12.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="BSD-2 GPL-3 public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
diff --git a/dev-python/docutils/docutils-0.13.1.ebuild b/dev-python/docutils/docutils-0.13.1.ebuild
index 16747da6af7..a9294556297 100644
--- a/dev-python/docutils/docutils-0.13.1.ebuild
+++ b/dev-python/docutils/docutils-0.13.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="BSD-2 GPL-3 public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
diff --git a/dev-python/docutils/docutils-0.14.ebuild b/dev-python/docutils/docutils-0.14.ebuild
index 496c0a56b7c..1ad400180d5 100644
--- a/dev-python/docutils/docutils-0.14.ebuild
+++ b/dev-python/docutils/docutils-0.14.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
diff --git a/dev-python/docutils/docutils-0.15.2.ebuild b/dev-python/docutils/docutils-0.15.2.ebuild
index 5812fcf06a0..54043974486 100644
--- a/dev-python/docutils/docutils-0.15.2.ebuild
+++ b/dev-python/docutils/docutils-0.15.2.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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/docutils/docutils-0.16.ebuild b/dev-python/docutils/docutils-0.16.ebuild
index 3fe18c7551a..bba79b152dd 100644
--- a/dev-python/docutils/docutils-0.16.ebuild
+++ b/dev-python/docutils/docutils-0.16.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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/ecdsa/ecdsa-0.13.3.ebuild b/dev-python/ecdsa/ecdsa-0.13.3.ebuild
index 5a1580bf32e..7dd82c3619f 100644
--- a/dev-python/ecdsa/ecdsa-0.13.3.ebuild
+++ b/dev-python/ecdsa/ecdsa-0.13.3.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 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/ecdsa/ecdsa-0.14.1-r1.ebuild b/dev-python/ecdsa/ecdsa-0.14.1-r1.ebuild
index 7a26d43e1df..e5540c542de 100644
--- a/dev-python/ecdsa/ecdsa-0.14.1-r1.ebuild
+++ b/dev-python/ecdsa/ecdsa-0.14.1-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 ~s390 ~sh sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
IUSE="test"
BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/ecdsa/ecdsa-0.14.1.ebuild b/dev-python/ecdsa/ecdsa-0.14.1.ebuild
index 84697bd1c98..24df9f7d613 100644
--- a/dev-python/ecdsa/ecdsa-0.14.1.ebuild
+++ b/dev-python/ecdsa/ecdsa-0.14.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 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/elementtree/elementtree-1.2.6-r3.ebuild b/dev-python/elementtree/elementtree-1.2.6-r3.ebuild
index 406ddc93a24..0b80d5c50a7 100644
--- a/dev-python/elementtree/elementtree-1.2.6-r3.ebuild
+++ b/dev-python/elementtree/elementtree-1.2.6-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://effbot.org/downloads/${MY_P}.tar.gz"
LICENSE="ElementTree"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/enum34/enum34-1.1.6-r1.ebuild b/dev-python/enum34/enum34-1.1.6-r1.ebuild
index dc3c674835a..ff55866d5a0 100644
--- a/dev-python/enum34/enum34-1.1.6-r1.ebuild
+++ b/dev-python/enum34/enum34-1.1.6-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 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/execnet/execnet-1.4.1.ebuild b/dev-python/execnet/execnet-1.4.1.ebuild
index ff29fe003f8..45cfc1a2ca2 100644
--- a/dev-python/execnet/execnet-1.4.1.ebuild
+++ b/dev-python/execnet/execnet-1.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 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
IUSE="doc test"
RDEPEND=">=dev-python/apipkg-1.4[${PYTHON_USEDEP}]"
diff --git a/dev-python/execnet/execnet-1.5.0.ebuild b/dev-python/execnet/execnet-1.5.0.ebuild
index 10c8e587ffd..6c9e32d8503 100644
--- a/dev-python/execnet/execnet-1.5.0.ebuild
+++ b/dev-python/execnet/execnet-1.5.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 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="doc test"
RDEPEND=">=dev-python/apipkg-1.4[${PYTHON_USEDEP}]"
diff --git a/dev-python/execnet/execnet-1.7.1.ebuild b/dev-python/execnet/execnet-1.7.1.ebuild
index c6ea7c2a495..c16846bd67f 100644
--- a/dev-python/execnet/execnet-1.7.1.ebuild
+++ b/dev-python/execnet/execnet-1.7.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 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
RDEPEND=">=dev-python/apipkg-1.4[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
--git a/dev-python/extras/extras-0.0.3.ebuild b/dev-python/extras/extras-0.0.3.ebuild
index 2e362b6f3d6..4531f414e8b 100644
--- a/dev-python/extras/extras-0.0.3.ebuild
+++ b/dev-python/extras/extras-0.0.3.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 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
--git a/dev-python/extras/extras-1.0.0.ebuild b/dev-python/extras/extras-1.0.0.ebuild
index 08e22462ab6..fee144155b0 100644
--- a/dev-python/extras/extras-1.0.0.ebuild
+++ b/dev-python/extras/extras-1.0.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 s390 ~sh 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/filemagic/filemagic-1.6.ebuild b/dev-python/filemagic/filemagic-1.6.ebuild
index fda6fd4d403..277d2dbb643 100644
--- a/dev-python/filemagic/filemagic-1.6.ebuild
+++ b/dev-python/filemagic/filemagic-1.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/fixtures/fixtures-1.4.0.ebuild b/dev-python/fixtures/fixtures-1.4.0.ebuild
index 6cb7074497d..9f2ce0a4c12 100644
--- a/dev-python/fixtures/fixtures-1.4.0.ebuild
+++ b/dev-python/fixtures/fixtures-1.4.0.ebuild
@@ -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 ~sh 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/fixtures/fixtures-3.0.0.ebuild b/dev-python/fixtures/fixtures-3.0.0.ebuild
index 5203a76fe0d..b7bee6f84dd 100644
--- a/dev-python/fixtures/fixtures-3.0.0.ebuild
+++ b/dev-python/fixtures/fixtures-3.0.0.ebuild
@@ -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 ~sh ~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.6.1.ebuild b/dev-python/flaky/flaky-3.6.1.ebuild
index c82c1123686..5df513a1895 100644
--- a/dev-python/flaky/flaky-3.6.1.ebuild
+++ b/dev-python/flaky/flaky-3.6.1.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 ~sh 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 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/freezegun/freezegun-0.3.15.ebuild b/dev-python/freezegun/freezegun-0.3.15.ebuild
index 01a1949f6b1..1a3da54f2db 100644
--- a/dev-python/freezegun/freezegun-0.3.15.ebuild
+++ b/dev-python/freezegun/freezegun-0.3.15.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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
RDEPEND="
>dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/funcsigs/funcsigs-1.0.2-r1.ebuild b/dev-python/funcsigs/funcsigs-1.0.2-r1.ebuild
index a76e80b2b23..f576a2fa5f2 100644
--- a/dev-python/funcsigs/funcsigs-1.0.2-r1.ebuild
+++ b/dev-python/funcsigs/funcsigs-1.0.2-r1.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 ~sh 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 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/functools32/functools32-3.2.3.ebuild b/dev-python/functools32/functools32-3.2.3.ebuild
index fdda8be186e..72a22f4dfb3 100644
--- a/dev-python/functools32/functools32-3.2.3.ebuild
+++ b/dev-python/functools32/functools32-3.2.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}-2.tar.gz"
SLOT="0"
LICENSE="PSF-2.4"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 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=""
S="${WORKDIR}"/${P}-2
diff --git a/dev-python/futures/futures-3.1.1.ebuild b/dev-python/futures/futures-3.1.1.ebuild
index ad173dc3496..3c62b12bed4 100644
--- a/dev-python/futures/futures-3.1.1.ebuild
+++ b/dev-python/futures/futures-3.1.1.ebuild
@@ -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 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux"
IUSE="doc"
DEPEND="
diff --git a/dev-python/futures/futures-3.2.0.ebuild b/dev-python/futures/futures-3.2.0.ebuild
index 52a0ab0b760..0f7e38207bd 100644
--- a/dev-python/futures/futures-3.2.0.ebuild
+++ b/dev-python/futures/futures-3.2.0.ebuild
@@ -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 ~ppc ~ppc64 s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="doc"
DEPEND="
diff --git a/dev-python/gconf-python/gconf-python-2.28.1-r1.ebuild b/dev-python/gconf-python/gconf-python-2.28.1-r1.ebuild
index bb0d69bbdf0..2b6d63785ae 100644
--- a/dev-python/gconf-python/gconf-python-2.28.1-r1.ebuild
+++ b/dev-python/gconf-python/gconf-python-2.28.1-r1.ebuild
@@ -11,7 +11,7 @@ inherit gnome-python-common-r1
DESCRIPTION="Python bindings for the GConf library"
LICENSE="LGPL-2.1"
SLOT="2"
-KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="examples"
RDEPEND="dev-python/pygobject:2[${PYTHON_USEDEP}]
diff --git a/dev-python/genty/genty-1.3.2.ebuild b/dev-python/genty/genty-1.3.2.ebuild
index dd93f4241d3..758a5947b65 100644
--- a/dev-python/genty/genty-1.3.2.ebuild
+++ b/dev-python/genty/genty-1.3.2.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 ~sh 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/gmpy/gmpy-2.0.8-r1.ebuild b/dev-python/gmpy/gmpy-2.0.8-r1.ebuild
index 1fd05a25474..2970b933c95 100644
--- a/dev-python/gmpy/gmpy-2.0.8-r1.ebuild
+++ b/dev-python/gmpy/gmpy-2.0.8-r1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/${MY_P}
LICENSE="LGPL-3+"
SLOT="2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh 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="mpir"
RDEPEND="
diff --git a/dev-python/gmpy/gmpy-2.0.8.ebuild b/dev-python/gmpy/gmpy-2.0.8.ebuild
index fba2e081226..c7070b5d9f6 100644
--- a/dev-python/gmpy/gmpy-2.0.8.ebuild
+++ b/dev-python/gmpy/gmpy-2.0.8.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/${MY_P}
LICENSE="LGPL-2.1"
SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh 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 mpir"
RDEPEND="
diff --git a/dev-python/gnome-python-base/gnome-python-base-2.28.1-r1.ebuild b/dev-python/gnome-python-base/gnome-python-base-2.28.1-r1.ebuild
index 09412704673..17527cd4b01 100644
--- a/dev-python/gnome-python-base/gnome-python-base-2.28.1-r1.ebuild
+++ b/dev-python/gnome-python-base/gnome-python-base-2.28.1-r1.ebuild
@@ -31,7 +31,7 @@ RDEPEND=">=x11-libs/gtk+-2.6:2
DEPEND="${RDEPEND}
virtual/pkgconfig"
-KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-python/gnome-python-desktop-base/gnome-python-desktop-base-2.32.0-r1.ebuild b/dev-python/gnome-python-desktop-base/gnome-python-desktop-base-2.32.0-r1.ebuild
index bb9bfedc44d..e1cd77ea6f5 100644
--- a/dev-python/gnome-python-desktop-base/gnome-python-desktop-base-2.32.0-r1.ebuild
+++ b/dev-python/gnome-python-desktop-base/gnome-python-desktop-base-2.32.0-r1.ebuild
@@ -14,7 +14,7 @@ inherit gnome2 python-r1
DESCRIPTION="Provides python the base files for the Gnome Python Desktop bindings"
HOMEPAGE="http://pygtk.org/"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/gnome-vfs-python/gnome-vfs-python-2.28.1-r1.ebuild b/dev-python/gnome-vfs-python/gnome-vfs-python-2.28.1-r1.ebuild
index 0f58536523c..40a2b49b99d 100644
--- a/dev-python/gnome-vfs-python/gnome-vfs-python-2.28.1-r1.ebuild
+++ b/dev-python/gnome-vfs-python/gnome-vfs-python-2.28.1-r1.ebuild
@@ -12,7 +12,7 @@ inherit gnome-python-common-r1
DESCRIPTION="Python bindings for the GnomeVFS library"
LICENSE="LGPL-2.1"
SLOT="2"
-KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="doc examples"
RDEPEND="dev-python/pygobject:2[${PYTHON_USEDEP}]
diff --git a/dev-python/google-apputils/google-apputils-0.4.2-r1.ebuild b/dev-python/google-apputils/google-apputils-0.4.2-r1.ebuild
index 00634ea125e..ba679b9eadf 100644
--- a/dev-python/google-apputils/google-apputils-0.4.2-r1.ebuild
+++ b/dev-python/google-apputils/google-apputils-0.4.2-r1.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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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/google-apputils/google-apputils-0.4.2-r2.ebuild b/dev-python/google-apputils/google-apputils-0.4.2-r2.ebuild
index 663374df89b..7aa544ee838 100644
--- a/dev-python/google-apputils/google-apputils-0.4.2-r2.ebuild
+++ b/dev-python/google-apputils/google-apputils-0.4.2-r2.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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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/hgdistver/hgdistver-0.25.ebuild b/dev-python/hgdistver/hgdistver-0.25.ebuild
index 5fafea39229..dd68ebc5f21 100644
--- a/dev-python/hgdistver/hgdistver-0.25.ebuild
+++ b/dev-python/hgdistver/hgdistver-0.25.ebuild
@@ -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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/hpack/hpack-3.0.0.ebuild b/dev-python/hpack/hpack-3.0.0.ebuild
index 8f7ed209d65..7c766037c73 100644
--- a/dev-python/hpack/hpack-3.0.0.ebuild
+++ b/dev-python/hpack/hpack-3.0.0.ebuild
@@ -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 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/html5lib/html5lib-0.9999999.ebuild b/dev-python/html5lib/html5lib-0.9999999.ebuild
index bdac7adf000..c3254355ba7 100644
--- a/dev-python/html5lib/html5lib-0.9999999.ebuild
+++ b/dev-python/html5lib/html5lib-0.9999999.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 ~sh 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-python/html5lib/html5lib-0.999999999.ebuild b/dev-python/html5lib/html5lib-0.999999999.ebuild
index 427a82743f7..c9b826117cf 100644
--- a/dev-python/html5lib/html5lib-0.999999999.ebuild
+++ b/dev-python/html5lib/html5lib-0.999999999.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 ~sh ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/hyper-h2/hyper-h2-3.1.1.ebuild b/dev-python/hyper-h2/hyper-h2-3.1.1.ebuild
index eeda7a5f4bd..6c06e44ad80 100644
--- a/dev-python/hyper-h2/hyper-h2-3.1.1.ebuild
+++ b/dev-python/hyper-h2/hyper-h2-3.1.1.ebuild
@@ -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 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
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 62373938392..b83a90ec0fa 100644
--- a/dev-python/hyper-h2/hyper-h2-3.2.0.ebuild
+++ b/dev-python/hyper-h2/hyper-h2-3.2.0.ebuild
@@ -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 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/hyperframe/hyperframe-5.1.0.ebuild b/dev-python/hyperframe/hyperframe-5.1.0.ebuild
index 97d2841f509..281c6993c1a 100644
--- a/dev-python/hyperframe/hyperframe-5.1.0.ebuild
+++ b/dev-python/hyperframe/hyperframe-5.1.0.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 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/hyperframe/hyperframe-5.2.0.ebuild b/dev-python/hyperframe/hyperframe-5.2.0.ebuild
index 08a46a50756..1f4958b9682 100644
--- a/dev-python/hyperframe/hyperframe-5.2.0.ebuild
+++ b/dev-python/hyperframe/hyperframe-5.2.0.ebuild
@@ -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 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
distutils_enable_tests pytest
diff --git a/dev-python/hyperlink/hyperlink-19.0.0.ebuild b/dev-python/hyperlink/hyperlink-19.0.0.ebuild
index 11303be1f04..fe9186ff6c7 100644
--- a/dev-python/hyperlink/hyperlink-19.0.0.ebuild
+++ b/dev-python/hyperlink/hyperlink-19.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 ~ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
RDEPEND="
dev-python/idna[${PYTHON_USEDEP}]"
diff --git a/dev-python/hypothesis/hypothesis-4.47.5.ebuild b/dev-python/hypothesis/hypothesis-4.47.5.ebuild
index 7d204a43369..5147881bf9c 100644
--- a/dev-python/hypothesis/hypothesis-4.47.5.ebuild
+++ b/dev-python/hypothesis/hypothesis-4.47.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar
LICENSE="MPL-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh 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/hypothesis/hypothesis-4.50.8.ebuild b/dev-python/hypothesis/hypothesis-4.50.8.ebuild
index 0b29ec27632..890c3b99edf 100644
--- a/dev-python/hypothesis/hypothesis-4.50.8.ebuild
+++ b/dev-python/hypothesis/hypothesis-4.50.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar
LICENSE="MPL-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh 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/idna/idna-2.8.ebuild b/dev-python/idna/idna-2.8.ebuild
index b11e6d7bb1c..05030be2994 100644
--- a/dev-python/idna/idna-2.8.ebuild
+++ b/dev-python/idna/idna-2.8.ebuild
@@ -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 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-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=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/incremental/incremental-17.5.0.ebuild b/dev-python/incremental/incremental-17.5.0.ebuild
index d6fc6b78a31..9ad4aec42df 100644
--- a/dev-python/incremental/incremental-17.5.0.ebuild
+++ b/dev-python/incremental/incremental-17.5.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 s390 ~sh 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}/${P}
diff --git a/dev-python/ipaddress/ipaddress-1.0.14.ebuild b/dev-python/ipaddress/ipaddress-1.0.14.ebuild
index 44e45406fc8..4469429aab4 100644
--- a/dev-python/ipaddress/ipaddress-1.0.14.ebuild
+++ b/dev-python/ipaddress/ipaddress-1.0.14.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="PSF-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh 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/dev-python/ipaddress/ipaddress-1.0.18.ebuild b/dev-python/ipaddress/ipaddress-1.0.18.ebuild
index ab39d296e55..d2b07a6c911 100644
--- a/dev-python/ipaddress/ipaddress-1.0.18.ebuild
+++ b/dev-python/ipaddress/ipaddress-1.0.18.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="PSF-2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-solaris"
IUSE=""
RDEPEND=""
diff --git a/dev-python/ipaddress/ipaddress-1.0.19.ebuild b/dev-python/ipaddress/ipaddress-1.0.19.ebuild
index a70e7174c58..af61660c87f 100644
--- a/dev-python/ipaddress/ipaddress-1.0.19.ebuild
+++ b/dev-python/ipaddress/ipaddress-1.0.19.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="PSF-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-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 ~x64-solaris"
IUSE=""
RDEPEND=""
diff --git a/dev-python/ipaddress/ipaddress-1.0.22.ebuild b/dev-python/ipaddress/ipaddress-1.0.22.ebuild
index 7b0d6a1b5f0..a2ef8253719 100644
--- a/dev-python/ipaddress/ipaddress-1.0.22.ebuild
+++ b/dev-python/ipaddress/ipaddress-1.0.22.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="PSF-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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=""
diff --git a/dev-python/ipaddress/ipaddress-1.0.23.ebuild b/dev-python/ipaddress/ipaddress-1.0.23.ebuild
index 3c92e4898a6..478c7acb5ae 100644
--- a/dev-python/ipaddress/ipaddress-1.0.23.ebuild
+++ b/dev-python/ipaddress/ipaddress-1.0.23.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="PSF-2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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=""
BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/iso8601/iso8601-0.1.10.ebuild b/dev-python/iso8601/iso8601-0.1.10.ebuild
index b1352fe280e..484b87a6e77 100644
--- a/dev-python/iso8601/iso8601-0.1.10.ebuild
+++ b/dev-python/iso8601/iso8601-0.1.10.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 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/iso8601/iso8601-0.1.11.ebuild b/dev-python/iso8601/iso8601-0.1.11.ebuild
index 6ce307618ff..edba6633125 100644
--- a/dev-python/iso8601/iso8601-0.1.11.ebuild
+++ b/dev-python/iso8601/iso8601-0.1.11.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 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/iso8601/iso8601-0.1.12.ebuild b/dev-python/iso8601/iso8601-0.1.12.ebuild
index b3aef30c2ad..300a36fda72 100644
--- a/dev-python/iso8601/iso8601-0.1.12.ebuild
+++ b/dev-python/iso8601/iso8601-0.1.12.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 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/itsdangerous/itsdangerous-1.1.0.ebuild b/dev-python/itsdangerous/itsdangerous-1.1.0.ebuild
index afa67241f27..668bed490b2 100644
--- a/dev-python/itsdangerous/itsdangerous-1.1.0.ebuild
+++ b/dev-python/itsdangerous/itsdangerous-1.1.0.ebuild
@@ -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 ~s390 ~sh ~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/setuptools[${PYTHON_USEDEP}]
test? ( dev-python/freezegun[${PYTHON_USEDEP}] )"
diff --git a/dev-python/jinja/jinja-2.10.3-r1.ebuild b/dev-python/jinja/jinja-2.10.3-r1.ebuild
index 5f75e1efedd..c5fe4cba443 100644
--- a/dev-python/jinja/jinja-2.10.3-r1.ebuild
+++ b/dev-python/jinja/jinja-2.10.3-r1.ebuild
@@ -16,7 +16,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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
IUSE="examples test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/jinja/jinja-2.11.1.ebuild b/dev-python/jinja/jinja-2.11.1.ebuild
index a18cf6260c5..c942958f1ce 100644
--- a/dev-python/jinja/jinja-2.11.1.ebuild
+++ b/dev-python/jinja/jinja-2.11.1.ebuild
@@ -16,7 +16,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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
IUSE="examples"
RDEPEND="
diff --git a/dev-python/jinja/jinja-2.8.1.ebuild b/dev-python/jinja/jinja-2.8.1.ebuild
index c23ba3eda25..cf1ca69bbed 100644
--- a/dev-python/jinja/jinja-2.8.1.ebuild
+++ b/dev-python/jinja/jinja-2.8.1.ebuild
@@ -16,7 +16,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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
IUSE="examples test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/jsonschema/jsonschema-2.5.1-r2.ebuild b/dev-python/jsonschema/jsonschema-2.5.1-r2.ebuild
index 9e31994522b..9f33b67b290 100644
--- a/dev-python/jsonschema/jsonschema-2.5.1-r2.ebuild
+++ b/dev-python/jsonschema/jsonschema-2.5.1-r2.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 ~s390 sh 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/jsonschema/jsonschema-2.6.0.ebuild b/dev-python/jsonschema/jsonschema-2.6.0.ebuild
index ef3f34fe472..6fa889c5c9e 100644
--- a/dev-python/jsonschema/jsonschema-2.6.0.ebuild
+++ b/dev-python/jsonschema/jsonschema-2.6.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 s390 ~sh 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/jsonschema/jsonschema-3.0.1.ebuild b/dev-python/jsonschema/jsonschema-3.0.1.ebuild
index 08d340d3912..e3d1ded91b7 100644
--- a/dev-python/jsonschema/jsonschema-3.0.1.ebuild
+++ b/dev-python/jsonschema/jsonschema-3.0.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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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/libbonobo-python/libbonobo-python-2.28.1-r1.ebuild b/dev-python/libbonobo-python/libbonobo-python-2.28.1-r1.ebuild
index a5d370124a4..6556336f652 100644
--- a/dev-python/libbonobo-python/libbonobo-python-2.28.1-r1.ebuild
+++ b/dev-python/libbonobo-python/libbonobo-python-2.28.1-r1.ebuild
@@ -12,7 +12,7 @@ inherit gnome-python-common-r1
DESCRIPTION="Python bindings for the Bonobo framework"
LICENSE="LGPL-2.1"
SLOT="2"
-KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="examples"
RDEPEND="dev-python/pygobject:2[${PYTHON_USEDEP}]
diff --git a/dev-python/libgnome-python/libgnome-python-2.28.1-r1.ebuild b/dev-python/libgnome-python/libgnome-python-2.28.1-r1.ebuild
index 21f9846a253..919bc8fe7ee 100644
--- a/dev-python/libgnome-python/libgnome-python-2.28.1-r1.ebuild
+++ b/dev-python/libgnome-python/libgnome-python-2.28.1-r1.ebuild
@@ -12,7 +12,7 @@ inherit gnome-python-common-r1
DESCRIPTION="Python bindings for essential GNOME libraries"
LICENSE="LGPL-2.1"
SLOT="2"
-KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="examples"
RDEPEND=">=gnome-base/libgnome-2.24.1
diff --git a/dev-python/libgnomecanvas-python/libgnomecanvas-python-2.28.1-r1.ebuild b/dev-python/libgnomecanvas-python/libgnomecanvas-python-2.28.1-r1.ebuild
index 7d438524541..971b1f44126 100644
--- a/dev-python/libgnomecanvas-python/libgnomecanvas-python-2.28.1-r1.ebuild
+++ b/dev-python/libgnomecanvas-python/libgnomecanvas-python-2.28.1-r1.ebuild
@@ -12,7 +12,7 @@ inherit gnome-python-common-r1
DESCRIPTION="Python bindings for the Gnome Canvas library"
LICENSE="LGPL-2.1"
SLOT="2"
-KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="examples"
RDEPEND="dev-python/pygobject:2[${PYTHON_USEDEP}]
diff --git a/dev-python/librsvg-python/librsvg-python-2.32.0-r1.ebuild b/dev-python/librsvg-python/librsvg-python-2.32.0-r1.ebuild
index 85ebfc76e4b..1996667c951 100644
--- a/dev-python/librsvg-python/librsvg-python-2.32.0-r1.ebuild
+++ b/dev-python/librsvg-python/librsvg-python-2.32.0-r1.ebuild
@@ -12,7 +12,7 @@ inherit gnome-python-common-r1
DESCRIPTION="Python bindings for the librsvg library"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86"
IUSE="examples"
RDEPEND=">=gnome-base/librsvg-2.13.93:2
diff --git a/dev-python/linecache2/linecache2-1.0.0.ebuild b/dev-python/linecache2/linecache2-1.0.0.ebuild
index 57c6f2f3560..ac9df00e96a 100644
--- a/dev-python/linecache2/linecache2-1.0.0.ebuild
+++ b/dev-python/linecache2/linecache2-1.0.0.ebuild
@@ -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 ~sh 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/lockfile/lockfile-0.11.0-r1.ebuild b/dev-python/lockfile/lockfile-0.11.0-r1.ebuild
index 1c1234a1a9e..6711d5da703 100644
--- a/dev-python/lockfile/lockfile-0.11.0-r1.ebuild
+++ b/dev-python/lockfile/lockfile-0.11.0-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 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/lockfile/lockfile-0.12.2-r1.ebuild b/dev-python/lockfile/lockfile-0.12.2-r1.ebuild
index 2061bcb8cf1..16da1864a23 100644
--- a/dev-python/lockfile/lockfile-0.12.2-r1.ebuild
+++ b/dev-python/lockfile/lockfile-0.12.2-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 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/lockfile/lockfile-0.12.2-r2.ebuild b/dev-python/lockfile/lockfile-0.12.2-r2.ebuild
index 11c3dc905f9..27fb155efae 100644
--- a/dev-python/lockfile/lockfile-0.12.2-r2.ebuild
+++ b/dev-python/lockfile/lockfile-0.12.2-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 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/lxml/lxml-4.4.2.ebuild b/dev-python/lxml/lxml-4.4.2.ebuild
index 8ca3f75db1d..ae748745bd3 100644
--- a/dev-python/lxml/lxml-4.4.2.ebuild
+++ b/dev-python/lxml/lxml-4.4.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/lxml/lxml/archive/${P}.tar.gz"
LICENSE="BSD ElementTree GPL-2 PSF-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc examples +threads test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/lxml/lxml-4.4.3.ebuild b/dev-python/lxml/lxml-4.4.3.ebuild
index 8e5f5c5c548..c5cc42ed9a7 100644
--- a/dev-python/lxml/lxml-4.4.3.ebuild
+++ b/dev-python/lxml/lxml-4.4.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 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc examples +threads test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/lxml/lxml-4.5.0.ebuild b/dev-python/lxml/lxml-4.5.0.ebuild
index 67ebeabeab5..256cb262575 100644
--- a/dev-python/lxml/lxml-4.5.0.ebuild
+++ b/dev-python/lxml/lxml-4.5.0.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 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc examples +threads test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/m2r/m2r-0.1.14.ebuild b/dev-python/m2r/m2r-0.1.14.ebuild
index 4d5e26f0d33..a0b98724048 100644
--- a/dev-python/m2r/m2r-0.1.14.ebuild
+++ b/dev-python/m2r/m2r-0.1.14.ebuild
@@ -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 ~s390 ~sh ~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-python/mako/mako-1.0.7.ebuild b/dev-python/mako/mako-1.0.7.ebuild
index 692dc1007f3..bcfb0940705 100644
--- a/dev-python/mako/mako-1.0.7.ebuild
+++ b/dev-python/mako/mako-1.0.7.ebuild
@@ -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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/mako/mako-1.1.0.ebuild b/dev-python/mako/mako-1.1.0.ebuild
index 31797ad4ddf..4ff420ebe96 100644
--- a/dev-python/mako/mako-1.1.0.ebuild
+++ b/dev-python/mako/mako-1.1.0.ebuild
@@ -17,7 +17,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 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/mako/mako-1.1.1.ebuild b/dev-python/mako/mako-1.1.1.ebuild
index 7718f5076fd..40cc79ff70a 100644
--- a/dev-python/mako/mako-1.1.1.ebuild
+++ b/dev-python/mako/mako-1.1.1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="doc"
RDEPEND=">=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]"
diff --git a/dev-python/mako/mako-1.1.2.ebuild b/dev-python/mako/mako-1.1.2.ebuild
index c3b7f9e5639..281a63e3eea 100644
--- a/dev-python/mako/mako-1.1.2.ebuild
+++ b/dev-python/mako/mako-1.1.2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="doc"
RDEPEND=">=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]"
diff --git a/dev-python/markupsafe/markupsafe-0.23.ebuild b/dev-python/markupsafe/markupsafe-0.23.ebuild
index a7aad3b1d71..e808574fb84 100644
--- a/dev-python/markupsafe/markupsafe-0.23.ebuild
+++ b/dev-python/markupsafe/markupsafe-0.23.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/markupsafe/markupsafe-1.0.ebuild b/dev-python/markupsafe/markupsafe-1.0.ebuild
index eee52348d0b..c2a13bfedd9 100644
--- a/dev-python/markupsafe/markupsafe-1.0.ebuild
+++ b/dev-python/markupsafe/markupsafe-1.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/markupsafe/markupsafe-1.1.1.ebuild b/dev-python/markupsafe/markupsafe-1.1.1.ebuild
index 217e0dbc26e..eefb9a219af 100644
--- a/dev-python/markupsafe/markupsafe-1.1.1.ebuild
+++ b/dev-python/markupsafe/markupsafe-1.1.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/medusa/medusa-0.5.4-r1.ebuild b/dev-python/medusa/medusa-0.5.4-r1.ebuild
index e57fa512fe1..df25e4fd30a 100644
--- a/dev-python/medusa/medusa-0.5.4-r1.ebuild
+++ b/dev-python/medusa/medusa-0.5.4-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="PSF-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE=""
python_install_all() {
diff --git a/dev-python/mimeparse/mimeparse-0.1.4-r1.ebuild b/dev-python/mimeparse/mimeparse-0.1.4-r1.ebuild
index 85b5099b3d8..a71d780e40d 100644
--- a/dev-python/mimeparse/mimeparse-0.1.4-r1.ebuild
+++ b/dev-python/mimeparse/mimeparse-0.1.4-r1.ebuild
@@ -15,7 +15,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 ~m68k ~mips ppc ppc64 ~s390 ~sh 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=""
S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/mimeparse/mimeparse-1.6.0.ebuild b/dev-python/mimeparse/mimeparse-1.6.0.ebuild
index 7cc7ed541f7..19c8cd2651f 100644
--- a/dev-python/mimeparse/mimeparse-1.6.0.ebuild
+++ b/dev-python/mimeparse/mimeparse-1.6.0.ebuild
@@ -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 ~m68k ~mips ppc ppc64 s390 ~sh 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=""
S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/mistune/mistune-0.8.3.ebuild b/dev-python/mistune/mistune-0.8.3.ebuild
index 6140ca91fbc..f9f4258290d 100644
--- a/dev-python/mistune/mistune-0.8.3.ebuild
+++ b/dev-python/mistune/mistune-0.8.3.ebuild
@@ -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 ~mips ~ppc ~ppc64 ~s390 ~sh ~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-python/mistune/mistune-0.8.4.ebuild b/dev-python/mistune/mistune-0.8.4.ebuild
index f691a9ece2e..1fbc8b94c15 100644
--- a/dev-python/mistune/mistune-0.8.4.ebuild
+++ b/dev-python/mistune/mistune-0.8.4.ebuild
@@ -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 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
BDEPEND="
dev-python/cython[${PYTHON_USEDEP}]
diff --git a/dev-python/mock/mock-1.0.1-r2.ebuild b/dev-python/mock/mock-1.0.1-r2.ebuild
index bee491b3248..0f26cbcab9c 100644
--- a/dev-python/mock/mock-1.0.1-r2.ebuild
+++ b/dev-python/mock/mock-1.0.1-r2.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 s390 sh 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="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/mock/mock-1.3.0-r2.ebuild b/dev-python/mock/mock-1.3.0-r2.ebuild
index 3c82f372725..1d572e5630e 100644
--- a/dev-python/mock/mock-1.3.0-r2.ebuild
+++ b/dev-python/mock/mock-1.3.0-r2.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 s390 sh 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/mock/mock-2.0.0.ebuild b/dev-python/mock/mock-2.0.0.ebuild
index b1fbe6e9217..0244e6ef0ce 100644
--- a/dev-python/mock/mock-2.0.0.ebuild
+++ b/dev-python/mock/mock-2.0.0.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 s390 ~sh 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/mock/mock-3.0.5-r1.ebuild b/dev-python/mock/mock-3.0.5-r1.ebuild
index 91c48fe1a43..661366ae893 100644
--- a/dev-python/mock/mock-3.0.5-r1.ebuild
+++ b/dev-python/mock/mock-3.0.5-r1.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 ~s390 ~sh ~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="
$(python_gen_cond_dep '
diff --git a/dev-python/mox/mox-0.5.3-r1.ebuild b/dev-python/mox/mox-0.5.3-r1.ebuild
index d8bc63a6e0d..70b536e1057 100644
--- a/dev-python/mox/mox-0.5.3-r1.ebuild
+++ b/dev-python/mox/mox-0.5.3-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 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~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/mysql-python/mysql-python-1.2.3-r1.ebuild b/dev-python/mysql-python/mysql-python-1.2.3-r1.ebuild
index e6a1d5418cc..b5d08ca3b99 100644
--- a/dev-python/mysql-python/mysql-python-1.2.3-r1.ebuild
+++ b/dev-python/mysql-python/mysql-python-1.2.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/mysql-python/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="virtual/mysql"
diff --git a/dev-python/mysql-python/mysql-python-1.2.5-r1.ebuild b/dev-python/mysql-python/mysql-python-1.2.5-r1.ebuild
index b9a306b810f..405bdbab116 100644
--- a/dev-python/mysql-python/mysql-python-1.2.5-r1.ebuild
+++ b/dev-python/mysql-python/mysql-python-1.2.5-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc"
RDEPEND="virtual/mysql"
diff --git a/dev-python/mysql-python/mysql-python-1.2.5-r2.ebuild b/dev-python/mysql-python/mysql-python-1.2.5-r2.ebuild
index 7ff354aa59e..d3ad8a40b6b 100644
--- a/dev-python/mysql-python/mysql-python-1.2.5-r2.ebuild
+++ b/dev-python/mysql-python/mysql-python-1.2.5-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc"
RDEPEND="dev-db/mysql-connector-c"
diff --git a/dev-python/mysql-python/mysql-python-1.2.5-r3.ebuild b/dev-python/mysql-python/mysql-python-1.2.5-r3.ebuild
index 320eb279639..919fe5a1b1d 100644
--- a/dev-python/mysql-python/mysql-python-1.2.5-r3.ebuild
+++ b/dev-python/mysql-python/mysql-python-1.2.5-r3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc"
RDEPEND="dev-db/mysql-connector-c"
diff --git a/dev-python/namespace-google/namespace-google-1.ebuild b/dev-python/namespace-google/namespace-google-1.ebuild
index 1f2b268b39e..043d3458888 100644
--- a/dev-python/namespace-google/namespace-google-1.ebuild
+++ b/dev-python/namespace-google/namespace-google-1.ebuild
@@ -12,7 +12,7 @@ SRC_URI=""
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE=""
RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/namespace-jaraco/namespace-jaraco-1.ebuild b/dev-python/namespace-jaraco/namespace-jaraco-1.ebuild
index 7d967696b4d..0f9fcee4809 100644
--- a/dev-python/namespace-jaraco/namespace-jaraco-1.ebuild
+++ b/dev-python/namespace-jaraco/namespace-jaraco-1.ebuild
@@ -12,7 +12,7 @@ SRC_URI=""
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
IUSE=""
RDEPEND="
diff --git a/dev-python/namespace-jaraco/namespace-jaraco-2.ebuild b/dev-python/namespace-jaraco/namespace-jaraco-2.ebuild
index e6f6fbbe97a..06d5764361a 100644
--- a/dev-python/namespace-jaraco/namespace-jaraco-2.ebuild
+++ b/dev-python/namespace-jaraco/namespace-jaraco-2.ebuild
@@ -12,7 +12,7 @@ SRC_URI=""
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
IUSE=""
RDEPEND="
diff --git a/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild b/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild
index ff6187a8f2c..63adb156325 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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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.ebuild b/dev-python/namespace-zope/namespace-zope-1.ebuild
index 060e0490c12..b64770fa0b4 100644
--- a/dev-python/namespace-zope/namespace-zope-1.ebuild
+++ b/dev-python/namespace-zope/namespace-zope-1.ebuild
@@ -12,7 +12,7 @@ SRC_URI=""
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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.4.0.ebuild b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild
index 6eafff557f9..6befd4ea6cc 100644
--- a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild
+++ b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.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 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE=""
RDEPEND="dev-python/pyopenssl[$(python_gen_usedep 'python*' pypy)]"
diff --git a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.2-r1.ebuild b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.2-r1.ebuild
index fe720e015ae..a7a6b5a600f 100644
--- a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.2-r1.ebuild
+++ b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.2-r1.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 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/node-semver/node-semver-0.2.0.ebuild b/dev-python/node-semver/node-semver-0.2.0.ebuild
index 95684d15442..632c269a89e 100644
--- a/dev-python/node-semver/node-semver-0.2.0.ebuild
+++ b/dev-python/node-semver/node-semver-0.2.0.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 ~s390 ~sh ~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/node-semver/node-semver-0.6.1.ebuild b/dev-python/node-semver/node-semver-0.6.1.ebuild
index bd3817b464e..f1eabb0d93a 100644
--- a/dev-python/node-semver/node-semver-0.6.1.ebuild
+++ b/dev-python/node-semver/node-semver-0.6.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/podhmo/python-semver/archive/${PV}.tar.gz -> ${P}.ta
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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/node-semver/node-semver-0.7.0.ebuild b/dev-python/node-semver/node-semver-0.7.0.ebuild
index bd3817b464e..f1eabb0d93a 100644
--- a/dev-python/node-semver/node-semver-0.7.0.ebuild
+++ b/dev-python/node-semver/node-semver-0.7.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/podhmo/python-semver/archive/${PV}.tar.gz -> ${P}.ta
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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/nose-show-skipped/nose-show-skipped-0.1.ebuild b/dev-python/nose-show-skipped/nose-show-skipped-0.1.ebuild
index d7b0471a4d5..ca6efa05b22 100644
--- a/dev-python/nose-show-skipped/nose-show-skipped-0.1.ebuild
+++ b/dev-python/nose-show-skipped/nose-show-skipped-0.1.ebuild
@@ -14,7 +14,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 s390 ~sh 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/dev-python/nose/nose-1.3.7-r3.ebuild b/dev-python/nose/nose-1.3.7-r3.ebuild
index ba71a3981d5..9543143b1bc 100644
--- a/dev-python/nose/nose-1.3.7-r3.ebuild
+++ b/dev-python/nose/nose-1.3.7-r3.ebuild
@@ -17,7 +17,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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc examples test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/nose/nose-1.3.7-r4.ebuild b/dev-python/nose/nose-1.3.7-r4.ebuild
index ba3ce0abbe8..431ecc06eef 100644
--- a/dev-python/nose/nose-1.3.7-r4.ebuild
+++ b/dev-python/nose/nose-1.3.7-r4.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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="coverage doc examples test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/notify-python/notify-python-0.1.1-r3.ebuild b/dev-python/notify-python/notify-python-0.1.1-r3.ebuild
index 027123fbb0e..5790b99e485 100644
--- a/dev-python/notify-python/notify-python-0.1.1-r3.ebuild
+++ b/dev-python/notify-python/notify-python-0.1.1-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86"
IUSE="examples"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/numpy-python2/numpy-python2-1.16.5.ebuild b/dev-python/numpy-python2/numpy-python2-1.16.5.ebuild
index caad08decf1..d98d8624653 100644
--- a/dev-python/numpy-python2/numpy-python2-1.16.5.ebuild
+++ b/dev-python/numpy-python2/numpy-python2-1.16.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -24,7 +24,7 @@ SRC_URI="
)"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc lapack test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/numpy/numpy-1.16.5.ebuild b/dev-python/numpy/numpy-1.16.5.ebuild
index eb3fb71b179..a2b51adbf1a 100644
--- a/dev-python/numpy/numpy-1.16.5.ebuild
+++ b/dev-python/numpy/numpy-1.16.5.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
)"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc lapack test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/numpy/numpy-1.17.4-r2.ebuild b/dev-python/numpy/numpy-1.17.4-r2.ebuild
index 06da8045df1..49a4164e78b 100644
--- a/dev-python/numpy/numpy-1.17.4-r2.ebuild
+++ b/dev-python/numpy/numpy-1.17.4-r2.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
)"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc lapack test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/oslo-sphinx/oslo-sphinx-4.18.0.ebuild b/dev-python/oslo-sphinx/oslo-sphinx-4.18.0.ebuild
index 2fa552f4745..b91b87ef2a6 100644
--- a/dev-python/oslo-sphinx/oslo-sphinx-4.18.0.ebuild
+++ b/dev-python/oslo-sphinx/oslo-sphinx-4.18.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc x86"
IUSE=""
DEPEND="
diff --git a/dev-python/packaging/packaging-20.1.ebuild b/dev-python/packaging/packaging-20.1.ebuild
index c98fcff8a7b..3e8885ff538 100644
--- a/dev-python/packaging/packaging-20.1.ebuild
+++ b/dev-python/packaging/packaging-20.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="|| ( Apache-2.0 BSD-2 )"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/packaging/packaging-20.3.ebuild b/dev-python/packaging/packaging-20.3.ebuild
index cbdf1bd9438..f43efba6c98 100644
--- a/dev-python/packaging/packaging-20.3.ebuild
+++ b/dev-python/packaging/packaging-20.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="|| ( Apache-2.0 BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/paramiko/paramiko-2.4.2.ebuild b/dev-python/paramiko/paramiko-2.4.2.ebuild
index 5353f2a07fc..289ded23af1 100644
--- a/dev-python/paramiko/paramiko-2.4.2.ebuild
+++ b/dev-python/paramiko/paramiko-2.4.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
IUSE="doc examples server test"
# Depends on pytest-relaxed which is broken
RESTRICT="!test? ( test )"
diff --git a/dev-python/paramiko/paramiko-2.6.0.ebuild b/dev-python/paramiko/paramiko-2.6.0.ebuild
index 694ab7ad7ee..3f3a07c9604 100644
--- a/dev-python/paramiko/paramiko-2.6.0.ebuild
+++ b/dev-python/paramiko/paramiko-2.6.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
IUSE="examples server test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/paramiko/paramiko-2.7.1.ebuild b/dev-python/paramiko/paramiko-2.7.1.ebuild
index 9b582817d10..9e402795e87 100644
--- a/dev-python/paramiko/paramiko-2.7.1.ebuild
+++ b/dev-python/paramiko/paramiko-2.7.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
IUSE="examples server test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/path-py/path-py-11.5.2.ebuild b/dev-python/path-py/path-py-11.5.2.ebuild
index 7f477ed01ef..00aec07d252 100644
--- a/dev-python/path-py/path-py-11.5.2.ebuild
+++ b/dev-python/path-py/path-py-11.5.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/p/path.py/${MY_P}.tar.gz"
SLOT="0"
LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh 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"
RDEPEND="$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' python3_{5,6,7} pypy3)
diff --git a/dev-python/path-py/path-py-12.0.2.ebuild b/dev-python/path-py/path-py-12.0.2.ebuild
index 7a5ea1d4249..48d0e2400b7 100644
--- a/dev-python/path-py/path-py-12.0.2.ebuild
+++ b/dev-python/path-py/path-py-12.0.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/p/path.py/${MY_P}.tar.gz"
SLOT="0"
LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh 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"
RDEPEND="$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' python3_{5,6,7} pypy3)
diff --git a/dev-python/pbr/pbr-0.8.2-r1.ebuild b/dev-python/pbr/pbr-0.8.2-r1.ebuild
index 29416b5550e..e2c82d0313e 100644
--- a/dev-python/pbr/pbr-0.8.2-r1.ebuild
+++ b/dev-python/pbr/pbr-0.8.2-r1.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 ppc ppc64 s390 ~sh 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-python/pbr/pbr-1.10.0-r1.ebuild b/dev-python/pbr/pbr-1.10.0-r1.ebuild
index 933d6f90643..76e1a71aac8 100644
--- a/dev-python/pbr/pbr-1.10.0-r1.ebuild
+++ b/dev-python/pbr/pbr-1.10.0-r1.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 m68k ~mips ppc ppc64 s390 sh 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/pexpect/pexpect-4.6.0.ebuild b/dev-python/pexpect/pexpect-4.6.0.ebuild
index a93d1c6bed7..07431cbe251 100644
--- a/dev-python/pexpect/pexpect-4.6.0.ebuild
+++ b/dev-python/pexpect/pexpect-4.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 ~m68k ~mips ppc ppc64 ~s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc examples"
RDEPEND=">=dev-python/ptyprocess-0.5[${PYTHON_USEDEP}]"
diff --git a/dev-python/pip/pip-9.0.1-r2.ebuild b/dev-python/pip/pip-9.0.1-r2.ebuild
index 8b98697311d..ec1b5425205 100644
--- a/dev-python/pip/pip-9.0.1-r2.ebuild
+++ b/dev-python/pip/pip-9.0.1-r2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://pip.pypa.io/ https://pypi.org/project/pip/ https://github.com/
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
SLOT="0"
IUSE="-vanilla"
diff --git a/dev-python/ply/ply-3.11.ebuild b/dev-python/ply/ply-3.11.ebuild
index af9028998be..ce6d49b1702 100644
--- a/dev-python/ply/ply-3.11.ebuild
+++ b/dev-python/ply/ply-3.11.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 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="examples"
RDEPEND=""
diff --git a/dev-python/pretend/pretend-1.0.8-r1.ebuild b/dev-python/pretend/pretend-1.0.8-r1.ebuild
index b122b6bccd6..60f979f15da 100644
--- a/dev-python/pretend/pretend-1.0.8-r1.ebuild
+++ b/dev-python/pretend/pretend-1.0.8-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/alex/pretend/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pretend/pretend-1.0.8.ebuild b/dev-python/pretend/pretend-1.0.8.ebuild
index 6a2fa2abc44..3e8ec8a17c8 100644
--- a/dev-python/pretend/pretend-1.0.8.ebuild
+++ b/dev-python/pretend/pretend-1.0.8.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 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pretend/pretend-1.0.9.ebuild b/dev-python/pretend/pretend-1.0.9.ebuild
index 3ea4647b340..150b2d8bed5 100644
--- a/dev-python/pretend/pretend-1.0.9.ebuild
+++ b/dev-python/pretend/pretend-1.0.9.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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 156c7fc76af..d5f323303de 100644
--- a/dev-python/priority/priority-1.3.0.ebuild
+++ b/dev-python/priority/priority-1.3.0.ebuild
@@ -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 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/process-tests/process-tests-2.0.2.ebuild b/dev-python/process-tests/process-tests-2.0.2.ebuild
index 61f6e5c8c6b..3c19ff96140 100644
--- a/dev-python/process-tests/process-tests-2.0.2.ebuild
+++ b/dev-python/process-tests/process-tests-2.0.2.ebuild
@@ -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 ~sh 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/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/progress/progress-1.2.ebuild b/dev-python/progress/progress-1.2.ebuild
index 1f0d0c065a6..0a77e643828 100644
--- a/dev-python/progress/progress-1.2.ebuild
+++ b/dev-python/progress/progress-1.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="ISC"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh 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/dev-python/progress/progress-1.3.ebuild b/dev-python/progress/progress-1.3.ebuild
index d0b4380c53c..cb4239b5e03 100644
--- a/dev-python/progress/progress-1.3.ebuild
+++ b/dev-python/progress/progress-1.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="ISC"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/protobuf-python/protobuf-python-3.10.1.ebuild b/dev-python/protobuf-python/protobuf-python-3.10.1.ebuild
index 23befa24245..cd9cf69f33f 100644
--- a/dev-python/protobuf-python/protobuf-python-3.10.1.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.10.1.ebuild
@@ -24,7 +24,7 @@ fi
LICENSE="BSD"
SLOT="0/21"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE=""
BDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/protobuf-python/protobuf-python-3.11.2.ebuild b/dev-python/protobuf-python/protobuf-python-3.11.2.ebuild
index 28ac6f31998..c50c48fa758 100644
--- a/dev-python/protobuf-python/protobuf-python-3.11.2.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.11.2.ebuild
@@ -24,7 +24,7 @@ fi
LICENSE="BSD"
SLOT="0/22"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE=""
BDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/protobuf-python/protobuf-python-3.11.4.ebuild b/dev-python/protobuf-python/protobuf-python-3.11.4.ebuild
index 30b3aa500f4..0800d26968d 100644
--- a/dev-python/protobuf-python/protobuf-python-3.11.4.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.11.4.ebuild
@@ -24,7 +24,7 @@ fi
LICENSE="BSD"
SLOT="0/22"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE=""
BDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/psycopg/psycopg-2.7.4.ebuild b/dev-python/psycopg/psycopg-2.7.4.ebuild
index 3e7fbe85246..a3c78dab303 100644
--- a/dev-python/psycopg/psycopg-2.7.4.ebuild
+++ b/dev-python/psycopg/psycopg-2.7.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="LGPL-3+"
SLOT="2"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE="debug doc examples"
RDEPEND=">=dev-db/postgresql-8.1:*"
diff --git a/dev-python/psycopg/psycopg-2.7.5.ebuild b/dev-python/psycopg/psycopg-2.7.5.ebuild
index 7f017474701..f18348fce8b 100644
--- a/dev-python/psycopg/psycopg-2.7.5.ebuild
+++ b/dev-python/psycopg/psycopg-2.7.5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="LGPL-3+"
SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE="debug doc examples"
RDEPEND=">=dev-db/postgresql-8.1:*"
diff --git a/dev-python/psycopg/psycopg-2.7.7.ebuild b/dev-python/psycopg/psycopg-2.7.7.ebuild
index 0c8eca0bb15..75ff73f9762 100644
--- a/dev-python/psycopg/psycopg-2.7.7.ebuild
+++ b/dev-python/psycopg/psycopg-2.7.7.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="LGPL-3+"
SLOT="2"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE="debug doc examples"
RDEPEND=">=dev-db/postgresql-8.1:*"
diff --git a/dev-python/psycopg/psycopg-2.8.3.ebuild b/dev-python/psycopg/psycopg-2.8.3.ebuild
index 4f7153baf26..bccef6f896e 100644
--- a/dev-python/psycopg/psycopg-2.8.3.ebuild
+++ b/dev-python/psycopg/psycopg-2.8.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="LGPL-3+"
SLOT="2"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE="debug doc"
RDEPEND=">=dev-db/postgresql-8.1:*"
diff --git a/dev-python/psycopg/psycopg-2.8.4.ebuild b/dev-python/psycopg/psycopg-2.8.4.ebuild
index 4f7153baf26..bccef6f896e 100644
--- a/dev-python/psycopg/psycopg-2.8.4.ebuild
+++ b/dev-python/psycopg/psycopg-2.8.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="LGPL-3+"
SLOT="2"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE="debug doc"
RDEPEND=">=dev-db/postgresql-8.1:*"
diff --git a/dev-python/ptyprocess/ptyprocess-0.5.2.ebuild b/dev-python/ptyprocess/ptyprocess-0.5.2.ebuild
index c899ed8d943..d68aa0c764f 100644
--- a/dev-python/ptyprocess/ptyprocess-0.5.2.ebuild
+++ b/dev-python/ptyprocess/ptyprocess-0.5.2.ebuild
@@ -14,6 +14,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="ISC"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
distutils_enable_tests pytest
diff --git a/dev-python/ptyprocess/ptyprocess-0.6.0.ebuild b/dev-python/ptyprocess/ptyprocess-0.6.0.ebuild
index d6bc8c208db..cf4709415b1 100644
--- a/dev-python/ptyprocess/ptyprocess-0.6.0.ebuild
+++ b/dev-python/ptyprocess/ptyprocess-0.6.0.ebuild
@@ -14,6 +14,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="ISC"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
distutils_enable_tests pytest
diff --git a/dev-python/py/py-1.4.30.ebuild b/dev-python/py/py-1.4.30.ebuild
index 93015db00c5..0310d4ccee1 100644
--- a/dev-python/py/py-1.4.30.ebuild
+++ b/dev-python/py/py-1.4.30.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 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/py/py-1.4.34.ebuild b/dev-python/py/py-1.4.34.ebuild
index b7f9f55c5d1..ef09547b505 100644
--- a/dev-python/py/py-1.4.34.ebuild
+++ b/dev-python/py/py-1.4.34.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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/py/py-1.5.2.ebuild b/dev-python/py/py-1.5.2.ebuild
index ed9ba3e15e1..3f8589be8da 100644
--- a/dev-python/py/py-1.5.2.ebuild
+++ b/dev-python/py/py-1.5.2.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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/py/py-1.5.3.ebuild b/dev-python/py/py-1.5.3.ebuild
index 7966b74a2e4..8506a520371 100644
--- a/dev-python/py/py-1.5.3.ebuild
+++ b/dev-python/py/py-1.5.3.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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/py/py-1.5.4.ebuild b/dev-python/py/py-1.5.4.ebuild
index cefe4de4abc..2160aec7c84 100644
--- a/dev-python/py/py-1.5.4.ebuild
+++ b/dev-python/py/py-1.5.4.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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/py/py-1.8.0.ebuild b/dev-python/py/py-1.8.0.ebuild
index 1150e52cd74..be0c50a2ea0 100644
--- a/dev-python/py/py-1.8.0.ebuild
+++ b/dev-python/py/py-1.8.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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc"
BDEPEND="
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.0.10.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.0.10.ebuild
index bbeaed1e2bb..dfb5a01b736 100644
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.0.10.ebuild
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.0.10.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 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
RDEPEND=">=dev-python/pyasn1-0.1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.0.5-r1.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.0.5-r1.ebuild
index fc8de354e4c..b3e483231a3 100644
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.0.5-r1.ebuild
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.0.5-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 ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sparc x86"
IUSE=""
RDEPEND="dev-python/pyasn1[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.0.8.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.0.8.ebuild
index 9f7b90df329..34d85005377 100644
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.0.8.ebuild
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.0.8.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 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND=">=dev-python/pyasn1-0.1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.1.4.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.1.4.ebuild
index bbeaed1e2bb..dfb5a01b736 100644
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.1.4.ebuild
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.1.4.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 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
RDEPEND=">=dev-python/pyasn1-0.1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.1.5.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.1.5.ebuild
index 535630bd7c1..82538a01532 100644
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.1.5.ebuild
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.1.5.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 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.2.1.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.2.1.ebuild
index b8a744737f1..d4e6d0415cb 100644
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.2.1.ebuild
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.2.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 ~m68k ~mips ppc ppc64 ~s390 ~sh 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/pyasn1/pyasn1-0.2.3.ebuild b/dev-python/pyasn1/pyasn1-0.2.3.ebuild
index ce3a4a098d1..c14cc73cddb 100644
--- a/dev-python/pyasn1/pyasn1-0.2.3.ebuild
+++ b/dev-python/pyasn1/pyasn1-0.2.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/etingof/pyasn1/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="doc"
RDEPEND=""
diff --git a/dev-python/pyasn1/pyasn1-0.3.7.ebuild b/dev-python/pyasn1/pyasn1-0.3.7.ebuild
index 282c8c3f332..df017a80c84 100644
--- a/dev-python/pyasn1/pyasn1-0.3.7.ebuild
+++ b/dev-python/pyasn1/pyasn1-0.3.7.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/etingof/pyasn1/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="doc"
RDEPEND=""
diff --git a/dev-python/pyasn1/pyasn1-0.4.2.ebuild b/dev-python/pyasn1/pyasn1-0.4.2.ebuild
index 1a69fdf750f..7bc793137c9 100644
--- a/dev-python/pyasn1/pyasn1-0.4.2.ebuild
+++ b/dev-python/pyasn1/pyasn1-0.4.2.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 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="doc"
RDEPEND=""
diff --git a/dev-python/pyasn1/pyasn1-0.4.3.ebuild b/dev-python/pyasn1/pyasn1-0.4.3.ebuild
index 4f4c43bee63..396113ff87d 100644
--- a/dev-python/pyasn1/pyasn1-0.4.3.ebuild
+++ b/dev-python/pyasn1/pyasn1-0.4.3.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 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="doc"
RDEPEND=""
diff --git a/dev-python/pyasn1/pyasn1-0.4.8.ebuild b/dev-python/pyasn1/pyasn1-0.4.8.ebuild
index 855d7cfae40..0b3bc44f286 100644
--- a/dev-python/pyasn1/pyasn1-0.4.8.ebuild
+++ b/dev-python/pyasn1/pyasn1-0.4.8.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 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="doc"
distutils_enable_tests setup.py
diff --git a/dev-python/pyblake2/pyblake2-1.1.2.ebuild b/dev-python/pyblake2/pyblake2-1.1.2.ebuild
index 474dfa029e0..dc0337ae278 100644
--- a/dev-python/pyblake2/pyblake2-1.1.2.ebuild
+++ b/dev-python/pyblake2/pyblake2-1.1.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
# pyblake2 itself allows more licenses but blake2 allows the following three
LICENSE="|| ( CC0-1.0 openssl Apache-2.0 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pycairo/pycairo-1.18.2.ebuild b/dev-python/pycairo/pycairo-1.18.2.ebuild
index 202b459da43..998ebde66ab 100644
--- a/dev-python/pycairo/pycairo-1.18.2.ebuild
+++ b/dev-python/pycairo/pycairo-1.18.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz
LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc examples test"
BDEPEND="
diff --git a/dev-python/pycmd/pycmd-1.2.ebuild b/dev-python/pycmd/pycmd-1.2.ebuild
index a4e2aaf495b..e83e1d8a7cc 100644
--- a/dev-python/pycmd/pycmd-1.2.ebuild
+++ b/dev-python/pycmd/pycmd-1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE=""
RDEPEND=">=dev-python/py-1.4.9[${PYTHON_USEDEP}]"
diff --git a/dev-python/pycparser/pycparser-2.19-r1.ebuild b/dev-python/pycparser/pycparser-2.19-r1.ebuild
index 8b0a9aa1f25..d6235a1cc5d 100644
--- a/dev-python/pycparser/pycparser-2.19-r1.ebuild
+++ b/dev-python/pycparser/pycparser-2.19-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 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pycparser/pycparser-2.20.ebuild b/dev-python/pycparser/pycparser-2.20.ebuild
index 57cb24f1d60..7f1f79c16a8 100644
--- a/dev-python/pycparser/pycparser-2.20.ebuild
+++ b/dev-python/pycparser/pycparser-2.20.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 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="dev-python/ply:=[${PYTHON_USEDEP}]"
BDEPEND="${RDEPEND}
diff --git a/dev-python/pycrypto/pycrypto-2.6.1-r2.ebuild b/dev-python/pycrypto/pycrypto-2.6.1-r2.ebuild
index 1a996b5bff0..ab5235731b1 100644
--- a/dev-python/pycrypto/pycrypto-2.6.1-r2.ebuild
+++ b/dev-python/pycrypto/pycrypto-2.6.1-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${P}.tar.gz"
LICENSE="PSF-2 public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
IUSE="doc +gmp test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pycups/pycups-1.9.73-r1.ebuild b/dev-python/pycups/pycups-1.9.73-r1.ebuild
index 2fc406f3ca5..565d776aa50 100644
--- a/dev-python/pycups/pycups-1.9.73-r1.ebuild
+++ b/dev-python/pycups/pycups-1.9.73-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://cyberelk.net/tim/data/pycups/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
SLOT="0"
IUSE="examples"
diff --git a/dev-python/pycups/pycups-1.9.73-r2.ebuild b/dev-python/pycups/pycups-1.9.73-r2.ebuild
index f1ce8a33d07..2f3384b3ff0 100644
--- a/dev-python/pycups/pycups-1.9.73-r2.ebuild
+++ b/dev-python/pycups/pycups-1.9.73-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://cyberelk.net/tim/data/pycups/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
SLOT="0"
IUSE="examples"
diff --git a/dev-python/pycurl/pycurl-7.43.0.2.ebuild b/dev-python/pycurl/pycurl-7.43.0.2.ebuild
index 965a025834d..29d27b88a81 100644
--- a/dev-python/pycurl/pycurl-7.43.0.2.ebuild
+++ b/dev-python/pycurl/pycurl-7.43.0.2.ebuild
@@ -17,7 +17,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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl examples ssl test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pycurl/pycurl-7.43.0.3.ebuild b/dev-python/pycurl/pycurl-7.43.0.3.ebuild
index f8a6c2f9123..ad9b101875b 100644
--- a/dev-python/pycurl/pycurl-7.43.0.3.ebuild
+++ b/dev-python/pycurl/pycurl-7.43.0.3.ebuild
@@ -17,7 +17,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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl examples ssl test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pycurl/pycurl-7.43.0.5.ebuild b/dev-python/pycurl/pycurl-7.43.0.5.ebuild
index be4a8e24589..83c00755199 100644
--- a/dev-python/pycurl/pycurl-7.43.0.5.ebuild
+++ b/dev-python/pycurl/pycurl-7.43.0.5.ebuild
@@ -17,7 +17,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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl examples ssl test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pycurl/pycurl-7.43.0.ebuild b/dev-python/pycurl/pycurl-7.43.0.ebuild
index 6d0938ac010..2c684960e26 100644
--- a/dev-python/pycurl/pycurl-7.43.0.ebuild
+++ b/dev-python/pycurl/pycurl-7.43.0.ebuild
@@ -17,7 +17,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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl examples ssl test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pydecomp/pydecomp-0.3.ebuild b/dev-python/pydecomp/pydecomp-0.3.ebuild
index 7cb69234af7..5856baad29f 100644
--- a/dev-python/pydecomp/pydecomp-0.3.ebuild
+++ b/dev-python/pydecomp/pydecomp-0.3.ebuild
@@ -13,7 +13,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 ~sh 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/pydecomp/pydecomp-9999.ebuild b/dev-python/pydecomp/pydecomp-9999.ebuild
index a301c9b2346..4c73e504f4d 100644
--- a/dev-python/pydecomp/pydecomp-9999.ebuild
+++ b/dev-python/pydecomp/pydecomp-9999.ebuild
@@ -13,7 +13,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 ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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 f3b56596292..b4d2fa058e7 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 ~sh ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pyelftools/pyelftools-0.24-r1.ebuild b/dev-python/pyelftools/pyelftools-0.24-r1.ebuild
index c8179c784ba..6fe5be5f535 100644
--- a/dev-python/pyelftools/pyelftools-0.24-r1.ebuild
+++ b/dev-python/pyelftools/pyelftools-0.24-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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/pyelftools/pyelftools-0.24.ebuild b/dev-python/pyelftools/pyelftools-0.24.ebuild
index f43efb8363a..5cd8d0edaf9 100644
--- a/dev-python/pyelftools/pyelftools-0.24.ebuild
+++ b/dev-python/pyelftools/pyelftools-0.24.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 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/pyelftools/pyelftools-0.25.ebuild b/dev-python/pyelftools/pyelftools-0.25.ebuild
index 0d2d0491636..407d24a1f84 100644
--- a/dev-python/pyelftools/pyelftools-0.25.ebuild
+++ b/dev-python/pyelftools/pyelftools-0.25.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh 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/pyftpdlib/pyftpdlib-1.5.5-r1.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.5-r1.ebuild
index 57361cfa884..10b9e857097 100644
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.5-r1.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-1.5.5-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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x86-macos ~sparc-solaris"
IUSE="examples ssl test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.6.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.6.ebuild
index a73ad6bcc5e..e04823492e1 100644
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.6.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-1.5.6.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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x86-macos ~sparc-solaris"
IUSE="examples ssl test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pygments/pygments-2.3.1.ebuild b/dev-python/pygments/pygments-2.3.1.ebuild
index 24361968ca7..a76b5759872 100644
--- a/dev-python/pygments/pygments-2.3.1.ebuild
+++ b/dev-python/pygments/pygments-2.3.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pygments/pygments-2.4.2.ebuild b/dev-python/pygments/pygments-2.4.2.ebuild
index 23ba2c8178e..8f27abd2d8b 100644
--- a/dev-python/pygments/pygments-2.4.2.ebuild
+++ b/dev-python/pygments/pygments-2.4.2.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pygments/pygments-2.5.2.ebuild b/dev-python/pygments/pygments-2.5.2.ebuild
index 4fa9a34a118..78623806f39 100644
--- a/dev-python/pygments/pygments-2.5.2.ebuild
+++ b/dev-python/pygments/pygments-2.5.2.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pygments/pygments-2.6.1.ebuild b/dev-python/pygments/pygments-2.6.1.ebuild
index 3dfa248ba15..df797ed9eb1 100644
--- a/dev-python/pygments/pygments-2.6.1.ebuild
+++ b/dev-python/pygments/pygments-2.6.1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pygobject/pygobject-2.28.6-r55.ebuild b/dev-python/pygobject/pygobject-2.28.6-r55.ebuild
index 40ae31cac23..095b9f6da1d 100644
--- a/dev-python/pygobject/pygobject-2.28.6-r55.ebuild
+++ b/dev-python/pygobject/pygobject-2.28.6-r55.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.pygtk.org/"
LICENSE="LGPL-2.1+"
SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="examples libffi test"
RESTRICT="!test? ( test )"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pygobject/pygobject-3.32.1.ebuild b/dev-python/pygobject/pygobject-3.32.1.ebuild
index e146b200294..3a220c1d941 100644
--- a/dev-python/pygobject/pygobject-3.32.1.ebuild
+++ b/dev-python/pygobject/pygobject-3.32.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/PyGObject"
LICENSE="LGPL-2.1+"
SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="+cairo examples test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pygobject/pygobject-3.34.0.ebuild b/dev-python/pygobject/pygobject-3.34.0.ebuild
index ddac6151afb..c013468acc7 100644
--- a/dev-python/pygobject/pygobject-3.34.0.ebuild
+++ b/dev-python/pygobject/pygobject-3.34.0.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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="+cairo examples test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pygtk/pygtk-2.24.0-r4.ebuild b/dev-python/pygtk/pygtk-2.24.0-r4.ebuild
index a96895dac63..00f4163fcec 100644
--- a/dev-python/pygtk/pygtk-2.24.0-r4.ebuild
+++ b/dev-python/pygtk/pygtk-2.24.0-r4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.pygtk.org/"
LICENSE="LGPL-2.1"
SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc examples test"
RESTRICT="!test? ( test )"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pygtk/pygtk-2.24.0-r5.ebuild b/dev-python/pygtk/pygtk-2.24.0-r5.ebuild
index 20d3d861938..fc0d3cb177c 100644
--- a/dev-python/pygtk/pygtk-2.24.0-r5.ebuild
+++ b/dev-python/pygtk/pygtk-2.24.0-r5.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://gitlab.gnome.org/Archive/pygtk"
LICENSE="LGPL-2.1"
SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc examples test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pygtksourceview/pygtksourceview-2.10.1-r1.ebuild b/dev-python/pygtksourceview/pygtksourceview-2.10.1-r1.ebuild
index 6f49f7ba11e..92076482355 100644
--- a/dev-python/pygtksourceview/pygtksourceview-2.10.1-r1.ebuild
+++ b/dev-python/pygtksourceview/pygtksourceview-2.10.1-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.pygtk.org/"
LICENSE="LGPL-2.1"
SLOT="2"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="doc"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.ebuild b/dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.ebuild
index 22ae6132654..8668e810507 100644
--- a/dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.ebuild
+++ b/dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~mips ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~mips ppc64 sparc x86 ~amd64-linux ~x86-linux"
IUSE="examples test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pylibacl/pylibacl-0.5.0-r1.ebuild b/dev-python/pylibacl/pylibacl-0.5.0-r1.ebuild
index 29c164513f3..894668c1b9a 100644
--- a/dev-python/pylibacl/pylibacl-0.5.0-r1.ebuild
+++ b/dev-python/pylibacl/pylibacl-0.5.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
RDEPEND="sys-apps/acl"
diff --git a/dev-python/pylibacl/pylibacl-0.5.3.ebuild b/dev-python/pylibacl/pylibacl-0.5.3.ebuild
index 83e917cd49a..b1a83e81767 100644
--- a/dev-python/pylibacl/pylibacl-0.5.3.ebuild
+++ b/dev-python/pylibacl/pylibacl-0.5.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/iustin/${PN}/archive/${PN}-v${PV}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 ~sparc x86"
RDEPEND="sys-apps/acl"
DEPEND="${RDEPEND}
diff --git a/dev-python/pymssql/pymssql-1.0.2-r1.ebuild b/dev-python/pymssql/pymssql-1.0.2-r1.ebuild
index c083c0e7c74..23f1f7dbf69 100644
--- a/dev-python/pymssql/pymssql-1.0.2-r1.ebuild
+++ b/dev-python/pymssql/pymssql-1.0.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
DEPEND=">=dev-db/freetds-0.63[mssql]
diff --git a/dev-python/pymssql/pymssql-2.1.3.ebuild b/dev-python/pymssql/pymssql-2.1.3.ebuild
index 54616e65bbd..12bc9a3b73d 100644
--- a/dev-python/pymssql/pymssql-2.1.3.ebuild
+++ b/dev-python/pymssql/pymssql-2.1.3.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 ~hppa ~ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE="test"
# tests need a running instance of freetds
diff --git a/dev-python/pyopengl/pyopengl-3.1.0.ebuild b/dev-python/pyopengl/pyopengl-3.1.0.ebuild
index 899e674b19e..a0aca0c5f50 100644
--- a/dev-python/pyopengl/pyopengl-3.1.0.ebuild
+++ b/dev-python/pyopengl/pyopengl-3.1.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
IUSE="tk"
RDEPEND="media-libs/freeglut
diff --git a/dev-python/pyopenssl/pyopenssl-19.0.0.ebuild b/dev-python/pyopenssl/pyopenssl-19.0.0.ebuild
index 71222827fbe..ad6c8e488a1 100644
--- a/dev-python/pyopenssl/pyopenssl-19.0.0.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-19.0.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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="doc examples test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pyopenssl/pyopenssl-19.1.0.ebuild b/dev-python/pyopenssl/pyopenssl-19.1.0.ebuild
index 97667dc6591..2f4be3ba682 100644
--- a/dev-python/pyopenssl/pyopenssl-19.1.0.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-19.1.0.ebuild
@@ -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 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-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="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pyorbit/pyorbit-2.24.0-r1.ebuild b/dev-python/pyorbit/pyorbit-2.24.0-r1.ebuild
index 42fffd37b31..2a80a016ca9 100644
--- a/dev-python/pyorbit/pyorbit-2.24.0-r1.ebuild
+++ b/dev-python/pyorbit/pyorbit-2.24.0-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.pygtk.org/"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE=""
RDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/pyparsing/pyparsing-2.2.0.ebuild b/dev-python/pyparsing/pyparsing-2.2.0.ebuild
index f3fe63fb5ce..d361c4fe6c4 100644
--- a/dev-python/pyparsing/pyparsing-2.2.0.ebuild
+++ b/dev-python/pyparsing/pyparsing-2.2.0.ebuild
@@ -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 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc examples"
# not contained in the tarball
diff --git a/dev-python/pyparsing/pyparsing-2.3.0.ebuild b/dev-python/pyparsing/pyparsing-2.3.0.ebuild
index 281c4c2eafe..40d6df647e9 100644
--- a/dev-python/pyparsing/pyparsing-2.3.0.ebuild
+++ b/dev-python/pyparsing/pyparsing-2.3.0.ebuild
@@ -15,7 +15,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 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="examples"
# setuptools currently vendors its own copy of pyparsing to avoid bootstrapping
diff --git a/dev-python/pyparsing/pyparsing-2.3.1.ebuild b/dev-python/pyparsing/pyparsing-2.3.1.ebuild
index b8d78e191a6..d1656de438a 100644
--- a/dev-python/pyparsing/pyparsing-2.3.1.ebuild
+++ b/dev-python/pyparsing/pyparsing-2.3.1.ebuild
@@ -15,7 +15,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 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="examples"
# setuptools currently vendors its own copy of pyparsing to avoid bootstrapping
diff --git a/dev-python/pyparsing/pyparsing-2.4.0.ebuild b/dev-python/pyparsing/pyparsing-2.4.0.ebuild
index e60814b8bd0..b24dee689cb 100644
--- a/dev-python/pyparsing/pyparsing-2.4.0.ebuild
+++ b/dev-python/pyparsing/pyparsing-2.4.0.ebuild
@@ -15,7 +15,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 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="examples"
# setuptools currently vendors its own copy of pyparsing to avoid bootstrapping
diff --git a/dev-python/pyparsing/pyparsing-2.4.6.ebuild b/dev-python/pyparsing/pyparsing-2.4.6.ebuild
index 8fe22a5c0a9..ed0744fb420 100644
--- a/dev-python/pyparsing/pyparsing-2.4.6.ebuild
+++ b/dev-python/pyparsing/pyparsing-2.4.6.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 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="examples"
distutils_enable_tests setup.py
diff --git a/dev-python/pyquery/pyquery-1.2.13-r1.ebuild b/dev-python/pyquery/pyquery-1.2.13-r1.ebuild
index e05023718be..6bb67c3ab83 100644
--- a/dev-python/pyquery/pyquery-1.2.13-r1.ebuild
+++ b/dev-python/pyquery/pyquery-1.2.13-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 ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sparc ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pyquery/pyquery-1.2.13.ebuild b/dev-python/pyquery/pyquery-1.2.13.ebuild
index b5b8640285b..bc7b1a1f0ea 100644
--- a/dev-python/pyquery/pyquery-1.2.13.ebuild
+++ b/dev-python/pyquery/pyquery-1.2.13.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 ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc64 s390 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pyquery/pyquery-1.4.0.ebuild b/dev-python/pyquery/pyquery-1.4.0.ebuild
index 2353f291849..38283e43fea 100644
--- a/dev-python/pyquery/pyquery-1.4.0.ebuild
+++ b/dev-python/pyquery/pyquery-1.4.0.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 ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc64 s390 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pyquery/pyquery-1.4.1.ebuild b/dev-python/pyquery/pyquery-1.4.1.ebuild
index 09c3844d296..725e8578216 100644
--- a/dev-python/pyquery/pyquery-1.4.1.ebuild
+++ b/dev-python/pyquery/pyquery-1.4.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 ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc64 s390 sparc x86"
IUSE="test"
RDEPEND="
diff --git a/dev-python/pyrex/pyrex-0.9.9-r1.ebuild b/dev-python/pyrex/pyrex-0.9.9-r1.ebuild
index cc8d3237b23..c357f42d5a2 100644
--- a/dev-python/pyrex/pyrex-0.9.9-r1.ebuild
+++ b/dev-python/pyrex/pyrex-0.9.9-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/${MY_P}.tar.g
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
IUSE="examples"
S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/pyrsistent/pyrsistent-0.15.6.ebuild b/dev-python/pyrsistent/pyrsistent-0.15.6.ebuild
index c09a0c9b379..84a2f2788e4 100644
--- a/dev-python/pyrsistent/pyrsistent-0.15.6.ebuild
+++ b/dev-python/pyrsistent/pyrsistent-0.15.6.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 ~m68k ~mips ppc ppc64 s390 ~sh 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-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyserial/pyserial-3.4.ebuild b/dev-python/pyserial/pyserial-3.4.ebuild
index c3c99726518..f6b940d010d 100644
--- a/dev-python/pyserial/pyserial-3.4.ebuild
+++ b/dev-python/pyserial/pyserial-3.4.ebuild
@@ -12,7 +12,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 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
IUSE="examples"
BDEPEND="
diff --git a/dev-python/pysha3/pysha3-1.0.2-r1.ebuild b/dev-python/pysha3/pysha3-1.0.2-r1.ebuild
index 1a7b0bd8b00..5ef02830365 100644
--- a/dev-python/pysha3/pysha3-1.0.2-r1.ebuild
+++ b/dev-python/pysha3/pysha3-1.0.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
LICENSE="CC0-1.0 PSF-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest-cache/pytest-cache-1.0-r1.ebuild b/dev-python/pytest-cache/pytest-cache-1.0-r1.ebuild
index 768a7a704df..1392793f8a8 100644
--- a/dev-python/pytest-cache/pytest-cache-1.0-r1.ebuild
+++ b/dev-python/pytest-cache/pytest-cache-1.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="test"
RDEPEND="dev-python/execnet[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest-cache/pytest-cache-1.0-r2.ebuild b/dev-python/pytest-cache/pytest-cache-1.0-r2.ebuild
index 962f06d70f3..69bf0b43457 100644
--- a/dev-python/pytest-cache/pytest-cache-1.0-r2.ebuild
+++ b/dev-python/pytest-cache/pytest-cache-1.0-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="test"
RDEPEND="dev-python/execnet[${PYTHON_USEDEP}]"
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 608a680a695..5148896cb8e 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
@@ -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 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
RDEPEND="
diff --git a/dev-python/pytest-expect/pytest-expect-1.1.0.ebuild b/dev-python/pytest-expect/pytest-expect-1.1.0.ebuild
index b9aa95d1acc..bfd3b9505f4 100644
--- a/dev-python/pytest-expect/pytest-expect-1.1.0.ebuild
+++ b/dev-python/pytest-expect/pytest-expect-1.1.0.ebuild
@@ -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 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE=""
RDEPEND="
diff --git a/dev-python/pytest-runner/pytest-runner-5.2.ebuild b/dev-python/pytest-runner/pytest-runner-5.2.ebuild
index c2d62b82574..0c4b821ad80 100644
--- a/dev-python/pytest-runner/pytest-runner-5.2.ebuild
+++ b/dev-python/pytest-runner/pytest-runner-5.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://pypi.org/project/pytest-runner/ https://github.com/pytest-dev/
SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
SLOT="0"
IUSE="test"
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.23.2.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.23.2.ebuild
index 919d32d358f..bf6291b09c7 100644
--- a/dev-python/pytest-xdist/pytest-xdist-1.23.2.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-1.23.2.ebuild
@@ -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 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/python-dateutil/python-dateutil-2.7.2-r1.ebuild b/dev-python/python-dateutil/python-dateutil-2.7.2-r1.ebuild
index add890fde38..8668b53fd23 100644
--- a/dev-python/python-dateutil/python-dateutil-2.7.2-r1.ebuild
+++ b/dev-python/python-dateutil/python-dateutil-2.7.2-r1.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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/python-dateutil/python-dateutil-2.8.0.ebuild b/dev-python/python-dateutil/python-dateutil-2.8.0.ebuild
index 0b72619f569..c82f703a525 100644
--- a/dev-python/python-dateutil/python-dateutil-2.8.0.ebuild
+++ b/dev-python/python-dateutil/python-dateutil-2.8.0.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 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/python-dateutil/python-dateutil-2.8.1-r1.ebuild b/dev-python/python-dateutil/python-dateutil-2.8.1-r1.ebuild
index a3d41b6b2ff..f5ace5d8bff 100644
--- a/dev-python/python-dateutil/python-dateutil-2.8.1-r1.ebuild
+++ b/dev-python/python-dateutil/python-dateutil-2.8.1-r1.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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
RDEPEND="
>=dev-python/six-1.5[${PYTHON_USEDEP}]
diff --git a/dev-python/python-docs/python-docs-2.7.14.ebuild b/dev-python/python-docs/python-docs-2.7.14.ebuild
index 1ff9906c5aa..a35170a6fbe 100644
--- a/dev-python/python-docs/python-docs-2.7.14.ebuild
+++ b/dev-python/python-docs/python-docs-2.7.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.
LICENSE="PSF-2"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE=""
S="${WORKDIR}/python-${PV}-docs-html"
diff --git a/dev-python/python-docs/python-docs-2.7.17.ebuild b/dev-python/python-docs/python-docs-2.7.17.ebuild
index 5f4f8298193..16f1d2327d6 100644
--- a/dev-python/python-docs/python-docs-2.7.17.ebuild
+++ b/dev-python/python-docs/python-docs-2.7.17.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 ~sh ~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.10.ebuild b/dev-python/python-docs/python-docs-3.6.10.ebuild
index 5f4f8298193..16f1d2327d6 100644
--- a/dev-python/python-docs/python-docs-3.6.10.ebuild
+++ b/dev-python/python-docs/python-docs-3.6.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 ~sh ~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.3.ebuild b/dev-python/python-docs/python-docs-3.6.3.ebuild
index 1e860fd48e8..0c905876f7f 100644
--- a/dev-python/python-docs/python-docs-3.6.3.ebuild
+++ b/dev-python/python-docs/python-docs-3.6.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.
LICENSE="PSF-2"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
S="${WORKDIR}/python-${PV}-docs-html"
diff --git a/dev-python/python-docs/python-docs-3.6.4.ebuild b/dev-python/python-docs/python-docs-3.6.4.ebuild
index 68b18149ba6..336116ca5a9 100644
--- a/dev-python/python-docs/python-docs-3.6.4.ebuild
+++ b/dev-python/python-docs/python-docs-3.6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.
LICENSE="PSF-2"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
S="${WORKDIR}/python-${PV}-docs-html"
diff --git a/dev-python/python-docs/python-docs-3.7.0.ebuild b/dev-python/python-docs/python-docs-3.7.0.ebuild
index 68b18149ba6..336116ca5a9 100644
--- a/dev-python/python-docs/python-docs-3.7.0.ebuild
+++ b/dev-python/python-docs/python-docs-3.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.
LICENSE="PSF-2"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
S="${WORKDIR}/python-${PV}-docs-html"
diff --git a/dev-python/python-docs/python-docs-3.7.6.ebuild b/dev-python/python-docs/python-docs-3.7.6.ebuild
index 5f4f8298193..16f1d2327d6 100644
--- a/dev-python/python-docs/python-docs-3.7.6.ebuild
+++ b/dev-python/python-docs/python-docs-3.7.6.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 ~sh ~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.7.ebuild b/dev-python/python-docs/python-docs-3.7.7.ebuild
index 5f4f8298193..16f1d2327d6 100644
--- a/dev-python/python-docs/python-docs-3.7.7.ebuild
+++ b/dev-python/python-docs/python-docs-3.7.7.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 ~sh ~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.1.ebuild b/dev-python/python-docs/python-docs-3.8.1.ebuild
index 5f4f8298193..16f1d2327d6 100644
--- a/dev-python/python-docs/python-docs-3.8.1.ebuild
+++ b/dev-python/python-docs/python-docs-3.8.1.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 ~sh ~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.2.ebuild b/dev-python/python-docs/python-docs-3.8.2.ebuild
index 5f4f8298193..16f1d2327d6 100644
--- a/dev-python/python-docs/python-docs-3.8.2.ebuild
+++ b/dev-python/python-docs/python-docs-3.8.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 ~sh ~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-fchksum/python-fchksum-1.7.1-r1.ebuild b/dev-python/python-fchksum/python-fchksum-1.7.1-r1.ebuild
index 7ad27634a25..f4cc4f156ec 100644
--- a/dev-python/python-fchksum/python-fchksum-1.7.1-r1.ebuild
+++ b/dev-python/python-fchksum/python-fchksum-1.7.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://code.fluffytapeworm.com/projects/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="sys-libs/zlib"
diff --git a/dev-python/python-gflags/python-gflags-3.1.1.ebuild b/dev-python/python-gflags/python-gflags-3.1.1.ebuild
index 268deeb9c0c..4d78be44ec9 100644
--- a/dev-python/python-gflags/python-gflags-3.1.1.ebuild
+++ b/dev-python/python-gflags/python-gflags-3.1.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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
RDEPEND="
dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-gflags/python-gflags-3.1.2-r1.ebuild b/dev-python/python-gflags/python-gflags-3.1.2-r1.ebuild
index 8711d2c52be..35b08f2fdfe 100644
--- a/dev-python/python-gflags/python-gflags-3.1.2-r1.ebuild
+++ b/dev-python/python-gflags/python-gflags-3.1.2-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 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
RDEPEND="
dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-libevdev/python-libevdev-0.8.ebuild b/dev-python/python-libevdev/python-libevdev-0.8.ebuild
index 1dc82be0de9..3ed80115ce4 100644
--- a/dev-python/python-libevdev/python-libevdev-0.8.ebuild
+++ b/dev-python/python-libevdev/python-libevdev-0.8.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 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
python_test() {
diff --git a/dev-python/pytidylib/pytidylib-0.3.2.ebuild b/dev-python/pytidylib/pytidylib-0.3.2.ebuild
index f22aa524309..ba5d952158c 100644
--- a/dev-python/pytidylib/pytidylib-0.3.2.ebuild
+++ b/dev-python/pytidylib/pytidylib-0.3.2.ebuild
@@ -14,7 +14,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 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
RDEPEND="app-text/htmltidy"
DEPEND=${RDEPEND}
diff --git a/dev-python/pytz/pytz-2016.3.ebuild b/dev-python/pytz/pytz-2016.3.ebuild
index 7edfdedaff9..1bfc8967dfb 100644
--- a/dev-python/pytz/pytz-2016.3.ebuild
+++ b/dev-python/pytz/pytz-2016.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE=""
DEPEND="
diff --git a/dev-python/pytz/pytz-2017.2.ebuild b/dev-python/pytz/pytz-2017.2.ebuild
index 13db556664a..8ddadddcea2 100644
--- a/dev-python/pytz/pytz-2017.2.ebuild
+++ b/dev-python/pytz/pytz-2017.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
IUSE=""
RDEPEND="
diff --git a/dev-python/pytz/pytz-2018.4.ebuild b/dev-python/pytz/pytz-2018.4.ebuild
index d820c972d34..80eb7f9930e 100644
--- a/dev-python/pytz/pytz-2018.4.ebuild
+++ b/dev-python/pytz/pytz-2018.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 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
IUSE=""
RDEPEND="
diff --git a/dev-python/pytz/pytz-2018.9.ebuild b/dev-python/pytz/pytz-2018.9.ebuild
index d820c972d34..80eb7f9930e 100644
--- a/dev-python/pytz/pytz-2018.9.ebuild
+++ b/dev-python/pytz/pytz-2018.9.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 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
IUSE=""
RDEPEND="
diff --git a/dev-python/pytz/pytz-2019.3.ebuild b/dev-python/pytz/pytz-2019.3.ebuild
index 5761a6bf97c..a2e681042f7 100644
--- a/dev-python/pytz/pytz-2019.3.ebuild
+++ b/dev-python/pytz/pytz-2019.3.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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
IUSE=""
RDEPEND="
diff --git a/dev-python/pyxattr/pyxattr-0.6.0-r1.ebuild b/dev-python/pyxattr/pyxattr-0.6.0-r1.ebuild
index 24e49800a54..bdbe76256f6 100644
--- a/dev-python/pyxattr/pyxattr-0.6.0-r1.ebuild
+++ b/dev-python/pyxattr/pyxattr-0.6.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 m68k ~mips ppc ppc64 s390 sh 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="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pyxattr/pyxattr-0.6.1-r1.ebuild b/dev-python/pyxattr/pyxattr-0.6.1-r1.ebuild
index 9e62c609296..b8b29076989 100644
--- a/dev-python/pyxattr/pyxattr-0.6.1-r1.ebuild
+++ b/dev-python/pyxattr/pyxattr-0.6.1-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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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="doc"
RDEPEND="sys-apps/attr"
diff --git a/dev-python/pyxattr/pyxattr-0.6.1.ebuild b/dev-python/pyxattr/pyxattr-0.6.1.ebuild
index 25785775563..cd11c32e581 100644
--- a/dev-python/pyxattr/pyxattr-0.6.1.ebuild
+++ b/dev-python/pyxattr/pyxattr-0.6.1.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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pyxattr/pyxattr-0.7.1.ebuild b/dev-python/pyxattr/pyxattr-0.7.1.ebuild
index b6483133845..b51e5ef7b4f 100644
--- a/dev-python/pyxattr/pyxattr-0.7.1.ebuild
+++ b/dev-python/pyxattr/pyxattr-0.7.1.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 ~sh 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-3.12.ebuild b/dev-python/pyyaml/pyyaml-3.12.ebuild
index 2bb60c8bc1e..d9019394ed5 100644
--- a/dev-python/pyyaml/pyyaml-3.12.ebuild
+++ b/dev-python/pyyaml/pyyaml-3.12.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://pyyaml.org/download/${PN}/${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="examples libyaml"
RDEPEND="libyaml? ( dev-libs/libyaml )"
diff --git a/dev-python/pyyaml/pyyaml-3.13.ebuild b/dev-python/pyyaml/pyyaml-3.13.ebuild
index 6c60108bee1..d62562d265a 100644
--- a/dev-python/pyyaml/pyyaml-3.13.ebuild
+++ b/dev-python/pyyaml/pyyaml-3.13.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://pyyaml.org/download/${PN}/${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="examples libyaml"
RDEPEND="libyaml? ( dev-libs/libyaml )"
diff --git a/dev-python/pyyaml/pyyaml-5.1.2.ebuild b/dev-python/pyyaml/pyyaml-5.1.2.ebuild
index b63569118b8..5b7d9e55871 100644
--- a/dev-python/pyyaml/pyyaml-5.1.2.ebuild
+++ b/dev-python/pyyaml/pyyaml-5.1.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://pyyaml.org/download/${PN}/${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="examples libyaml"
RDEPEND="libyaml? ( dev-libs/libyaml )"
diff --git a/dev-python/pyyaml/pyyaml-5.1.ebuild b/dev-python/pyyaml/pyyaml-5.1.ebuild
index 62d85eb5388..d0af6c67fe6 100644
--- a/dev-python/pyyaml/pyyaml-5.1.ebuild
+++ b/dev-python/pyyaml/pyyaml-5.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://pyyaml.org/download/${PN}/${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="examples libyaml"
RDEPEND="libyaml? ( dev-libs/libyaml )"
diff --git a/dev-python/pyyaml/pyyaml-5.3.1.ebuild b/dev-python/pyyaml/pyyaml-5.3.1.ebuild
index 7d016b02cfc..8928ff4c6ed 100644
--- a/dev-python/pyyaml/pyyaml-5.3.1.ebuild
+++ b/dev-python/pyyaml/pyyaml-5.3.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 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="examples +libyaml"
RDEPEND="libyaml? ( dev-libs/libyaml:= )"
diff --git a/dev-python/pyyaml/pyyaml-5.3.ebuild b/dev-python/pyyaml/pyyaml-5.3.ebuild
index 54061976295..01da2471ad5 100644
--- a/dev-python/pyyaml/pyyaml-5.3.ebuild
+++ b/dev-python/pyyaml/pyyaml-5.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://pyyaml.org/download/${PN}/${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="examples libyaml"
RDEPEND="libyaml? ( dev-libs/libyaml )"
diff --git a/dev-python/regendoc/regendoc-0.5.ebuild b/dev-python/regendoc/regendoc-0.5.ebuild
index 2e31b72782f..ca72730cb3e 100644
--- a/dev-python/regendoc/regendoc-0.5.ebuild
+++ b/dev-python/regendoc/regendoc-0.5.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://pypi.org/project/RegenDoc/
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${P}.tar.gz"
LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
SLOT="0"
RDEPEND="dev-python/click[${PYTHON_USEDEP}]"
diff --git a/dev-python/regendoc/regendoc-0.6.1.ebuild b/dev-python/regendoc/regendoc-0.6.1.ebuild
index e55109098cd..187bf6727e7 100644
--- a/dev-python/regendoc/regendoc-0.6.1.ebuild
+++ b/dev-python/regendoc/regendoc-0.6.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${P}.tar.gz"
SLOT="0"
LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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/requests/requests-2.21.0-r1.ebuild b/dev-python/requests/requests-2.21.0-r1.ebuild
index a40f2c3e542..468af094c16 100644
--- a/dev-python/requests/requests-2.21.0-r1.ebuild
+++ b/dev-python/requests/requests-2.21.0-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 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
IUSE="socks5 +ssl"
RDEPEND="
diff --git a/dev-python/restkit/restkit-4.2.2.ebuild b/dev-python/restkit/restkit-4.2.2.ebuild
index ba931dd23c9..bb7283b0aaa 100644
--- a/dev-python/restkit/restkit-4.2.2.ebuild
+++ b/dev-python/restkit/restkit-4.2.2.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 ppc64 s390 ~sh x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc64 s390 x86"
IUSE="+cli doc examples test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/retrying/retrying-1.3.3.ebuild b/dev-python/retrying/retrying-1.3.3.ebuild
index d4188908776..845480d5837 100644
--- a/dev-python/retrying/retrying-1.3.3.ebuild
+++ b/dev-python/retrying/retrying-1.3.3.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 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
DEPEND="
diff --git a/dev-python/rfc3986/rfc3986-0.3.1.ebuild b/dev-python/rfc3986/rfc3986-0.3.1.ebuild
index 088d955a84b..b47b7c48e3e 100644
--- a/dev-python/rfc3986/rfc3986-0.3.1.ebuild
+++ b/dev-python/rfc3986/rfc3986-0.3.1.ebuild
@@ -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 m68k ~mips ppc ppc64 ~s390 sh 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/rfc3986/rfc3986-0.4.1.ebuild b/dev-python/rfc3986/rfc3986-0.4.1.ebuild
index 420981dad9d..59e07562ca0 100644
--- a/dev-python/rfc3986/rfc3986-0.4.1.ebuild
+++ b/dev-python/rfc3986/rfc3986-0.4.1.ebuild
@@ -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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 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/rfc3986/rfc3986-1.1.0.ebuild b/dev-python/rfc3986/rfc3986-1.1.0.ebuild
index ead27766cb0..d46f46a73b9 100644
--- a/dev-python/rfc3986/rfc3986-1.1.0.ebuild
+++ b/dev-python/rfc3986/rfc3986-1.1.0.ebuild
@@ -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 ~m68k ~mips ppc ppc64 ~s390 ~sh 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/rfc3986/rfc3986-1.2.0.ebuild b/dev-python/rfc3986/rfc3986-1.2.0.ebuild
index 5b17adced43..85095c0d47c 100644
--- a/dev-python/rfc3986/rfc3986-1.2.0.ebuild
+++ b/dev-python/rfc3986/rfc3986-1.2.0.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 ~m68k ~mips ppc ppc64 ~s390 ~sh 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/rfc3986/rfc3986-1.3.2.ebuild b/dev-python/rfc3986/rfc3986-1.3.2.ebuild
index abbdaf3500c..5d5064b5811 100644
--- a/dev-python/rfc3986/rfc3986-1.3.2.ebuild
+++ b/dev-python/rfc3986/rfc3986-1.3.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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="idna test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/rfc3987/rfc3987-1.3.7.ebuild b/dev-python/rfc3987/rfc3987-1.3.7.ebuild
index 7e41c449233..56d392904d3 100644
--- a/dev-python/rfc3987/rfc3987-1.3.7.ebuild
+++ b/dev-python/rfc3987/rfc3987-1.3.7.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 ~sh 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="$(python_gen_cond_dep \
diff --git a/dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild b/dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild
index ac077fc0f4a..d0be22bef7e 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 ~sh 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/rfc3987/rfc3987-1.3.8.ebuild b/dev-python/rfc3987/rfc3987-1.3.8.ebuild
index 5fa0fafe82e..8793d02c51b 100644
--- a/dev-python/rfc3987/rfc3987-1.3.8.ebuild
+++ b/dev-python/rfc3987/rfc3987-1.3.8.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 ~sh ~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="$(python_gen_cond_dep \
diff --git a/dev-python/rst-linker/rst-linker-1.11.ebuild b/dev-python/rst-linker/rst-linker-1.11.ebuild
index ec0ba275e2f..1f944a4ca1f 100644
--- a/dev-python/rst-linker/rst-linker-1.11.ebuild
+++ b/dev-python/rst-linker/rst-linker-1.11.ebuild
@@ -13,7 +13,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 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/rst-linker/rst-linker-1.9-r1.ebuild b/dev-python/rst-linker/rst-linker-1.9-r1.ebuild
index fa1c10e2d9b..4a956f60c50 100644
--- a/dev-python/rst-linker/rst-linker-1.9-r1.ebuild
+++ b/dev-python/rst-linker/rst-linker-1.9-r1.ebuild
@@ -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 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/rst-linker/rst-linker-2.0.0.ebuild b/dev-python/rst-linker/rst-linker-2.0.0.ebuild
index 596c9c6f546..5986d16e187 100644
--- a/dev-python/rst-linker/rst-linker-2.0.0.ebuild
+++ b/dev-python/rst-linker/rst-linker-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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/service_identity/service_identity-14.0.0.ebuild b/dev-python/service_identity/service_identity-14.0.0.ebuild
index 69089f8ba92..c692cfe42e3 100644
--- a/dev-python/service_identity/service_identity-14.0.0.ebuild
+++ b/dev-python/service_identity/service_identity-14.0.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 ppc ppc64 s390 sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 ~sparc x86"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/service_identity/service_identity-16.0.0.ebuild b/dev-python/service_identity/service_identity-16.0.0.ebuild
index 123eb891786..ecebb40c717 100644
--- a/dev-python/service_identity/service_identity-16.0.0.ebuild
+++ b/dev-python/service_identity/service_identity-16.0.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 ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 s390 sparc x86"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/service_identity/service_identity-17.0.0-r1.ebuild b/dev-python/service_identity/service_identity-17.0.0-r1.ebuild
index 6ff7ef93ef5..5e1869e6204 100644
--- a/dev-python/service_identity/service_identity-17.0.0-r1.ebuild
+++ b/dev-python/service_identity/service_identity-17.0.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pyca/service_identity/archive/${PV}.tar.gz -> ${P}.g
LICENSE=" MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/service_identity/service_identity-17.0.0.ebuild b/dev-python/service_identity/service_identity-17.0.0.ebuild
index 754c443ca02..cbd502474d7 100644
--- a/dev-python/service_identity/service_identity-17.0.0.ebuild
+++ b/dev-python/service_identity/service_identity-17.0.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 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/service_identity/service_identity-18.1.0.ebuild b/dev-python/service_identity/service_identity-18.1.0.ebuild
index 5b7bde943c6..2553d171f31 100644
--- a/dev-python/service_identity/service_identity-18.1.0.ebuild
+++ b/dev-python/service_identity/service_identity-18.1.0.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${P/_/-}
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
# TODO: upstream made pyopenssl optional
RDEPEND="
diff --git a/dev-python/setuptools/setuptools-42.0.2.ebuild b/dev-python/setuptools/setuptools-42.0.2.ebuild
index 886d7f12a2e..c76c9bb8ee1 100644
--- a/dev-python/setuptools/setuptools-42.0.2.ebuild
+++ b/dev-python/setuptools/setuptools-42.0.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
inherit git-r3
else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="Collection of extensions to Distutils"
diff --git a/dev-python/setuptools/setuptools-44.0.0.ebuild b/dev-python/setuptools/setuptools-44.0.0.ebuild
index 0f44927d103..fdae09bf6d6 100644
--- a/dev-python/setuptools/setuptools-44.0.0.ebuild
+++ b/dev-python/setuptools/setuptools-44.0.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
inherit git-r3
else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
- KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="Collection of extensions to Distutils"
diff --git a/dev-python/setuptools/setuptools-44.1.0.ebuild b/dev-python/setuptools/setuptools-44.1.0.ebuild
index 62bde4d0955..b08246e89b0 100644
--- a/dev-python/setuptools/setuptools-44.1.0.ebuild
+++ b/dev-python/setuptools/setuptools-44.1.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
inherit git-r3
else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="Collection of extensions to Distutils"
diff --git a/dev-python/setuptools/setuptools-45.3.0.ebuild b/dev-python/setuptools/setuptools-45.3.0.ebuild
index 6c8745132ea..17d23ae5d72 100644
--- a/dev-python/setuptools/setuptools-45.3.0.ebuild
+++ b/dev-python/setuptools/setuptools-45.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/setuptools_scm/setuptools_scm-1.15.6-r1.ebuild b/dev-python/setuptools_scm/setuptools_scm-1.15.6-r1.ebuild
index eb3c67431c8..84907393f6c 100644
--- a/dev-python/setuptools_scm/setuptools_scm-1.15.6-r1.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-1.15.6-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 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="git mercurial test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/setuptools_scm/setuptools_scm-3.2.0.ebuild b/dev-python/setuptools_scm/setuptools_scm-3.2.0.ebuild
index 6d941bf40e4..f5cf1c3d616 100644
--- a/dev-python/setuptools_scm/setuptools_scm-3.2.0.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-3.2.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 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/setuptools_scm/setuptools_scm-3.4.3.ebuild b/dev-python/setuptools_scm/setuptools_scm-3.4.3.ebuild
index 342b97f1603..bbb1fc3532d 100644
--- a/dev-python/setuptools_scm/setuptools_scm-3.4.3.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-3.4.3.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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/setuptools_scm/setuptools_scm-3.5.0.ebuild b/dev-python/setuptools_scm/setuptools_scm-3.5.0.ebuild
index 863001fb7e5..fa4a2dcc6d2 100644
--- a/dev-python/setuptools_scm/setuptools_scm-3.5.0.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-3.5.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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild b/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild
index c26a6a0777a..19533b59cca 100644
--- a/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild
+++ b/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild
@@ -13,7 +13,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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE=""
DEPEND="
diff --git a/dev-python/six/six-1.12.0.ebuild b/dev-python/six/six-1.12.0.ebuild
index 14e8298f9ca..95493c46ccc 100644
--- a/dev-python/six/six-1.12.0.ebuild
+++ b/dev-python/six/six-1.12.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 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/six/six-1.13.0.ebuild b/dev-python/six/six-1.13.0.ebuild
index cd119c861f9..7a0942516f9 100644
--- a/dev-python/six/six-1.13.0.ebuild
+++ b/dev-python/six/six-1.13.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 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc"
BDEPEND="
diff --git a/dev-python/six/six-1.14.0.ebuild b/dev-python/six/six-1.14.0.ebuild
index e5db44b3632..69ccd1b80bb 100644
--- a/dev-python/six/six-1.14.0.ebuild
+++ b/dev-python/six/six-1.14.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 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc"
distutils_enable_sphinx documentation
diff --git a/dev-python/snakeoil/snakeoil-0.7.5.ebuild b/dev-python/snakeoil/snakeoil-0.7.5.ebuild
index 739493a9ebf..1d2c6362e83 100644
--- a/dev-python/snakeoil/snakeoil-0.7.5.ebuild
+++ b/dev-python/snakeoil/snakeoil-0.7.5.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 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
SRC_URI="https://github.com/pkgcore/snakeoil/releases/download/v${PV}/${P}.tar.gz"
fi
diff --git a/dev-python/snakeoil/snakeoil-0.8.8.ebuild b/dev-python/snakeoil/snakeoil-0.8.8.ebuild
index 086ed0263f6..b8fb817baf1 100644
--- a/dev-python/snakeoil/snakeoil-0.8.8.ebuild
+++ b/dev-python/snakeoil/snakeoil-0.8.8.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 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
+ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
fi
diff --git a/dev-python/snakeoil/snakeoil-9999.ebuild b/dev-python/snakeoil/snakeoil-9999.ebuild
index e073443aa4a..1b7261487c4 100644
--- a/dev-python/snakeoil/snakeoil-9999.ebuild
+++ b/dev-python/snakeoil/snakeoil-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
fi
diff --git a/dev-python/snowballstemmer/snowballstemmer-1.2.1.ebuild b/dev-python/snowballstemmer/snowballstemmer-1.2.1.ebuild
index 2bd33744483..33976162d98 100644
--- a/dev-python/snowballstemmer/snowballstemmer-1.2.1.ebuild
+++ b/dev-python/snowballstemmer/snowballstemmer-1.2.1.ebuild
@@ -14,5 +14,5 @@ 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 ~sh sparc x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-solaris"
IUSE=""
diff --git a/dev-python/snowballstemmer/snowballstemmer-2.0.0.ebuild b/dev-python/snowballstemmer/snowballstemmer-2.0.0.ebuild
index f88e03a8c0a..d7c56efc95b 100644
--- a/dev-python/snowballstemmer/snowballstemmer-2.0.0.ebuild
+++ b/dev-python/snowballstemmer/snowballstemmer-2.0.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 ~s390 ~sh ~sparc ~x86 ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-solaris"
diff --git a/dev-python/soappy/soappy-0.12.22.ebuild b/dev-python/soappy/soappy-0.12.22.ebuild
index 8d1358aceb7..9ab58b6e893 100644
--- a/dev-python/soappy/soappy-0.12.22.ebuild
+++ b/dev-python/soappy/soappy-0.12.22.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="examples ssl"
diff --git a/dev-python/socketpool/socketpool-0.5.3-r2.ebuild b/dev-python/socketpool/socketpool-0.5.3-r2.ebuild
index b3f27c2b97f..0972b88b467 100644
--- a/dev-python/socketpool/socketpool-0.5.3-r2.ebuild
+++ b/dev-python/socketpool/socketpool-0.5.3-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A simple Python socket pool"
HOMEPAGE="https://github.com/benoitc/socketpool/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 s390 ~sparc x86"
IUSE="examples test"
LICENSE="|| ( MIT public-domain )"
SLOT="0"
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 d82a1d283fa..63e07c2f040 100644
--- a/dev-python/sphinx-epytext/sphinx-epytext-0.0.4.ebuild
+++ b/dev-python/sphinx-epytext/sphinx-epytext-0.0.4.ebuild
@@ -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 sh 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 1a2d0685982..7764b433fd3 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2.ebuild b/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2.ebuild
index fc61a8c3e43..9d613c38206 100644
--- a/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2.ebuild
+++ b/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2.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 ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE=""
DEPEND=""
diff --git a/dev-python/sphinx/sphinx-1.7.5-r1.ebuild b/dev-python/sphinx/sphinx-1.7.5-r1.ebuild
index 364127d57fd..fb0a6415ac1 100644
--- a/dev-python/sphinx/sphinx-1.7.5-r1.ebuild
+++ b/dev-python/sphinx/sphinx-1.7.5-r1.ebuild
@@ -14,7 +14,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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
IUSE="doc latex net test"
# Tests automagically use latex, bug 667414
diff --git a/dev-python/sphinx/sphinx-2.0.1-r1.ebuild b/dev-python/sphinx/sphinx-2.0.1-r1.ebuild
index 3d4f0e641fc..d9765793b04 100644
--- a/dev-python/sphinx/sphinx-2.0.1-r1.ebuild
+++ b/dev-python/sphinx/sphinx-2.0.1-r1.ebuild
@@ -14,7 +14,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 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
IUSE="doc latex test"
# Tests automagically use latex, bug 667414
diff --git a/dev-python/sphinx/sphinx-2.4.3-r1.ebuild b/dev-python/sphinx/sphinx-2.4.3-r1.ebuild
index 8063e705318..f237709f572 100644
--- a/dev-python/sphinx/sphinx-2.4.3-r1.ebuild
+++ b/dev-python/sphinx/sphinx-2.4.3-r1.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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
IUSE="doc latex test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/sphinx/sphinx-2.4.4.ebuild b/dev-python/sphinx/sphinx-2.4.4.ebuild
index 8063e705318..f237709f572 100644
--- a/dev-python/sphinx/sphinx-2.4.4.ebuild
+++ b/dev-python/sphinx/sphinx-2.4.4.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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
IUSE="doc latex test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9.ebuild
index b097f22d89e..a5cdaff4cf2 100644
--- a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9.ebuild
+++ b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9.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 s390 ~sh 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="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.2.4.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.2.4.ebuild
index 3f6a9a21087..54b2008d887 100644
--- a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.2.4.ebuild
+++ b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.2.4.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 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.1.ebuild b/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.1.ebuild
index 3ae3cf171f6..9a542f3337a 100644
--- a/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.1.ebuild
+++ b/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.1.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 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
RDEPEND=""
PDEPEND="
diff --git a/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2.ebuild b/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2.ebuild
index e4bb6ff3dd9..1f8d89046f9 100644
--- a/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2.ebuild
+++ b/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2.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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
PDEPEND="
diff --git a/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.1.ebuild b/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.1.ebuild
index 81c466b6ecf..5cd748fb898 100644
--- a/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.1.ebuild
+++ b/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.1.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 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
RDEPEND=""
PDEPEND="
diff --git a/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2.ebuild b/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2.ebuild
index 8500fe53feb..60454a5e906 100644
--- a/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2.ebuild
+++ b/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2.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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
PDEPEND="
diff --git a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.2.ebuild b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.2.ebuild
index 24b418e45eb..bb345e75423 100644
--- a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.2.ebuild
+++ b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.2.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 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
RDEPEND=""
PDEPEND="
diff --git a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.3.ebuild b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.3.ebuild
index 60095391e98..4c31ace46d3 100644
--- a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.3.ebuild
+++ b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.3.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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
PDEPEND="
diff --git a/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r1.ebuild b/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r1.ebuild
index f56470a7711..fec5c2f1903 100644
--- a/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r1.ebuild
+++ b/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r1.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 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r2.ebuild b/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r2.ebuild
index 85c9ed66597..5c20acaa206 100644
--- a/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r2.ebuild
+++ b/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r2.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 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r1.ebuild b/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r1.ebuild
index cde57a06a40..2c170df58fc 100644
--- a/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r1.ebuild
+++ b/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r1.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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
PDEPEND="
diff --git a/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1.ebuild b/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1.ebuild
index 35274be3418..bd50f736d6d 100644
--- a/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1.ebuild
+++ b/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1.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 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
RDEPEND=""
PDEPEND="
diff --git a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.2.ebuild b/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.2.ebuild
index 2a85ec64ced..3ab0eaeed0b 100644
--- a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.2.ebuild
+++ b/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.2.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 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
RDEPEND=""
PDEPEND="
diff --git a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3.ebuild b/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3.ebuild
index 54743776694..faaa7426e97 100644
--- a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3.ebuild
+++ b/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3.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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
PDEPEND="
diff --git a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.3.ebuild b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.3.ebuild
index eed787e6208..c31a2b3e9ca 100644
--- a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.3.ebuild
+++ b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.3.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 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
RDEPEND=""
PDEPEND="
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 4ddb2e4cbd8..a9b6c40261b 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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
PDEPEND="
diff --git a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.12.0.ebuild b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.12.0.ebuild
index ba41ae0e7e4..653bebb39dd 100644
--- a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.12.0.ebuild
+++ b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.12.0.ebuild
@@ -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 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="doc"
CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/sqlalchemy/sqlalchemy-0.7.10.ebuild b/dev-python/sqlalchemy/sqlalchemy-0.7.10.ebuild
index 900e011459c..bbec08c0f40 100644
--- a/dev-python/sqlalchemy/sqlalchemy-0.7.10.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-0.7.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc examples mssql mysql postgres +sqlite test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.2.18.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.2.18.ebuild
index 7673c028bc6..2f7fd79a696 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.2.18.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.2.18.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
IUSE="doc examples +sqlite test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.3.11.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.3.11.ebuild
index 6da3cdef6b3..030fdd38a3c 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.3.11.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.3.11.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
IUSE="doc examples +sqlite test"
REQUIRED_USE="test? ( sqlite )"
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.3.3.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.3.3.ebuild
index ed1d71da6fb..ec7ea5ee0e6 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.3.3.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.3.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
IUSE="doc examples +sqlite test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.3.4.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.3.4.ebuild
index 33bf1df96d8..c82d13bfea9 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.3.4.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.3.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
IUSE="doc examples +sqlite test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild b/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
index 01158a575ba..f2ae8c4538f 100644
--- a/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
+++ b/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-2"
SLOT="0"
IUSE=""
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
DEPEND=""
diff --git a/dev-python/strict-rfc3339/strict-rfc3339-0.6.ebuild b/dev-python/strict-rfc3339/strict-rfc3339-0.6.ebuild
index f376f4650ec..2f847335256 100644
--- a/dev-python/strict-rfc3339/strict-rfc3339-0.6.ebuild
+++ b/dev-python/strict-rfc3339/strict-rfc3339-0.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="GPL-3+"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh 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=""
# Not shipped
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 930b689e0aa..80278e63688 100644
--- a/dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild
+++ b/dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild
@@ -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 ~sh 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/strict-rfc3339/strict-rfc3339-0.7.ebuild b/dev-python/strict-rfc3339/strict-rfc3339-0.7.ebuild
index cd1ea1b94c6..f35922f827e 100644
--- a/dev-python/strict-rfc3339/strict-rfc3339-0.7.ebuild
+++ b/dev-python/strict-rfc3339/strict-rfc3339-0.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="GPL-3+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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=""
# Not shipped
diff --git a/dev-python/subunit/subunit-1.2.0-r1.ebuild b/dev-python/subunit/subunit-1.2.0-r1.ebuild
index c47c1e7c4ce..1b0253e3827 100644
--- a/dev-python/subunit/subunit-1.2.0-r1.ebuild
+++ b/dev-python/subunit/subunit-1.2.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/$(get_version_component_range 1-2)/+d
LICENSE="Apache-2.0 BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh 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/tempita/tempita-0.5.3-r2.ebuild b/dev-python/tempita/tempita-0.5.3-r2.ebuild
index 038643e44be..d0058e68db3 100644
--- a/dev-python/tempita/tempita-0.5.3-r2.ebuild
+++ b/dev-python/tempita/tempita-0.5.3-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://bitbucket.org/ianb/${PN}/get/${MY_COMMIT}.tar.gz -> ${P}-bitbuc
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/testrepository/testrepository-0.0.18-r1.ebuild b/dev-python/testrepository/testrepository-0.0.18-r1.ebuild
index c9f86536063..4720ccea7f8 100644
--- a/dev-python/testrepository/testrepository-0.0.18-r1.ebuild
+++ b/dev-python/testrepository/testrepository-0.0.18-r1.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 ~m68k ~mips ppc ppc64 ~s390 ~sh 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/testrepository/testrepository-0.0.20.ebuild b/dev-python/testrepository/testrepository-0.0.20.ebuild
index 68e35f0ad6e..663ff410611 100644
--- a/dev-python/testrepository/testrepository-0.0.20.ebuild
+++ b/dev-python/testrepository/testrepository-0.0.20.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 ~m68k ~mips ppc ppc64 s390 ~sh 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/testresources/testresources-0.2.7-r2.ebuild b/dev-python/testresources/testresources-0.2.7-r2.ebuild
index b5ec2ed6b81..fe388a4cec5 100644
--- a/dev-python/testresources/testresources-0.2.7-r2.ebuild
+++ b/dev-python/testresources/testresources-0.2.7-r2.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 ~m68k ~mips ppc ppc64 ~s390 ~sh 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/testresources/testresources-1.0.0.ebuild b/dev-python/testresources/testresources-1.0.0.ebuild
index 53e170eb75a..9a136ccef1f 100644
--- a/dev-python/testresources/testresources-1.0.0.ebuild
+++ b/dev-python/testresources/testresources-1.0.0.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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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/testresources/testresources-2.0.1.ebuild b/dev-python/testresources/testresources-2.0.1.ebuild
index bc591c7b20a..ff08e831e3c 100644
--- a/dev-python/testresources/testresources-2.0.1.ebuild
+++ b/dev-python/testresources/testresources-2.0.1.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 ~m68k ~mips ppc ppc64 s390 ~sh 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.ebuild b/dev-python/testscenarios/testscenarios-0.5.0.ebuild
index ed6efe9c84c..4edd736ec11 100644
--- a/dev-python/testscenarios/testscenarios-0.5.0.ebuild
+++ b/dev-python/testscenarios/testscenarios-0.5.0.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 ~m68k ~mips ppc ppc64 s390 ~sh 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/testtools/testtools-2.3.0.ebuild b/dev-python/testtools/testtools-2.3.0.ebuild
index f47a45fa163..7532eb94e40 100644
--- a/dev-python/testtools/testtools-2.3.0.ebuild
+++ b/dev-python/testtools/testtools-2.3.0.ebuild
@@ -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 ~sh 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="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/textfsm/textfsm-0.4.0.ebuild b/dev-python/textfsm/textfsm-0.4.0.ebuild
index 185822d8b92..c7e30ec8290 100644
--- a/dev-python/textfsm/textfsm-0.4.0.ebuild
+++ b/dev-python/textfsm/textfsm-0.4.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 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="examples"
python_install_all() {
diff --git a/dev-python/traceback2/traceback2-1.4.0.ebuild b/dev-python/traceback2/traceback2-1.4.0.ebuild
index c8e6a583061..bf2c35d8676 100644
--- a/dev-python/traceback2/traceback2-1.4.0.ebuild
+++ b/dev-python/traceback2/traceback2-1.4.0.ebuild
@@ -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 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
IUSE=""
DEPEND="
diff --git a/dev-python/twisted/twisted-19.10.0.ebuild b/dev-python/twisted/twisted-19.10.0.ebuild
index 6975bbb4648..7dc1cb2ddc5 100644
--- a/dev-python/twisted/twisted-19.10.0.ebuild
+++ b/dev-python/twisted/twisted-19.10.0.ebuild
@@ -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 ~mips ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~mips ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/u-msgpack/u-msgpack-2.4.1.ebuild b/dev-python/u-msgpack/u-msgpack-2.4.1.ebuild
index a2fcbf641fe..2f6ac9d42b3 100644
--- a/dev-python/u-msgpack/u-msgpack-2.4.1.ebuild
+++ b/dev-python/u-msgpack/u-msgpack-2.4.1.ebuild
@@ -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 s390 ~sh 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"
RDEPEND=""
diff --git a/dev-python/u-msgpack/u-msgpack-2.5.2.ebuild b/dev-python/u-msgpack/u-msgpack-2.5.2.ebuild
index 8855625ad37..ee83bb71de0 100644
--- a/dev-python/u-msgpack/u-msgpack-2.5.2.ebuild
+++ b/dev-python/u-msgpack/u-msgpack-2.5.2.ebuild
@@ -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 s390 ~sh 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}/${MY_P}"
diff --git a/dev-python/unittest2/unittest2-1.1.0.ebuild b/dev-python/unittest2/unittest2-1.1.0.ebuild
index b7929b5aa63..fa42458708e 100644
--- a/dev-python/unittest2/unittest2-1.1.0.ebuild
+++ b/dev-python/unittest2/unittest2-1.1.0.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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE=""
CDEPEND="
diff --git a/dev-python/urllib3/urllib3-1.24.2.ebuild b/dev-python/urllib3/urllib3-1.24.2.ebuild
index 7be6c90f2f8..8ede37d3edf 100644
--- a/dev-python/urllib3/urllib3-1.24.2.ebuild
+++ b/dev-python/urllib3/urllib3-1.24.2.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 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-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="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/vcversioner/vcversioner-2.16.0.0.ebuild b/dev-python/vcversioner/vcversioner-2.16.0.0.ebuild
index 6486a6d5a5d..cf6f21428be 100644
--- a/dev-python/vcversioner/vcversioner-2.16.0.0.ebuild
+++ b/dev-python/vcversioner/vcversioner-2.16.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/v/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE="test"
DEPEND="
diff --git a/dev-python/versioneer/versioneer-0.16.ebuild b/dev-python/versioneer/versioneer-0.16.ebuild
index 2dc2682f99b..256d75aa7e0 100644
--- a/dev-python/versioneer/versioneer-0.16.ebuild
+++ b/dev-python/versioneer/versioneer-0.16.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="public-domain"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~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/dev-python/versioneer/versioneer-0.18-r1.ebuild b/dev-python/versioneer/versioneer-0.18-r1.ebuild
index f6e8f0c93ee..d424c7b01f7 100644
--- a/dev-python/versioneer/versioneer-0.18-r1.ebuild
+++ b/dev-python/versioneer/versioneer-0.18-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="public-domain"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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/dev-python/versioneer/versioneer-0.18.ebuild b/dev-python/versioneer/versioneer-0.18.ebuild
index 4855fe2a603..ee2ba747dd0 100644
--- a/dev-python/versioneer/versioneer-0.18.ebuild
+++ b/dev-python/versioneer/versioneer-0.18.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="public-domain"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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/dev-python/virtualenv/virtualenv-16.0.0.ebuild b/dev-python/virtualenv/virtualenv-16.0.0.ebuild
index 9f9c249e57d..7091b848463 100644
--- a/dev-python/virtualenv/virtualenv-16.0.0.ebuild
+++ b/dev-python/virtualenv/virtualenv-16.0.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh 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"
SLOT="0"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/waitress/waitress-1.0.2.ebuild b/dev-python/waitress/waitress-1.0.2.ebuild
index d6f71815761..9633c1ec463 100644
--- a/dev-python/waitress/waitress-1.0.2.ebuild
+++ b/dev-python/waitress/waitress-1.0.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 hppa ia64 ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/waitress/waitress-1.3.1.ebuild b/dev-python/waitress/waitress-1.3.1.ebuild
index f736eea3db3..3ca0960108b 100644
--- a/dev-python/waitress/waitress-1.3.1.ebuild
+++ b/dev-python/waitress/waitress-1.3.1.ebuild
@@ -16,6 +16,6 @@ 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 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 s390 sparc x86"
distutils_enable_tests nose
diff --git a/dev-python/webcolors/webcolors-1.10.ebuild b/dev-python/webcolors/webcolors-1.10.ebuild
index 62968601a41..28f26962242 100644
--- a/dev-python/webcolors/webcolors-1.10.ebuild
+++ b/dev-python/webcolors/webcolors-1.10.ebuild
@@ -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 ~sh 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/setuptools[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/webcolors/webcolors-1.11.1.ebuild b/dev-python/webcolors/webcolors-1.11.1.ebuild
index bfabb88f7c0..6a9ff4cb309 100644
--- a/dev-python/webcolors/webcolors-1.11.1.ebuild
+++ b/dev-python/webcolors/webcolors-1.11.1.ebuild
@@ -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 ~sh ~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/webcolors/webcolors-1.5.ebuild b/dev-python/webcolors/webcolors-1.5.ebuild
index 463c1abd40d..8de66be832a 100644
--- a/dev-python/webcolors/webcolors-1.5.ebuild
+++ b/dev-python/webcolors/webcolors-1.5.ebuild
@@ -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 sh 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/webcolors/webcolors-1.8.1.ebuild b/dev-python/webcolors/webcolors-1.8.1.ebuild
index f22485f3651..4289e67208f 100644
--- a/dev-python/webcolors/webcolors-1.8.1.ebuild
+++ b/dev-python/webcolors/webcolors-1.8.1.ebuild
@@ -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 ~sh ~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/webencodings/webencodings-0.5.1-r1.ebuild b/dev-python/webencodings/webencodings-0.5.1-r1.ebuild
index 7f5474a455c..0af28bd629f 100644
--- a/dev-python/webencodings/webencodings-0.5.1-r1.ebuild
+++ b/dev-python/webencodings/webencodings-0.5.1-r1.ebuild
@@ -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 s390 ~sh 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"
BDEPEND="${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/webencodings/webencodings-0.5.1.ebuild b/dev-python/webencodings/webencodings-0.5.1.ebuild
index aa11ec87a6d..0b9a60d4a67 100644
--- a/dev-python/webencodings/webencodings-0.5.1.ebuild
+++ b/dev-python/webencodings/webencodings-0.5.1.ebuild
@@ -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 s390 ~sh 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"
RDEPEND=""
diff --git a/dev-python/webob/webob-1.8.2-r1.ebuild b/dev-python/webob/webob-1.8.2-r1.ebuild
index 8b588251863..5f8a233e41d 100644
--- a/dev-python/webob/webob-1.8.2-r1.ebuild
+++ b/dev-python/webob/webob-1.8.2-r1.ebuild
@@ -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 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc test"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/webob/webob-1.8.2.ebuild b/dev-python/webob/webob-1.8.2.ebuild
index 69003bd45bb..c72fb0e6746 100644
--- a/dev-python/webob/webob-1.8.2.ebuild
+++ b/dev-python/webob/webob-1.8.2.ebuild
@@ -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 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc test"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/webob/webob-1.8.5-r1.ebuild b/dev-python/webob/webob-1.8.5-r1.ebuild
index 26b6bd42364..939aac364d8 100644
--- a/dev-python/webob/webob-1.8.5-r1.ebuild
+++ b/dev-python/webob/webob-1.8.5-r1.ebuild
@@ -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 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc test"
BDEPEND="
diff --git a/dev-python/webob/webob-1.8.5-r3.ebuild b/dev-python/webob/webob-1.8.5-r3.ebuild
index 254f85c4093..147f2ac83da 100644
--- a/dev-python/webob/webob-1.8.5-r3.ebuild
+++ b/dev-python/webob/webob-1.8.5-r3.ebuild
@@ -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 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/webob/webob-1.8.5.ebuild b/dev-python/webob/webob-1.8.5.ebuild
index e7cfebfe4ed..7c5945cd51f 100644
--- a/dev-python/webob/webob-1.8.5.ebuild
+++ b/dev-python/webob/webob-1.8.5.ebuild
@@ -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 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc test"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/webtest/webtest-2.0.21.ebuild b/dev-python/webtest/webtest-2.0.21.ebuild
index dda00346600..52db123124f 100644
--- a/dev-python/webtest/webtest-2.0.21.ebuild
+++ b/dev-python/webtest/webtest-2.0.21.ebuild
@@ -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 ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc64 ~s390 sparc x86"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/webtest/webtest-2.0.29-r1.ebuild b/dev-python/webtest/webtest-2.0.29-r1.ebuild
index 31206c5679b..0849379fb4d 100644
--- a/dev-python/webtest/webtest-2.0.29-r1.ebuild
+++ b/dev-python/webtest/webtest-2.0.29-r1.ebuild
@@ -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 ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sparc ~x86"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/webtest/webtest-2.0.29.ebuild b/dev-python/webtest/webtest-2.0.29.ebuild
index 027c7d22137..2e01d529f75 100644
--- a/dev-python/webtest/webtest-2.0.29.ebuild
+++ b/dev-python/webtest/webtest-2.0.29.ebuild
@@ -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 ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc64 s390 sparc x86"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/webtest/webtest-2.0.33.ebuild b/dev-python/webtest/webtest-2.0.33.ebuild
index 5c92935b992..72765b809f2 100644
--- a/dev-python/webtest/webtest-2.0.33.ebuild
+++ b/dev-python/webtest/webtest-2.0.33.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sparc ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/wheel/wheel-0.29.0.ebuild b/dev-python/wheel/wheel-0.29.0.ebuild
index df43e94eed3..3b889e9e330 100644
--- a/dev-python/wheel/wheel-0.29.0.ebuild
+++ b/dev-python/wheel/wheel-0.29.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 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE="doc test"
RDEPEND="dev-python/jsonschema[${PYTHON_USEDEP}]"
diff --git a/dev-python/wheel/wheel-0.33.6.ebuild b/dev-python/wheel/wheel-0.33.6.ebuild
index b069f5e7a1a..dd2363cb0fe 100644
--- a/dev-python/wheel/wheel-0.33.6.ebuild
+++ b/dev-python/wheel/wheel-0.33.6.ebuild
@@ -14,7 +14,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 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/wheel/wheel-0.34.2.ebuild b/dev-python/wheel/wheel-0.34.2.ebuild
index 5d110120c2a..fa81a9e2a92 100644
--- a/dev-python/wheel/wheel-0.34.2.ebuild
+++ b/dev-python/wheel/wheel-0.34.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 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
distutils_enable_tests pytest
diff --git a/dev-python/wsgiproxy2/wsgiproxy2-0.4.2.ebuild b/dev-python/wsgiproxy2/wsgiproxy2-0.4.2.ebuild
index e6581be752b..765567798ea 100644
--- a/dev-python/wsgiproxy2/wsgiproxy2-0.4.2.ebuild
+++ b/dev-python/wsgiproxy2/wsgiproxy2-0.4.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.zip"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc64 s390 sparc x86"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/wsgiproxy2/wsgiproxy2-0.4.4-r1.ebuild b/dev-python/wsgiproxy2/wsgiproxy2-0.4.4-r1.ebuild
index e4dae3014b2..7ea464b9271 100644
--- a/dev-python/wsgiproxy2/wsgiproxy2-0.4.4-r1.ebuild
+++ b/dev-python/wsgiproxy2/wsgiproxy2-0.4.4-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 ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sparc ~x86"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/wsgiproxy2/wsgiproxy2-0.4.6.ebuild b/dev-python/wsgiproxy2/wsgiproxy2-0.4.6.ebuild
index f0be8aead2d..fbf2d8b43d8 100644
--- a/dev-python/wsgiproxy2/wsgiproxy2-0.4.6.ebuild
+++ b/dev-python/wsgiproxy2/wsgiproxy2-0.4.6.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 ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc64 s390 sparc x86"
RDEPEND="
dev-python/requests[${PYTHON_USEDEP}]
diff --git a/dev-python/wstools/wstools-0.4.3.ebuild b/dev-python/wstools/wstools-0.4.3.ebuild
index 89eac2c6532..973635dfd8e 100644
--- a/dev-python/wstools/wstools-0.4.3.ebuild
+++ b/dev-python/wstools/wstools-0.4.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos ~x86-macos"
IUSE=""
RDEPEND=""
diff --git a/dev-python/wstools/wstools-0.4.5-r1.ebuild b/dev-python/wstools/wstools-0.4.5-r1.ebuild
index 5d7da026788..2802177b014 100644
--- a/dev-python/wstools/wstools-0.4.5-r1.ebuild
+++ b/dev-python/wstools/wstools-0.4.5-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 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/wxpython/wxpython-3.0.2.0.ebuild b/dev-python/wxpython/wxpython-3.0.2.0.ebuild
index bc451a8634c..11b707ab110 100644
--- a/dev-python/wxpython/wxpython-3.0.2.0.ebuild
+++ b/dev-python/wxpython/wxpython-3.0.2.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
LICENSE="wxWinLL-3"
SLOT="3.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
IUSE="cairo examples libnotify opengl"
RDEPEND="
diff --git a/dev-python/wxpython/wxpython-4.0.6.ebuild b/dev-python/wxpython/wxpython-4.0.6.ebuild
index 00b70ee2261..37342ff62d4 100644
--- a/dev-python/wxpython/wxpython-4.0.6.ebuild
+++ b/dev-python/wxpython/wxpython-4.0.6.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
LICENSE="wxWinLL-3"
SLOT="4.0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE="test webkit"
RESTRICT="!test? ( test )"
diff --git a/dev-python/wxpython/wxpython-4.0.7.ebuild b/dev-python/wxpython/wxpython-4.0.7.ebuild
index d4171de07d4..9028e5005cc 100644
--- a/dev-python/wxpython/wxpython-4.0.7.ebuild
+++ b/dev-python/wxpython/wxpython-4.0.7.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${MY_PV}.tar.gz"
LICENSE="wxWinLL-3"
SLOT="4.0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE="test webkit"
RESTRICT="!test? ( test )"
diff --git a/dev-python/zope-event/zope-event-4.2.0.ebuild b/dev-python/zope-event/zope-event-4.2.0.ebuild
index e1ebb78e37e..3d1b742ce6b 100644
--- a/dev-python/zope-event/zope-event-4.2.0.ebuild
+++ b/dev-python/zope-event/zope-event-4.2.0.ebuild
@@ -14,7 +14,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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/zope-event/zope-event-4.3.0.ebuild b/dev-python/zope-event/zope-event-4.3.0.ebuild
index e569780826a..28da396aff5 100644
--- a/dev-python/zope-event/zope-event-4.3.0.ebuild
+++ b/dev-python/zope-event/zope-event-4.3.0.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="ZPL"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/zope-event/zope-event-4.4.ebuild b/dev-python/zope-event/zope-event-4.4.ebuild
index 040e3158421..ac100f3555c 100644
--- a/dev-python/zope-event/zope-event-4.4.ebuild
+++ b/dev-python/zope-event/zope-event-4.4.ebuild
@@ -15,7 +15,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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/zope-interface/zope-interface-4.1.1.ebuild b/dev-python/zope-interface/zope-interface-4.1.1.ebuild
index 35e5ff520bb..ff807064820 100644
--- a/dev-python/zope-interface/zope-interface-4.1.1.ebuild
+++ b/dev-python/zope-interface/zope-interface-4.1.1.ebuild
@@ -15,7 +15,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 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/zope-interface/zope-interface-4.3.2.ebuild b/dev-python/zope-interface/zope-interface-4.3.2.ebuild
index 4875bd9e038..e9af2abfdaf 100644
--- a/dev-python/zope-interface/zope-interface-4.3.2.ebuild
+++ b/dev-python/zope-interface/zope-interface-4.3.2.ebuild
@@ -16,7 +16,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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/zope-interface/zope-interface-4.4.3.ebuild b/dev-python/zope-interface/zope-interface-4.4.3.ebuild
index 5f471894b84..805325c4dd7 100644
--- a/dev-python/zope-interface/zope-interface-4.4.3.ebuild
+++ b/dev-python/zope-interface/zope-interface-4.4.3.ebuild
@@ -16,7 +16,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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/zope-interface/zope-interface-4.5.0.ebuild b/dev-python/zope-interface/zope-interface-4.5.0.ebuild
index f5492eae59e..92742e09e39 100644
--- a/dev-python/zope-interface/zope-interface-4.5.0.ebuild
+++ b/dev-python/zope-interface/zope-interface-4.5.0.ebuild
@@ -16,7 +16,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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/zope-interface/zope-interface-4.6.0.ebuild b/dev-python/zope-interface/zope-interface-4.6.0.ebuild
index d61e9ab54a1..9868e14b631 100644
--- a/dev-python/zope-interface/zope-interface-4.6.0.ebuild
+++ b/dev-python/zope-interface/zope-interface-4.6.0.ebuild
@@ -16,7 +16,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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/zope-interface/zope-interface-4.7.1.ebuild b/dev-python/zope-interface/zope-interface-4.7.1.ebuild
index d102c52b33e..1fd658a4276 100644
--- a/dev-python/zope-interface/zope-interface-4.7.1.ebuild
+++ b/dev-python/zope-interface/zope-interface-4.7.1.ebuild
@@ -16,7 +16,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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-ruby/builder/builder-3.2.3.ebuild b/dev-ruby/builder/builder-3.2.3.ebuild
index 075bf8d7eab..1fea3a41075 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 ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_bdepend "doc? ( dev-ruby/rdoc )"
diff --git a/dev-ruby/builder/builder-3.2.4.ebuild b/dev-ruby/builder/builder-3.2.4.ebuild
index 6f290af2651..de1d874bca4 100644
--- a/dev-ruby/builder/builder-3.2.4.ebuild
+++ b/dev-ruby/builder/builder-3.2.4.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://onestepback.org/"
LICENSE="MIT"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
all_ruby_prepare() {
diff --git a/dev-ruby/did_you_mean/did_you_mean-1.1.2.ebuild b/dev-ruby/did_you_mean/did_you_mean-1.1.2.ebuild
index 6f64fb7b205..0fea8915d4d 100644
--- a/dev-ruby/did_you_mean/did_you_mean-1.1.2.ebuild
+++ b/dev-ruby/did_you_mean/did_you_mean-1.1.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/yuki24/did_you_mean"
LICENSE="MIT"
SLOT="2.4"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
all_ruby_prepare() {
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 30bb06d0814..2f4b484aae2 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 ~ia64 ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
all_ruby_prepare() {
diff --git a/dev-ruby/did_you_mean/did_you_mean-1.3.0.ebuild b/dev-ruby/did_you_mean/did_you_mean-1.3.0.ebuild
index cc04c59b80d..dc32cb32722 100644
--- a/dev-ruby/did_you_mean/did_you_mean-1.3.0.ebuild
+++ b/dev-ruby/did_you_mean/did_you_mean-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/yuki24/did_you_mean"
LICENSE="MIT"
SLOT="2.6"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
all_ruby_prepare() {
diff --git a/dev-ruby/did_you_mean/did_you_mean-1.3.1.ebuild b/dev-ruby/did_you_mean/did_you_mean-1.3.1.ebuild
index df99e515b0c..439fd074735 100644
--- a/dev-ruby/did_you_mean/did_you_mean-1.3.1.ebuild
+++ b/dev-ruby/did_you_mean/did_you_mean-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/yuki24/did_you_mean"
LICENSE="MIT"
SLOT="2.6"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
all_ruby_prepare() {
diff --git a/dev-ruby/did_you_mean/did_you_mean-1.4.0.ebuild b/dev-ruby/did_you_mean/did_you_mean-1.4.0.ebuild
index a4e8c072a9e..e731ed981fe 100644
--- a/dev-ruby/did_you_mean/did_you_mean-1.4.0.ebuild
+++ b/dev-ruby/did_you_mean/did_you_mean-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/yuki24/did_you_mean"
LICENSE="MIT"
SLOT="2.6"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
all_ruby_prepare() {
diff --git a/dev-ruby/hoe/hoe-3.16.0.ebuild b/dev-ruby/hoe/hoe-3.16.0.ebuild
index e9e45023b14..33100beb04a 100644
--- a/dev-ruby/hoe/hoe-3.16.0.ebuild
+++ b/dev-ruby/hoe/hoe-3.16.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://www.zenspider.com/projects/hoe.html"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc"
ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.9:5 )"
diff --git a/dev-ruby/hoe/hoe-3.18.1.ebuild b/dev-ruby/hoe/hoe-3.18.1.ebuild
index 877de98a25e..375ba37f322 100644
--- a/dev-ruby/hoe/hoe-3.18.1.ebuild
+++ b/dev-ruby/hoe/hoe-3.18.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ HOMEPAGE="https://www.zenspider.com/projects/hoe.html"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc"
ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.9:5 )"
diff --git a/dev-ruby/hoe/hoe-3.19.0.ebuild b/dev-ruby/hoe/hoe-3.19.0.ebuild
index 877de98a25e..375ba37f322 100644
--- a/dev-ruby/hoe/hoe-3.19.0.ebuild
+++ b/dev-ruby/hoe/hoe-3.19.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ HOMEPAGE="https://www.zenspider.com/projects/hoe.html"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc"
ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.9:5 )"
diff --git a/dev-ruby/hoe/hoe-3.20.0.ebuild b/dev-ruby/hoe/hoe-3.20.0.ebuild
index d79b56955af..7da07e7c509 100644
--- a/dev-ruby/hoe/hoe-3.20.0.ebuild
+++ b/dev-ruby/hoe/hoe-3.20.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ HOMEPAGE="https://www.zenspider.com/projects/hoe.html"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc"
ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.9:5 )"
diff --git a/dev-ruby/hoe/hoe-3.21.0.ebuild b/dev-ruby/hoe/hoe-3.21.0.ebuild
index 67562fea00f..7041a12fc20 100644
--- a/dev-ruby/hoe/hoe-3.21.0.ebuild
+++ b/dev-ruby/hoe/hoe-3.21.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://www.zenspider.com/projects/hoe.html"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc"
ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.9:5 )"
diff --git a/dev-ruby/json/json-1.8.6-r1.ebuild b/dev-ruby/json/json-1.8.6-r1.ebuild
index b8622f37c35..1f64bfb3bcf 100644
--- a/dev-ruby/json/json-1.8.6-r1.ebuild
+++ b/dev-ruby/json/json-1.8.6-r1.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="A JSON implementation as a Ruby extension"
HOMEPAGE="https://github.com/flori/json"
LICENSE="|| ( Ruby GPL-2 )"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE=""
diff --git a/dev-ruby/json/json-2.2.0.ebuild b/dev-ruby/json/json-2.2.0.ebuild
index 166259933d9..790d02c6ec0 100644
--- a/dev-ruby/json/json-2.2.0.ebuild
+++ b/dev-ruby/json/json-2.2.0.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="A JSON implementation as a Ruby extension"
HOMEPAGE="https://github.com/flori/json"
LICENSE="Ruby"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="2"
IUSE=""
diff --git a/dev-ruby/json/json-2.3.0.ebuild b/dev-ruby/json/json-2.3.0.ebuild
index fe3e49f02c6..bc3579ec11d 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 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 f75ffe28462..cfd93e597ff 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 ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ff6593d6576..e51f3141ca4 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 ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 96731dcea17..7c7dc542f78 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 ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc test"
each_ruby_test() {
diff --git a/dev-ruby/minitest/minitest-5.12.2.ebuild b/dev-ruby/minitest/minitest-5.12.2.ebuild
index a3e50f68ee5..6e8b63da036 100644
--- a/dev-ruby/minitest/minitest-5.12.2.ebuild
+++ b/dev-ruby/minitest/minitest-5.12.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/seattlerb/minitest"
LICENSE="MIT"
SLOT="5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc test"
each_ruby_test() {
diff --git a/dev-ruby/minitest/minitest-5.13.0.ebuild b/dev-ruby/minitest/minitest-5.13.0.ebuild
index 76abba4b61e..91995895e56 100644
--- a/dev-ruby/minitest/minitest-5.13.0.ebuild
+++ b/dev-ruby/minitest/minitest-5.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/seattlerb/minitest"
LICENSE="MIT"
SLOT="5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc test"
each_ruby_test() {
diff --git a/dev-ruby/minitest/minitest-5.14.0.ebuild b/dev-ruby/minitest/minitest-5.14.0.ebuild
index 156e9fc4cc4..91995895e56 100644
--- a/dev-ruby/minitest/minitest-5.14.0.ebuild
+++ b/dev-ruby/minitest/minitest-5.14.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/seattlerb/minitest"
LICENSE="MIT"
SLOT="5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc test"
each_ruby_test() {
diff --git a/dev-ruby/net-telnet/net-telnet-0.1.1-r1.ebuild b/dev-ruby/net-telnet/net-telnet-0.1.1-r1.ebuild
index 7934127496a..cdad01fc29d 100644
--- a/dev-ruby/net-telnet/net-telnet-0.1.1-r1.ebuild
+++ b/dev-ruby/net-telnet/net-telnet-0.1.1-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/ruby/net-telnet/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="|| ( Ruby-BSD BSD-2 )"
SLOT="1"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
ruby_add_bdepend "test? ( dev-ruby/minitest )"
diff --git a/dev-ruby/net-telnet/net-telnet-0.2.0.ebuild b/dev-ruby/net-telnet/net-telnet-0.2.0.ebuild
index 985944bb2c7..2f72779ace7 100644
--- a/dev-ruby/net-telnet/net-telnet-0.2.0.ebuild
+++ b/dev-ruby/net-telnet/net-telnet-0.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/ruby/net-telnet/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="|| ( Ruby-BSD BSD-2 )"
SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
ruby_add_bdepend "test? ( dev-ruby/minitest )"
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 78d6745b06e..bb5673a41af 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 ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE=""
diff --git a/dev-ruby/power_assert/power_assert-1.1.6.ebuild b/dev-ruby/power_assert/power_assert-1.1.6.ebuild
index 975cfd7d07d..75cfae25dc1 100644
--- a/dev-ruby/power_assert/power_assert-1.1.6.ebuild
+++ b/dev-ruby/power_assert/power_assert-1.1.6.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 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE=""
diff --git a/dev-ruby/power_assert/power_assert-1.1.7.ebuild b/dev-ruby/power_assert/power_assert-1.1.7.ebuild
index 975cfd7d07d..75cfae25dc1 100644
--- a/dev-ruby/power_assert/power_assert-1.1.7.ebuild
+++ b/dev-ruby/power_assert/power_assert-1.1.7.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 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 0c922599621..7e57bd595da 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 ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc test"
ruby_add_bdepend "dev-ruby/rake
diff --git a/dev-ruby/racc/racc-1.4.16-r1.ebuild b/dev-ruby/racc/racc-1.4.16-r1.ebuild
index 782ea278d88..cf87ba7f736 100644
--- a/dev-ruby/racc/racc-1.4.16-r1.ebuild
+++ b/dev-ruby/racc/racc-1.4.16-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/tenderlove/racc/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc test"
ruby_add_bdepend "dev-ruby/rake
diff --git a/dev-ruby/rake/rake-12.3.3.ebuild b/dev-ruby/rake/rake-12.3.3.ebuild
index 97e122cc1ab..dd0bec93a41 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 ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc"
DEPEND+=" app-arch/gzip"
diff --git a/dev-ruby/rake/rake-13.0.0.ebuild b/dev-ruby/rake/rake-13.0.0.ebuild
index 217d6fabbdc..fee0fd5a6d9 100644
--- a/dev-ruby/rake/rake-13.0.0.ebuild
+++ b/dev-ruby/rake/rake-13.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -21,7 +21,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 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc"
DEPEND+=" app-arch/gzip"
diff --git a/dev-ruby/rake/rake-13.0.1.ebuild b/dev-ruby/rake/rake-13.0.1.ebuild
index 233762fa09a..7a751b7c9e4 100644
--- a/dev-ruby/rake/rake-13.0.1.ebuild
+++ b/dev-ruby/rake/rake-13.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -21,7 +21,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 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc"
DEPEND+=" app-arch/gzip"
diff --git a/dev-ruby/rdoc/rdoc-5.1.0-r1.ebuild b/dev-ruby/rdoc/rdoc-5.1.0-r1.ebuild
index cd7e28a75f5..9fc70e623f6 100644
--- a/dev-ruby/rdoc/rdoc-5.1.0-r1.ebuild
+++ b/dev-ruby/rdoc/rdoc-5.1.0-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/rdoc/rdoc/"
SRC_URI="https://github.com/rdoc/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Ruby MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE=""
diff --git a/dev-ruby/rdoc/rdoc-6.1.2.ebuild b/dev-ruby/rdoc/rdoc-6.1.2.ebuild
index 1cedcabc455..6f602a21e49 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 ~ia64 ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE="doc"
diff --git a/dev-ruby/rdoc/rdoc-6.2.0.ebuild b/dev-ruby/rdoc/rdoc-6.2.0.ebuild
index faeb127e47e..22e2b4480b7 100644
--- a/dev-ruby/rdoc/rdoc-6.2.0.ebuild
+++ b/dev-ruby/rdoc/rdoc-6.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE="doc"
diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.6.0.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.6.0.ebuild
index 5c45c18dbe3..6fa860a35e7 100644
--- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.6.0.ebuild
+++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.6.0.ebuild
@@ -19,7 +19,7 @@ RUBY_S="$MY_P"/bindings/ruby
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
IUSE="graph test"
RESTRICT="!test? ( test )"
REQUIRED_USE="test? ( graph )"
diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.1-r1.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.1-r1.ebuild
index 6928da159c5..8f0077784d7 100644
--- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.1-r1.ebuild
+++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.1-r1.ebuild
@@ -16,7 +16,7 @@ RUBY_S="$MY_P"/bindings/ruby
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
IUSE="graph test"
RESTRICT="!test? ( test )"
REQUIRED_USE="test? ( graph )"
diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild
index bdc029b7885..12c83d98f20 100644
--- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild
+++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild
@@ -16,7 +16,7 @@ RUBY_S="$MY_P"/bindings/ruby
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
IUSE="graph test"
RESTRICT="!test? ( test )"
REQUIRED_USE="test? ( graph )"
diff --git a/dev-ruby/rubygems/rubygems-2.7.10.ebuild b/dev-ruby/rubygems/rubygems-2.7.10.ebuild
index 68cba4a60df..298d2f48f73 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 ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE="server test"
RESTRICT="!test? ( test )"
diff --git a/dev-ruby/rubygems/rubygems-3.0.3.ebuild b/dev-ruby/rubygems/rubygems-3.0.3.ebuild
index ad752396332..e82a8f5e2d9 100644
--- a/dev-ruby/rubygems/rubygems-3.0.3.ebuild
+++ b/dev-ruby/rubygems/rubygems-3.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ LICENSE="GPL-2 || ( Ruby MIT )"
SRC_URI="https://rubygems.org/rubygems/${P}.tgz"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE="server test"
RESTRICT="!test? ( test )"
diff --git a/dev-ruby/rubygems/rubygems-3.0.4-r1.ebuild b/dev-ruby/rubygems/rubygems-3.0.4-r1.ebuild
index 26cc98a87d5..4ec315ffe54 100644
--- a/dev-ruby/rubygems/rubygems-3.0.4-r1.ebuild
+++ b/dev-ruby/rubygems/rubygems-3.0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ LICENSE="GPL-2 || ( Ruby MIT )"
SRC_URI="https://rubygems.org/rubygems/${P}.tgz"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE="server test"
RESTRICT="!test? ( test )"
diff --git a/dev-ruby/rubygems/rubygems-3.0.6.ebuild b/dev-ruby/rubygems/rubygems-3.0.6.ebuild
index e4bbbd3eb42..f65e8be1f84 100644
--- a/dev-ruby/rubygems/rubygems-3.0.6.ebuild
+++ b/dev-ruby/rubygems/rubygems-3.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ LICENSE="GPL-2 || ( Ruby MIT )"
SRC_URI="https://rubygems.org/rubygems/${P}.tgz"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE="server test"
RESTRICT="!test? ( test )"
diff --git a/dev-ruby/rubygems/rubygems-3.0.8.ebuild b/dev-ruby/rubygems/rubygems-3.0.8.ebuild
index 25f81c20ff8..2c78bdb6bd4 100644
--- a/dev-ruby/rubygems/rubygems-3.0.8.ebuild
+++ b/dev-ruby/rubygems/rubygems-3.0.8.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2 || ( Ruby MIT )"
SRC_URI="https://rubygems.org/rubygems/${P}.tgz"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE="server test"
RESTRICT="!test? ( test )"
diff --git a/dev-ruby/rubygems/rubygems-3.1.2.ebuild b/dev-ruby/rubygems/rubygems-3.1.2.ebuild
index 03bc6391da9..ce3c96bea35 100644
--- a/dev-ruby/rubygems/rubygems-3.1.2.ebuild
+++ b/dev-ruby/rubygems/rubygems-3.1.2.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2 || ( Ruby MIT )"
SRC_URI="https://rubygems.org/rubygems/${P}.tgz"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE="server test"
RESTRICT="!test? ( test )"
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 55e0db178df..562789bb4f7 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 ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc test"
ruby_add_rdepend "dev-ruby/power_assert"
diff --git a/dev-ruby/test-unit/test-unit-3.3.4.ebuild b/dev-ruby/test-unit/test-unit-3.3.4.ebuild
index 2fcc30296ab..320d33c0f30 100644
--- a/dev-ruby/test-unit/test-unit-3.3.4.ebuild
+++ b/dev-ruby/test-unit/test-unit-3.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ HOMEPAGE="https://rubygems.org/gems/test-unit"
LICENSE="|| ( Ruby GPL-2 ) PSF-2"
SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc test"
ruby_add_rdepend "dev-ruby/power_assert"
diff --git a/dev-ruby/test-unit/test-unit-3.3.5.ebuild b/dev-ruby/test-unit/test-unit-3.3.5.ebuild
index ac68fdc1281..320d33c0f30 100644
--- a/dev-ruby/test-unit/test-unit-3.3.5.ebuild
+++ b/dev-ruby/test-unit/test-unit-3.3.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://rubygems.org/gems/test-unit"
LICENSE="|| ( Ruby GPL-2 ) PSF-2"
SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc test"
ruby_add_rdepend "dev-ruby/power_assert"
diff --git a/dev-ruby/xmlrpc/xmlrpc-0.3.0.ebuild b/dev-ruby/xmlrpc/xmlrpc-0.3.0.ebuild
index 00f80a6d867..59c83379ee0 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 ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
ruby_add_bdepend "test? ( dev-ruby/test-unit )"
diff --git a/dev-scheme/guile/guile-1.8.8-r3.ebuild b/dev-scheme/guile/guile-1.8.8-r3.ebuild
index ed93ec083d2..4124ee79371 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 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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.13-r2.ebuild b/dev-scheme/guile/guile-2.0.13-r2.ebuild
index 042d420fa89..e1049aaf965 100644
--- a/dev-scheme/guile/guile-2.0.13-r2.ebuild
+++ b/dev-scheme/guile/guile-2.0.13-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -7,7 +7,7 @@ inherit flag-o-matic autotools
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 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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.0.14-r3.ebuild b/dev-scheme/guile/guile-2.0.14-r3.ebuild
index 1624bd767af..d22fb438fb1 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 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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.3.ebuild b/dev-scheme/guile/guile-2.2.3.ebuild
index 06943660c13..5fa9b08d7dd 100644
--- a/dev-scheme/guile/guile-2.2.3.ebuild
+++ b/dev-scheme/guile/guile-2.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,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 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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.4.ebuild b/dev-scheme/guile/guile-2.2.4.ebuild
index 3ea9f889727..e52d1c9216a 100644
--- a/dev-scheme/guile/guile-2.2.4.ebuild
+++ b/dev-scheme/guile/guile-2.2.4.ebuild
@@ -12,7 +12,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 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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.6.ebuild b/dev-scheme/guile/guile-2.2.6.ebuild
index 894d90a6a47..2724d116552 100644
--- a/dev-scheme/guile/guile-2.2.6.ebuild
+++ b/dev-scheme/guile/guile-2.2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 6b2cdecac56..cb35a0dfe35 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND="
dev-lang/tk:0=
diff --git a/dev-tcltk/blt/blt-2.4z-r14.ebuild b/dev-tcltk/blt/blt-2.4z-r14.ebuild
index 896f8c28b83..5fe84228912 100644
--- a/dev-tcltk/blt/blt-2.4z-r14.ebuild
+++ b/dev-tcltk/blt/blt-2.4z-r14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 242333cf557..9241c43151f 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~m68k-mint ~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 ~x86-macos ~m68k-mint ~x64-solaris ~x86-solaris"
IUSE="debug doc threads"
# We need dejagnu for src_test, but dejagnu needs expect
diff --git a/dev-tcltk/thread/thread-2.8.2.ebuild b/dev-tcltk/thread/thread-2.8.2.ebuild
index 391435b3eb0..d618091de89 100644
--- a/dev-tcltk/thread/thread-2.8.2.ebuild
+++ b/dev-tcltk/thread/thread-2.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/project/tcl/Thread%20Extension/${PV}/${MY_P}.tar.g
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
IUSE=""
DEPEND="dev-lang/tcl:0=[threads]"
diff --git a/dev-tcltk/tix/tix-8.4.3-r1.ebuild b/dev-tcltk/tix/tix-8.4.3-r1.ebuild
index 1a35b7821ae..7e03894fe90 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
RESTRICT="test"
diff --git a/dev-tcltk/togl/togl-2.0-r2.ebuild b/dev-tcltk/togl/togl-2.0-r2.ebuild
index cb54421cfae..20d6831df80 100644
--- a/dev-tcltk/togl/togl-2.0-r2.ebuild
+++ b/dev-tcltk/togl/togl-2.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
IUSE="debug +threads"
RDEPEND="
diff --git a/dev-tcltk/togl/togl-2.0-r3.ebuild b/dev-tcltk/togl/togl-2.0-r3.ebuild
index 5791c04242e..ddc67f18c36 100644
--- a/dev-tcltk/togl/togl-2.0-r3.ebuild
+++ b/dev-tcltk/togl/togl-2.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="debug +threads"
RDEPEND="
diff --git a/dev-tex/bibtexu/bibtexu-3.71_p20190410.ebuild b/dev-tex/bibtexu/bibtexu-3.71_p20190410.ebuild
index f31833d489e..533877de304 100644
--- a/dev-tex/bibtexu/bibtexu-3.71_p20190410.ebuild
+++ b/dev-tex/bibtexu/bibtexu-3.71_p20190410.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc source"
RDEPEND=">=dev-libs/kpathsea-6.2.1:=
diff --git a/dev-tex/chktex/chktex-1.7.6.ebuild b/dev-tex/chktex/chktex-1.7.6.ebuild
index ce0d5e0e37e..0cc444d5719 100644
--- a/dev-tex/chktex/chktex-1.7.6.ebuild
+++ b/dev-tex/chktex/chktex-1.7.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.savannah.gnu.org/releases/chktex/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="debug doc +pcre test"
RESTRICT="!test? ( test )"
# Tests fail without pcre. Enable pcre by default and make tests depend on it.
diff --git a/dev-tex/cjk-latex/cjk-latex-4.8.4.ebuild b/dev-tex/cjk-latex/cjk-latex-4.8.4.ebuild
index 6e68140d823..fedc9c443a3 100644
--- a/dev-tex/cjk-latex/cjk-latex-4.8.4.ebuild
+++ b/dev-tex/cjk-latex/cjk-latex-4.8.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="ftp://ftp.ffii.org/pub/cjk/${MY_P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh 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="doc emacs"
RDEPEND="virtual/latex-base
diff --git a/dev-tex/currvita/currvita-0.9i-r1.ebuild b/dev-tex/currvita/currvita-0.9i-r1.ebuild
index 09bd0cff470..332059e5418 100644
--- a/dev-tex/currvita/currvita-0.9i-r1.ebuild
+++ b/dev-tex/currvita/currvita-0.9i-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.ctan.org/tex-archive/macros/latex/contrib/currvita/"
# ftp://ftp.dante.de/tex-archive/macros/latex/contrib/currvita.tar.gz
SRC_URI="mirror://gentoo/${P}.tar.gz"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
LICENSE="GPL-2"
SLOT="0"
diff --git a/dev-tex/detex/detex-2.8-r1.ebuild b/dev-tex/detex/detex-2.8-r1.ebuild
index 9766c4ff699..041644ba4d7 100644
--- a/dev-tex/detex/detex-2.8-r1.ebuild
+++ b/dev-tex/detex/detex-2.8-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.cs.purdue.edu/homes/trinkle/detex/${P}.tar"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="sys-devel/flex"
diff --git a/dev-tex/dot2tex/dot2tex-2.11.3.ebuild b/dev-tex/dot2tex/dot2tex-2.11.3.ebuild
index 4645c02dd8f..9cfc6d2e1c1 100644
--- a/dev-tex/dot2tex/dot2tex-2.11.3.ebuild
+++ b/dev-tex/dot2tex/dot2tex-2.11.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/kjellmf/dot2tex/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
IUSE="doc examples"
DEPEND="dev-python/pyparsing[${PYTHON_USEDEP}]"
diff --git a/dev-tex/dot2texi/dot2texi-3.0.ebuild b/dev-tex/dot2texi/dot2texi-3.0.ebuild
index d822aa49822..2d1d625153c 100644
--- a/dev-tex/dot2texi/dot2texi-3.0.ebuild
+++ b/dev-tex/dot2texi/dot2texi-3.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.ctan.org/pkg/dot2texi"
# Taken from http://theory.uwinnipeg.ca/scripts/CTAN/macros/latex/contrib/dot2texi.zip
SRC_URI="mirror://gentoo/${P}.zip"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
LICENSE="GPL-2"
SLOT="0"
diff --git a/dev-tex/dvi2tty/dvi2tty-5.3.4-r1.ebuild b/dev-tex/dvi2tty/dvi2tty-5.3.4-r1.ebuild
index 1e830184c21..bb1931ccdb7 100644
--- a/dev-tex/dvi2tty/dvi2tty-5.3.4-r1.ebuild
+++ b/dev-tex/dvi2tty/dvi2tty-5.3.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.mesa.nl/pub/dvi2tty/${P}.tgz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
src_prepare() {
default
diff --git a/dev-tex/envlab/envlab-1.2-r1.ebuild b/dev-tex/envlab/envlab-1.2-r1.ebuild
index ec3870802b0..fa4310af4e9 100644
--- a/dev-tex/envlab/envlab-1.2-r1.ebuild
+++ b/dev-tex/envlab/envlab-1.2-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://ctan.org/pkg/envlab"
# downloaded from:
# ftp://ftp.ctan.org/pub/tex-archive/macros/latex/contrib/${PN}.tar.gz
SRC_URI="mirror://gentoo/${P}.tar.gz"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
LICENSE="LPPL-1.2"
SLOT="0"
diff --git a/dev-tex/europecv/europecv-20060424-r2.ebuild b/dev-tex/europecv/europecv-20060424-r2.ebuild
index a6caf9b8080..219c7c7a515 100644
--- a/dev-tex/europecv/europecv-20060424-r2.ebuild
+++ b/dev-tex/europecv/europecv-20060424-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.zip"
LICENSE="LPPL-1.2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="examples"
diff --git a/dev-tex/feynmf/feynmf-1.08-r6.ebuild b/dev-tex/feynmf/feynmf-1.08-r6.ebuild
index 1d633dfd1e3..b588e42138f 100644
--- a/dev-tex/feynmf/feynmf-1.08-r6.ebuild
+++ b/dev-tex/feynmf/feynmf-1.08-r6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.gz
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc"
RDEPEND="dev-texlive/texlive-metapost"
diff --git a/dev-tex/g-brief/g-brief-4.0.2-r1.ebuild b/dev-tex/g-brief/g-brief-4.0.2-r1.ebuild
index db01154215d..b71f159e117 100644
--- a/dev-tex/g-brief/g-brief-4.0.2-r1.ebuild
+++ b/dev-tex/g-brief/g-brief-4.0.2-r1.ebuild
@@ -15,7 +15,7 @@ LICENSE="LPPL-1.2"
IUSE=""
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
RDEPEND="dev-texlive/texlive-langgerman"
DEPEND="${RDEPEND}
diff --git a/dev-tex/glossaries/glossaries-4.41.ebuild b/dev-tex/glossaries/glossaries-4.41.ebuild
index 0875229939e..522d152abe3 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc examples"
RDEPEND="dev-lang/perl
diff --git a/dev-tex/latex-beamer/latex-beamer-3.56-r1.ebuild b/dev-tex/latex-beamer/latex-beamer-3.56-r1.ebuild
index 5d7bf300c4e..e3cadf8b02d 100644
--- a/dev-tex/latex-beamer/latex-beamer-3.56-r1.ebuild
+++ b/dev-tex/latex-beamer/latex-beamer-3.56-r1.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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc"
DEPEND="dev-texlive/texlive-latex"
diff --git a/dev-tex/latex-beamer/latex-beamer-3.57.ebuild b/dev-tex/latex-beamer/latex-beamer-3.57.ebuild
index 055171a8f89..1723ec5cab7 100644
--- a/dev-tex/latex-beamer/latex-beamer-3.57.ebuild
+++ b/dev-tex/latex-beamer/latex-beamer-3.57.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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc"
DEPEND="dev-texlive/texlive-latex"
diff --git a/dev-tex/latex2html/latex2html-2015.ebuild b/dev-tex/latex2html/latex2html-2015.ebuild
index 6f42fb7ae5e..3248aa4ace8 100644
--- a/dev-tex/latex2html/latex2html-2015.ebuild
+++ b/dev-tex/latex2html/latex2html-2015.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://mirrors.ctan.org/support/latex2html/latex2html-2015.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="gif png"
DEPEND="app-text/ghostscript-gpl
diff --git a/dev-tex/latex2html/latex2html-2017.2-r2.ebuild b/dev-tex/latex2html/latex2html-2017.2-r2.ebuild
index e236e337623..ca88c6d78f4 100644
--- a/dev-tex/latex2html/latex2html-2017.2-r2.ebuild
+++ b/dev-tex/latex2html/latex2html-2017.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="http://mirrors.ctan.org/support/latex2html/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="gif png"
DEPEND="app-text/ghostscript-gpl
diff --git a/dev-tex/latexdiff/latexdiff-1.2.1.ebuild b/dev-tex/latexdiff/latexdiff-1.2.1.ebuild
index 9dd06da775a..58b9f42702a 100644
--- a/dev-tex/latexdiff/latexdiff-1.2.1.ebuild
+++ b/dev-tex/latexdiff/latexdiff-1.2.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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
fi
LICENSE="GPL-3"
diff --git a/dev-tex/latexdiff/latexdiff-1.3.0.ebuild b/dev-tex/latexdiff/latexdiff-1.3.0.ebuild
index b8d8353c944..ac2081b0520 100644
--- a/dev-tex/latexdiff/latexdiff-1.3.0.ebuild
+++ b/dev-tex/latexdiff/latexdiff-1.3.0.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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+ KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
fi
LICENSE="GPL-3"
diff --git a/dev-tex/latexdiff/latexdiff-9999.ebuild b/dev-tex/latexdiff/latexdiff-9999.ebuild
index 827ffb515f5..2926345b876 100644
--- a/dev-tex/latexdiff/latexdiff-9999.ebuild
+++ b/dev-tex/latexdiff/latexdiff-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
fi
LICENSE="GPL-3"
diff --git a/dev-tex/latexmk/latexmk-456.ebuild b/dev-tex/latexmk/latexmk-456.ebuild
index ef8462815b0..2ae77e76ebc 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 sh sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
RDEPEND="virtual/latex-base
dev-lang/perl"
diff --git a/dev-tex/latexmk/latexmk-465.ebuild b/dev-tex/latexmk/latexmk-465.ebuild
index 627b740373d..98cf8d88db7 100644
--- a/dev-tex/latexmk/latexmk-465.ebuild
+++ b/dev-tex/latexmk/latexmk-465.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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 ~sh ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
RDEPEND="virtual/latex-base
dev-lang/perl"
diff --git a/dev-tex/leaflet/leaflet-20041222.ebuild b/dev-tex/leaflet/leaflet-20041222.ebuild
index f4e17cdebe7..16059b8fd6e 100644
--- a/dev-tex/leaflet/leaflet-20041222.ebuild
+++ b/dev-tex/leaflet/leaflet-20041222.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.ctan.org/tex-archive/macros/latex/contrib/leaflet/"
SRC_URI="mirror://gentoo/${P}.zip"
# checksum from official ftp site changes frequently so we mirror it
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
LICENSE="LPPL-1.3"
SLOT="0"
diff --git a/dev-tex/pgf/pgf-3.1.4b-r2.ebuild b/dev-tex/pgf/pgf-3.1.4b-r2.ebuild
index 619b9fb56a0..76589c5ed57 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc source"
RDEPEND="dev-texlive/texlive-latexrecommended"
diff --git a/dev-tex/pgf/pgf-3.1.5b.ebuild b/dev-tex/pgf/pgf-3.1.5b.ebuild
index 8009fb304ee..73c994a29c6 100644
--- a/dev-tex/pgf/pgf-3.1.5b.ebuild
+++ b/dev-tex/pgf/pgf-3.1.5b.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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc source"
RDEPEND="dev-texlive/texlive-latexrecommended"
diff --git a/dev-tex/svninfo/svninfo-0.7.4.ebuild b/dev-tex/svninfo/svninfo-0.7.4.ebuild
index 72cf394f0c4..29df7612b28 100644
--- a/dev-tex/svninfo/svninfo-0.7.4.ebuild
+++ b/dev-tex/svninfo/svninfo-0.7.4.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A LaTeX module to access SVN version info"
HOMEPAGE="https://www.brucker.ch/projects/svninfo/index.en.html"
SRC_URI="https://www.brucker.ch/projects/svninfo/download/${P}.tar.gz"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
LICENSE="LPPL-1.2"
SLOT="0"
diff --git a/dev-tex/tex4ht/tex4ht-20090611_p1038-r8.ebuild b/dev-tex/tex4ht/tex4ht-20090611_p1038-r8.ebuild
index 5ec642562a7..73b1f783e2b 100644
--- a/dev-tex/tex4ht/tex4ht-20090611_p1038-r8.ebuild
+++ b/dev-tex/tex4ht/tex4ht-20090611_p1038-r8.ebuild
@@ -19,7 +19,7 @@ SRC_URI="http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/${MY_P}.tar.gz
LICENSE="LPPL-1.2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh 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="java"
RDEPEND="app-text/ghostscript-gpl
diff --git a/dev-tex/translator/translator-1.00.ebuild b/dev-tex/translator/translator-1.00.ebuild
index 259654fbe1f..b9ce31fe0e8 100644
--- a/dev-tex/translator/translator-1.00.ebuild
+++ b/dev-tex/translator/translator-1.00.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A package for translating words in TeX"
HOMEPAGE="https://bitbucket.org/rivanvx/beamer/src"
SRC_URI="mirror://sourceforge/latex-beamer/${P}.tar.gz"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
LICENSE="GPL-2 LPPL-1.3c"
SLOT="0"
diff --git a/dev-tex/xmltex/xmltex-1.9-r3.ebuild b/dev-tex/xmltex/xmltex-1.9-r3.ebuild
index 05cafcf280c..f57dccbb846 100644
--- a/dev-tex/xmltex/xmltex-1.9-r3.ebuild
+++ b/dev-tex/xmltex/xmltex-1.9-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
LICENSE="LPPL-1.2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
S=${WORKDIR}/${PN}/base
diff --git a/dev-texlive/texlive-basic/texlive-basic-2019-r1.ebuild b/dev-texlive/texlive-basic/texlive-basic-2019-r1.ebuild
index 4ed16dcf178..f619af870f7 100644
--- a/dev-texlive/texlive-basic/texlive-basic-2019-r1.ebuild
+++ b/dev-texlive/texlive-basic/texlive-basic-2019-r1.ebuild
@@ -15,7 +15,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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="!<app-text/dvipsk-5.996_p20160523
>=app-text/texlive-core-2019[luajittex?]"
--git a/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2019.ebuild b/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2019.ebuild
index 4881da4a64d..3bfecf965b3 100644
--- a/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2019.ebuild
+++ b/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2019.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive BibTeX additional styles"
LICENSE=" Artistic GPL-1 GPL-2 GPL-3 BSD-4 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-latex-2019
!=app-text/texlive-core-2017*
diff --git a/dev-texlive/texlive-context/texlive-context-2019.ebuild b/dev-texlive/texlive-context/texlive-context-2019.ebuild
index b98c55c2460..42010ffc1d8 100644
--- a/dev-texlive/texlive-context/texlive-context-2019.ebuild
+++ b/dev-texlive/texlive-context/texlive-context-2019.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 ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2019
>=dev-texlive/texlive-latex-2010
--git a/dev-texlive/texlive-fontsextra/texlive-fontsextra-2019.ebuild b/dev-texlive/texlive-fontsextra/texlive-fontsextra-2019.ebuild
index a9ffe941f8d..9e50405e01e 100644
--- a/dev-texlive/texlive-fontsextra/texlive-fontsextra-2019.ebuild
+++ b/dev-texlive/texlive-fontsextra/texlive-fontsextra-2019.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Additional fonts"
LICENSE=" Apache-2.0 BSD GPL-1 GPL-2 GPL-3 LPPL-1.2 LPPL-1.3 MIT OFL public-domain TeX TeX-other-free "
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2019
!<dev-texlive/texlive-latexextra-2016
diff --git a/dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2019.ebuild b/dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2019.ebuild
index 2f74226f321..6142314d3bd 100644
--- a/dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2019.ebuild
+++ b/dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2019.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Recommended fonts"
LICENSE=" BSD GPL-1 GPL-2 LPPL-1.3 OFL public-domain TeX TeX-other-free "
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2019
!<dev-texlive/texlive-latexrecommended-2014
diff --git a/dev-texlive/texlive-fontutils/texlive-fontutils-2019.ebuild b/dev-texlive/texlive-fontutils/texlive-fontutils-2019.ebuild
index 0ae91852112..c9044091e70 100644
--- a/dev-texlive/texlive-fontutils/texlive-fontutils-2019.ebuild
+++ b/dev-texlive/texlive-fontutils/texlive-fontutils-2019.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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2019
!<app-text/texlive-core-2013
--git a/dev-texlive/texlive-formatsextra/texlive-formatsextra-2019.ebuild b/dev-texlive/texlive-formatsextra/texlive-formatsextra-2019.ebuild
index 14c78ca436d..3f7571edb4d 100644
--- a/dev-texlive/texlive-formatsextra/texlive-formatsextra-2019.ebuild
+++ b/dev-texlive/texlive-formatsextra/texlive-formatsextra-2019.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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2019
>=dev-texlive/texlive-latex-2019
diff --git a/dev-texlive/texlive-games/texlive-games-2019.ebuild b/dev-texlive/texlive-games/texlive-games-2019.ebuild
index 45fdd9ff2fb..7f121f0d146 100644
--- a/dev-texlive/texlive-games/texlive-games-2019.ebuild
+++ b/dev-texlive/texlive-games/texlive-games-2019.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Games typesetting"
LICENSE=" GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free "
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-latex-2019"
RDEPEND="${DEPEND} "
diff --git a/dev-texlive/texlive-humanities/texlive-humanities-2019.ebuild b/dev-texlive/texlive-humanities/texlive-humanities-2019.ebuild
index 62dd856085a..d106ad50d79 100644
--- a/dev-texlive/texlive-humanities/texlive-humanities-2019.ebuild
+++ b/dev-texlive/texlive-humanities/texlive-humanities-2019.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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-latex-2019"
RDEPEND="${DEPEND} "
diff --git a/dev-texlive/texlive-langarabic/texlive-langarabic-2019.ebuild b/dev-texlive/texlive-langarabic/texlive-langarabic-2019.ebuild
index 29f2d9b6848..ce024d37059 100644
--- a/dev-texlive/texlive-langarabic/texlive-langarabic-2019.ebuild
+++ b/dev-texlive/texlive-langarabic/texlive-langarabic-2019.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Arabic"
LICENSE=" CC-BY-SA-4.0 GPL-2 GPL-3+ LPPL-1.3 LPPL-1.3c OFL public-domain "
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2019
!<dev-texlive/texlive-xetex-2016
diff --git a/dev-texlive/texlive-langchinese/texlive-langchinese-2019.ebuild b/dev-texlive/texlive-langchinese/texlive-langchinese-2019.ebuild
index a11b030816f..54c6146b8cf 100644
--- a/dev-texlive/texlive-langchinese/texlive-langchinese-2019.ebuild
+++ b/dev-texlive/texlive-langchinese/texlive-langchinese-2019.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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-langcjk-2019
!<dev-texlive/texlive-langcjk-2014
diff --git a/dev-texlive/texlive-langcjk/texlive-langcjk-2019.ebuild b/dev-texlive/texlive-langcjk/texlive-langcjk-2019.ebuild
index 3e410950681..26b8f4ad6cb 100644
--- a/dev-texlive/texlive-langcjk/texlive-langcjk-2019.ebuild
+++ b/dev-texlive/texlive-langcjk/texlive-langcjk-2019.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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2019
>=app-text/texlive-core-2010[cjk]
diff --git a/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2019.ebuild b/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2019.ebuild
index 474cfb52670..2f0e1c4f5a4 100644
--- a/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2019.ebuild
+++ b/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2019.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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2019
>=dev-texlive/texlive-latex-2019
diff --git a/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2019-r1.ebuild b/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2019-r1.ebuild
index ae4caee7e3d..74b0d4e57ce 100644
--- a/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2019-r1.ebuild
+++ b/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2019-r1.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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2019
>=dev-texlive/texlive-latex-2019
diff --git a/dev-texlive/texlive-langenglish/texlive-langenglish-2019.ebuild b/dev-texlive/texlive-langenglish/texlive-langenglish-2019.ebuild
index 3a5cda46bc1..6b7648ad2c8 100644
--- a/dev-texlive/texlive-langenglish/texlive-langenglish-2019.ebuild
+++ b/dev-texlive/texlive-langenglish/texlive-langenglish-2019.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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2019
!<dev-texlive/texlive-basic-2016
diff --git a/dev-texlive/texlive-langeuropean/texlive-langeuropean-2019.ebuild b/dev-texlive/texlive-langeuropean/texlive-langeuropean-2019.ebuild
index b010e2398c3..88eb741515b 100644
--- a/dev-texlive/texlive-langeuropean/texlive-langeuropean-2019.ebuild
+++ b/dev-texlive/texlive-langeuropean/texlive-langeuropean-2019.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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2019
!dev-texlive/texlive-langarmenian
diff --git a/dev-texlive/texlive-langfrench/texlive-langfrench-2019.ebuild b/dev-texlive/texlive-langfrench/texlive-langfrench-2019.ebuild
index 90e2a20b85e..4c01214fbf5 100644
--- a/dev-texlive/texlive-langfrench/texlive-langfrench-2019.ebuild
+++ b/dev-texlive/texlive-langfrench/texlive-langfrench-2019.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive French"
LICENSE=" FDL-1.1 GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free "
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2019
!<dev-texlive/texlive-basic-2016
diff --git a/dev-texlive/texlive-langgerman/texlive-langgerman-2019.ebuild b/dev-texlive/texlive-langgerman/texlive-langgerman-2019.ebuild
index d333ddd5be9..0945c90b582 100644
--- a/dev-texlive/texlive-langgerman/texlive-langgerman-2019.ebuild
+++ b/dev-texlive/texlive-langgerman/texlive-langgerman-2019.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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2019
!<dev-texlive/texlive-basic-2016
diff --git a/dev-texlive/texlive-langgreek/texlive-langgreek-2019.ebuild b/dev-texlive/texlive-langgreek/texlive-langgreek-2019.ebuild
index edc9c1407ef..8cd317b9603 100644
--- a/dev-texlive/texlive-langgreek/texlive-langgreek-2019.ebuild
+++ b/dev-texlive/texlive-langgreek/texlive-langgreek-2019.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Greek"
LICENSE=" GPL-1 GPL-2 LGPL-3 LPPL-1.3 public-domain TeX-other-free "
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2019
!<dev-texlive/texlive-basic-2016
diff --git a/dev-texlive/texlive-langitalian/texlive-langitalian-2019.ebuild b/dev-texlive/texlive-langitalian/texlive-langitalian-2019.ebuild
index b191fec55bb..02ff8ff2c6f 100644
--- a/dev-texlive/texlive-langitalian/texlive-langitalian-2019.ebuild
+++ b/dev-texlive/texlive-langitalian/texlive-langitalian-2019.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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2019
!<dev-texlive/texlive-basic-2016
diff --git a/dev-texlive/texlive-langjapanese/texlive-langjapanese-2019.ebuild b/dev-texlive/texlive-langjapanese/texlive-langjapanese-2019.ebuild
index 396b734d6fd..65b075758be 100644
--- a/dev-texlive/texlive-langjapanese/texlive-langjapanese-2019.ebuild
+++ b/dev-texlive/texlive-langjapanese/texlive-langjapanese-2019.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Japanese"
LICENSE=" BSD BSD-2 GPL-1 GPL-2 GPL-3 LPPL-1.3 MIT public-domain TeX TeX-other-free "
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-langcjk-2019
!<dev-texlive/texlive-basic-2016
diff --git a/dev-texlive/texlive-langkorean/texlive-langkorean-2019.ebuild b/dev-texlive/texlive-langkorean/texlive-langkorean-2019.ebuild
index 57297e25851..232a0893fd5 100644
--- a/dev-texlive/texlive-langkorean/texlive-langkorean-2019.ebuild
+++ b/dev-texlive/texlive-langkorean/texlive-langkorean-2019.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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-langcjk-2019
!<dev-texlive/texlive-basic-2016
diff --git a/dev-texlive/texlive-langother/texlive-langother-2019.ebuild b/dev-texlive/texlive-langother/texlive-langother-2019.ebuild
index 7ddbd941ef2..a22ab0f8fac 100644
--- a/dev-texlive/texlive-langother/texlive-langother-2019.ebuild
+++ b/dev-texlive/texlive-langother/texlive-langother-2019.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Other languages"
LICENSE=" GPL-1 GPL-2 LGPL-2 LPPL-1.3 OFL public-domain TeX-other-free "
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2019
!dev-texlive/texlive-documentation-vietnamese
diff --git a/dev-texlive/texlive-langpolish/texlive-langpolish-2019.ebuild b/dev-texlive/texlive-langpolish/texlive-langpolish-2019.ebuild
index 5bb046dfaef..640fd5e3448 100644
--- a/dev-texlive/texlive-langpolish/texlive-langpolish-2019.ebuild
+++ b/dev-texlive/texlive-langpolish/texlive-langpolish-2019.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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-latex-2019
>=dev-texlive/texlive-basic-2019
diff --git a/dev-texlive/texlive-langportuguese/texlive-langportuguese-2019.ebuild b/dev-texlive/texlive-langportuguese/texlive-langportuguese-2019.ebuild
index 00fb1883ae3..9b66e079ce6 100644
--- a/dev-texlive/texlive-langportuguese/texlive-langportuguese-2019.ebuild
+++ b/dev-texlive/texlive-langportuguese/texlive-langportuguese-2019.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Portuguese"
LICENSE=" GPL-1 GPL-2+ LPPL-1.3 public-domain "
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2019
!<dev-texlive/texlive-basic-2016
diff --git a/dev-texlive/texlive-langspanish/texlive-langspanish-2019.ebuild b/dev-texlive/texlive-langspanish/texlive-langspanish-2019.ebuild
index de82d059fea..53717538f70 100644
--- a/dev-texlive/texlive-langspanish/texlive-langspanish-2019.ebuild
+++ b/dev-texlive/texlive-langspanish/texlive-langspanish-2019.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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2019
!<dev-texlive/texlive-basic-2016
diff --git a/dev-texlive/texlive-latex/texlive-latex-2019.ebuild b/dev-texlive/texlive-latex/texlive-latex-2019.ebuild
index 27f9a167a02..92a11eedf60 100644
--- a/dev-texlive/texlive-latex/texlive-latex-2019.ebuild
+++ b/dev-texlive/texlive-latex/texlive-latex-2019.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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2019
!!<dev-texlive/texlive-latex-2016
--git a/dev-texlive/texlive-latexextra/texlive-latexextra-2019-r2.ebuild b/dev-texlive/texlive-latexextra/texlive-latexextra-2019-r2.ebuild
index 4de2bb5b73c..0d1bd367dce 100644
--- a/dev-texlive/texlive-latexextra/texlive-latexextra-2019-r2.ebuild
+++ b/dev-texlive/texlive-latexextra/texlive-latexextra-2019-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+ LGPL-2 LGPL-3 LPPL-1.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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-latexrecommended-2019
>=dev-texlive/texlive-pictures-2019
diff --git a/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2019-r2.ebuild b/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2019-r2.ebuild
index 9f77e587333..2f3b5814fe3 100644
--- a/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2019-r2.ebuild
+++ b/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2019-r2.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive LaTeX recommended packages"
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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-latex-2019
!<dev-texlive/texlive-latexextra-2017
diff --git a/dev-texlive/texlive-luatex/texlive-luatex-2019.ebuild b/dev-texlive/texlive-luatex/texlive-luatex-2019.ebuild
index be9ca170051..96e811eba80 100644
--- a/dev-texlive/texlive-luatex/texlive-luatex-2019.ebuild
+++ b/dev-texlive/texlive-luatex/texlive-luatex-2019.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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2019
"
diff --git a/dev-texlive/texlive-mathscience/texlive-mathscience-2019.ebuild b/dev-texlive/texlive-mathscience/texlive-mathscience-2019.ebuild
index 756ac0dc11f..bebb5ffecb0 100644
--- a/dev-texlive/texlive-mathscience/texlive-mathscience-2019.ebuild
+++ b/dev-texlive/texlive-mathscience/texlive-mathscience-2019.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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-fontsrecommended-2019
>=dev-texlive/texlive-latex-2019
diff --git a/dev-texlive/texlive-metapost/texlive-metapost-2019.ebuild b/dev-texlive/texlive-metapost/texlive-metapost-2019.ebuild
index 58f9666c1db..fd491238065 100644
--- a/dev-texlive/texlive-metapost/texlive-metapost-2019.ebuild
+++ b/dev-texlive/texlive-metapost/texlive-metapost-2019.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive MetaPost and Metafont packages"
LICENSE=" CC-BY-SA-4.0 GPL-1 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2019
"
diff --git a/dev-texlive/texlive-music/texlive-music-2019.ebuild b/dev-texlive/texlive-music/texlive-music-2019.ebuild
index c0ec6a4e611..59c58eb0d93 100644
--- a/dev-texlive/texlive-music/texlive-music-2019.ebuild
+++ b/dev-texlive/texlive-music/texlive-music-2019.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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-latex-2019
!<dev-texlive/texlive-pictures-2015
diff --git a/dev-texlive/texlive-pictures/texlive-pictures-2019.ebuild b/dev-texlive/texlive-pictures/texlive-pictures-2019.ebuild
index 89911421e51..73fd96fd592 100644
--- a/dev-texlive/texlive-pictures/texlive-pictures-2019.ebuild
+++ b/dev-texlive/texlive-pictures/texlive-pictures-2019.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Graphics, pictures, diagrams"
LICENSE=" Apache-2.0 BSD-2 GPL-2 CC-BY-SA-4.0 "
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2019
>=dev-tex/pgf-3.0.1
diff --git a/dev-texlive/texlive-plaingeneric/texlive-plaingeneric-2019.ebuild b/dev-texlive/texlive-plaingeneric/texlive-plaingeneric-2019.ebuild
index 51220953a91..4828d1cf8da 100644
--- a/dev-texlive/texlive-plaingeneric/texlive-plaingeneric-2019.ebuild
+++ b/dev-texlive/texlive-plaingeneric/texlive-plaingeneric-2019.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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2019
!dev-texlive/texlive-genericextra
diff --git a/dev-texlive/texlive-pstricks/texlive-pstricks-2019.ebuild b/dev-texlive/texlive-pstricks/texlive-pstricks-2019.ebuild
index bc4e37323c5..2d50a1d74db 100644
--- a/dev-texlive/texlive-pstricks/texlive-pstricks-2019.ebuild
+++ b/dev-texlive/texlive-pstricks/texlive-pstricks-2019.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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2019
>=dev-texlive/texlive-plaingeneric-2019
diff --git a/dev-texlive/texlive-publishers/texlive-publishers-2019.ebuild b/dev-texlive/texlive-publishers/texlive-publishers-2019.ebuild
index de4166d3ff5..7aee78786e3 100644
--- a/dev-texlive/texlive-publishers/texlive-publishers-2019.ebuild
+++ b/dev-texlive/texlive-publishers/texlive-publishers-2019.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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-latex-2019"
RDEPEND="${DEPEND} "
diff --git a/dev-texlive/texlive-xetex/texlive-xetex-2019.ebuild b/dev-texlive/texlive-xetex/texlive-xetex-2019.ebuild
index db2a26f6e5f..5c69f8fbf6d 100644
--- a/dev-texlive/texlive-xetex/texlive-xetex-2019.ebuild
+++ b/dev-texlive/texlive-xetex/texlive-xetex-2019.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 "
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2019
>=dev-texlive/texlive-latexextra-2010
diff --git a/dev-util/boost-build/boost-build-1.72.0.ebuild b/dev-util/boost-build/boost-build-1.72.0.ebuild
index 7a5ceed1897..c395e647a1f 100644
--- a/dev-util/boost-build/boost-build-1.72.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.72.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar
LICENSE="Boost-1.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="examples"
RESTRICT="test"
diff --git a/dev-util/byacc/byacc-20190617.ebuild b/dev-util/byacc/byacc-20190617.ebuild
index 6b11ecbe3cc..f5be84a1425 100644
--- a/dev-util/byacc/byacc-20190617.ebuild
+++ b/dev-util/byacc/byacc-20190617.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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
diff --git a/dev-util/byacc/byacc-20191125.ebuild b/dev-util/byacc/byacc-20191125.ebuild
index 52031138194..dd0f7b254f6 100644
--- a/dev-util/byacc/byacc-20191125.ebuild
+++ b/dev-util/byacc/byacc-20191125.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
diff --git a/dev-util/catalyst/catalyst-3.0.8.ebuild b/dev-util/catalyst/catalyst-3.0.8.ebuild
index f94e4f7fdbb..22218cf13a1 100644
--- a/dev-util/catalyst/catalyst-3.0.8.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.8.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 ~riscv s390 sh sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
fi
PYTHON_COMPAT=( python3_{6,7,8} )
diff --git a/dev-util/catalyst/catalyst-3.0.9.ebuild b/dev-util/catalyst/catalyst-3.0.9.ebuild
index f49e1e66af5..9b107bd9beb 100644
--- a/dev-util/catalyst/catalyst-3.0.9.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.9.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 ~riscv ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
fi
PYTHON_COMPAT=( python3_{6,7,8} )
diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index f49e1e66af5..9b107bd9beb 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.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 ~riscv ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
fi
PYTHON_COMPAT=( python3_{6,7,8} )
diff --git a/dev-util/ccache/ccache-3.7.2.ebuild b/dev-util/ccache/ccache-3.7.2.ebuild
index 898d97b2848..d09b3caa317 100644
--- a/dev-util/ccache/ccache-3.7.2.ebuild
+++ b/dev-util/ccache/ccache-3.7.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 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/dev-util/ccache/ccache-3.7.6.ebuild b/dev-util/ccache/ccache-3.7.6.ebuild
index 033b34c72fe..65702dfbe18 100644
--- a/dev-util/ccache/ccache-3.7.6.ebuild
+++ b/dev-util/ccache/ccache-3.7.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
IUSE="test"
DEPEND="app-arch/xz-utils
diff --git a/dev-util/ccache/ccache-3.7.7-r1.ebuild b/dev-util/ccache/ccache-3.7.7-r1.ebuild
index 9259def48c9..07a4093e8de 100644
--- a/dev-util/ccache/ccache-3.7.7-r1.ebuild
+++ b/dev-util/ccache/ccache-3.7.7-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
IUSE="test"
DEPEND="app-arch/xz-utils
diff --git a/dev-util/ccache/ccache-3.7.7.ebuild b/dev-util/ccache/ccache-3.7.7.ebuild
index d516baace6e..29ea0e3e221 100644
--- a/dev-util/ccache/ccache-3.7.7.ebuild
+++ b/dev-util/ccache/ccache-3.7.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
IUSE="test"
DEPEND="app-arch/xz-utils
diff --git a/dev-util/ccache/ccache-3.7.8-r1.ebuild b/dev-util/ccache/ccache-3.7.8-r1.ebuild
index c84c0678c54..620e3f3c820 100644
--- a/dev-util/ccache/ccache-3.7.8-r1.ebuild
+++ b/dev-util/ccache/ccache-3.7.8-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="test"
DEPEND="app-arch/xz-utils
diff --git a/dev-util/ccache/ccache-3.7.8.ebuild b/dev-util/ccache/ccache-3.7.8.ebuild
index e884b459f8d..32f24f67e07 100644
--- a/dev-util/ccache/ccache-3.7.8.ebuild
+++ b/dev-util/ccache/ccache-3.7.8.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="test"
DEPEND="app-arch/xz-utils
diff --git a/dev-util/cgvg/cgvg-1.6.3.ebuild b/dev-util/cgvg/cgvg-1.6.3.ebuild
index 175d774ab32..40c1c972cc1 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="http://uzix.org/cgvg/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh 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.13.5.ebuild b/dev-util/cmake/cmake-3.13.5.ebuild
index e0c63f1d304..b9d4d984f6d 100644
--- a/dev-util/cmake/cmake-3.13.5.ebuild
+++ b/dev-util/cmake/cmake-3.13.5.ebuild
@@ -16,7 +16,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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc emacs system-jsoncpp ncurses qt5"
RDEPEND="
diff --git a/dev-util/cmake/cmake-3.14.6.ebuild b/dev-util/cmake/cmake-3.14.6.ebuild
index b1f72ffce41..c7d14bb2c42 100644
--- a/dev-util/cmake/cmake-3.14.6.ebuild
+++ b/dev-util/cmake/cmake-3.14.6.ebuild
@@ -16,7 +16,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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc emacs system-jsoncpp ncurses qt5 test"
RESTRICT="!test? ( test )"
diff --git a/dev-util/cmake/cmake-3.16.5.ebuild b/dev-util/cmake/cmake-3.16.5.ebuild
index d1ff4432f4d..1c7a90022f1 100644
--- a/dev-util/cmake/cmake-3.16.5.ebuild
+++ b/dev-util/cmake/cmake-3.16.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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc emacs ncurses qt5 test"
RESTRICT="!test? ( test )"
diff --git a/dev-util/cmake/cmake-3.17.0.ebuild b/dev-util/cmake/cmake-3.17.0.ebuild
index 8f7b237f89e..a6e3aed2b30 100644
--- a/dev-util/cmake/cmake-3.17.0.ebuild
+++ b/dev-util/cmake/cmake-3.17.0.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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc emacs ncurses qt5 test"
RESTRICT="!test? ( test )"
diff --git a/dev-util/cpuinfo-collection/cpuinfo-collection-20101114.ebuild b/dev-util/cpuinfo-collection/cpuinfo-collection-20101114.ebuild
index 2bedd9a2de5..bfe6cf3b5be 100644
--- a/dev-util/cpuinfo-collection/cpuinfo-collection-20101114.ebuild
+++ b/dev-util/cpuinfo-collection/cpuinfo-collection-20101114.ebuild
@@ -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 sh 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 c45d0210609..d0f96409bee 100644
--- a/dev-util/cscope/cscope-15.8a-r1.ebuild
+++ b/dev-util/cscope/cscope-15.8a-r1.ebuild
@@ -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 sh 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/cscope/cscope-15.8a-r2.ebuild b/dev-util/cscope/cscope-15.8a-r2.ebuild
index fa8fde9d60d..c47d3feaa6c 100644
--- a/dev-util/cscope/cscope-15.8a-r2.ebuild
+++ b/dev-util/cscope/cscope-15.8a-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="emacs"
RDEPEND=">=sys-libs/ncurses-5.2:0=
diff --git a/dev-util/cscope/cscope-15.9.ebuild b/dev-util/cscope/cscope-15.9.ebuild
index 02daf13636d..c5b4b35ef25 100644
--- a/dev-util/cscope/cscope-15.9.ebuild
+++ b/dev-util/cscope/cscope-15.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
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 a860d8d9c23..5788a321a5f 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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="json xml yaml"
CDEPEND="
diff --git a/dev-util/cunit/cunit-2.1_p3.ebuild b/dev-util/cunit/cunit-2.1_p3.ebuild
index 9a51cda1919..2bbae979950 100644
--- a/dev-util/cunit/cunit-2.1_p3.ebuild
+++ b/dev-util/cunit/cunit-2.1_p3.ebuild
@@ -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 ~sh 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="ncurses static-libs"
RDEPEND="ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )"
diff --git a/dev-util/debhelper/debhelper-12.8.ebuild b/dev-util/debhelper/debhelper-12.8.ebuild
index f3567e709e9..99dca21e93e 100644
--- a/dev-util/debhelper/debhelper-12.8.ebuild
+++ b/dev-util/debhelper/debhelper-12.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux"
IUSE="test"
RESTRICT="!test? ( test )"
DH_LANGS=( de es fr )
diff --git a/dev-util/debhelper/debhelper-12.9.ebuild b/dev-util/debhelper/debhelper-12.9.ebuild
index f3567e709e9..99dca21e93e 100644
--- a/dev-util/debhelper/debhelper-12.9.ebuild
+++ b/dev-util/debhelper/debhelper-12.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux"
IUSE="test"
RESTRICT="!test? ( test )"
DH_LANGS=( de es fr )
diff --git a/dev-util/debhelper/debhelper-9.20160814.ebuild b/dev-util/debhelper/debhelper-9.20160814.ebuild
index 38484b2c129..77c653bc601 100644
--- a/dev-util/debhelper/debhelper-9.20160814.ebuild
+++ b/dev-util/debhelper/debhelper-9.20160814.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux"
IUSE="test"
RESTRICT="!test? ( test )"
DH_LANGS=( de es fr )
diff --git a/dev-util/debootstrap/debootstrap-1.0.115.ebuild b/dev-util/debootstrap/debootstrap-1.0.115.ebuild
index 882f122a397..f6c5d6e5498 100644
--- a/dev-util/debootstrap/debootstrap-1.0.115.ebuild
+++ b/dev-util/debootstrap/debootstrap-1.0.115.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
RDEPEND="
app-arch/dpkg
diff --git a/dev-util/debootstrap/debootstrap-1.0.116.ebuild b/dev-util/debootstrap/debootstrap-1.0.116.ebuild
index 8214beb8d50..43a821d6889 100644
--- a/dev-util/debootstrap/debootstrap-1.0.116.ebuild
+++ b/dev-util/debootstrap/debootstrap-1.0.116.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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.gz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
RDEPEND="
app-arch/dpkg
diff --git a/dev-util/debootstrap/debootstrap-1.0.117.ebuild b/dev-util/debootstrap/debootstrap-1.0.117.ebuild
index a734c5eb67d..43a821d6889 100644
--- a/dev-util/debootstrap/debootstrap-1.0.117.ebuild
+++ b/dev-util/debootstrap/debootstrap-1.0.117.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
RDEPEND="
app-arch/dpkg
diff --git a/dev-util/debootstrap/debootstrap-1.0.123.ebuild b/dev-util/debootstrap/debootstrap-1.0.123.ebuild
index a27f4b9812a..8ac0c3265c7 100644
--- a/dev-util/debootstrap/debootstrap-1.0.123.ebuild
+++ b/dev-util/debootstrap/debootstrap-1.0.123.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
RDEPEND="
app-arch/dpkg
diff --git a/dev-util/dejagnu/dejagnu-1.6.2.ebuild b/dev-util/dejagnu/dejagnu-1.6.2.ebuild
index 6644791e1ed..fc736f0e1e4 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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="dev-lang/tcl
diff --git a/dev-util/dejagnu/dejagnu-1.6.ebuild b/dev-util/dejagnu/dejagnu-1.6.ebuild
index 1ce6a9ec227..6bb38458567 100644
--- a/dev-util/dejagnu/dejagnu-1.6.ebuild
+++ b/dev-util/dejagnu/dejagnu-1.6.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 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~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 1031795ac06..d05f4ff1629 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 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-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 ~x86-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 5103256d7bc..56ccb3cc3e8 100644
--- a/dev-util/dialog/dialog-1.3.20170131.ebuild
+++ b/dev-util/dialog/dialog-1.3.20170131.ebuild
@@ -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 sh 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.20191110.ebuild b/dev-util/dialog/dialog-1.3.20191110.ebuild
index f119f530eae..7a23e6577d5 100644
--- a/dev-util/dialog/dialog-1.3.20191110.ebuild
+++ b/dev-util/dialog/dialog-1.3.20191110.ebuild
@@ -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 ~sh ~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.20191210.ebuild b/dev-util/dialog/dialog-1.3.20191210.ebuild
index f119f530eae..7a23e6577d5 100644
--- a/dev-util/dialog/dialog-1.3.20191210.ebuild
+++ b/dev-util/dialog/dialog-1.3.20191210.ebuild
@@ -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 ~sh ~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.20200228.ebuild b/dev-util/dialog/dialog-1.3.20200228.ebuild
index f119f530eae..7a23e6577d5 100644
--- a/dev-util/dialog/dialog-1.3.20200228.ebuild
+++ b/dev-util/dialog/dialog-1.3.20200228.ebuild
@@ -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 ~sh ~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.60.ebuild b/dev-util/diffstat/diffstat-1.60.ebuild
index 89410f2b634..5846378e4fe 100644
--- a/dev-util/diffstat/diffstat-1.60.ebuild
+++ b/dev-util/diffstat/diffstat-1.60.ebuild
@@ -9,7 +9,7 @@ SRC_URI="ftp://invisible-island.net/diffstat/${P}.tgz"
LICENSE="HPND"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
src_configure() {
diff --git a/dev-util/diffstat/diffstat-1.61.ebuild b/dev-util/diffstat/diffstat-1.61.ebuild
index 2d5941e2e68..79ee7ff1a1e 100644
--- a/dev-util/diffstat/diffstat-1.61.ebuild
+++ b/dev-util/diffstat/diffstat-1.61.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,5 +9,5 @@ SRC_URI="ftp://invisible-island.net/diffstat/${P}.tgz"
LICENSE="HPND"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
diff --git a/dev-util/diffstat/diffstat-1.63.ebuild b/dev-util/diffstat/diffstat-1.63.ebuild
index 7d76d1956d4..45af0bc677c 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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.60.7.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.60.7.ebuild
index 32d59a05616..f0bdfb9e364 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.60.7.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.60.7.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.gtk.org/"
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE=""
RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.62.5.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.62.5.ebuild
index 3e6dd45f2bd..fe957c7d3de 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.62.5.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.62.5.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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE=""
RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.62.6.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.62.6.ebuild
index 3e6dd45f2bd..fe957c7d3de 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.62.6.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.62.6.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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE=""
RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.64.1.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.64.1.ebuild
index 0e3cddd0d6b..7ac03968168 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.64.1.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.64.1.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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE=""
RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/glade/glade-3.22.1-r1.ebuild b/dev-util/glade/glade-3.22.1-r1.ebuild
index bfb3e487bea..3a4b5c00399 100644
--- a/dev-util/glade/glade-3.22.1-r1.ebuild
+++ b/dev-util/glade/glade-3.22.1-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://glade.gnome.org/"
LICENSE="GPL-2+ FDL-1.1+"
SLOT="3.10/6" # subslot = suffix of libgladeui-2.so
-KEYWORDS="~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86"
IUSE="debug +introspection python webkit"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-util/glade/glade-3.22.2.ebuild b/dev-util/glade/glade-3.22.2.ebuild
index 83c8db833e5..55d4695620e 100644
--- a/dev-util/glade/glade-3.22.2.ebuild
+++ b/dev-util/glade/glade-3.22.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://glade.gnome.org/"
LICENSE="GPL-2+ FDL-1.1+"
SLOT="3.10/6" # subslot = suffix of libgladeui-2.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE="debug +introspection python webkit"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-util/glib-utils/glib-utils-2.60.7.ebuild b/dev-util/glib-utils/glib-utils-2.60.7.ebuild
index 61433eead92..42e911c57f5 100644
--- a/dev-util/glib-utils/glib-utils-2.60.7.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.60.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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
RDEPEND="${PYTHON_DEPS}
!<dev-libs/glib-2.56.2:2
diff --git a/dev-util/glib-utils/glib-utils-2.62.5.ebuild b/dev-util/glib-utils/glib-utils-2.62.5.ebuild
index a2afdf89b13..0dd0c2ddd68 100644
--- a/dev-util/glib-utils/glib-utils-2.62.5.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.62.5.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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
RDEPEND="${PYTHON_DEPS}
!<dev-libs/glib-2.56.2:2
diff --git a/dev-util/glib-utils/glib-utils-2.62.6.ebuild b/dev-util/glib-utils/glib-utils-2.62.6.ebuild
index a2afdf89b13..0dd0c2ddd68 100644
--- a/dev-util/glib-utils/glib-utils-2.62.6.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.62.6.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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
RDEPEND="${PYTHON_DEPS}
!<dev-libs/glib-2.56.2:2
diff --git a/dev-util/glib-utils/glib-utils-2.64.1.ebuild b/dev-util/glib-utils/glib-utils-2.64.1.ebuild
index a2afdf89b13..0dd0c2ddd68 100644
--- a/dev-util/glib-utils/glib-utils-2.64.1.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.64.1.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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
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 27f6942ffb2..aaf9bf91b07 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-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.jirka.org/gob.html"
LICENSE="GPL-2+"
SLOT="2"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 m68k ppc ~ppc64 s390 sh ~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 1a06518f0b7..ee317a87312 100644
--- a/dev-util/gperf/gperf-3.1.ebuild
+++ b/dev-util/gperf/gperf-3.1.ebuild
@@ -11,7 +11,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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
src_prepare() {
diff --git a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild
index cc5f7c81d7c..b2fb442f560 100644
--- a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild
+++ b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gtk.org/"
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/gtk-doc-am/gtk-doc-am-1.25-r1.ebuild b/dev-util/gtk-doc-am/gtk-doc-am-1.25-r1.ebuild
index 394ed867b46..d89fcb59510 100644
--- a/dev-util/gtk-doc-am/gtk-doc-am-1.25-r1.ebuild
+++ b/dev-util/gtk-doc-am/gtk-doc-am-1.25-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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND=">=dev-lang/perl-5.18"
DEPEND="${RDEPEND}
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 b7417a1b606..9a3ecfc7dae 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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND=""
DEPEND="${RDEPEND}
diff --git a/dev-util/gtk-doc/gtk-doc-1.25-r1.ebuild b/dev-util/gtk-doc/gtk-doc-1.25-r1.ebuild
index 6c653820480..31c936e6307 100644
--- a/dev-util/gtk-doc/gtk-doc-1.25-r1.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.25-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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 ~x86-macos ~sparc-solaris ~x64-solaris"
IUSE="debug doc emacs highlight test vim"
RESTRICT="!test? ( test )"
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 902b77297de..1754b664d78 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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 ~x86-macos ~sparc-solaris ~x64-solaris"
IUSE="debug doc emacs"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.11.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.11.ebuild
index 0f373df6a8f..c618a54f1fe 100644
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.11.ebuild
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.11.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1+"
SLOT="0"
IUSE=""
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 ~x86-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.13.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.13.ebuild
index 27cb2756092..7855c632cd2 100644
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.13.ebuild
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.13.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1+"
SLOT="0"
IUSE=""
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 ~x86-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.14.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.14.ebuild
index cf8d30cf424..4c02aa74fa1 100644
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.14.ebuild
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.14.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1+"
SLOT="0"
IUSE=""
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 ~x86-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.11-r1.ebuild b/dev-util/indent/indent-2.2.11-r1.ebuild
index e989d7df4da..40e57b5d6a9 100644
--- a/dev-util/indent/indent-2.2.11-r1.ebuild
+++ b/dev-util/indent/indent-2.2.11-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="nls"
DEPEND="
diff --git a/dev-util/indent/indent-2.2.11_p5.ebuild b/dev-util/indent/indent-2.2.11_p5.ebuild
index 84120c0044d..4b76c2fb070 100644
--- a/dev-util/indent/indent-2.2.11_p5.ebuild
+++ b/dev-util/indent/indent-2.2.11_p5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="nls"
DEPEND="
diff --git a/dev-util/indent/indent-2.2.12.ebuild b/dev-util/indent/indent-2.2.12.ebuild
index 6ba9d6e6fd5..593d2b3c78a 100644
--- a/dev-util/indent/indent-2.2.12.ebuild
+++ b/dev-util/indent/indent-2.2.12.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="nls"
DEPEND="
diff --git a/dev-util/intltool/intltool-0.51.0-r2.ebuild b/dev-util/intltool/intltool-0.51.0-r2.ebuild
index 7047142c73a..77795f08d11 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="
diff --git a/dev-util/itstool/itstool-2.0.2.ebuild b/dev-util/itstool/itstool-2.0.2.ebuild
index 2606e551b64..6acbbccc740 100644
--- a/dev-util/itstool/itstool-2.0.2.ebuild
+++ b/dev-util/itstool/itstool-2.0.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://files.itstool.org/itstool/${P}.tar.bz2"
# files in /usr/share/itstool/its are HPND/as-is || GPL-3
LICENSE="GPL-3+ || ( HPND GPL-3+ )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~x86-linux"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/itstool/itstool-2.0.6-r1.ebuild b/dev-util/itstool/itstool-2.0.6-r1.ebuild
index d277093282f..d995c0d3fbc 100644
--- a/dev-util/itstool/itstool-2.0.6-r1.ebuild
+++ b/dev-util/itstool/itstool-2.0.6-r1.ebuild
@@ -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 s390 ~sh sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x86-linux"
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 064cc82a1b6..fab05faea94 100644
--- a/dev-util/kyua/kyua-0.13-r2.ebuild
+++ b/dev-util/kyua/kyua-0.13-r2.ebuild
@@ -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 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
IUSE="test"
# Tests fail
diff --git a/dev-util/lcov/lcov-1.13-r2.ebuild b/dev-util/lcov/lcov-1.13-r2.ebuild
index ab94d37030a..309969b8a69 100644
--- a/dev-util/lcov/lcov-1.13-r2.ebuild
+++ b/dev-util/lcov/lcov-1.13-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,7 +8,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
else
SRC_URI="mirror://sourceforge/ltp/${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux ~x64-macos"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux ~x64-macos"
fi
inherit prefix
diff --git a/dev-util/lcov/lcov-1.14.ebuild b/dev-util/lcov/lcov-1.14.ebuild
index 594a8545390..f5ded7d1a5c 100644
--- a/dev-util/lcov/lcov-1.14.ebuild
+++ b/dev-util/lcov/lcov-1.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,7 +8,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
else
SRC_URI="mirror://sourceforge/ltp/${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux ~x64-macos"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux ~x64-macos"
fi
inherit prefix
diff --git a/dev-util/lcov/lcov-1.14_p2.ebuild b/dev-util/lcov/lcov-1.14_p2.ebuild
index 41677b6255d..df29f3e698b 100644
--- a/dev-util/lcov/lcov-1.14_p2.ebuild
+++ b/dev-util/lcov/lcov-1.14_p2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ else
mirror://sourceforge/ltp/${PN}-${LCOV_V}.tar.gz
mirror://debian/pool/main/l/${PN}/${PN}_${LCOV_V}-${DB_V}.debian.tar.xz
"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux ~x64-macos"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux ~x64-macos"
fi
inherit prefix
diff --git a/dev-util/lcov/lcov-9999.ebuild b/dev-util/lcov/lcov-9999.ebuild
index b9b110f5728..295385b60d6 100644
--- a/dev-util/lcov/lcov-9999.ebuild
+++ b/dev-util/lcov/lcov-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,7 +8,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
else
SRC_URI="mirror://sourceforge/ltp/${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux ~x64-macos"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux ~x64-macos"
fi
inherit prefix
diff --git a/dev-util/meson/meson-0.52.1.ebuild b/dev-util/meson/meson-0.52.1.ebuild
index f4c8341e470..b3f7d3a8299 100644
--- a/dev-util/meson/meson-0.52.1.ebuild
+++ b/dev-util/meson/meson-0.52.1.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 sh 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"
fi
inherit distutils-r1 toolchain-funcs
diff --git a/dev-util/meson/meson-0.53.1.ebuild b/dev-util/meson/meson-0.53.1.ebuild
index 0d807167558..e101c51b6be 100644
--- a/dev-util/meson/meson-0.53.1.ebuild
+++ b/dev-util/meson/meson-0.53.1.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 ~sh ~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"
fi
inherit distutils-r1 toolchain-funcs
diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild
index ab875e3bb07..6154c7a5df1 100644
--- a/dev-util/meson/meson-9999.ebuild
+++ b/dev-util/meson/meson-9999.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 ~sh ~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"
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 1f57d9e412c..aed66121807 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 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x86-macos ~x64-solaris"
fi
DESCRIPTION="A small build system similar to make"
diff --git a/dev-util/ninja/ninja-1.8.2-r1.ebuild b/dev-util/ninja/ninja-1.8.2-r1.ebuild
index def8432c182..366073aff8a 100644
--- a/dev-util/ninja/ninja-1.8.2-r1.ebuild
+++ b/dev-util/ninja/ninja-1.8.2-r1.ebuild
@@ -15,7 +15,7 @@ else
MY_P="ninja-${KITWARE_VERSION}"
S="${WORKDIR}/${MY_P}"
SRC_URI="https://github.com/Kitware/ninja/archive/v${KITWARE_VERSION}.tar.gz -> ${MY_P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
fi
DESCRIPTION="A small build system similar to make"
diff --git a/dev-util/ninja/ninja-1.8.2-r2.ebuild b/dev-util/ninja/ninja-1.8.2-r2.ebuild
index 155653a132c..17b2dfc3f74 100644
--- a/dev-util/ninja/ninja-1.8.2-r2.ebuild
+++ b/dev-util/ninja/ninja-1.8.2-r2.ebuild
@@ -15,7 +15,7 @@ else
MY_P="ninja-${KITWARE_VERSION}"
S="${WORKDIR}/${MY_P}"
SRC_URI="https://github.com/Kitware/ninja/archive/v${KITWARE_VERSION}.tar.gz -> ${MY_P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
fi
DESCRIPTION="A small build system similar to make"
diff --git a/dev-util/ninja/ninja-1.8.2.ebuild b/dev-util/ninja/ninja-1.8.2.ebuild
index 3f087982903..9af6eeca5c5 100644
--- a/dev-util/ninja/ninja-1.8.2.ebuild
+++ b/dev-util/ninja/ninja-1.8.2.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 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
fi
DESCRIPTION="A small build system similar to make"
diff --git a/dev-util/ninja/ninja-1.9.0.ebuild b/dev-util/ninja/ninja-1.9.0.ebuild
index 8f1ed92809b..ba05cd68bce 100644
--- a/dev-util/ninja/ninja-1.9.0.ebuild
+++ b/dev-util/ninja/ninja-1.9.0.ebuild
@@ -15,7 +15,7 @@ else
MY_P="ninja-${KITWARE_VERSION}"
S="${WORKDIR}/${MY_P}"
SRC_URI="https://github.com/Kitware/ninja/archive/v${KITWARE_VERSION}.tar.gz -> ${MY_P}.tar.gz"
- KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~x86-macos ~x64-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 5d9e2fbb5af..2c2703836cf 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 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x86-macos ~x64-solaris"
fi
DESCRIPTION="A small build system similar to make"
diff --git a/dev-util/patchutils/patchutils-0.3.3.ebuild b/dev-util/patchutils/patchutils-0.3.3.ebuild
index dc7dc7ad05c..8ab571fb87b 100644
--- a/dev-util/patchutils/patchutils-0.3.3.ebuild
+++ b/dev-util/patchutils/patchutils-0.3.3.ebuild
@@ -11,7 +11,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 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-util/patchutils/patchutils-0.3.4.ebuild b/dev-util/patchutils/patchutils-0.3.4.ebuild
index 323ac499dd8..748e8daf1ee 100644
--- a/dev-util/patchutils/patchutils-0.3.4.ebuild
+++ b/dev-util/patchutils/patchutils-0.3.4.ebuild
@@ -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 ~sh sparc x86 ~ppc-aix ~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 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-util/pkgconf/pkgconf-1.6.3.ebuild b/dev-util/pkgconf/pkgconf-1.6.3.ebuild
index 9ad432e4fc3..8f7b695a397 100644
--- a/dev-util/pkgconf/pkgconf-1.6.3.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.6.3.ebuild
@@ -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 ~sh 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/pkgconf/pkgconf-9999.ebuild b/dev-util/pkgconf/pkgconf-9999.ebuild
index 28e58496a4d..6297af6bdd0 100644
--- a/dev-util/pkgconf/pkgconf-9999.ebuild
+++ b/dev-util/pkgconf/pkgconf-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2012-2019 Gentoo Authors
+# Copyright 2012-2020 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 ~sh ~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 5493aaafb19..daecaa862b0 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 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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.28-r3.ebuild b/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild
index 12bfcf9d3e9..66e58798833 100644
--- a/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -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 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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.1.ebuild b/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild
index 1872abeebff..80dfe836e0a 100644
--- a/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 f7da36a99da..5429d1beac3 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 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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-9999.ebuild b/dev-util/pkgconfig/pkgconfig-9999.ebuild
index 1872abeebff..80dfe836e0a 100644
--- a/dev-util/pkgconfig/pkgconfig-9999.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 4520177d2df..453712bc6cc 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="vim-syntax"
DEPEND=""
diff --git a/dev-util/ragel/ragel-6.7-r1.ebuild b/dev-util/ragel/ragel-6.7-r1.ebuild
index eb7a9d4f657..475e26a5cb2 100644
--- a/dev-util/ragel/ragel-6.7-r1.ebuild
+++ b/dev-util/ragel/ragel-6.7-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.complang.org/ragel/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="vim-syntax"
DEPEND=""
diff --git a/dev-util/ragel/ragel-6.8.ebuild b/dev-util/ragel/ragel-6.8.ebuild
index 4b0b866fe27..027b1b51220 100644
--- a/dev-util/ragel/ragel-6.8.ebuild
+++ b/dev-util/ragel/ragel-6.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://www.complang.org/ragel/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="vim-syntax"
DEPEND=""
diff --git a/dev-util/ragel/ragel-6.9.ebuild b/dev-util/ragel/ragel-6.9.ebuild
index 2cb2eff5e6a..21b79373ef5 100644
--- a/dev-util/ragel/ragel-6.9.ebuild
+++ b/dev-util/ragel/ragel-6.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="vim-syntax"
DEPEND=""
diff --git a/dev-util/re2c/re2c-1.1.1.ebuild b/dev-util/re2c/re2c-1.1.1.ebuild
index 7f4d7f39b97..b7a135fc74e 100644
--- a/dev-util/re2c/re2c-1.1.1.ebuild
+++ b/dev-util/re2c/re2c-1.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.gz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
src_prepare() {
default
diff --git a/dev-util/re2c/re2c-1.2.1.ebuild b/dev-util/re2c/re2c-1.2.1.ebuild
index 7eb1c82d39b..19face84375 100644
--- a/dev-util/re2c/re2c-1.2.1.ebuild
+++ b/dev-util/re2c/re2c-1.2.1.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 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="debug"
src_configure() {
diff --git a/dev-util/re2c/re2c-1.3.ebuild b/dev-util/re2c/re2c-1.3.ebuild
index e27d8116722..19face84375 100644
--- a/dev-util/re2c/re2c-1.3.ebuild
+++ b/dev-util/re2c/re2c-1.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 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="debug"
src_configure() {
diff --git a/dev-util/scons/scons-3.1.1.ebuild b/dev-util/scons/scons-3.1.1.ebuild
index 3bfbf5c1bd4..0102f66443f 100644
--- a/dev-util/scons/scons-3.1.1.ebuild
+++ b/dev-util/scons/scons-3.1.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-util/scons/scons-3.1.2.ebuild b/dev-util/scons/scons-3.1.2.ebuild
index 8db241731da..8f0377513c9 100644
--- a/dev-util/scons/scons-3.1.2.ebuild
+++ b/dev-util/scons/scons-3.1.2.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-util/shadowman/shadowman-2.ebuild b/dev-util/shadowman/shadowman-2.ebuild
index bf8c8c7596a..560212dded3 100644
--- a/dev-util/shadowman/shadowman-2.ebuild
+++ b/dev-util/shadowman/shadowman-2.ebuild
@@ -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 sh 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 5a221149248..f615dcbaf66 100644
--- a/dev-util/shflags/shflags-1.0.3.ebuild
+++ b/dev-util/shflags/shflags-1.0.3.ebuild
@@ -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 sh 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 0466a6600bd..1a8dfb65407 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-2018 Gentoo Foundation
+# Copyright 1999-2020 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 ~sh ~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 40b05d37646..5ca21d4f44b 100644
--- a/dev-util/shtool/shtool-2.0.8-r1.ebuild
+++ b/dev-util/shtool/shtool-2.0.8-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 arm hppa ia64 ppc s390 sh sparc x86"
+KEYWORDS="amd64 arm hppa ia64 ppc s390 sparc x86"
IUSE=""
DEPEND="dev-lang/perl"
diff --git a/dev-util/source-highlight/source-highlight-3.1.8.ebuild b/dev-util/source-highlight/source-highlight-3.1.8.ebuild
index e5797d75268..36791b0d6d1 100644
--- a/dev-util/source-highlight/source-highlight-3.1.8.ebuild
+++ b/dev-util/source-highlight/source-highlight-3.1.8.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Generate highlighted source code as an (x)html document"
HOMEPAGE="https://www.gnu.org/software/src-highlite/source-highlight.html"
SRC_URI="mirror://gnu/src-highlite/${P}.tar.gz"
LICENSE="GPL-3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
SLOT="0"
IUSE="doc static-libs"
diff --git a/dev-util/source-highlight/source-highlight-3.1.9.ebuild b/dev-util/source-highlight/source-highlight-3.1.9.ebuild
index 516b2b2f110..79dc0516a19 100644
--- a/dev-util/source-highlight/source-highlight-3.1.9.ebuild
+++ b/dev-util/source-highlight/source-highlight-3.1.9.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Generate highlighted source code as an (x)html document"
HOMEPAGE="https://www.gnu.org/software/src-highlite/source-highlight.html"
SRC_URI="mirror://gnu/src-highlite/${P}.tar.gz"
LICENSE="GPL-3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
SLOT="0"
IUSE="doc static-libs"
diff --git a/dev-util/strace/strace-4.26.ebuild b/dev-util/strace/strace-4.26.ebuild
index eba46fc9475..7b668e8f413 100644
--- a/dev-util/strace/strace-4.26.ebuild
+++ b/dev-util/strace/strace-4.26.ebuild
@@ -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 s390 sh 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
DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
diff --git a/dev-util/strace/strace-5.3.ebuild b/dev-util/strace/strace-5.3.ebuild
index cdfda1bdee3..db81adfa400 100644
--- a/dev-util/strace/strace-5.3.ebuild
+++ b/dev-util/strace/strace-5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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 ~sh 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/strace/strace-5.4.ebuild b/dev-util/strace/strace-5.4.ebuild
index 31a56378b3f..49b3e03d04c 100644
--- a/dev-util/strace/strace-5.4.ebuild
+++ b/dev-util/strace/strace-5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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 ~sh ~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/strace/strace-5.5.ebuild b/dev-util/strace/strace-5.5.ebuild
index c6b8e0324fb..15e9ea94170 100644
--- a/dev-util/strace/strace-5.5.ebuild
+++ b/dev-util/strace/strace-5.5.ebuild
@@ -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 ~sh ~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/strace/strace-9999.ebuild b/dev-util/strace/strace-9999.ebuild
index db378889c0d..369df34c830 100644
--- a/dev-util/strace/strace-9999.ebuild
+++ b/dev-util/strace/strace-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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 ~sh ~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/unifdef/unifdef-2.10.ebuild b/dev-util/unifdef/unifdef-2.10.ebuild
index 561606f878f..d20326ef3bf 100644
--- a/dev-util/unifdef/unifdef-2.10.ebuild
+++ b/dev-util/unifdef/unifdef-2.10.ebuild
@@ -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 sh 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/unifdef/unifdef-2.11.ebuild b/dev-util/unifdef/unifdef-2.11.ebuild
index 848ad49bbe5..4a75de434b4 100644
--- a/dev-util/unifdef/unifdef-2.11.ebuild
+++ b/dev-util/unifdef/unifdef-2.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 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 ~sh ~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/unifdef/unifdef-2.12.ebuild b/dev-util/unifdef/unifdef-2.12.ebuild
index e10516d447e..4a75de434b4 100644
--- a/dev-util/unifdef/unifdef-2.12.ebuild
+++ b/dev-util/unifdef/unifdef-2.12.ebuild
@@ -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 ~sh ~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 896f0b021c0..115b36348cc 100644
--- a/dev-util/yacc/yacc-1.9.1-r6.ebuild
+++ b/dev-util/yacc/yacc-1.9.1-r6.ebuild
@@ -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 sh 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/bzr/bzr-2.7.0.ebuild b/dev-vcs/bzr/bzr-2.7.0.ebuild
index 38d45d5c3c0..da65c222ffc 100644
--- a/dev-vcs/bzr/bzr-2.7.0.ebuild
+++ b/dev-vcs/bzr/bzr-2.7.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://bazaar-vcs.org/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
IUSE="curl doc +sftp test"
PLOCALES="ar ast bs ca cs de el en_AU en_GB es fa fo fr gl he id it ja ko ms my nb nl oc pl pt_BR ro ru sco si sk sr sv tr ug uk vi zh_CN"
diff --git a/dev-vcs/bzr/bzr-2.7.1_pre.ebuild b/dev-vcs/bzr/bzr-2.7.1_pre.ebuild
index 17f28726163..c39f0b24d9d 100644
--- a/dev-vcs/bzr/bzr-2.7.1_pre.ebuild
+++ b/dev-vcs/bzr/bzr-2.7.1_pre.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="http://bazaar-vcs.org/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
IUSE="curl doc +sftp test"
PLOCALES="ar ast bs ca cs de el en_AU en_GB es fa fo fr gl he id it ja ko ms my nb nl oc pl pt_BR ro ru sco si sk sr sv tr ug uk vi zh_CN"
diff --git a/dev-vcs/cvs/cvs-1.12.12-r12.ebuild b/dev-vcs/cvs/cvs-1.12.12-r12.ebuild
index 94360c45f7b..dc9e06c10e5 100644
--- a/dev-vcs/cvs/cvs-1.12.12-r12.ebuild
+++ b/dev-vcs/cvs/cvs-1.12.12-r12.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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~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 0a94dcb6c9b..733681f043d 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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="sys-libs/zlib"
diff --git a/dev-vcs/cvsps/cvsps-2.2_beta1.ebuild b/dev-vcs/cvsps/cvsps-2.2_beta1.ebuild
index 32856e3e352..10816e7ab2e 100644
--- a/dev-vcs/cvsps/cvsps-2.2_beta1.ebuild
+++ b/dev-vcs/cvsps/cvsps-2.2_beta1.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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 2b627a3015b..c1751ca7fb1 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="sys-libs/zlib"
diff --git a/dev-vcs/cvsync/cvsync-2014.08.24.014706.ebuild b/dev-vcs/cvsync/cvsync-2014.08.24.014706.ebuild
index f638af4de21..974b6422495 100644
--- a/dev-vcs/cvsync/cvsync-2014.08.24.014706.ebuild
+++ b/dev-vcs/cvsync/cvsync-2014.08.24.014706.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
S="${WORKDIR}/${PN}"
fi
diff --git a/dev-vcs/cvsync/cvsync-9999.ebuild b/dev-vcs/cvsync/cvsync-9999.ebuild
index f638af4de21..974b6422495 100644
--- a/dev-vcs/cvsync/cvsync-9999.ebuild
+++ b/dev-vcs/cvsync/cvsync-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
S="${WORKDIR}/${PN}"
fi
diff --git a/dev-vcs/git-tools/git-tools-2017.10.ebuild b/dev-vcs/git-tools/git-tools-2017.10.ebuild
index 7445f4d682a..dc9eb0a0eb7 100644
--- a/dev-vcs/git-tools/git-tools-2017.10.ebuild
+++ b/dev-vcs/git-tools/git-tools-2017.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/MestreLion/git-tools/archive/v${PV}.tar.gz -> ${P}.t
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-vcs/git/git-2.23.1-r1.ebuild b/dev-vcs/git/git-2.23.1-r1.ebuild
index 08388bd1da0..7de0bd3da16 100644
--- a/dev-vcs/git/git-2.23.1-r1.ebuild
+++ b/dev-vcs/git/git-2.23.1-r1.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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="GPL-2"
diff --git a/dev-vcs/git/git-2.24.1.ebuild b/dev-vcs/git/git-2.24.1.ebuild
index f0047ec0196..b8598cb359f 100644
--- a/dev-vcs/git/git-2.24.1.ebuild
+++ b/dev-vcs/git/git-2.24.1.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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="GPL-2"
diff --git a/dev-vcs/git/git-2.25.1.ebuild b/dev-vcs/git/git-2.25.1.ebuild
index d256228c484..db2ca20707c 100644
--- a/dev-vcs/git/git-2.25.1.ebuild
+++ b/dev-vcs/git/git-2.25.1.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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="GPL-2"
diff --git a/dev-vcs/git/git-2.25.2.ebuild b/dev-vcs/git/git-2.25.2.ebuild
index d256228c484..db2ca20707c 100644
--- a/dev-vcs/git/git-2.25.2.ebuild
+++ b/dev-vcs/git/git-2.25.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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="GPL-2"
diff --git a/dev-vcs/git/git-2.26.0.ebuild b/dev-vcs/git/git-2.26.0.ebuild
index d256228c484..db2ca20707c 100644
--- a/dev-vcs/git/git-2.26.0.ebuild
+++ b/dev-vcs/git/git-2.26.0.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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="GPL-2"
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index d256228c484..db2ca20707c 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-9999-r1.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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="GPL-2"
diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
index d256228c484..db2ca20707c 100644
--- a/dev-vcs/git/git-9999-r2.ebuild
+++ b/dev-vcs/git/git-9999-r2.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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="GPL-2"
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index d256228c484..db2ca20707c 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="GPL-2"
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index d256228c484..db2ca20707c 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="GPL-2"
diff --git a/dev-vcs/pwclient/pwclient-20141110122616.ebuild b/dev-vcs/pwclient/pwclient-20141110122616.ebuild
index 21bc9cbe3c0..322df3248bc 100644
--- a/dev-vcs/pwclient/pwclient-20141110122616.ebuild
+++ b/dev-vcs/pwclient/pwclient-20141110122616.ebuild
@@ -21,7 +21,7 @@ SRC_URI="mirror://gentoo/${P}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-vcs/rcs/rcs-5.9.3.ebuild b/dev-vcs/rcs/rcs-5.9.3.ebuild
index b94ad2867a2..a5646f93a02 100644
--- a/dev-vcs/rcs/rcs-5.9.3.ebuild
+++ b/dev-vcs/rcs/rcs-5.9.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/rcs/${P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
IUSE="doc"
RDEPEND="
diff --git a/dev-vcs/rcs/rcs-5.9.4.ebuild b/dev-vcs/rcs/rcs-5.9.4.ebuild
index c6b01511e23..b630bc1201e 100644
--- a/dev-vcs/rcs/rcs-5.9.4.ebuild
+++ b/dev-vcs/rcs/rcs-5.9.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/rcs/${P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
IUSE="doc"
RDEPEND="
diff --git a/dev-vcs/repo/repo-1.26.ebuild b/dev-vcs/repo/repo-1.26.ebuild
index f2e793147ad..01c4dd2015d 100644
--- a/dev-vcs/repo/repo-1.26.ebuild
+++ b/dev-vcs/repo/repo-1.26.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://storage.googleapis.com/git-repo-downloads/${P}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-vcs/repo/repo-1.27.ebuild b/dev-vcs/repo/repo-1.27.ebuild
index 280f73384ee..02aa1a54881 100644
--- a/dev-vcs/repo/repo-1.27.ebuild
+++ b/dev-vcs/repo/repo-1.27.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://storage.googleapis.com/git-repo-downloads/${P}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-vcs/repo/repo-2.4.ebuild b/dev-vcs/repo/repo-2.4.ebuild
index 681273f3560..5664a3767c1 100644
--- a/dev-vcs/repo/repo-2.4.ebuild
+++ b/dev-vcs/repo/repo-2.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://storage.googleapis.com/git-repo-downloads/${P}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-vcs/tig/tig-2.3.3.ebuild b/dev-vcs/tig/tig-2.3.3.ebuild
index 106bf192389..a30633ee366 100644
--- a/dev-vcs/tig/tig-2.3.3.ebuild
+++ b/dev-vcs/tig/tig-2.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3 autotools
else
SRC_URI="https://github.com/jonas/tig/releases/download/${P}/${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
fi
DESCRIPTION="text mode interface for git"
diff --git a/dev-vcs/tig/tig-2.4.1.ebuild b/dev-vcs/tig/tig-2.4.1.ebuild
index bf02b0fba85..a30633ee366 100644
--- a/dev-vcs/tig/tig-2.4.1.ebuild
+++ b/dev-vcs/tig/tig-2.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3 autotools
else
SRC_URI="https://github.com/jonas/tig/releases/download/${P}/${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
fi
DESCRIPTION="text mode interface for git"
diff --git a/dev-vcs/tig/tig-2.5.0.ebuild b/dev-vcs/tig/tig-2.5.0.ebuild
index 149399f133e..9b2134288a3 100644
--- a/dev-vcs/tig/tig-2.5.0.ebuild
+++ b/dev-vcs/tig/tig-2.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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/jonas/tig/releases/download/${P}/${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
fi
DESCRIPTION="text mode interface for git"
diff --git a/dev-vcs/tig/tig-9999.ebuild b/dev-vcs/tig/tig-9999.ebuild
index 149399f133e..9b2134288a3 100644
--- a/dev-vcs/tig/tig-9999.ebuild
+++ b/dev-vcs/tig/tig-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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/jonas/tig/releases/download/${P}/${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
fi
DESCRIPTION="text mode interface for git"
diff --git a/games-misc/asr-manpages/asr-manpages-1.3_rc6.ebuild b/games-misc/asr-manpages/asr-manpages-1.3_rc6.ebuild
index 26d8645edc1..37e8b84e8c3 100644
--- a/games-misc/asr-manpages/asr-manpages-1.3_rc6.ebuild
+++ b/games-misc/asr-manpages/asr-manpages-1.3_rc6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 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/a/asr-manpages/${MY_P}.orig.tar.gz
LICENSE="freedist" #465704
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~x86"
IUSE=""
RDEPEND="virtual/man"
diff --git a/games-misc/fortune-mod-all/fortune-mod-all-4.ebuild b/games-misc/fortune-mod-all/fortune-mod-all-4.ebuild
index 6dd836604f6..924065f2451 100644
--- a/games-misc/fortune-mod-all/fortune-mod-all-4.ebuild
+++ b/games-misc/fortune-mod-all/fortune-mod-all-4.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
LICENSE="metapackage"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~sh ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="l10n_cs l10n_de l10n_it"
RDEPEND="games-misc/fortune-mod
diff --git a/games-misc/fortune-mod-at-linux/fortune-mod-at-linux-20030120.ebuild b/games-misc/fortune-mod-at-linux/fortune-mod-at-linux-20030120.ebuild
index a16a0be8bff..541d19fb395 100644
--- a/games-misc/fortune-mod-at-linux/fortune-mod-at-linux-20030120.ebuild
+++ b/games-misc/fortune-mod-at-linux/fortune-mod-at-linux-20030120.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/fortune-mod-fvl/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~sh ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="unicode"
RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-bofh-excuses/fortune-mod-bofh-excuses-1.2-r1.ebuild b/games-misc/fortune-mod-bofh-excuses/fortune-mod-bofh-excuses-1.2-r1.ebuild
index e20d20c3685..68aa09a6b5a 100644
--- a/games-misc/fortune-mod-bofh-excuses/fortune-mod-bofh-excuses-1.2-r1.ebuild
+++ b/games-misc/fortune-mod-bofh-excuses/fortune-mod-bofh-excuses-1.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/fortune-bofh-excuses-${PV}.tar.gz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~sh ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-chucknorris/fortune-mod-chucknorris-0.1.ebuild b/games-misc/fortune-mod-chucknorris/fortune-mod-chucknorris-0.1.ebuild
index 8fca3702e5d..c0466b0f591 100644
--- a/games-misc/fortune-mod-chucknorris/fortune-mod-chucknorris-0.1.ebuild
+++ b/games-misc/fortune-mod-chucknorris/fortune-mod-chucknorris-0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -8,7 +8,7 @@ SRC_URI="https://www.k-lug.org/~kessler/chucknorris.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~sh ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE=""
RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-cs/fortune-mod-cs-1.6.9.ebuild b/games-misc/fortune-mod-cs/fortune-mod-cs-1.6.9.ebuild
index 920ab75af07..4005ac8cf64 100644
--- a/games-misc/fortune-mod-cs/fortune-mod-cs-1.6.9.ebuild
+++ b/games-misc/fortune-mod-cs/fortune-mod-cs-1.6.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -8,7 +8,7 @@ SRC_URI="http://ftp.fi.muni.cz/pub/linux/people/zdenek_pytela/${P/-mod/}.tar.bz2
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~sh ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="unicode"
RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-fvl/fortune-mod-fvl-20030120.ebuild b/games-misc/fortune-mod-fvl/fortune-mod-fvl-20030120.ebuild
index 3dd7034065d..ce5d5013b67 100644
--- a/games-misc/fortune-mod-fvl/fortune-mod-fvl-20030120.ebuild
+++ b/games-misc/fortune-mod-fvl/fortune-mod-fvl-20030120.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/fortune-mod-fvl/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~sh ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE=""
RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-it/fortune-mod-it-1.99.ebuild b/games-misc/fortune-mod-it/fortune-mod-it-1.99.ebuild
index 94c1223a3a3..b02a80fd4ca 100644
--- a/games-misc/fortune-mod-it/fortune-mod-it-1.99.ebuild
+++ b/games-misc/fortune-mod-it/fortune-mod-it-1.99.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -8,7 +8,7 @@ SRC_URI="http://www.fortune-it.net/download/fortune-it-${PVR}.tar.gz"
LICENSE="freedist"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~sh ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="offensive"
DEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-kernelcookies/fortune-mod-kernelcookies-9.ebuild b/games-misc/fortune-mod-kernelcookies/fortune-mod-kernelcookies-9.ebuild
index 0e8ba435348..754edb90273 100644
--- a/games-misc/fortune-mod-kernelcookies/fortune-mod-kernelcookies-9.ebuild
+++ b/games-misc/fortune-mod-kernelcookies/fortune-mod-kernelcookies-9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="http://www.schwarzvogel.de/pkgs/kernelcookies-${PV}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~sh ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="offensive"
DEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-mormon/fortune-mod-mormon-1.1.0.ebuild b/games-misc/fortune-mod-mormon/fortune-mod-mormon-1.1.0.ebuild
index 9f78bc606bb..2762f733657 100644
--- a/games-misc/fortune-mod-mormon/fortune-mod-mormon-1.1.0.ebuild
+++ b/games-misc/fortune-mod-mormon/fortune-mod-mormon-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/mormon/${P}.tar.bz2"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~sh ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE=""
RDEPEND="
diff --git a/games-misc/fortune-mod-norbert-tretkowski/fortune-mod-norbert-tretkowski-20030120.ebuild b/games-misc/fortune-mod-norbert-tretkowski/fortune-mod-norbert-tretkowski-20030120.ebuild
index 7fa5a76fcf3..33cb9d5ed61 100644
--- a/games-misc/fortune-mod-norbert-tretkowski/fortune-mod-norbert-tretkowski-20030120.ebuild
+++ b/games-misc/fortune-mod-norbert-tretkowski/fortune-mod-norbert-tretkowski-20030120.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/fortune-mod-fvl/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~sh ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE=""
RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-osfortune/fortune-mod-osfortune-1.ebuild b/games-misc/fortune-mod-osfortune/fortune-mod-osfortune-1.ebuild
index f420060ef7d..039a08107f7 100644
--- a/games-misc/fortune-mod-osfortune/fortune-mod-osfortune-1.ebuild
+++ b/games-misc/fortune-mod-osfortune/fortune-mod-osfortune-1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://web.archive.org/web/20030919200547/http://www.dibona.com/openso
LICENSE="GPL-1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~sh ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE=""
DEPEND="games-misc/fortune-mod"
--git a/games-misc/fortune-mod-rss/fortune-mod-rss-20030120.ebuild b/games-misc/fortune-mod-rss/fortune-mod-rss-20030120.ebuild
index a00ff077188..5ea4baec573 100644
--- a/games-misc/fortune-mod-rss/fortune-mod-rss-20030120.ebuild
+++ b/games-misc/fortune-mod-rss/fortune-mod-rss-20030120.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/fortune-mod-fvl/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~sh ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE=""
RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-scriptures/fortune-mod-scriptures-1.1.0.ebuild b/games-misc/fortune-mod-scriptures/fortune-mod-scriptures-1.1.0.ebuild
index 0b938be766f..4a96e439b6e 100644
--- a/games-misc/fortune-mod-scriptures/fortune-mod-scriptures-1.1.0.ebuild
+++ b/games-misc/fortune-mod-scriptures/fortune-mod-scriptures-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/mormon/${P}.tar.bz2"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~sh ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE=""
RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-tao/fortune-mod-tao-1.ebuild b/games-misc/fortune-mod-tao/fortune-mod-tao-1.ebuild
index a60df1e47f0..62f3764a9ab 100644
--- a/games-misc/fortune-mod-tao/fortune-mod-tao-1.ebuild
+++ b/games-misc/fortune-mod-tao/fortune-mod-tao-1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${MY_PN}.tar.gz"
LICENSE="GPL-1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~sh ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE=""
RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-thomas-ogrisegg/fortune-mod-thomas-ogrisegg-20030120.ebuild b/games-misc/fortune-mod-thomas-ogrisegg/fortune-mod-thomas-ogrisegg-20030120.ebuild
index a340bb7e09e..56a8b646cb3 100644
--- a/games-misc/fortune-mod-thomas-ogrisegg/fortune-mod-thomas-ogrisegg-20030120.ebuild
+++ b/games-misc/fortune-mod-thomas-ogrisegg/fortune-mod-thomas-ogrisegg-20030120.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/fortune-mod-fvl/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~sh ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE=""
RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-zx-error/fortune-mod-zx-error-1.0-r1.ebuild b/games-misc/fortune-mod-zx-error/fortune-mod-zx-error-1.0-r1.ebuild
index c1ae843c7f2..c357ccb1c7e 100644
--- a/games-misc/fortune-mod-zx-error/fortune-mod-zx-error-1.0-r1.ebuild
+++ b/games-misc/fortune-mod-zx-error/fortune-mod-zx-error-1.0-r1.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~sh ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod/fortune-mod-1.99.1-r2.ebuild b/games-misc/fortune-mod/fortune-mod-1.99.1-r2.ebuild
index e1083af7aec..10baf010b5f 100644
--- a/games-misc/fortune-mod/fortune-mod-1.99.1-r2.ebuild
+++ b/games-misc/fortune-mod/fortune-mod-1.99.1-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.redellipse.net/code/downloads/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa m68k ~mips ppc64 sh x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa m68k ~mips ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE="offensive elibc_glibc"
DEPEND="app-text/recode"
diff --git a/games-misc/funny-manpages/funny-manpages-1.3_rc5-r1.ebuild b/games-misc/funny-manpages/funny-manpages-1.3_rc5-r1.ebuild
index 922db36737b..1c7c1840f26 100644
--- a/games-misc/funny-manpages/funny-manpages-1.3_rc5-r1.ebuild
+++ b/games-misc/funny-manpages/funny-manpages-1.3_rc5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 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/f/funny-manpages/${MY_P}.orig.tar.gz
LICENSE="freedist" #465704
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~x86"
IUSE=""
RDEPEND="virtual/man"
diff --git a/games-misc/funny-manpages/funny-manpages-2.3.ebuild b/games-misc/funny-manpages/funny-manpages-2.3.ebuild
index 2ab4b79b95e..d8bd6f0300d 100644
--- a/games-misc/funny-manpages/funny-manpages-2.3.ebuild
+++ b/games-misc/funny-manpages/funny-manpages-2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -15,7 +15,7 @@ fi
LICENSE="freedist" #465704
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~x86"
IUSE=""
RDEPEND="virtual/man"
diff --git a/games-misc/games-envd/games-envd-0.ebuild b/games-misc/games-envd/games-envd-0.ebuild
index 4e826ef57e3..017b93e341e 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 sh x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa m68k ~mips ppc64 s390 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
S=${WORKDIR}
diff --git a/games-misc/wtf/wtf-20090924.ebuild b/games-misc/wtf/wtf-20090924.ebuild
index 6f01b2bd659..1e6e7942b7d 100644
--- a/games-misc/wtf/wtf-20090924.ebuild
+++ b/games-misc/wtf/wtf-20090924.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="http://dev.gentooexperimental.org/~darkside/distfiles/${PN}/${P}.tar.bz
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="!games-misc/bsd-games"
diff --git a/gnome-base/dconf-editor/dconf-editor-3.34.2.ebuild b/gnome-base/dconf-editor/dconf-editor-3.34.2.ebuild
index 4eecd4fb57d..6e9c891bb89 100644
--- a/gnome-base/dconf-editor/dconf-editor-3.34.2.ebuild
+++ b/gnome-base/dconf-editor/dconf-editor-3.34.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/dconf-editor"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-linux"
RDEPEND="
>=gnome-base/dconf-0.26.1
diff --git a/gnome-base/dconf-editor/dconf-editor-3.34.4.ebuild b/gnome-base/dconf-editor/dconf-editor-3.34.4.ebuild
index bda15a66522..21fa99568f7 100644
--- a/gnome-base/dconf-editor/dconf-editor-3.34.4.ebuild
+++ b/gnome-base/dconf-editor/dconf-editor-3.34.4.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/dconf-editor"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
RDEPEND="
>=gnome-base/dconf-0.26.1
diff --git a/gnome-base/dconf/dconf-0.32.0-r2.ebuild b/gnome-base/dconf/dconf-0.32.0-r2.ebuild
index af0c7f04f57..96a275129a7 100644
--- a/gnome-base/dconf/dconf-0.32.0-r2.ebuild
+++ b/gnome-base/dconf/dconf-0.32.0-r2.ebuild
@@ -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 ~sh 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.34.0.ebuild b/gnome-base/dconf/dconf-0.34.0.ebuild
index 6d67755c116..c40041616f5 100644
--- a/gnome-base/dconf/dconf-0.34.0.ebuild
+++ b/gnome-base/dconf/dconf-0.34.0.ebuild
@@ -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 ~sh ~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/gconf/gconf-3.2.6-r4.ebuild b/gnome-base/gconf/gconf-3.2.6-r4.ebuild
index 93a85bd5a17..40c7e1ff167 100644
--- a/gnome-base/gconf/gconf-3.2.6-r4.ebuild
+++ b/gnome-base/gconf/gconf-3.2.6-r4.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://projects.gnome.org/gconf/"
LICENSE="LGPL-2+"
SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86 ~x86-linux"
IUSE="debug +introspection ldap policykit"
RDEPEND="
diff --git a/gnome-base/gdm/gdm-3.32.0.ebuild b/gnome-base/gdm/gdm-3.32.0.ebuild
index 9512c3a8534..82b7e169880 100644
--- a/gnome-base/gdm/gdm-3.32.0.ebuild
+++ b/gnome-base/gdm/gdm-3.32.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -25,7 +25,7 @@ IUSE="accessibility audit bluetooth-sound branding elogind fprint +introspection
RESTRICT="!test? ( test )"
REQUIRED_USE="^^ ( elogind systemd )"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
# NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686
# nspr used by smartcard extension
diff --git a/gnome-base/gdm/gdm-3.34.1.ebuild b/gnome-base/gdm/gdm-3.34.1.ebuild
index a2c4c54d138..cd0b9154afa 100644
--- a/gnome-base/gdm/gdm-3.34.1.ebuild
+++ b/gnome-base/gdm/gdm-3.34.1.ebuild
@@ -25,7 +25,7 @@ IUSE="accessibility audit bluetooth-sound branding elogind fprint +introspection
RESTRICT="!test? ( test )"
REQUIRED_USE="^^ ( elogind systemd )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
# NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686
# nspr used by smartcard extension
diff --git a/gnome-base/gnome-common/gnome-common-3.18.0-r1.ebuild b/gnome-base/gnome-common/gnome-common-3.18.0-r1.ebuild
index 02e76664a96..9eeccc99021 100644
--- a/gnome-base/gnome-common/gnome-common-3.18.0-r1.ebuild
+++ b/gnome-base/gnome-common/gnome-common-3.18.0-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-common"
LICENSE="GPL-3"
SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
RDEPEND=""
DEPEND=""
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.30.3-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.30.3-r1.ebuild
index f1a2f590bad..028c5ddf061 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.30.3-r1.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.30.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -16,7 +16,7 @@ REQUIRED_USE="
flickr? ( gnome-online-accounts )
^^ ( elogind systemd )
" # Theoretically "?? ( elogind systemd )" is fine too, lacking some functionality at runtime, but needs testing if handled gracefully enough
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
# kerberos unfortunately means mit-krb5; build fails with heimdal
# display panel requires colord and gnome-settings-daemon[colord]
diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r2.ebuild
index 19918dc9adb..d54c6742526 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r2.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.gnome.org/"
LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
SLOT="2"
-KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="license-docs"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.32.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.32.2.ebuild
index ede39c8cdc4..cee93712f2c 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.32.2.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.32.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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/~leio/distfiles/${P}-patchset.tar.xz"
LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
SLOT="3/17" # subslot = libgnome-desktop-3 soname version
IUSE="debug gtk-doc +introspection seccomp udev"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
# cairo[X] needed for gnome-bg
COMMON_DEPEND="
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.34.4.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.34.4.ebuild
index 69181d36cf8..5018ba92f32 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.34.4.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.34.4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
SLOT="3/18" # subslot = libgnome-desktop-3 soname version
IUSE="debug gtk-doc +introspection seccomp systemd udev"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
# cairo[X] needed for gnome-bg
COMMON_DEPEND="
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.31.91-r1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.31.91-r1.ebuild
index 707441b984a..cc404c68d5a 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.31.91-r1.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.31.91-r1.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2+ LGPL-2+"
SLOT="0"
IUSE="+caps pam selinux +ssh-agent test"
RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
# Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456
RDEPEND="
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.34.0.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.34.0.ebuild
index 650e6ade5ea..6cc05b7b3b5 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.34.0.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.34.0.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2+ LGPL-2+"
SLOT="0"
IUSE="+caps pam selinux +ssh-agent test"
RESTRICT="!test? ( test )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
# Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456
RDEPEND="
--git a/gnome-base/gnome-menus/gnome-menus-3.32.0.ebuild b/gnome-base/gnome-menus/gnome-menus-3.32.0.ebuild
index 802b3eff00c..133815f866b 100644
--- a/gnome-base/gnome-menus/gnome-menus-3.32.0.ebuild
+++ b/gnome-base/gnome-menus/gnome-menus-3.32.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-menus"
LICENSE="GPL-2+ LGPL-2+"
SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="+introspection test"
RESTRICT="!test? ( test )"
diff --git a/gnome-base/gnome-mime-data/gnome-mime-data-2.18.0.ebuild b/gnome-base/gnome-mime-data/gnome-mime-data-2.18.0.ebuild
index eac655533fd..97026fa9c64 100644
--- a/gnome-base/gnome-mime-data/gnome-mime-data-2.18.0.ebuild
+++ b/gnome-base/gnome-mime-data/gnome-mime-data-2.18.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.gnome.org/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=""
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
index 6d5440e373f..6bbc1522641 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gnome.org/"
LICENSE="GPL-2 LGPL-2"
SLOT="2"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="acl gnutls ipv6 kerberos libressl samba ssl zeroconf"
RDEPEND="
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.24.1.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.24.1.ebuild
index 43186aa1c5f..9f95c6a96c6 100644
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.24.1.ebuild
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.24.1.ebuild
@@ -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 ~sh 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"
RDEPEND="
>=dev-libs/glib-2.31:2
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.32.0.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.32.0.ebuild
index b659a75bc17..97b4e698c66 100644
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.32.0.ebuild
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.32.0.ebuild
@@ -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 ~sh 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.34.0.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.34.0.ebuild
index bd590c71c0e..02a1aa53e9c 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
@@ -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 ~sh ~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/gvfs/gvfs-1.40.2.ebuild b/gnome-base/gvfs/gvfs-1.40.2.ebuild
index c7f770eb9c3..1091d5d1f7a 100644
--- a/gnome-base/gvfs/gvfs-1.40.2.ebuild
+++ b/gnome-base/gvfs/gvfs-1.40.2.ebuild
@@ -22,7 +22,7 @@ REQUIRED_USE="
mtp? ( udev )
udisks? ( udev )
"
-KEYWORDS="~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
RDEPEND="
>=dev-libs/glib-2.57.2:2
diff --git a/gnome-base/gvfs/gvfs-1.42.2.ebuild b/gnome-base/gvfs/gvfs-1.42.2.ebuild
index 42155c79381..1139a7ece0b 100644
--- a/gnome-base/gvfs/gvfs-1.42.2.ebuild
+++ b/gnome-base/gvfs/gvfs-1.42.2.ebuild
@@ -23,7 +23,7 @@ REQUIRED_USE="
mtp? ( udev )
udisks? ( udev )
"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
RDEPEND="
>=dev-libs/glib-2.57.2:2
diff --git a/gnome-base/libbonobo/libbonobo-2.24.3-r1.ebuild b/gnome-base/libbonobo/libbonobo-2.24.3-r1.ebuild
index 88c445076b3..75c9aedb318 100644
--- a/gnome-base/libbonobo/libbonobo-2.24.3-r1.ebuild
+++ b/gnome-base/libbonobo/libbonobo-2.24.3-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://developer.gnome.org/libbonobo/stable/"
LICENSE="LGPL-2.1 GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
IUSE="debug examples test"
RDEPEND="
diff --git a/gnome-base/libbonoboui/libbonoboui-2.24.5-r1.ebuild b/gnome-base/libbonoboui/libbonoboui-2.24.5-r1.ebuild
index 7ffdc1730de..ee35342f99b 100644
--- a/gnome-base/libbonoboui/libbonoboui-2.24.5-r1.ebuild
+++ b/gnome-base/libbonoboui/libbonoboui-2.24.5-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://developer.gnome.org/libbonoboui/"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
IUSE="examples test"
RESTRICT="!test? ( test )"
diff --git a/gnome-base/libglade/libglade-2.6.4-r2.ebuild b/gnome-base/libglade/libglade-2.6.4-r2.ebuild
index cd1c4f1d9d5..9c05a87f238 100644
--- a/gnome-base/libglade/libglade-2.6.4-r2.ebuild
+++ b/gnome-base/libglade/libglade-2.6.4-r2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://library.gnome.org/devel/libglade/stable/"
LICENSE="LGPL-2"
SLOT="2.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs test tools"
RESTRICT="!test? ( test )"
REQUIRED_USE="tools? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild
index f8d067b1771..ab5b5656a7f 100644
--- a/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild
+++ b/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild
@@ -18,7 +18,7 @@ SLOT="0"
IUSE="debug +introspection test vala"
RESTRICT="!test? ( test )"
REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
RDEPEND="
>=dev-libs/glib-2.16.0:2[${MULTILIB_USEDEP}]
diff --git a/gnome-base/libgnome/libgnome-2.32.1-r1.ebuild b/gnome-base/libgnome/libgnome-2.32.1-r1.ebuild
index b32f0d3e959..f66f67bc319 100644
--- a/gnome-base/libgnome/libgnome-2.32.1-r1.ebuild
+++ b/gnome-base/libgnome/libgnome-2.32.1-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://library.gnome.org/devel/libgnome/stable/"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
IUSE="branding"
SRC_URI="${SRC_URI}
diff --git a/gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild b/gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild
index 031614fa0af..169cb22e50c 100644
--- a/gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild
+++ b/gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://library.gnome.org/devel/libgnomecanvas/stable/"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="glade"
RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
diff --git a/gnome-base/libgnomekbd/libgnomekbd-3.26.1.ebuild b/gnome-base/libgnomekbd/libgnomekbd-3.26.1.ebuild
index 0fb48653b8d..8ba0aec7a5c 100644
--- a/gnome-base/libgnomekbd/libgnomekbd-3.26.1.ebuild
+++ b/gnome-base/libgnomekbd/libgnomekbd-3.26.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnome.org"
LICENSE="LGPL-2+"
SLOT="0/8"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="+introspection test"
RESTRICT="!test? ( test )"
diff --git a/gnome-base/libgnomeui/libgnomeui-2.24.5-r1.ebuild b/gnome-base/libgnomeui/libgnomeui-2.24.5-r1.ebuild
index 61863b7c0ee..04ad1b7e144 100644
--- a/gnome-base/libgnomeui/libgnomeui-2.24.5-r1.ebuild
+++ b/gnome-base/libgnomeui/libgnomeui-2.24.5-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://library.gnome.org/devel/libgnomeui/stable/"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/gnome-base/libgtop/libgtop-2.38.0.ebuild b/gnome-base/libgtop/libgtop-2.38.0.ebuild
index f472a1c5118..0b6055971b0 100644
--- a/gnome-base/libgtop/libgtop-2.38.0.ebuild
+++ b/gnome-base/libgtop/libgtop-2.38.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://git.gnome.org/browse/libgtop"
LICENSE="GPL-2+"
SLOT="2/11" # libgtop soname version
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86"
IUSE="+introspection"
RDEPEND="
diff --git a/gnome-base/libgtop/libgtop-2.40.0-r1.ebuild b/gnome-base/libgtop/libgtop-2.40.0-r1.ebuild
index 0e55b90dd57..c118400b36a 100644
--- a/gnome-base/libgtop/libgtop-2.40.0-r1.ebuild
+++ b/gnome-base/libgtop/libgtop-2.40.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
LICENSE="GPL-2+"
SLOT="2/11" # libgtop soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE="+introspection"
RDEPEND="
diff --git a/gnome-base/libgtop/libgtop-2.40.0.ebuild b/gnome-base/libgtop/libgtop-2.40.0.ebuild
index 5413e13da05..4950f22ebfc 100644
--- a/gnome-base/libgtop/libgtop-2.40.0.ebuild
+++ b/gnome-base/libgtop/libgtop-2.40.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://git.gnome.org/browse/libgtop"
LICENSE="GPL-2+"
SLOT="2/11" # libgtop soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE="+introspection"
RDEPEND="
diff --git a/gnome-base/librsvg/librsvg-2.40.21.ebuild b/gnome-base/librsvg/librsvg-2.40.21.ebuild
index a5298fa3696..312c088da43 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 amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="+introspection tools +vala"
REQUIRED_USE="vala? ( introspection )"
diff --git a/gnome-base/orbit/orbit-2.14.19-r5.ebuild b/gnome-base/orbit/orbit-2.14.19-r5.ebuild
index 3a4c42c9db3..84866d0e69b 100644
--- a/gnome-base/orbit/orbit-2.14.19-r5.ebuild
+++ b/gnome-base/orbit/orbit-2.14.19-r5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://projects.gnome.org/ORBit2/"
LICENSE="GPL-2 LGPL-2"
SLOT="2"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="pic static-libs test"
RESTRICT="!test? ( test )"
REQUIRED_USE="test? ( debug )"
--git a/gnome-extra/gconf-editor/gconf-editor-3.0.1-r1.ebuild b/gnome-extra/gconf-editor/gconf-editor-3.0.1-r1.ebuild
index ca80e0a0dfe..cd83dece139 100644
--- a/gnome-extra/gconf-editor/gconf-editor-3.0.1-r1.ebuild
+++ b/gnome-extra/gconf-editor/gconf-editor-3.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ HOMEPAGE="https://git.gnome.org/browse/gconf-editor"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="
--git a/gnome-extra/gnome-calculator/gnome-calculator-3.32.2.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-3.32.2.ebuild
index c9031578e5f..df6f5053dbb 100644
--- a/gnome-extra/gnome-calculator/gnome-calculator-3.32.2.ebuild
+++ b/gnome-extra/gnome-calculator/gnome-calculator-3.32.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Calculator"
LICENSE="GPL-3+"
SLOT="0"
IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
# gtksourceview vapi definitions in dev-lang/vala itself are too old, and newer vala removes them
# altogether, thus we need them installed by gtksourceview[vala]
--git a/gnome-extra/gnome-calculator/gnome-calculator-3.34.1.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-3.34.1.ebuild
index bffb0d5c654..088b8952052 100644
--- a/gnome-extra/gnome-calculator/gnome-calculator-3.34.1.ebuild
+++ b/gnome-extra/gnome-calculator/gnome-calculator-3.34.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Calculator"
LICENSE="GPL-3+"
SLOT="0"
IUSE="+introspection"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
# gtksourceview vapi definitions in dev-lang/vala itself are too old, and newer vala removes them
# altogether, thus we need them installed by gtksourceview[vala]
--git a/gnome-extra/gnome-search-tool/gnome-search-tool-3.6.0.ebuild b/gnome-extra/gnome-search-tool/gnome-search-tool-3.6.0.ebuild
index 52387683b7b..6a896b793d8 100644
--- a/gnome-extra/gnome-search-tool/gnome-search-tool-3.6.0.ebuild
+++ b/gnome-extra/gnome-search-tool/gnome-search-tool-3.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Attic/GnomeUtils"
LICENSE="GPL-2 FDL-1.1"
SLOT="0"
IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="
dev-libs/atk
--git a/gnome-extra/gnome-utils/gnome-utils-3.8.0.ebuild b/gnome-extra/gnome-utils/gnome-utils-3.8.0.ebuild
index 54151cb0891..f2bf05a95df 100644
--- a/gnome-extra/gnome-utils/gnome-utils-3.8.0.ebuild
+++ b/gnome-extra/gnome-utils/gnome-utils-3.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Attic/GnomeUtils"
LICENSE="metapackage"
SLOT="0"
IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
DEPEND=""
RDEPEND="
--git a/gnome-extra/gtkhtml/gtkhtml-4.10.0-r2.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.10.0-r2.ebuild
index aefd78f80c0..57d3fb7bf34 100644
--- a/gnome-extra/gtkhtml/gtkhtml-4.10.0-r2.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-4.10.0-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gitlab.gnome.org/Archive/gtkhtml"
LICENSE="GPL-2+ LGPL-2+"
SLOT="4.0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE=""
# orbit is referenced in configure, but is not used anywhere else
--git a/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild
index 0d1d152fbef..e83b54fcb0e 100644
--- a/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gitlab.gnome.org/Archive/gtkhtml"
LICENSE="GPL-2+ LGPL-2+"
SLOT="4.0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
# orbit is referenced in configure, but is not used anywhere else
--git a/gnome-extra/gucharmap/gucharmap-12.0.1-r1.ebuild b/gnome-extra/gucharmap/gucharmap-12.0.1-r1.ebuild
index 96e97ba7eec..16aafd985d6 100644
--- a/gnome-extra/gucharmap/gucharmap-12.0.1-r1.ebuild
+++ b/gnome-extra/gucharmap/gucharmap-12.0.1-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap"
LICENSE="GPL-3+"
SLOT="2.90"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="debug +introspection test vala"
RESTRICT="!test? ( test )"
--git a/gnome-extra/gucharmap/gucharmap-12.0.1.ebuild b/gnome-extra/gucharmap/gucharmap-12.0.1.ebuild
index 2e2613a91d1..b8676fc2c04 100644
--- a/gnome-extra/gucharmap/gucharmap-12.0.1.ebuild
+++ b/gnome-extra/gucharmap/gucharmap-12.0.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap"
LICENSE="GPL-3+"
SLOT="2.90"
-KEYWORDS="~alpha amd64 arm arm64 ia64 ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86"
IUSE="debug +introspection test vala"
RESTRICT="!test? ( test )"
--git a/gnome-extra/gucharmap/gucharmap-3.0.1-r200.ebuild b/gnome-extra/gucharmap/gucharmap-3.0.1-r200.ebuild
index a65a899e9ed..e0f92d7b007 100644
--- a/gnome-extra/gucharmap/gucharmap-3.0.1-r200.ebuild
+++ b/gnome-extra/gucharmap/gucharmap-3.0.1-r200.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86"
IUSE="cjk debug doc +introspection"
RDEPEND="
--git a/gnome-extra/libgsf/libgsf-1.14.45.ebuild b/gnome-extra/libgsf/libgsf-1.14.45.ebuild
index b290c926426..d8dee389efe 100644
--- a/gnome-extra/libgsf/libgsf-1.14.45.ebuild
+++ b/gnome-extra/libgsf/libgsf-1.14.45.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://developer.gnome.org/gsf/"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0/114" # libgsf-1.so version
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 gtk +introspection"
RDEPEND="
--git a/gnome-extra/libgsf/libgsf-1.14.46.ebuild b/gnome-extra/libgsf/libgsf-1.14.46.ebuild
index 28d78cc1a6d..c74bfd5e949 100644
--- a/gnome-extra/libgsf/libgsf-1.14.46.ebuild
+++ b/gnome-extra/libgsf/libgsf-1.14.46.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://developer.gnome.org/gsf/"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0/114" # libgsf-1.so version
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 gtk +introspection"
RDEPEND="
--git a/gnome-extra/polkit-gnome/polkit-gnome-0.105-r2.ebuild b/gnome-extra/polkit-gnome/polkit-gnome-0.105-r2.ebuild
index cc57d0d56cd..cfb3fc60a9a 100644
--- a/gnome-extra/polkit-gnome/polkit-gnome-0.105-r2.ebuild
+++ b/gnome-extra/polkit-gnome/polkit-gnome-0.105-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.freedesktop.org/polkit/polkit/"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
DEPEND=">=dev-libs/glib-2.30
--git a/gnome-extra/yelp-xsl/yelp-xsl-3.32.1.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-3.32.1.ebuild
index 655b353a384..d0f9765cb68 100644
--- a/gnome-extra/yelp-xsl/yelp-xsl-3.32.1.ebuild
+++ b/gnome-extra/yelp-xsl/yelp-xsl-3.32.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 ~sh 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:=
--git a/gnome-extra/zenity/zenity-3.32.0.ebuild b/gnome-extra/zenity/zenity-3.32.0.ebuild
index 915aa6749dd..64bf0a289f7 100644
--- a/gnome-extra/zenity/zenity-3.32.0.ebuild
+++ b/gnome-extra/zenity/zenity-3.32.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Zenity"
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="debug libnotify webkit"
# TODO: X11 dependency is automagically enabled
diff --git a/mail-client/mailx-support/mailx-support-20060102-r2.ebuild b/mail-client/mailx-support/mailx-support-20060102-r2.ebuild
index b043cedc7d9..f743007d603 100644
--- a/mail-client/mailx-support/mailx-support-20060102-r2.ebuild
+++ b/mail-client/mailx-support/mailx-support-20060102-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE=""
RDEPEND=""
diff --git a/mail-client/mailx/mailx-8.1.2.20160123.ebuild b/mail-client/mailx/mailx-8.1.2.20160123.ebuild
index 2acaae0da82..9098b65e405 100644
--- a/mail-client/mailx/mailx-8.1.2.20160123.ebuild
+++ b/mail-client/mailx/mailx-8.1.2.20160123.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${DP/_/-}.orig"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE=""
DEPEND=">=net-libs/liblockfile-1.03
diff --git a/mail-filter/bogofilter/bogofilter-1.2.4-r3.ebuild b/mail-filter/bogofilter/bogofilter-1.2.4-r3.ebuild
index bfba8461099..ffb156c9c51 100644
--- a/mail-filter/bogofilter/bogofilter-1.2.4-r3.ebuild
+++ b/mail-filter/bogofilter/bogofilter-1.2.4-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
IUSE="berkdb sqlite tokyocabinet"
# pax needed for bf_tar
diff --git a/mail-filter/maildrop/maildrop-3.0.0.ebuild b/mail-filter/maildrop/maildrop-3.0.0.ebuild
index bbbe3b64122..879f7d29fda 100644
--- a/mail-filter/maildrop/maildrop-3.0.0.ebuild
+++ b/mail-filter/maildrop/maildrop-3.0.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.courier-mta.org/maildrop/"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm 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 ca949f0929c..48ca6fca9d0 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
IUSE="mbox selinux"
DEPEND="virtual/mta"
diff --git a/mail-filter/spamassassin/spamassassin-3.4.3.ebuild b/mail-filter/spamassassin/spamassassin-3.4.3.ebuild
index da1c0754b71..ce694c7cf42 100644
--- a/mail-filter/spamassassin/spamassassin-3.4.3.ebuild
+++ b/mail-filter/spamassassin/spamassassin-3.4.3.ebuild
@@ -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 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
IUSE="berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test"
RESTRICT="!test? ( test )"
diff --git a/mail-filter/spamassassin/spamassassin-3.4.4.ebuild b/mail-filter/spamassassin/spamassassin-3.4.4.ebuild
index 1ca7107d8c9..d5c807e571b 100644
--- a/mail-filter/spamassassin/spamassassin-3.4.4.ebuild
+++ b/mail-filter/spamassassin/spamassassin-3.4.4.ebuild
@@ -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 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
IUSE="berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test"
RESTRICT="!test? ( test )"
diff --git a/mail-mta/courier/courier-1.0.5.ebuild b/mail-mta/courier/courier-1.0.5.ebuild
index b68eddcc407..e67bae4cc07 100644
--- a/mail-mta/courier/courier-1.0.5.ebuild
+++ b/mail-mta/courier/courier-1.0.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sh 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/postfix/postfix-3.4.10.ebuild b/mail-mta/postfix/postfix-3.4.10.ebuild
index f62330bb7af..96e41411110 100644
--- a/mail-mta/postfix/postfix-3.4.10.ebuild
+++ b/mail-mta/postfix/postfix-3.4.10.ebuild
@@ -16,7 +16,7 @@ SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
LICENSE="|| ( IBM EPL-2.0 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
DEPEND=">=dev-libs/libpcre-3.4
diff --git a/mail-mta/postfix/postfix-3.4.9.ebuild b/mail-mta/postfix/postfix-3.4.9.ebuild
index 34afc5b614b..c99dfa0cb46 100644
--- a/mail-mta/postfix/postfix-3.4.9.ebuild
+++ b/mail-mta/postfix/postfix-3.4.9.ebuild
@@ -16,7 +16,7 @@ SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
LICENSE="|| ( IBM EPL-2.0 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
IUSE="+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
DEPEND=">=dev-libs/libpcre-3.4
diff --git a/mail-mta/postfix/postfix-3.5.0.ebuild b/mail-mta/postfix/postfix-3.5.0.ebuild
index e151573f236..15887b8c8b9 100644
--- a/mail-mta/postfix/postfix-3.5.0.ebuild
+++ b/mail-mta/postfix/postfix-3.5.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
LICENSE="|| ( IBM EPL-2.0 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
DEPEND=">=dev-libs/libpcre-3.4
diff --git a/mail-mta/postfix/postfix-3.6_pre20200316.ebuild b/mail-mta/postfix/postfix-3.6_pre20200316.ebuild
index 0a64c171fce..e2ad04c2d0a 100644
--- a/mail-mta/postfix/postfix-3.6_pre20200316.ebuild
+++ b/mail-mta/postfix/postfix-3.6_pre20200316.ebuild
@@ -16,7 +16,7 @@ SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
LICENSE="|| ( IBM EPL-2.0 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
DEPEND=">=dev-libs/libpcre-3.4
diff --git a/mail-mta/sendmail/sendmail-8.15.2-r2.ebuild b/mail-mta/sendmail/sendmail-8.15.2-r2.ebuild
index b8ea4032251..e18dbb7271f 100644
--- a/mail-mta/sendmail/sendmail-8.15.2-r2.ebuild
+++ b/mail-mta/sendmail/sendmail-8.15.2-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.sendmail.org/pub/${PN}/${PN}.${PV}.tar.gz"
LICENSE="Sendmail GPL-2" # GPL-2 is here for initscript
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="ssl ldap libressl sasl tcpd mbox ipv6 nis sockets"
DEPEND="net-mail/mailbase
diff --git a/mail-mta/ssmtp/ssmtp-2.64-r3.ebuild b/mail-mta/ssmtp/ssmtp-2.64-r3.ebuild
index 062e254c12e..c9fc9a248a4 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="ipv6 libressl +ssl gnutls +mta"
DEPEND="ssl? (
diff --git a/media-fonts/alee-fonts/alee-fonts-13-r1.ebuild b/media-fonts/alee-fonts/alee-fonts-13-r1.ebuild
index 4212b45d5b3..a1ad2fadd78 100644
--- a/media-fonts/alee-fonts/alee-fonts-13-r1.ebuild
+++ b/media-fonts/alee-fonts/alee-fonts-13-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://turul.canonical.com/pool/main/t/ttf-alee/ttf-alee_${PV}.tar.gz"
LICENSE="Artistic"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE=""
FONT_SUFFIX="ttf"
diff --git a/media-fonts/aquafont/aquafont-2.7-r4.ebuild b/media-fonts/aquafont/aquafont-2.7-r4.ebuild
index 5c424393ef9..26857eb8e7d 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 ffa9f3119b1..eb5d26e10bf 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 297eb3d825a..94edbb1a545 100644
--- a/media-fonts/arabeyes-fonts/arabeyes-fonts-2.0-r1.ebuild
+++ b/media-fonts/arabeyes-fonts/arabeyes-fonts-2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/arabeyes/${MY_PN}_${PV}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 arm ia64 ppc s390 sh sparc x86"
+KEYWORDS="amd64 arm ia64 ppc s390 sparc x86"
FONT_SUFFIX="ttf"
diff --git a/media-fonts/arkpandora/arkpandora-2.04.ebuild b/media-fonts/arkpandora/arkpandora-2.04.ebuild
index 3fc30bf81ef..3375065ece2 100644
--- a/media-fonts/arkpandora/arkpandora-2.04.ebuild
+++ b/media-fonts/arkpandora/arkpandora-2.04.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tgz"
LICENSE="BitstreamVera"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~ppc ppc64 s390 sparc x86"
IUSE=""
FONT_S="${S}"
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 848374dd929..6ad0fcc2323 100644
--- a/media-fonts/arphicfonts/arphicfonts-0.2.20080216.1-r2.ebuild
+++ b/media-fonts/arphicfonts/arphicfonts-0.2.20080216.1-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/non-gnu/chinese-fonts-truetype/gkai00mp.ttf.gz
LICENSE="Arphic"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
IUSE=""
DEPEND="media-gfx/fontforge"
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 d18010ce490..eabe5e66cee 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 1e8b9627b65..235ff0e9f3b 100644
--- a/media-fonts/artwiz-latin1/artwiz-latin1-1.1.ebuild
+++ b/media-fonts/artwiz-latin1/artwiz-latin1-1.1.ebuild
@@ -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 sh 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 be77c78d727..5b4a0fa4231 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 @@ SRC_URI="http://kldp.net/${PN/-*}/release/865-${BDF_P}.tar.gz -> ${BDF_P}.tar.gz
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="unicode"
RESTRICT="binchecks strip"
diff --git a/media-fonts/cantarell/cantarell-0.111.ebuild b/media-fonts/cantarell/cantarell-0.111.ebuild
index 87d88c1d9a8..e059d816224 100644
--- a/media-fonts/cantarell/cantarell-0.111.ebuild
+++ b/media-fonts/cantarell/cantarell-0.111.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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="media-libs/fontconfig"
diff --git a/media-fonts/cheapskatefonts/cheapskatefonts-1.0.ebuild b/media-fonts/cheapskatefonts/cheapskatefonts-1.0.ebuild
index 823323dbd41..4bc5611a102 100644
--- a/media-fonts/cheapskatefonts/cheapskatefonts-1.0.ebuild
+++ b/media-fonts/cheapskatefonts/cheapskatefonts-1.0.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~ppc s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~ppc s390 sparc x86"
BDEPEND="app-arch/unzip"
diff --git a/media-fonts/comic-neue/comic-neue-2.2.ebuild b/media-fonts/comic-neue/comic-neue-2.2.ebuild
index c985a6016ae..f2c34c5f558 100644
--- a/media-fonts/comic-neue/comic-neue-2.2.ebuild
+++ b/media-fonts/comic-neue/comic-neue-2.2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://comicneue.com/"
SRC_URI="http://comicneue.com/${P}.zip"
LICENSE="OFL-1.1"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
SLOT="0"
DEPEND="app-arch/unzip"
diff --git a/media-fonts/comic-neue/comic-neue-2.3.ebuild b/media-fonts/comic-neue/comic-neue-2.3.ebuild
index 071c18c9c42..53923fadf87 100644
--- a/media-fonts/comic-neue/comic-neue-2.3.ebuild
+++ b/media-fonts/comic-neue/comic-neue-2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ HOMEPAGE="http://comicneue.com"
SRC_URI="http://comicneue.com/${P}.zip"
LICENSE="OFL-1.1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
SLOT="0"
DEPEND="app-arch/unzip"
diff --git a/media-fonts/corefonts/corefonts-1-r7.ebuild b/media-fonts/corefonts/corefonts-1-r7.ebuild
index 8f8dcaa9a9f..83e0296917c 100644
--- a/media-fonts/corefonts/corefonts-1-r7.ebuild
+++ b/media-fonts/corefonts/corefonts-1-r7.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://gentoo/EUupdate.EXE
LICENSE="MSttfEULA"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="X tahoma"
DEPEND="app-arch/cabextract"
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 3f9ea76fad1..c0efc3a97bc 100644
--- a/media-fonts/cronyx-fonts/cronyx-fonts-2.3.8.ebuild
+++ b/media-fonts/cronyx-fonts/cronyx-fonts-2.3.8.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ppc s390 sh 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 cd519cacdbc..bfdf8b04506 100644
--- a/media-fonts/culmus/culmus-0.120-r5.ebuild
+++ b/media-fonts/culmus/culmus-0.120-r5.ebuild
@@ -36,7 +36,7 @@ SRC_URI+=" taamey? ( $(printf "http://culmus.sourceforge.net/taamim/%s.zip " ${T
LICENSE="|| ( GPL-2 LICENSE-BITSTREAM ) ancient? ( MIT ) fancy? ( GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 s390 sparc x86"
IUSE="ancient fancy fontforge taamey"
FONT_CONF=( "${T}/65-culmus.conf" )
diff --git a/media-fonts/culmus/culmus-0.133.ebuild b/media-fonts/culmus/culmus-0.133.ebuild
index d21d6b87d73..a66e3311e3c 100644
--- a/media-fonts/culmus/culmus-0.133.ebuild
+++ b/media-fonts/culmus/culmus-0.133.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -36,7 +36,7 @@ SRC_URI+=" taamey? ( $(printf "http://culmus.sourceforge.net/taamim/%s.zip " ${T
LICENSE="|| ( GPL-2 LICENSE-BITSTREAM ) ancient? ( MIT ) fancy? ( GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="ancient fancy fontforge taamey"
FONT_CONF=( "${T}/65-culmus.conf" )
diff --git a/media-fonts/dejavu/dejavu-2.35.ebuild b/media-fonts/dejavu/dejavu-2.35.ebuild
index 2d00daeacf1..fd374c8a9f6 100644
--- a/media-fonts/dejavu/dejavu-2.35.ebuild
+++ b/media-fonts/dejavu/dejavu-2.35.ebuild
@@ -25,7 +25,7 @@ fi
LICENSE="BitstreamVera"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="fontforge"
DEPEND="fontforge? ( >=x11-apps/mkfontscale-1.2.0
diff --git a/media-fonts/dejavu/dejavu-2.37.ebuild b/media-fonts/dejavu/dejavu-2.37.ebuild
index c5773e6f23e..bd8d1d38573 100644
--- a/media-fonts/dejavu/dejavu-2.37.ebuild
+++ b/media-fonts/dejavu/dejavu-2.37.ebuild
@@ -25,7 +25,7 @@ fi
LICENSE="BitstreamVera"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="fontforge"
DEPEND="fontforge? (
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 72b6aa97703..1c68b6050ac 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
@@ -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 sh 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.ebuild b/media-fonts/encodings/encodings-1.0.5.ebuild
index b3d246cc6ee..e96e220547f 100644
--- a/media-fonts/encodings/encodings-1.0.5.ebuild
+++ b/media-fonts/encodings/encodings-1.0.5.ebuild
@@ -9,7 +9,7 @@ inherit font xorg-2
DESCRIPTION="X.Org font encodings"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="x11-apps/mkfontscale
diff --git a/media-fonts/essays1743/essays1743-2.100.ebuild b/media-fonts/essays1743/essays1743-2.100.ebuild
index fd5e6cac081..962931d7eb9 100644
--- a/media-fonts/essays1743/essays1743-2.100.ebuild
+++ b/media-fonts/essays1743/essays1743-2.100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://www.thibault.org/fonts/essays/${P}-1-ttf.tar.gz"
LICENSE="|| ( LGPL-2.1 OFL-1.1 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sh ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sparc ~x86 ~x64-macos"
IUSE=""
DEPEND=""
diff --git a/media-fonts/farsi-fonts/farsi-fonts-0.4.ebuild b/media-fonts/farsi-fonts/farsi-fonts-0.4.ebuild
index 3001623d133..64c51e529fe 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 sh sparc x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~ppc s390 sparc x86 ~ppc-macos ~x86-macos"
BDEPEND="app-arch/unzip"
diff --git a/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.3-r1.ebuild b/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.3-r1.ebuild
index e69a4d8b6a7..b29dc45549b 100644
--- a/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.3-r1.ebuild
+++ b/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
DESCRIPTION="X.Org Adobe bitmap fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE=""
DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.3-r1.ebuild b/media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.3-r1.ebuild
index e69a4d8b6a7..b29dc45549b 100644
--- a/media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.3-r1.ebuild
+++ b/media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
DESCRIPTION="X.Org Adobe bitmap fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE=""
DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.4-r1.ebuild b/media-fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.4-r1.ebuild
index 85c01f48638..435f558a352 100644
--- a/media-fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.4-r1.ebuild
+++ b/media-fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.4-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
DESCRIPTION="X.Org Adobe Utopia bitmap fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE=""
DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.4-r1.ebuild b/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.4-r1.ebuild
index 85c01f48638..435f558a352 100644
--- a/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.4-r1.ebuild
+++ b/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.4-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
DESCRIPTION="X.Org Adobe Utopia bitmap fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE=""
DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.4-r1.ebuild b/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.4-r1.ebuild
index 079710a7181..868bf4beb88 100644
--- a/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.4-r1.ebuild
+++ b/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.4-r1.ebuild
@@ -6,5 +6,5 @@ inherit xorg-2
DESCRIPTION="X.Org Adobe Utopia Type 1 fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE=""
diff --git a/media-fonts/font-alias/font-alias-1.0.3-r1.ebuild b/media-fonts/font-alias/font-alias-1.0.3-r1.ebuild
index 22010fc2e87..ecf919b9e24 100644
--- a/media-fonts/font-alias/font-alias-1.0.3-r1.ebuild
+++ b/media-fonts/font-alias/font-alias-1.0.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
DESCRIPTION="X.Org font aliases"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=""
DEPEND="${RDEPEND}
diff --git a/media-fonts/font-arabic-misc/font-arabic-misc-1.0.3-r1.ebuild b/media-fonts/font-arabic-misc/font-arabic-misc-1.0.3-r1.ebuild
index 18b03b80755..c1bba74eff2 100644
--- a/media-fonts/font-arabic-misc/font-arabic-misc-1.0.3-r1.ebuild
+++ b/media-fonts/font-arabic-misc/font-arabic-misc-1.0.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
DESCRIPTION="X.Org arabic bitmap fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE=""
DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.3-r1.ebuild b/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.3-r1.ebuild
index 7d363c459d7..603ba8f863d 100644
--- a/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.3-r1.ebuild
+++ b/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.3-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE=""
DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.3-r1.ebuild b/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.3-r1.ebuild
index 7d363c459d7..603ba8f863d 100644
--- a/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.3-r1.ebuild
+++ b/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.3-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE=""
DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.3-r1.ebuild b/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.3-r1.ebuild
index 5047fd00d3c..70bc7e5889b 100644
--- a/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.3-r1.ebuild
+++ b/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.3-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE=""
DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.3-r1.ebuild b/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.3-r1.ebuild
index 5047fd00d3c..70bc7e5889b 100644
--- a/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.3-r1.ebuild
+++ b/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.3-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE=""
DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-bh-ttf/font-bh-ttf-1.0.3-r1.ebuild b/media-fonts/font-bh-ttf/font-bh-ttf-1.0.3-r1.ebuild
index 9f51b947207..f28d33b24e3 100644
--- a/media-fonts/font-bh-ttf/font-bh-ttf-1.0.3-r1.ebuild
+++ b/media-fonts/font-bh-ttf/font-bh-ttf-1.0.3-r1.ebuild
@@ -7,5 +7,5 @@ inherit xorg-2
DESCRIPTION="X.Org Bigelow & Holmes TrueType fonts"
LICENSE="bh-luxi"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~x64-macos"
IUSE=""
diff --git a/media-fonts/font-bh-type1/font-bh-type1-1.0.3-r1.ebuild b/media-fonts/font-bh-type1/font-bh-type1-1.0.3-r1.ebuild
index f702b8a6086..9d0b71e2c0b 100644
--- a/media-fonts/font-bh-type1/font-bh-type1-1.0.3-r1.ebuild
+++ b/media-fonts/font-bh-type1/font-bh-type1-1.0.3-r1.ebuild
@@ -7,5 +7,5 @@ inherit xorg-2
DESCRIPTION="X.Org Bigelow & Holmes Type 1 fonts"
LICENSE="bh-luxi"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-macos"
IUSE=""
diff --git a/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.3-r1.ebuild b/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.3-r1.ebuild
index efb47f4f83a..84f320a7ff8 100644
--- a/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.3-r1.ebuild
+++ b/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
DESCRIPTION="X.Org Bitstream bitmap fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE=""
DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.3-r1.ebuild b/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.3-r1.ebuild
index efb47f4f83a..84f320a7ff8 100644
--- a/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.3-r1.ebuild
+++ b/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
DESCRIPTION="X.Org Bitstream bitmap fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE=""
DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-bitstream-speedo/font-bitstream-speedo-1.0.2-r1.ebuild b/media-fonts/font-bitstream-speedo/font-bitstream-speedo-1.0.2-r1.ebuild
index 40d7bbc5529..6bc48f934df 100644
--- a/media-fonts/font-bitstream-speedo/font-bitstream-speedo-1.0.2-r1.ebuild
+++ b/media-fonts/font-bitstream-speedo/font-bitstream-speedo-1.0.2-r1.ebuild
@@ -6,5 +6,5 @@ inherit xorg-2
DESCRIPTION="Bitstream Speedo fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE=""
diff --git a/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.3-r1.ebuild b/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.3-r1.ebuild
index 4513dbbd7f6..01ffdabbff3 100644
--- a/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.3-r1.ebuild
+++ b/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.3-r1.ebuild
@@ -6,5 +6,5 @@ inherit xorg-2
DESCRIPTION="X.Org Bitstream Type 1 fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE=""
diff --git a/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.3-r1.ebuild b/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.3-r1.ebuild
index 1397e21e136..9f5990e7990 100644
--- a/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.3-r1.ebuild
+++ b/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
DESCRIPTION="X.Org Cronyx cyrillic fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE=""
DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-cursor-misc/font-cursor-misc-1.0.3-r1.ebuild b/media-fonts/font-cursor-misc/font-cursor-misc-1.0.3-r1.ebuild
index d28c91234d4..dafa102842c 100644
--- a/media-fonts/font-cursor-misc/font-cursor-misc-1.0.3-r1.ebuild
+++ b/media-fonts/font-cursor-misc/font-cursor-misc-1.0.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
DESCRIPTION="X.Org cursor font"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-linux"
IUSE=""
DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.3-r1.ebuild b/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.3-r1.ebuild
index 13798f0c677..414bf8f0d4d 100644
--- a/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.3-r1.ebuild
+++ b/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
DESCRIPTION="X.Org Daewoo fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE=""
DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-dec-misc/font-dec-misc-1.0.3-r1.ebuild b/media-fonts/font-dec-misc/font-dec-misc-1.0.3-r1.ebuild
index 9e1fd5718e5..d3adc12c60d 100644
--- a/media-fonts/font-dec-misc/font-dec-misc-1.0.3-r1.ebuild
+++ b/media-fonts/font-dec-misc/font-dec-misc-1.0.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
DESCRIPTION="X.Org DEC fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE=""
DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-ibm-type1/font-ibm-type1-1.0.3-r1.ebuild b/media-fonts/font-ibm-type1/font-ibm-type1-1.0.3-r1.ebuild
index 2019f54ae24..2e2b41a7409 100644
--- a/media-fonts/font-ibm-type1/font-ibm-type1-1.0.3-r1.ebuild
+++ b/media-fonts/font-ibm-type1/font-ibm-type1-1.0.3-r1.ebuild
@@ -6,5 +6,5 @@ inherit xorg-2
DESCRIPTION="X.Org IBM Courier font"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE=""
diff --git a/media-fonts/font-isas-misc/font-isas-misc-1.0.3-r1.ebuild b/media-fonts/font-isas-misc/font-isas-misc-1.0.3-r1.ebuild
index 4e94f1680ee..dd2a006e616 100644
--- a/media-fonts/font-isas-misc/font-isas-misc-1.0.3-r1.ebuild
+++ b/media-fonts/font-isas-misc/font-isas-misc-1.0.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
DESCRIPTION="X.Org the Institute of Software, Academia Sinica (chinese) fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE=""
DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-jis-misc/font-jis-misc-1.0.3-r1.ebuild b/media-fonts/font-jis-misc/font-jis-misc-1.0.3-r1.ebuild
index db24585a93e..c7e831c709d 100644
--- a/media-fonts/font-jis-misc/font-jis-misc-1.0.3-r1.ebuild
+++ b/media-fonts/font-jis-misc/font-jis-misc-1.0.3-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
inherit xorg-2
DESCRIPTION="X.Org JIS (japanese) fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE=""
DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-micro-misc/font-micro-misc-1.0.3-r1.ebuild b/media-fonts/font-micro-misc/font-micro-misc-1.0.3-r1.ebuild
index cbf3888c38c..5647fc52904 100644
--- a/media-fonts/font-micro-misc/font-micro-misc-1.0.3-r1.ebuild
+++ b/media-fonts/font-micro-misc/font-micro-misc-1.0.3-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
DESCRIPTION="X.Org micro-misc font"
LICENSE="public-domain"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE=""
DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.3-r1.ebuild b/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.3-r1.ebuild
index 64e73de1f46..72c57e65589 100644
--- a/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.3-r1.ebuild
+++ b/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
DESCRIPTION="X.Org misc-cyrillic fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE=""
DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.3-r1.ebuild b/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.3-r1.ebuild
index 123b7cb666e..8ada290041c 100644
--- a/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.3-r1.ebuild
+++ b/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.3-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
DESCRIPTION="Miscellaneous Ethiopic fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE=""
FONT_OPTIONS="--with-otf-fontdir=${EPREFIX}/usr/share/fonts/OTF"
diff --git a/media-fonts/font-misc-meltho/font-misc-meltho-1.0.3-r1.ebuild b/media-fonts/font-misc-meltho/font-misc-meltho-1.0.3-r1.ebuild
index 9d4d0a65d22..913428ccf77 100644
--- a/media-fonts/font-misc-meltho/font-misc-meltho-1.0.3-r1.ebuild
+++ b/media-fonts/font-misc-meltho/font-misc-meltho-1.0.3-r1.ebuild
@@ -8,5 +8,5 @@ inherit xorg-2
DESCRIPTION="X.Org Syriac fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE=""
diff --git a/media-fonts/font-misc-misc/font-misc-misc-1.1.2-r1.ebuild b/media-fonts/font-misc-misc/font-misc-misc-1.1.2-r1.ebuild
index a0a27ed3584..99196538d34 100644
--- a/media-fonts/font-misc-misc/font-misc-misc-1.1.2-r1.ebuild
+++ b/media-fonts/font-misc-misc/font-misc-misc-1.1.2-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
DESCRIPTION="X.Org miscellaneous fonts"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-mutt-misc/font-mutt-misc-1.0.3-r1.ebuild b/media-fonts/font-mutt-misc/font-mutt-misc-1.0.3-r1.ebuild
index d51e89c6ad8..d2ef26399f7 100644
--- a/media-fonts/font-mutt-misc/font-mutt-misc-1.0.3-r1.ebuild
+++ b/media-fonts/font-mutt-misc/font-mutt-misc-1.0.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
DESCRIPTION="X.Org ClearlyU fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE=""
DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.2-r1.ebuild b/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.2-r1.ebuild
index 56ca8fd7909..0e3e81f0f86 100644
--- a/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.2-r1.ebuild
+++ b/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.2-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
DESCRIPTION="X.Org Schumacher fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE=""
DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.4-r1.ebuild b/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.4-r1.ebuild
index 8540ac34467..5ad1a1f86fb 100644
--- a/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.4-r1.ebuild
+++ b/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.4-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
DESCRIPTION="X.Org Screen cyrillic fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE=""
DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-sony-misc/font-sony-misc-1.0.3-r1.ebuild b/media-fonts/font-sony-misc/font-sony-misc-1.0.3-r1.ebuild
index 9913f4b0d0c..86aa66c7e41 100644
--- a/media-fonts/font-sony-misc/font-sony-misc-1.0.3-r1.ebuild
+++ b/media-fonts/font-sony-misc/font-sony-misc-1.0.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
DESCRIPTION="X.Org Sony fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE=""
DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-sun-misc/font-sun-misc-1.0.3-r1.ebuild b/media-fonts/font-sun-misc/font-sun-misc-1.0.3-r1.ebuild
index dc3acb5b96b..c13ca966e21 100644
--- a/media-fonts/font-sun-misc/font-sun-misc-1.0.3-r1.ebuild
+++ b/media-fonts/font-sun-misc/font-sun-misc-1.0.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
DESCRIPTION="X.Org Sun fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
DEPEND="x11-apps/bdftopcf"
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 307652e88e9..2a77481a8ef 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
@@ -7,7 +7,7 @@ inherit xorg-3
EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/font/util.git"
DESCRIPTION="X.Org font utilities"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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-r1.ebuild b/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.3-r1.ebuild
index 36542358b68..26f4c47aa0e 100644
--- a/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.3-r1.ebuild
+++ b/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
DESCRIPTION="X.Org Winitzki cyrillic font"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE=""
DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.4-r1.ebuild b/media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.4-r1.ebuild
index 4ee0ea2dcae..5320c454289 100644
--- a/media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.4-r1.ebuild
+++ b/media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.4-r1.ebuild
@@ -6,5 +6,5 @@ inherit xorg-2
DESCRIPTION="X.Org XFree86 Type 1 font"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE=""
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 338db6c78db..05a82516e62 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
@@ -21,7 +21,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ppc s390 sh x86"
+KEYWORDS="~alpha amd64 arm ia64 ppc s390 x86"
S="${WORKDIR}"
FONT_S="${S}"
diff --git a/media-fonts/freefont/freefont-20120503.ebuild b/media-fonts/freefont/freefont-20120503.ebuild
index f248f287f33..8494342c951 100644
--- a/media-fonts/freefont/freefont-20120503.ebuild
+++ b/media-fonts/freefont/freefont-20120503.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/freefont/${PN}-ttf-${PV}.zip
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
DEPEND="app-arch/unzip"
diff --git a/media-fonts/freefonts/freefonts-0.10-r4.ebuild b/media-fonts/freefonts/freefonts-0.10-r4.ebuild
index 9977f28424d..e380c35cce2 100644
--- a/media-fonts/freefonts/freefonts-0.10-r4.ebuild
+++ b/media-fonts/freefonts/freefonts-0.10-r4.ebuild
@@ -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 sh 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 915847fa791..0ccddf75f52 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~ppc s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 3f08b83d390..678f727a0d2 100644
--- a/media-fonts/hunkyfonts/hunkyfonts-0.3.1.ebuild
+++ b/media-fonts/hunkyfonts/hunkyfonts-0.3.1.ebuild
@@ -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 sh 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 13fa5330bff..6bb75db1e60 100644
--- a/media-fonts/intlfonts/intlfonts-1.2.1-r1.ebuild
+++ b/media-fonts/intlfonts/intlfonts-1.2.1-r1.ebuild
@@ -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 sh 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/ipaex/ipaex-002.01.ebuild b/media-fonts/ipaex/ipaex-002.01.ebuild
index 33d238b3403..e47305f05ce 100644
--- a/media-fonts/ipaex/ipaex-002.01.ebuild
+++ b/media-fonts/ipaex/ipaex-002.01.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://dl.ipafont.ipa.go.jp/IPAexfont/${MY_P}.zip"
LICENSE="IPAfont"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE=""
RESTRICT="binchecks strip test"
diff --git a/media-fonts/ipamonafont/ipamonafont-1.0.8.ebuild b/media-fonts/ipamonafont/ipamonafont-1.0.8.ebuild
index 70d90eb586a..60a187d4282 100644
--- a/media-fonts/ipamonafont/ipamonafont-1.0.8.ebuild
+++ b/media-fonts/ipamonafont/ipamonafont-1.0.8.ebuild
@@ -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 hppa ia64 ppc ~ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ~ppc64 s390 sparc x86"
IUSE=""
RESTRICT="mirror"
diff --git a/media-fonts/ja-ipafonts/ja-ipafonts-003.02-r1.ebuild b/media-fonts/ja-ipafonts/ja-ipafonts-003.02-r1.ebuild
index 3324379b397..aed28e28b20 100644
--- a/media-fonts/ja-ipafonts/ja-ipafonts-003.02-r1.ebuild
+++ b/media-fonts/ja-ipafonts/ja-ipafonts-003.02-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://dl.ipafont.ipa.go.jp/IPAfont/${MY_P}.zip"
LICENSE="IPAfont"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sh x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE=""
RESTRICT="binchecks strip"
diff --git a/media-fonts/ja-ipafonts/ja-ipafonts-003.03.ebuild b/media-fonts/ja-ipafonts/ja-ipafonts-003.03.ebuild
index 0fd0be000a1..a6da02dbf0e 100644
--- a/media-fonts/ja-ipafonts/ja-ipafonts-003.03.ebuild
+++ b/media-fonts/ja-ipafonts/ja-ipafonts-003.03.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -13,7 +13,7 @@ SRC_URI="http://dl.ipafont.ipa.go.jp/IPAfont/${MY_P}.zip"
LICENSE="IPAfont"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 190882bba47..6e165366d86 100644
--- a/media-fonts/jisx0213-fonts/jisx0213-fonts-20040425-r2.ebuild
+++ b/media-fonts/jisx0213-fonts/jisx0213-fonts-20040425-r2.ebuild
@@ -23,7 +23,7 @@ SRC_URI="mirror://gentoo/jiskan16-2004-1.bdf.gz
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ppc s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ia64 ppc s390 sparc x86"
IUSE=""
RESTRICT="binchecks strip"
diff --git a/media-fonts/kacst-fonts/kacst-fonts-2.01.ebuild b/media-fonts/kacst-fonts/kacst-fonts-2.01.ebuild
index b81857a9a45..914b89f5e70 100644
--- a/media-fonts/kacst-fonts/kacst-fonts-2.01.ebuild
+++ b/media-fonts/kacst-fonts/kacst-fonts-2.01.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/arabeyes/${P//-/_}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~s390 ~sparc x86"
IUSE=""
FONT_SUFFIX="ttf"
diff --git a/media-fonts/kochi-substitute/kochi-substitute-20030809-r3.ebuild b/media-fonts/kochi-substitute/kochi-substitute-20030809-r3.ebuild
index 36f5204320b..fc1c378df5d 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 43867cd5d5a..bf1eb2c6f86 100644
--- a/media-fonts/konfont/konfont-0.1.ebuild
+++ b/media-fonts/konfont/konfont-0.1.ebuild
@@ -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 sh 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 570cd429b98..2a12c20123a 100644
--- a/media-fonts/lfpfonts-fix/lfpfonts-fix-0.83-r2.ebuild
+++ b/media-fonts/lfpfonts-fix/lfpfonts-fix-0.83-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://sourceforge.net/projects/xfonts/"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ppc s390 sh 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 17e56a4787f..ffaac34c6e9 100644
--- a/media-fonts/lfpfonts-var/lfpfonts-var-0.84.ebuild
+++ b/media-fonts/lfpfonts-var/lfpfonts-var-0.84.ebuild
@@ -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 sh 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 432a4906091..cf816a395fc 100644
--- a/media-fonts/lohit-assamese/lohit-assamese-2.91.5.ebuild
+++ b/media-fonts/lohit-assamese/lohit-assamese-2.91.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 s390 sh sparc x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 s390 sparc x86 ~ppc-macos ~x86-macos"
IUSE=""
DEPEND="!<media-fonts/lohit-fonts-2.20150220"
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 b560d7b03f9..05ea9e55fda 100644
--- a/media-fonts/lohit-bengali/lohit-bengali-2.91.5.ebuild
+++ b/media-fonts/lohit-bengali/lohit-bengali-2.91.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 s390 sh sparc x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 s390 sparc x86 ~ppc-macos ~x86-macos"
IUSE=""
DEPEND="!<media-fonts/lohit-fonts-2.20150220"
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 f7f87104b2f..45249157623 100644
--- a/media-fonts/lohit-devanagari/lohit-devanagari-2.95.4.ebuild
+++ b/media-fonts/lohit-devanagari/lohit-devanagari-2.95.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 s390 sh sparc x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 s390 sparc x86 ~ppc-macos ~x86-macos"
IUSE=""
DEPEND="!<media-fonts/lohit-fonts-2.20150220"
diff --git a/media-fonts/lohit-fonts/lohit-fonts-2.20150220.ebuild b/media-fonts/lohit-fonts/lohit-fonts-2.20150220.ebuild
index bb9d8b32233..e0c2f9f47f7 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 sh sparc x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 s390 sparc x86 ~ppc-macos ~x86-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 99808457541..c5080cf5033 100644
--- a/media-fonts/lohit-gujarati/lohit-gujarati-2.92.4.ebuild
+++ b/media-fonts/lohit-gujarati/lohit-gujarati-2.92.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 s390 sh sparc x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 s390 sparc x86 ~ppc-macos ~x86-macos"
IUSE=""
DEPEND="!<media-fonts/lohit-fonts-2.20150220"
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 af8c775de19..79d9bb6b3d2 100644
--- a/media-fonts/lohit-gurmukhi/lohit-gurmukhi-2.91.2.ebuild
+++ b/media-fonts/lohit-gurmukhi/lohit-gurmukhi-2.91.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 s390 sh sparc x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 s390 sparc x86 ~ppc-macos ~x86-macos"
IUSE=""
DEPEND="!<media-fonts/lohit-fonts-2.20150220"
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 6c98034bcc3..aad66327b17 100644
--- a/media-fonts/lohit-kannada/lohit-kannada-2.5.4.ebuild
+++ b/media-fonts/lohit-kannada/lohit-kannada-2.5.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 s390 sh sparc x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 s390 sparc x86 ~ppc-macos ~x86-macos"
IUSE=""
DEPEND="!<media-fonts/lohit-fonts-2.20150220"
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 6e186b0038c..3702bbe0f24 100644
--- a/media-fonts/lohit-malayalam/lohit-malayalam-2.92.2.ebuild
+++ b/media-fonts/lohit-malayalam/lohit-malayalam-2.92.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 s390 sh sparc x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 s390 sparc x86 ~ppc-macos ~x86-macos"
IUSE=""
DEPEND="!<media-fonts/lohit-fonts-2.20150220"
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 34b72b40e05..05947403a4a 100644
--- a/media-fonts/lohit-marathi/lohit-marathi-2.94.2.ebuild
+++ b/media-fonts/lohit-marathi/lohit-marathi-2.94.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 s390 sh sparc x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 s390 sparc x86 ~ppc-macos ~x86-macos"
IUSE=""
DEPEND="!<media-fonts/lohit-fonts-2.20150220"
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 82beacaac27..3ae5123857d 100644
--- a/media-fonts/lohit-nepali/lohit-nepali-2.94.2.ebuild
+++ b/media-fonts/lohit-nepali/lohit-nepali-2.94.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 s390 sh sparc x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 s390 sparc x86 ~ppc-macos ~x86-macos"
IUSE=""
DEPEND="!<media-fonts/lohit-fonts-2.20150220"
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 235e6c07ad5..62f88d26a1d 100644
--- a/media-fonts/lohit-odia/lohit-odia-2.91.2.ebuild
+++ b/media-fonts/lohit-odia/lohit-odia-2.91.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 s390 sh sparc x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 s390 sparc x86 ~ppc-macos ~x86-macos"
IUSE=""
DEPEND="!<media-fonts/lohit-fonts-2.20150220"
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 36cf3b4a6c9..5f97a1188a3 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
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 s390 sh sparc x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 s390 sparc x86 ~ppc-macos ~x86-macos"
IUSE=""
DEPEND="!<media-fonts/lohit-fonts-2.20150220"
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 ce9e9f5b1d5..f3fe1e9aba3 100644
--- a/media-fonts/lohit-tamil/lohit-tamil-2.91.3.ebuild
+++ b/media-fonts/lohit-tamil/lohit-tamil-2.91.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 s390 sh sparc x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 s390 sparc x86 ~ppc-macos ~x86-macos"
IUSE=""
DEPEND="!<media-fonts/lohit-fonts-2.20150220"
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 52d4b5ad655..72b2cf62cc3 100644
--- a/media-fonts/lohit-telugu/lohit-telugu-2.5.5.ebuild
+++ b/media-fonts/lohit-telugu/lohit-telugu-2.5.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 s390 sh sparc x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 s390 sparc x86 ~ppc-macos ~x86-macos"
IUSE=""
DEPEND="!<media-fonts/lohit-fonts-2.20150220"
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 5b0aa333e1a..1a07e18bcab 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
@@ -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 sh 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 6646e5f2d93..4632306bea4 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
@@ -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 sh 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 401e8006b9b..502ae9d92eb 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
@@ -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 sh 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 a23d7b88942..cd6d0c24a1c 100644
--- a/media-fonts/monafont/monafont-2.90-r2.ebuild
+++ b/media-fonts/monafont/monafont-2.90-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sh 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 adf9498b1bc..e3c58b49315 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 @@ SRC_URI="mirror://sourceforge.jp/${PN}/5030/${MY_P}.tar.gz"
LICENSE="mplus-fonts"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE="X"
DEPEND=">=x11-apps/mkfontscale-1.2.0
diff --git a/media-fonts/open-sans/open-sans-1-r1.ebuild b/media-fonts/open-sans/open-sans-1-r1.ebuild
index cea11b713e0..3a0d0f0111c 100644
--- a/media-fonts/open-sans/open-sans-1-r1.ebuild
+++ b/media-fonts/open-sans/open-sans-1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~jstein/dist/${P}.zip"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
DEPEND="app-arch/unzip"
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 26357de8265..235577e63fa 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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.gz"
LICENSE="Arphic"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sparc ~x86"
IUSE=""
FONT_SUFFIX="ttf ttc"
diff --git a/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2.ebuild b/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2.ebuild
index ed8a4255853..88aa54632fe 100644
--- a/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2.ebuild
+++ b/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
LICENSE="Arphic"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc s390 sparc x86"
IUSE=""
FONT_SUFFIX="ttf ttc"
diff --git a/media-fonts/oto/oto-0.5.ebuild b/media-fonts/oto/oto-0.5.ebuild
index f6f1b6bcc23..52a7aa849c9 100644
--- a/media-fonts/oto/oto-0.5.ebuild
+++ b/media-fonts/oto/oto-0.5.ebuild
@@ -9,4 +9,4 @@ SRC_URI="mirror://sourceforge/oto/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ~ppc ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ia64 ~ppc ~s390 sparc x86"
diff --git a/media-fonts/pcf2bdf/pcf2bdf-1.04-r1.ebuild b/media-fonts/pcf2bdf/pcf2bdf-1.04-r1.ebuild
index 03352f559d8..e86ae57b79d 100644
--- a/media-fonts/pcf2bdf/pcf2bdf-1.04-r1.ebuild
+++ b/media-fonts/pcf2bdf/pcf2bdf-1.04-r1.ebuild
@@ -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 sh 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 a76819ddc07..ca0a9089a3a 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 4a3f9206a72..4bc3e166e07 100644
--- a/media-fonts/sgi-fonts/sgi-fonts-1.0.ebuild
+++ b/media-fonts/sgi-fonts/sgi-fonts-1.0.ebuild
@@ -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 sh 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 182a015894a..3db166986e3 100644
--- a/media-fonts/shinonome/shinonome-0.9.11.ebuild
+++ b/media-fonts/shinonome/shinonome-0.9.11.ebuild
@@ -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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 s390 sparc x86"
# Only installs fonts
RESTRICT="strip binchecks"
diff --git a/media-fonts/sil-abyssinica/sil-abyssinica-1.500.ebuild b/media-fonts/sil-abyssinica/sil-abyssinica-1.500.ebuild
index 1ab0cef9d1e..9d94da07b2a 100644
--- a/media-fonts/sil-abyssinica/sil-abyssinica-1.500.ebuild
+++ b/media-fonts/sil-abyssinica/sil-abyssinica-1.500.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://software.sil.org/downloads/r/${PN/sil-/}/${MY_P}.zip"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sparc x86 ~ppc-macos ~x86-macos"
IUSE="doc"
DEPEND="app-arch/unzip"
diff --git a/media-fonts/sil-arabicfonts/sil-arabicfonts-2.100.ebuild b/media-fonts/sil-arabicfonts/sil-arabicfonts-2.100.ebuild
index bc679a508a7..92b4270a9fd 100644
--- a/media-fonts/sil-arabicfonts/sil-arabicfonts-2.100.ebuild
+++ b/media-fonts/sil-arabicfonts/sil-arabicfonts-2.100.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://software.sil.org/downloads/r/scheherazade/${MY_P1}.zip
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sparc x86"
DEPEND="app-arch/unzip"
RDEPEND=""
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 e5e2f589b20..2615b278da6 100644
--- a/media-fonts/sil-charis/sil-charis-5.000-r1.ebuild
+++ b/media-fonts/sil-charis/sil-charis-5.000-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://scripts.sil.org/cms/scripts/render_download.php?format=file&medi
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~x64-macos"
IUSE="compact"
DEPEND="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 978ec8df610..3cb0684161c 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 @@ SRC_URI="http://scripts.sil.org/cms/scripts/render_download.php?format=file&medi
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86"
IUSE=""
DEPEND="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 b2159a85a40..23c07b53c2a 100644
--- a/media-fonts/sil-ezra/sil-ezra-2.51.ebuild
+++ b/media-fonts/sil-ezra/sil-ezra-2.51.ebuild
@@ -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 sh 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 67961dfe5d2..2337d7b0f06 100644
--- a/media-fonts/sil-galatia/sil-galatia-2.1.ebuild
+++ b/media-fonts/sil-galatia/sil-galatia-2.1.ebuild
@@ -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 sh 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 f88105d33a5..5fcf790f98f 100644
--- a/media-fonts/sil-gentium/sil-gentium-5.000-r1.ebuild
+++ b/media-fonts/sil-gentium/sil-gentium-5.000-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://scripts.sil.org/cms/scripts/render_download.php?format=file&medi
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
IUSE="compact doc"
DEPEND="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 e8350b2a1d3..62350a62e07 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 @@ SRC_URI="mirror://gentoo/${MY_PN}-${PV}.zip"
LICENSE="OFL"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86"
IUSE=""
DEPEND="app-arch/unzip"
diff --git a/media-fonts/source-han-sans/source-han-sans-1.001.ebuild b/media-fonts/source-han-sans/source-han-sans-1.001.ebuild
index 16744de4633..de806318ae4 100644
--- a/media-fonts/source-han-sans/source-han-sans-1.001.ebuild
+++ b/media-fonts/source-han-sans/source-han-sans-1.001.ebuild
@@ -17,7 +17,7 @@ SRC_URI="l10n_ja? ( https://dev.gentoo.org/~jstein/dist/${PN}-ja-${PV}.tar.xz )
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sh sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~x64-macos"
IUSE="l10n_ja l10n_ko +l10n_zh-CN l10n_zh-TW"
REQUIRED_USE="|| ( l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW )"
diff --git a/media-fonts/source-han-sans/source-han-sans-1.004.ebuild b/media-fonts/source-han-sans/source-han-sans-1.004.ebuild
index a24712f8e94..6ab8669f165 100644
--- a/media-fonts/source-han-sans/source-han-sans-1.004.ebuild
+++ b/media-fonts/source-han-sans/source-han-sans-1.004.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -18,7 +18,7 @@ SRC_URI="
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
IUSE="l10n_ja l10n_ko +l10n_zh-CN l10n_zh-TW"
REQUIRED_USE="|| ( l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW )"
diff --git a/media-fonts/source-pro/source-pro-20141211.ebuild b/media-fonts/source-pro/source-pro-20141211.ebuild
index c8295a89ecf..a2f2efaa09a 100644
--- a/media-fonts/source-pro/source-pro-20141211.ebuild
+++ b/media-fonts/source-pro/source-pro-20141211.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/adobe-fonts/source-sans-pro/archive/${SANSV}.tar.gz
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sh sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~x64-macos"
IUSE="cjk"
RDEPEND="media-libs/fontconfig
diff --git a/media-fonts/source-pro/source-pro-20160608.ebuild b/media-fonts/source-pro/source-pro-20160608.ebuild
index 99804914606..d6fd64638e6 100644
--- a/media-fonts/source-pro/source-pro-20160608.ebuild
+++ b/media-fonts/source-pro/source-pro-20160608.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/adobe-fonts/source-sans-pro/archive/${SANSV}.tar.gz
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
IUSE="cjk"
RDEPEND="media-libs/fontconfig
diff --git a/media-fonts/source-pro/source-pro-20170111.ebuild b/media-fonts/source-pro/source-pro-20170111.ebuild
index db747fe5040..82eef2bbad0 100644
--- a/media-fonts/source-pro/source-pro-20170111.ebuild
+++ b/media-fonts/source-pro/source-pro-20170111.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/adobe-fonts/source-sans-pro/archive/${SANSV}.tar.gz
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sh sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~x64-macos"
IUSE="cjk"
RDEPEND="media-libs/fontconfig
diff --git a/media-fonts/stix-fonts/stix-fonts-1.1.1.ebuild b/media-fonts/stix-fonts/stix-fonts-1.1.1.ebuild
index 2510c026c40..398b713a390 100644
--- a/media-fonts/stix-fonts/stix-fonts-1.1.1.ebuild
+++ b/media-fonts/stix-fonts/stix-fonts-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN/-/}/STIXv${PV}-word.zip"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE=""
DEPEND="app-arch/unzip"
diff --git a/media-fonts/stix-fonts/stix-fonts-2.0.0.ebuild b/media-fonts/stix-fonts/stix-fonts-2.0.0.ebuild
index 56967a0726d..4fca51144ee 100644
--- a/media-fonts/stix-fonts/stix-fonts-2.0.0.ebuild
+++ b/media-fonts/stix-fonts/stix-fonts-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 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}.zip"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE=""
DEPEND="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 26c4f3bfbbe..6929329891a 100644
--- a/media-fonts/tengwar-fonts/tengwar-fonts-1.9d.ebuild
+++ b/media-fonts/tengwar-fonts/tengwar-fonts-1.9d.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="free-noncomm"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 s390 sparc x86"
BDEPEND="app-arch/unzip"
diff --git a/media-fonts/terminus-font/terminus-font-4.46.ebuild b/media-fonts/terminus-font/terminus-font-4.46.ebuild
index 4451622925d..f5833fdc88b 100644
--- a/media-fonts/terminus-font/terminus-font-4.46.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.46.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
LICENSE="OFL-1.1 GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="a-like-o +center-tilde distinct-l +pcf +pcf-unicode-only +psf quote
ru-dv +ru-g ru-i ru-k"
diff --git a/media-fonts/terminus-font/terminus-font-4.47.ebuild b/media-fonts/terminus-font/terminus-font-4.47.ebuild
index f37d2391b73..40ce47872db 100644
--- a/media-fonts/terminus-font/terminus-font-4.47.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.47.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
LICENSE="OFL-1.1 GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="a-like-o +center-tilde distinct-l +pcf +pcf-unicode-only +psf quote
ru-dv +ru-g ru-i ru-k"
diff --git a/media-fonts/terminus-font/terminus-font-4.48.ebuild b/media-fonts/terminus-font/terminus-font-4.48.ebuild
index f37d2391b73..40ce47872db 100644
--- a/media-fonts/terminus-font/terminus-font-4.48.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.48.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
LICENSE="OFL-1.1 GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="a-like-o +center-tilde distinct-l +pcf +pcf-unicode-only +psf quote
ru-dv +ru-g ru-i ru-k"
diff --git a/media-fonts/texcm-ttf/texcm-ttf-1.0.ebuild b/media-fonts/texcm-ttf/texcm-ttf-1.0.ebuild
index 28c8186a527..e3674f7c75c 100644
--- a/media-fonts/texcm-ttf/texcm-ttf-1.0.ebuild
+++ b/media-fonts/texcm-ttf/texcm-ttf-1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.zip"
LICENSE="bakoma"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh 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"
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 1022ac5e98c..0f28511ea08 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 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
DOCS="COPYRIGHT.TXT README.TXT RELEASENOTES.TXT"
FONT_SUFFIX="ttf"
--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 aaccc5e493d..a4f3520812f 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
@@ -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 sh 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 467f8085013..e00c6a21716 100644
--- a/media-fonts/unfonts/unfonts-1.0.2_pre080608-r1.ebuild
+++ b/media-fonts/unfonts/unfonts-1.0.2_pre080608-r1.ebuild
@@ -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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 s390 sparc x86"
IUSE=""
# Only installs fonts
RESTRICT="strip binchecks"
diff --git a/media-fonts/unifont/unifont-10.0.04.ebuild b/media-fonts/unifont/unifont-10.0.04.ebuild
index c7f38721c87..33cd165967b 100644
--- a/media-fonts/unifont/unifont-10.0.04.ebuild
+++ b/media-fonts/unifont/unifont-10.0.04.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 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}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="fontforge utils"
DEPEND="
diff --git a/media-fonts/unifont/unifont-10.0.05.ebuild b/media-fonts/unifont/unifont-10.0.05.ebuild
index c7f38721c87..33cd165967b 100644
--- a/media-fonts/unifont/unifont-10.0.05.ebuild
+++ b/media-fonts/unifont/unifont-10.0.05.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 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}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="fontforge utils"
DEPEND="
diff --git a/media-fonts/unifont/unifont-10.0.06.ebuild b/media-fonts/unifont/unifont-10.0.06.ebuild
index 809688e7153..f2eb42d79da 100644
--- a/media-fonts/unifont/unifont-10.0.06.ebuild
+++ b/media-fonts/unifont/unifont-10.0.06.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 ~s390 sparc x86"
IUSE="fontforge utils"
DEPEND="
diff --git a/media-fonts/unifont/unifont-11.0.02.ebuild b/media-fonts/unifont/unifont-11.0.02.ebuild
index 09349057d2f..847c858d4f0 100644
--- a/media-fonts/unifont/unifont-11.0.02.ebuild
+++ b/media-fonts/unifont/unifont-11.0.02.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 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}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="fontforge utils"
DEPEND="
diff --git a/media-fonts/unifont/unifont-9.0.06.ebuild b/media-fonts/unifont/unifont-9.0.06.ebuild
index 2f51aa949a3..6be3cb86d54 100644
--- a/media-fonts/unifont/unifont-9.0.06.ebuild
+++ b/media-fonts/unifont/unifont-9.0.06.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 ~s390 sparc x86"
IUSE="fontforge utils"
DEPEND="
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 6e4cde4201d..465f1bda122 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 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 73bc45f66af..75bc18deff0 100644
--- a/media-fonts/urwvn-fonts/urwvn-fonts-3.05.ebuild
+++ b/media-fonts/urwvn-fonts/urwvn-fonts-3.05.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/project/vntex/urwvn-ttf/${MY_P}-ttf.tar.bz2"
LICENSE="GPL-2 Aladdin" # see bug #434262
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc s390 sparc x86"
IUSE=""
S="${WORKDIR}/${MY_P}-ttf"
diff --git a/media-fonts/vollkorn/vollkorn-2.1.ebuild b/media-fonts/vollkorn/vollkorn-2.1.ebuild
index 582cd7cb3ee..77be6a4a34f 100644
--- a/media-fonts/vollkorn/vollkorn-2.1.ebuild
+++ b/media-fonts/vollkorn/vollkorn-2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://friedrichalthausen.de/Vollkorn-${PV}.zip"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE=""
# Only installs fonts
RESTRICT="strip binchecks"
diff --git a/media-fonts/wqy-bitmapfont/wqy-bitmapfont-1.0.0_rc1.ebuild b/media-fonts/wqy-bitmapfont/wqy-bitmapfont-1.0.0_rc1.ebuild
index c5d1dad91b0..87b9f7dbde3 100644
--- a/media-fonts/wqy-bitmapfont/wqy-bitmapfont-1.0.0_rc1.ebuild
+++ b/media-fonts/wqy-bitmapfont/wqy-bitmapfont-1.0.0_rc1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/wqy/${MY_PN}-pcf-${PV/_rc/-RC}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ~s390 sparc x86"
IUSE=""
# Only installs fonts
RESTRICT="strip binchecks"
diff --git a/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r3.ebuild b/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r3.ebuild
index fef31db5e9f..7815e377eb2 100644
--- a/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r3.ebuild
+++ b/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r3.ebuild
@@ -11,7 +11,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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ia64 ppc s390 sparc x86"
BDEPEND="
x11-misc/imake
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 827d1a9bf3a..4f59cf47a97 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 ~sh ~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 e2e33f0ed5a..44796e09bd4 100644
--- a/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r3.ebuild
+++ b/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ppc s390 sh 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 e2cc624b1b2..767a27a402d 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 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE=""
# these apps are used at runtime by ebdftopcf
diff --git a/media-gfx/exiv2/exiv2-0.27.2.ebuild b/media-gfx/exiv2/exiv2-0.27.2.ebuild
index eb4ea7a0803..0ab81f1bea8 100644
--- a/media-gfx/exiv2/exiv2-0.27.2.ebuild
+++ b/media-gfx/exiv2/exiv2-0.27.2.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999 ]]; then
inherit git-r3
else
SRC_URI="https://exiv2.org/builds/${P}-Source.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh 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"
fi
CMAKE_ECLASS=cmake
diff --git a/media-gfx/fbida/fbida-2.12.ebuild b/media-gfx/fbida/fbida-2.12.ebuild
index ab56de804a3..ac6cac23494 100644
--- a/media-gfx/fbida/fbida-2.12.ebuild
+++ b/media-gfx/fbida/fbida-2.12.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
"
LICENSE="GPL-2 IJG"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ppc ppc64 sparc x86"
IUSE="curl fbcon ghostscript +gif lirc +png scanner +tiff X +webp"
REQUIRED_USE="
ghostscript? ( tiff )
diff --git a/media-gfx/fbida/fbida-2.13-r1.ebuild b/media-gfx/fbida/fbida-2.13-r1.ebuild
index 64860913dbe..9c67c20e134 100644
--- a/media-gfx/fbida/fbida-2.13-r1.ebuild
+++ b/media-gfx/fbida/fbida-2.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="
"
LICENSE="GPL-2 IJG"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE="curl fbcon ghostscript +gif lirc +png scanner +tiff X +webp"
REQUIRED_USE="
ghostscript? ( tiff )
diff --git a/media-gfx/fbida/fbida-2.14.ebuild b/media-gfx/fbida/fbida-2.14.ebuild
index 7f663d4f342..c7ddbadf36c 100644
--- a/media-gfx/fbida/fbida-2.14.ebuild
+++ b/media-gfx/fbida/fbida-2.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="
"
LICENSE="GPL-2 IJG"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE="curl fbcon ghostscript +gif lirc +png scanner +tiff X +webp"
REQUIRED_USE="
ghostscript? ( tiff )
diff --git a/media-gfx/fontforge/fontforge-20170731-r5.ebuild b/media-gfx/fontforge/fontforge-20170731-r5.ebuild
index 90a77ef518b..e9f552b4de4 100644
--- a/media-gfx/fontforge/fontforge-20170731-r5.ebuild
+++ b/media-gfx/fontforge/fontforge-20170731-r5.ebuild
@@ -13,7 +13,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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="cairo truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode X"
RESTRICT="!test? ( test )"
diff --git a/media-gfx/fontforge/fontforge-20190317-r3.ebuild b/media-gfx/fontforge/fontforge-20190317-r3.ebuild
index b6d8e0e08cb..3116cb1b793 100644
--- a/media-gfx/fontforge/fontforge-20190317-r3.ebuild
+++ b/media-gfx/fontforge/fontforge-20190317-r3.ebuild
@@ -13,7 +13,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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="cairo truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode X"
RESTRICT="!test? ( test )"
diff --git a/media-gfx/fontforge/fontforge-20190801.ebuild b/media-gfx/fontforge/fontforge-20190801.ebuild
index 40ce320955c..32a1a5e8348 100644
--- a/media-gfx/fontforge/fontforge-20190801.ebuild
+++ b/media-gfx/fontforge/fontforge-20190801.ebuild
@@ -13,7 +13,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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="cairo truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode X"
RESTRICT="!test? ( test )"
diff --git a/media-gfx/gnome-font-viewer/gnome-font-viewer-3.32.0.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-3.32.0.ebuild
index eb3984b8702..eceff0c61b9 100644
--- a/media-gfx/gnome-font-viewer/gnome-font-viewer-3.32.0.ebuild
+++ b/media-gfx/gnome-font-viewer/gnome-font-viewer-3.32.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-font-viewer"
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="0"
IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
RDEPEND="
>=dev-libs/glib-2.35.1:2
diff --git a/media-gfx/gnome-font-viewer/gnome-font-viewer-3.34.0.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-3.34.0.ebuild
index 92f58830eb3..1a0343af934 100644
--- a/media-gfx/gnome-font-viewer/gnome-font-viewer-3.34.0.ebuild
+++ b/media-gfx/gnome-font-viewer/gnome-font-viewer-3.34.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-font-viewer"
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="0"
IUSE=""
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
RDEPEND="
>=dev-libs/glib-2.35.1:2
diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-3.32.0.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-3.32.0.ebuild
index 9d6b6a3b2a0..521236d8c9c 100644
--- a/media-gfx/gnome-screenshot/gnome-screenshot-3.32.0.ebuild
+++ b/media-gfx/gnome-screenshot/gnome-screenshot-3.32.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-screenshot"
LICENSE="GPL-2+"
SLOT="0"
IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
# libcanberra 0.26-r2 is needed for gtk+:3 fixes
DEPEND="
diff --git a/media-gfx/graphite2/graphite2-1.3.13.ebuild b/media-gfx/graphite2/graphite2-1.3.13.ebuild
index 3b8abd615a3..3847dad149a 100644
--- a/media-gfx/graphite2/graphite2-1.3.13.ebuild
+++ b/media-gfx/graphite2/graphite2-1.3.13.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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="perl test"
RESTRICT="!test? ( test )"
diff --git a/media-gfx/graphviz/graphviz-2.42.3.ebuild b/media-gfx/graphviz/graphviz-2.42.3.ebuild
index fd8cee3432b..51a1652b93d 100644
--- a/media-gfx/graphviz/graphviz-2.42.3.ebuild
+++ b/media-gfx/graphviz/graphviz-2.42.3.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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
IUSE="+cairo devil doc examples gdk-pixbuf 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/gtkimageview/gtkimageview-1.6.4.ebuild b/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
index e7f1da0489b..b967fdb3163 100644
--- a/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
+++ b/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE="examples static-libs"
# tests are severely broken, bug #483952
diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.0.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.0.ebuild
index d9f410ec978..39813da4202 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.11.0.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.11.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
LICENSE="imagemagick"
SLOT="0/6.9.11"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
REQUIRED_USE="corefonts? ( truetype )
diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.1.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.1.ebuild
index d3efe07546f..6091e7fc988 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.11.1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.11.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
LICENSE="imagemagick"
SLOT="0/6.9.11"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
REQUIRED_USE="corefonts? ( truetype )
diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.0.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.0.ebuild
index e6ced6e0fc4..325c7855893 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.10.0.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.10.0.ebuild
@@ -13,7 +13,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A collection of tools and libraries for many image formats"
diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.1.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.1.ebuild
index a9e638d3fb7..0de3a35e9a9 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.10.1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.10.1.ebuild
@@ -13,7 +13,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A collection of tools and libraries for many image formats"
diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-9999.ebuild
index a9e638d3fb7..0de3a35e9a9 100644
--- a/media-gfx/imagemagick/imagemagick-9999.ebuild
+++ b/media-gfx/imagemagick/imagemagick-9999.ebuild
@@ -13,7 +13,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A collection of tools and libraries for many image formats"
diff --git a/media-gfx/potrace/potrace-1.15.ebuild b/media-gfx/potrace/potrace-1.15.ebuild
index 45c8a269b26..b299dbd14f6 100644
--- a/media-gfx/potrace/potrace-1.15.ebuild
+++ b/media-gfx/potrace/potrace-1.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://potrace.sourceforge.net/download/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh 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="metric static-libs"
RDEPEND="sys-libs/zlib"
diff --git a/media-gfx/potrace/potrace-1.16.ebuild b/media-gfx/potrace/potrace-1.16.ebuild
index ac56cfcdbd3..03f6e9cd2c6 100644
--- a/media-gfx/potrace/potrace-1.16.ebuild
+++ b/media-gfx/potrace/potrace-1.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://potrace.sourceforge.net/download/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~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="metric static-libs"
RDEPEND="sys-libs/zlib:="
diff --git a/media-gfx/sam2p/sam2p-0.49.3.ebuild b/media-gfx/sam2p/sam2p-0.49.3.ebuild
index 6559080f200..aa525ceee9f 100644
--- a/media-gfx/sam2p/sam2p-0.49.3.ebuild
+++ b/media-gfx/sam2p/sam2p-0.49.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/pts/${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 ~sh sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
IUSE="examples gif"
DEPEND="dev-lang/perl"
diff --git a/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild b/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild
index 149f3fdc347..93788a92505 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild
@@ -122,7 +122,7 @@ SRC_URI="https://alioth.debian.org/frs/download.php/file/${FRS_ID}/${P}.tar.gz"
LICENSE="GPL-2 public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh 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="
sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
diff --git a/media-gfx/scrot/scrot-0.8_p13-r1.ebuild b/media-gfx/scrot/scrot-0.8_p13-r1.ebuild
index b090cb21f60..94d6392391d 100644
--- a/media-gfx/scrot/scrot-0.8_p13-r1.ebuild
+++ b/media-gfx/scrot/scrot-0.8_p13-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://${PN}.sourcearchive.com/downloads/${MY_PV}/${PN}_0.8.orig.tar.gz
LICENSE="feh LGPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86"
IUSE=""
RDEPEND=">=media-libs/imlib2-1.0.3
diff --git a/media-gfx/scrot/scrot-1.2.ebuild b/media-gfx/scrot/scrot-1.2.ebuild
index d61d7a45964..234442c4fbc 100644
--- a/media-gfx/scrot/scrot-1.2.ebuild
+++ b/media-gfx/scrot/scrot-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/archive/${PV
LICENSE="feh LGPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
RDEPEND="
>=media-libs/giblib-1.2.3
diff --git a/media-gfx/ufraw/ufraw-0.22-r3.ebuild b/media-gfx/ufraw/ufraw-0.22-r3.ebuild
index 364bb452b7e..bc5fd6d1930 100644
--- a/media-gfx/ufraw/ufraw-0.22-r3.ebuild
+++ b/media-gfx/ufraw/ufraw-0.22-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh 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"
IUSE="contrast fits gimp gnome gtk openmp timezone"
REQUIRED_USE="gimp? ( gtk )"
diff --git a/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
index 3e16fb47f0c..b8f62dc92f5 100644
--- a/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
+++ b/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.x.org/R5contrib/${P/-/.}.tar.gz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="tiff jpeg png"
RDEPEND="x11-libs/libX11
diff --git a/media-libs/a52dec/a52dec-0.7.4-r6.ebuild b/media-libs/a52dec/a52dec-0.7.4-r6.ebuild
index 424f9c45103..d02e5ee53c2 100644
--- a/media-libs/a52dec/a52dec-0.7.4-r6.ebuild
+++ b/media-libs/a52dec/a52dec-0.7.4-r6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://liba52.sourceforge.net/files/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="djbfft oss static-libs"
RDEPEND="djbfft? ( sci-libs/djbfft )"
diff --git a/media-libs/a52dec/a52dec-0.7.4-r7.ebuild b/media-libs/a52dec/a52dec-0.7.4-r7.ebuild
index d529b1867b8..3038ae45e33 100644
--- a/media-libs/a52dec/a52dec-0.7.4-r7.ebuild
+++ b/media-libs/a52dec/a52dec-0.7.4-r7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://liba52.sourceforge.net/files/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="djbfft oss static-libs"
RDEPEND="djbfft? ( >=sci-libs/djbfft-0.76-r2[${MULTILIB_USEDEP}] )"
diff --git a/media-libs/aalib/aalib-1.4_rc5-r9.ebuild b/media-libs/aalib/aalib-1.4_rc5-r9.ebuild
index 57b59ef5269..d3f73b224fb 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
IUSE="X slang gpm static-libs"
RDEPEND="
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.1.2.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.1.2.ebuild
index 22cac7d92c3..b2367e8d4c4 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.1.2.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.1.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
IUSE="alisp debug doc elibc_uclibc python +thread-safety"
RDEPEND="python? ( ${PYTHON_DEPS} )"
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.2.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.2.ebuild
index c09b03a0ee3..498d94a753d 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.2.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="alisp debug doc elibc_uclibc python +thread-safety"
RDEPEND="python? ( ${PYTHON_DEPS} )"
diff --git a/media-libs/audiofile/audiofile-0.3.6-r3.ebuild b/media-libs/audiofile/audiofile-0.3.6-r3.ebuild
index c6a0f126d2a..33984325558 100644
--- a/media-libs/audiofile/audiofile-0.3.6-r3.ebuild
+++ b/media-libs/audiofile/audiofile-0.3.6-r3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.68k.org/~michael/audiofile/"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0/1" # subslot = soname major version
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="flac static-libs test"
RESTRICT="!test? ( test )"
diff --git a/media-libs/bio2jack/bio2jack-0.9-r2.ebuild b/media-libs/bio2jack/bio2jack-0.9-r2.ebuild
index 6e919ac8036..430eff7e842 100644
--- a/media-libs/bio2jack/bio2jack-0.9-r2.ebuild
+++ b/media-libs/bio2jack/bio2jack-0.9-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/bio2jack/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="static-libs"
BDEPEND="
diff --git a/media-libs/exempi/exempi-2.4.5-r1.ebuild b/media-libs/exempi/exempi-2.4.5-r1.ebuild
index e55f19eb4af..34771335ec2 100644
--- a/media-libs/exempi/exempi-2.4.5-r1.ebuild
+++ b/media-libs/exempi/exempi-2.4.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://libopenraw.freedesktop.org/download/${P}.tar.gz"
LICENSE="BSD"
SLOT="2/3"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
IUSE="examples static-libs test"
RESTRICT="!test? ( test )"
diff --git a/media-libs/faac/faac-1.29.9.2.ebuild b/media-libs/faac/faac-1.29.9.2.ebuild
index 10cbce7fe68..a57c8e543ec 100644
--- a/media-libs/faac/faac-1.29.9.2.ebuild
+++ b/media-libs/faac/faac-1.29.9.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1 MPEG-4"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
src_prepare() {
default
diff --git a/media-libs/faad2/faad2-2.8.8.ebuild b/media-libs/faad2/faad2-2.8.8.ebuild
index 8aee5323b0c..889d1351574 100644
--- a/media-libs/faad2/faad2-2.8.8.ebuild
+++ b/media-libs/faad2/faad2-2.8.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/faac/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="digitalradio static-libs"
RDEPEND=""
diff --git a/media-libs/faad2/faad2-2.9.0.ebuild b/media-libs/faad2/faad2-2.9.0.ebuild
index 4e56aeddfd2..b3f81962bb2 100644
--- a/media-libs/faad2/faad2-2.9.0.ebuild
+++ b/media-libs/faad2/faad2-2.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/knik0/faad2/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="digitalradio static-libs"
RDEPEND=""
diff --git a/media-libs/flac/flac-1.3.2-r1.ebuild b/media-libs/flac/flac-1.3.2-r1.ebuild
index 44661aa7f6a..697c6198c66 100644
--- a/media-libs/flac/flac-1.3.2-r1.ebuild
+++ b/media-libs/flac/flac-1.3.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.xiph.org/releases/${PN}/${P}.tar.xz"
LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="altivec +cxx debug ogg cpu_flags_x86_sse static-libs"
RDEPEND="ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )"
diff --git a/media-libs/flac/flac-1.3.3.ebuild b/media-libs/flac/flac-1.3.3.ebuild
index 3ef7468888a..2d3d968badf 100644
--- a/media-libs/flac/flac-1.3.3.ebuild
+++ b/media-libs/flac/flac-1.3.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.xiph.org/releases/${PN}/${P}.tar.xz"
LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="altivec +cxx debug ogg cpu_flags_x86_sse static-libs"
RDEPEND="ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )"
diff --git a/media-libs/fontconfig/fontconfig-2.12.6.ebuild b/media-libs/fontconfig/fontconfig-2.12.6.ebuild
index 7bf5a9a0282..62c0c4759ec 100644
--- a/media-libs/fontconfig/fontconfig-2.12.6.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.12.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://fontconfig.org/release/${P}.tar.bz2"
LICENSE="MIT"
SLOT="1.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="doc static-libs"
# Purposefully dropped the xml USE flag and libxml2 support. Expat is the
diff --git a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
index 917ca35e28f..daef4a967c1 100644
--- a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.bz2"
LICENSE="MIT"
SLOT="1.0"
[[ $(ver_cut 3) -ge 90 ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc static-libs"
# Purposefully dropped the xml USE flag and libxml2 support. Expat is the
diff --git a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
index 95b4c7c1cfb..21301b194b4 100644
--- a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.bz2"
LICENSE="MIT"
SLOT="1.0"
[[ $(ver_cut 3) -ge 90 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="doc static-libs"
BDEPEND="dev-util/gperf
diff --git a/media-libs/freeglut/freeglut-3.2.1.ebuild b/media-libs/freeglut/freeglut-3.2.1.ebuild
index dec72e4fdd6..b428fbaa6b7 100644
--- a/media-libs/freeglut/freeglut-3.2.1.ebuild
+++ b/media-libs/freeglut/freeglut-3.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="debug static-libs"
# enabling GLES support seems to cause build failures
diff --git a/media-libs/freetype/freetype-2.10.0.ebuild b/media-libs/freetype/freetype-2.10.0.ebuild
index 0b8e98d60ac..b7e3f1a4869 100644
--- a/media-libs/freetype/freetype-2.10.0.ebuild
+++ b/media-libs/freetype/freetype-2.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ if [[ "${PV}" != 9999 ]] ; then
mirror://nongnu/freetype/ft2demos-${PV}.tar.bz2 )
doc? ( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2
mirror://nongnu/freetype/${PN}-doc-${PV}.tar.bz2 )"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE+=" doc"
else
inherit autotools git-r3
diff --git a/media-libs/freetype/freetype-2.10.1.ebuild b/media-libs/freetype/freetype-2.10.1.ebuild
index 091b3bccbba..d6f5e68744d 100644
--- a/media-libs/freetype/freetype-2.10.1.ebuild
+++ b/media-libs/freetype/freetype-2.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ if [[ "${PV}" != 9999 ]] ; then
mirror://nongnu/freetype/ft2demos-${PV}.tar.xz )
doc? ( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.xz
mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz )"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE+=" doc"
else
inherit autotools git-r3
diff --git a/media-libs/freetype/freetype-2.9.1-r3.ebuild b/media-libs/freetype/freetype-2.9.1-r3.ebuild
index acbb3e8155c..3d80211c302 100644
--- a/media-libs/freetype/freetype-2.9.1-r3.ebuild
+++ b/media-libs/freetype/freetype-2.9.1-r3.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" != 9999 ]] ; then
mirror://nongnu/freetype/ft2demos-${PV}.tar.bz2 )
doc? ( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2
mirror://nongnu/freetype/${PN}-doc-${PV}.tar.bz2 )"
- KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE+=" doc"
else
inherit autotools git-r3
diff --git a/media-libs/freetype/freetype-2.9.1-r4.ebuild b/media-libs/freetype/freetype-2.9.1-r4.ebuild
index 2260eecc4ca..159d8a07550 100644
--- a/media-libs/freetype/freetype-2.9.1-r4.ebuild
+++ b/media-libs/freetype/freetype-2.9.1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -16,7 +16,7 @@ if [[ "${PV}" != 9999 ]] ; then
mirror://nongnu/freetype/ft2demos-${PV}.tar.bz2 )
doc? ( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2
mirror://nongnu/freetype/${PN}-doc-${PV}.tar.bz2 )"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE+=" doc"
else
inherit autotools git-r3
diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild
index 091b3bccbba..d6f5e68744d 100644
--- a/media-libs/freetype/freetype-9999.ebuild
+++ b/media-libs/freetype/freetype-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ if [[ "${PV}" != 9999 ]] ; then
mirror://nongnu/freetype/ft2demos-${PV}.tar.xz )
doc? ( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.xz
mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz )"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE+=" doc"
else
inherit autotools git-r3
diff --git a/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild b/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
index c73c5027cac..81ba8bd9830 100644
--- a/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
+++ b/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-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.2.5-r2.ebuild b/media-libs/gd/gd-2.2.5-r2.ebuild
index 1eee0d93911..6795edf5ff0 100644
--- a/media-libs/gd/gd-2.2.5-r2.ebuild
+++ b/media-libs/gd/gd-2.2.5-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/libgd/libgd/releases/download/${P}/lib${P}.tar.xz
LICENSE="gd IJG HPND BSD"
SLOT="2/3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="cpu_flags_x86_sse fontconfig jpeg png static-libs test tiff truetype webp xpm zlib"
RESTRICT="!test? ( test )"
diff --git a/media-libs/giblib/giblib-1.2.4-r1.ebuild b/media-libs/giblib/giblib-1.2.4-r1.ebuild
index 39ede26934a..330368ff662 100644
--- a/media-libs/giblib/giblib-1.2.4-r1.ebuild
+++ b/media-libs/giblib/giblib-1.2.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.linuxbrit.co.uk/downloads/${P}.tar.gz"
LICENSE="feh"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86"
RDEPEND="
media-libs/freetype
diff --git a/media-libs/giflib/giflib-5.1.4.ebuild b/media-libs/giflib/giflib-5.1.4.ebuild
index 2e75ce60e70..a12eead4598 100644
--- a/media-libs/giflib/giflib-5.1.4.ebuild
+++ b/media-libs/giflib/giflib-5.1.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/giflib/${P}.tar.bz2"
LICENSE="MIT"
SLOT="0/7"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc static-libs"
DEPEND="doc? ( app-text/xmlto )"
diff --git a/media-libs/giflib/giflib-5.2.1-r1.ebuild b/media-libs/giflib/giflib-5.2.1-r1.ebuild
index cf813ae147b..6a3189199cf 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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc static-libs"
DEPEND="doc? ( app-text/xmlto )"
diff --git a/media-libs/glew/glew-1.10.0-r100.ebuild b/media-libs/glew/glew-1.10.0-r100.ebuild
index 0e2bd36ca8d..56618864632 100644
--- a/media-libs/glew/glew-1.10.0-r100.ebuild
+++ b/media-libs/glew/glew-1.10.0-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 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}.tgz"
LICENSE="BSD MIT"
SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
RDEPEND=">=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
!=media-libs/glew-1.10*:0"
diff --git a/media-libs/glew/glew-1.6.0-r100.ebuild b/media-libs/glew/glew-1.6.0-r100.ebuild
index 818b61e28e2..571a9bd8a66 100644
--- a/media-libs/glew/glew-1.6.0-r100.ebuild
+++ b/media-libs/glew/glew-1.6.0-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 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}.tgz"
LICENSE="BSD MIT"
SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
RDEPEND=">=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]"
diff --git a/media-libs/glew/glew-2.1.0-r1.ebuild b/media-libs/glew/glew-2.1.0-r1.ebuild
index dec7c74d76f..8f5c7fe4be0 100644
--- a/media-libs/glew/glew-2.1.0-r1.ebuild
+++ b/media-libs/glew/glew-2.1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
LICENSE="BSD MIT"
SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc static-libs"
DEPEND="
diff --git a/media-libs/glu/glu-9.0.1.ebuild b/media-libs/glu/glu-9.0.1.ebuild
index 55c4c940814..e74f262d778 100644
--- a/media-libs/glu/glu-9.0.1.ebuild
+++ b/media-libs/glu/glu-9.0.1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} = 9999* ]]; then
SRC_URI=""
else
SRC_URI="https://mesa.freedesktop.org/archive/glu/${P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-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"
fi
LICENSE="SGI-B-2.0"
diff --git a/media-libs/glu/glu-9999.ebuild b/media-libs/glu/glu-9999.ebuild
index da58c29272e..a20186b9dad 100644
--- a/media-libs/glu/glu-9999.ebuild
+++ b/media-libs/glu/glu-9999.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} = 9999* ]]; then
SRC_URI=""
else
SRC_URI="https://mesa.freedesktop.org/archive/glu/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-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"
fi
LICENSE="SGI-B-2.0"
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.14.5.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.14.5.ebuild
index 5b5107400af..166bf9da9ee 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.14.5.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.14.5.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
HOMEPAGE="https://gstreamer.freedesktop.org/"
LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
# For OpenGL we have three separate concepts, with a list of possibilities in each:
# * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.14.5.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.14.5.ebuild
index 94dfa129e9d..1d2a31b680c 100644
--- a/media-libs/gst-plugins-good/gst-plugins-good-1.14.5.ebuild
+++ b/media-libs/gst-plugins-good/gst-plugins-good-1.14.5.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for GStreamer"
HOMEPAGE="https://gstreamer.freedesktop.org/"
LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
IUSE="+orc"
RDEPEND="
diff --git a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.14.3.ebuild b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.14.3.ebuild
index 0ced8242290..bb40db40236 100644
--- a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.14.3.ebuild
+++ b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.14.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
HOMEPAGE="https://gstreamer.freedesktop.org/"
LICENSE="LGPL-2+" # some split plugins are LGPL but combining with a GPL library
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
RDEPEND="
>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
diff --git a/media-libs/gstreamer/gstreamer-1.14.5.ebuild b/media-libs/gstreamer/gstreamer-1.14.5.ebuild
index d1e6df24377..98137758418 100644
--- a/media-libs/gstreamer/gstreamer-1.14.5.ebuild
+++ b/media-libs/gstreamer/gstreamer-1.14.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
LICENSE="LGPL-2+"
SLOT="1.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="+caps +introspection nls +orc test unwind"
RESTRICT="!test? ( test )"
diff --git a/media-libs/harfbuzz/harfbuzz-2.6.1.ebuild b/media-libs/harfbuzz/harfbuzz-2.6.1.ebuild
index e187ade993d..37b6b645657 100644
--- a/media-libs/harfbuzz/harfbuzz-2.6.1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.6.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
inherit git-r3 autotools
else
SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/harfbuzz/harfbuzz-2.6.4.ebuild b/media-libs/harfbuzz/harfbuzz-2.6.4.ebuild
index 99e5ac1e912..727463abde5 100644
--- a/media-libs/harfbuzz/harfbuzz-2.6.4.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.6.4.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
inherit git-r3 autotools
else
SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index aee517e2a1c..ba04a2d32be 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
inherit git-r3 autotools
else
SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/id3lib/id3lib-3.8.3-r8.ebuild b/media-libs/id3lib/id3lib-3.8.3-r8.ebuild
index b7997ad1a61..2c68bfd8dfe 100644
--- a/media-libs/id3lib/id3lib-3.8.3-r8.ebuild
+++ b/media-libs/id3lib/id3lib-3.8.3-r8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
IUSE="doc static-libs"
RDEPEND="sys-libs/zlib:="
diff --git a/media-libs/imlib/imlib-1.9.15-r5.ebuild b/media-libs/imlib/imlib-1.9.15-r5.ebuild
index e6372d2d2a7..ec9b402b700 100644
--- a/media-libs/imlib/imlib-1.9.15-r5.ebuild
+++ b/media-libs/imlib/imlib-1.9.15-r5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnome/sources/${PN}/${PVP[0]}.${PVP[1]}/${P}.tar.bz2
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE="doc static-libs"
RDEPEND="
diff --git a/media-libs/imlib2/imlib2-1.6.1.ebuild b/media-libs/imlib2/imlib2-1.6.1.ebuild
index 5d79c96d0a0..60e7fff2533 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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.14.ebuild b/media-libs/jbig2dec/jbig2dec-0.14.ebuild
index be7c05cffd8..e8a8666bbac 100644
--- a/media-libs/jbig2dec/jbig2dec-0.14.ebuild
+++ b/media-libs/jbig2dec/jbig2dec-0.14.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://downloads.ghostscript.com/public/${PN}/${P}.tar.gz
LICENSE="AGPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="png static-libs test"
RDEPEND="png? ( media-libs/libpng:0= )"
diff --git a/media-libs/jbig2dec/jbig2dec-0.17-r1.ebuild b/media-libs/jbig2dec/jbig2dec-0.17-r1.ebuild
index 81ec6ea19bd..7a9fd37195c 100644
--- a/media-libs/jbig2dec/jbig2dec-0.17-r1.ebuild
+++ b/media-libs/jbig2dec/jbig2dec-0.17-r1.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 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="png static-libs test"
RESTRICT="!test? ( test )"
diff --git a/media-libs/jbigkit/jbigkit-2.1.ebuild b/media-libs/jbigkit/jbigkit-2.1.ebuild
index c0781ca44f2..41972783325 100644
--- a/media-libs/jbigkit/jbigkit-2.1.ebuild
+++ b/media-libs/jbigkit/jbigkit-2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.cl.cam.ac.uk/~mgk25/download/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0/2.1" # Since we install libjbig.so and libjbig85.so without version, use ${PV} like 2.1
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
DOCS="ANNOUNCE CHANGES TODO libjbig/*.txt pbmtools/*.txt"
diff --git a/media-libs/jpeg/jpeg-6b-r12.ebuild b/media-libs/jpeg/jpeg-6b-r12.ebuild
index 66c97bfd20e..06f884f363a 100644
--- a/media-libs/jpeg/jpeg-6b-r12.ebuild
+++ b/media-libs/jpeg/jpeg-6b-r12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/jpegsrc.v${PV}.tar.gz
LICENSE="IJG"
SLOT="62"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
DOCS=""
diff --git a/media-libs/jpeg/jpeg-8d-r2.ebuild b/media-libs/jpeg/jpeg-8d-r2.ebuild
index 0594e736d32..e8f537b6324 100644
--- a/media-libs/jpeg/jpeg-8d-r2.ebuild
+++ b/media-libs/jpeg/jpeg-8d-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="http://www.ijg.org/files/${PN}src.v${PV}.tar.gz"
LICENSE="IJG"
SLOT="8"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="!=media-libs/jpeg-8*:0
diff --git a/media-libs/jpeg/jpeg-9c.ebuild b/media-libs/jpeg/jpeg-9c.ebuild
index bdc6bf5b393..2659372271d 100644
--- a/media-libs/jpeg/jpeg-9c.ebuild
+++ b/media-libs/jpeg/jpeg-9c.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.ijg.org/files/${PN}src.v${PV}.tar.gz
LICENSE="IJG"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
DEPEND=""
diff --git a/media-libs/lcms/lcms-2.9.ebuild b/media-libs/lcms/lcms-2.9.ebuild
index 805b597718f..49ffdde7c33 100644
--- a/media-libs/lcms/lcms-2.9.ebuild
+++ b/media-libs/lcms/lcms-2.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/lcms2-${PV}.tar.gz"
LICENSE="MIT"
SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc jpeg static-libs test +threads tiff"
RESTRICT="!test? ( test )"
diff --git a/media-libs/lensfun/lensfun-0.3.2-r1.ebuild b/media-libs/lensfun/lensfun-0.3.2-r1.ebuild
index 85a11256a7e..61d50733eac 100644
--- a/media-libs/lensfun/lensfun-0.3.2-r1.ebuild
+++ b/media-libs/lensfun/lensfun-0.3.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-3 CC-BY-SA-3.0" # See README for reasoning.
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="doc cpu_flags_x86_sse cpu_flags_x86_sse2 test"
RESTRICT="!test? ( test )"
diff --git a/media-libs/libao/libao-1.2.2-r1.ebuild b/media-libs/libao/libao-1.2.2-r1.ebuild
index d03e0147608..48bceb252b0 100644
--- a/media-libs/libao/libao-1.2.2-r1.ebuild
+++ b/media-libs/libao/libao-1.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/xiph/libao/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE="alsa nas mmap pulseaudio static-libs"
RDEPEND="
diff --git a/media-libs/libao/libao-1.2.2.ebuild b/media-libs/libao/libao-1.2.2.ebuild
index 8c6eb896370..a2d96aa086e 100644
--- a/media-libs/libao/libao-1.2.2.ebuild
+++ b/media-libs/libao/libao-1.2.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/xiph/libao/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE="alsa nas mmap pulseaudio static-libs"
RDEPEND="
diff --git a/media-libs/libart_lgpl/libart_lgpl-2.3.21-r3.ebuild b/media-libs/libart_lgpl/libart_lgpl-2.3.21-r3.ebuild
index 24e588abb80..bc554fd3bcf 100644
--- a/media-libs/libart_lgpl/libart_lgpl-2.3.21-r3.ebuild
+++ b/media-libs/libart_lgpl/libart_lgpl-2.3.21-r3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.levien.com/libart"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r1.ebuild b/media-libs/libcaca/libcaca-0.99_beta19-r1.ebuild
index c511e19d4d6..8195f1c2861 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19-r1.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://libcaca.zoy.org/files/${PN}/${MY_P}.tar.gz"
LICENSE="GPL-2 ISC LGPL-2.1 WTFPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE="cxx doc imlib java mono ncurses opengl python ruby slang static-libs test truetype X"
RESTRICT="!test? ( test )"
REQUIRED_USE="
diff --git a/media-libs/libcanberra/libcanberra-0.30-r5.ebuild b/media-libs/libcanberra/libcanberra-0.30-r5.ebuild
index fe5cc349971..08a75f67a77 100644
--- a/media-libs/libcanberra/libcanberra-0.30-r5.ebuild
+++ b/media-libs/libcanberra/libcanberra-0.30-r5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.xz"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
IUSE="alsa gnome gstreamer +gtk +gtk3 oss pulseaudio +sound tdb udev"
COMMON_DEPEND="
diff --git a/media-libs/libcddb/libcddb-1.3.2-r1.ebuild b/media-libs/libcddb/libcddb-1.3.2-r1.ebuild
index 806bb7a13db..9365e575d84 100644
--- a/media-libs/libcddb/libcddb-1.3.2-r1.ebuild
+++ b/media-libs/libcddb/libcddb-1.3.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="doc static-libs"
RDEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libcue/libcue-2.2.1.ebuild b/media-libs/libcue/libcue-2.2.1.ebuild
index 9d485704f6c..75b638d991b 100644
--- a/media-libs/libcue/libcue-2.2.1.ebuild
+++ b/media-libs/libcue/libcue-2.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lipnitsk/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0/2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
IUSE=""
BDEPEND="
diff --git a/media-libs/libdca/libdca-0.0.5-r3.ebuild b/media-libs/libdca/libdca-0.0.5-r3.ebuild
index 793a4fe1a88..79df548122c 100644
--- a/media-libs/libdca/libdca-0.0.5-r3.ebuild
+++ b/media-libs/libdca/libdca-0.0.5-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="debug oss static-libs"
RDEPEND="!media-libs/libdts"
diff --git a/media-libs/libdvdcss/libdvdcss-1.4.2.ebuild b/media-libs/libdvdcss/libdvdcss-1.4.2.ebuild
index d098b4fcd1f..8bcfebfe77f 100644
--- a/media-libs/libdvdcss/libdvdcss-1.4.2.ebuild
+++ b/media-libs/libdvdcss/libdvdcss-1.4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="1.2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="doc static-libs"
RDEPEND=""
diff --git a/media-libs/libdvdnav/libdvdnav-6.0.0.ebuild b/media-libs/libdvdnav/libdvdnav-6.0.0.ebuild
index 8808e021c4b..2bf754694a4 100644
--- a/media-libs/libdvdnav/libdvdnav-6.0.0.ebuild
+++ b/media-libs/libdvdnav/libdvdnav-6.0.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
EGIT_REPO_URI="https://code.videolan.org/videolan/libdvdnav.git"
else
SRC_URI="https://downloads.videolan.org/pub/videolan/libdvdnav/${PV}/${P}.tar.bz2"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
fi
LICENSE="GPL-2"
diff --git a/media-libs/libdvdnav/libdvdnav-6.0.1.ebuild b/media-libs/libdvdnav/libdvdnav-6.0.1.ebuild
index ec07e6a8c91..945ffe1f209 100644
--- a/media-libs/libdvdnav/libdvdnav-6.0.1.ebuild
+++ b/media-libs/libdvdnav/libdvdnav-6.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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://code.videolan.org/videolan/libdvdnav.git"
else
SRC_URI="https://downloads.videolan.org/pub/videolan/libdvdnav/${PV}/${P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
fi
LICENSE="GPL-2"
diff --git a/media-libs/libdvdnav/libdvdnav-9999.ebuild b/media-libs/libdvdnav/libdvdnav-9999.ebuild
index ec07e6a8c91..945ffe1f209 100644
--- a/media-libs/libdvdnav/libdvdnav-9999.ebuild
+++ b/media-libs/libdvdnav/libdvdnav-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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://code.videolan.org/videolan/libdvdnav.git"
else
SRC_URI="https://downloads.videolan.org/pub/videolan/libdvdnav/${PV}/${P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
fi
LICENSE="GPL-2"
diff --git a/media-libs/libdvdread/libdvdread-6.0.0.ebuild b/media-libs/libdvdread/libdvdread-6.0.0.ebuild
index babe61a8758..a869d5d3fcd 100644
--- a/media-libs/libdvdread/libdvdread-6.0.0.ebuild
+++ b/media-libs/libdvdread/libdvdread-6.0.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
EGIT_REPO_URI="https://code.videolan.org/videolan/libdvdread.git"
else
SRC_URI="https://downloads.videolan.org/pub/videolan/libdvdread/${PV}/${P}.tar.bz2"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
fi
LICENSE="GPL-2"
diff --git a/media-libs/libdvdread/libdvdread-6.0.1.ebuild b/media-libs/libdvdread/libdvdread-6.0.1.ebuild
index 4cd3f34f6e8..a2e6f930960 100644
--- a/media-libs/libdvdread/libdvdread-6.0.1.ebuild
+++ b/media-libs/libdvdread/libdvdread-6.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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://code.videolan.org/videolan/libdvdread.git"
else
SRC_URI="https://downloads.videolan.org/pub/videolan/libdvdread/${PV}/${P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
fi
LICENSE="GPL-2"
diff --git a/media-libs/libdvdread/libdvdread-6.0.2.ebuild b/media-libs/libdvdread/libdvdread-6.0.2.ebuild
index 37061f73c69..b35ac186b9a 100644
--- a/media-libs/libdvdread/libdvdread-6.0.2.ebuild
+++ b/media-libs/libdvdread/libdvdread-6.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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://code.videolan.org/videolan/libdvdread.git"
else
SRC_URI="https://downloads.videolan.org/pub/videolan/libdvdread/${PV}/${P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
fi
LICENSE="GPL-2"
diff --git a/media-libs/libdvdread/libdvdread-9999.ebuild b/media-libs/libdvdread/libdvdread-9999.ebuild
index 37061f73c69..b35ac186b9a 100644
--- a/media-libs/libdvdread/libdvdread-9999.ebuild
+++ b/media-libs/libdvdread/libdvdread-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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://code.videolan.org/videolan/libdvdread.git"
else
SRC_URI="https://downloads.videolan.org/pub/videolan/libdvdread/${PV}/${P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
fi
LICENSE="GPL-2"
diff --git a/media-libs/libexif/libexif-0.6.21-r3.ebuild b/media-libs/libexif/libexif-0.6.21-r3.ebuild
index 52a4180c40b..2d2cf51fbc8 100644
--- a/media-libs/libexif/libexif-0.6.21-r3.ebuild
+++ b/media-libs/libexif/libexif-0.6.21-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="doc nls static-libs"
RDEPEND="nls? ( virtual/libintl )"
diff --git a/media-libs/libfame/libfame-0.9.1-r2.ebuild b/media-libs/libfame/libfame-0.9.1-r2.ebuild
index 33ef8a05bfc..b6e0007449d 100644
--- a/media-libs/libfame/libfame-0.9.1-r2.ebuild
+++ b/media-libs/libfame/libfame-0.9.1-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/fame/${P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE="cpu_flags_x86_mmx static-libs"
PATCHES=(
diff --git a/media-libs/libfpx/libfpx-1.3.1_p10.ebuild b/media-libs/libfpx/libfpx-1.3.1_p10.ebuild
index ec581abba06..b50c2ba388d 100644
--- a/media-libs/libfpx/libfpx-1.3.1_p10.ebuild
+++ b/media-libs/libfpx/libfpx-1.3.1_p10.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://imagemagick/delegates/${P/_p/-}.tar.bz2"
LICENSE="Flashpix"
SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-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="static-libs"
S=${WORKDIR}/${P/_p/-}
diff --git a/media-libs/libggi/libggi-2.2.2-r1.ebuild b/media-libs/libggi/libggi-2.2.2-r1.ebuild
index 1bac00c0c48..a93db35ffa5 100644
--- a/media-libs/libggi/libggi-2.2.2-r1.ebuild
+++ b/media-libs/libggi/libggi-2.2.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/ggi/${P}.src.tar.bz2"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86"
+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/libgii/libgii-1.0.2-r2.ebuild b/media-libs/libgii/libgii-1.0.2-r2.ebuild
index 8e6e0ec6a3f..4f91fc5a277 100644
--- a/media-libs/libgii/libgii-1.0.2-r2.ebuild
+++ b/media-libs/libgii/libgii-1.0.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/ggi/${P}.src.tar.bz2"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE="X"
RDEPEND="
diff --git a/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild b/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild
index 9d8efc13781..dc73cb598d4 100644
--- a/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild
+++ b/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mad/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug"
RDEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r2.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r2.ebuild
index 60134cbc7a3..8b32def52a7 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r2.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
LICENSE="BSD IJG"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="java static-libs"
ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild
index 241c9cc17b5..2b39db8130e 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
LICENSE="BSD IJG"
SLOT="0"
[[ "$(ver_cut 3)" -ge 90 ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="java static-libs"
ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.4.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.4.ebuild
index 35f5d3a2c6b..631db4302e2 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.4.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
LICENSE="BSD IJG"
SLOT="0"
[[ "$(ver_cut 3)" -ge 90 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="java static-libs"
ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
diff --git a/media-libs/libldac/libldac-2.0.2-r1.ebuild b/media-libs/libldac/libldac-2.0.2-r1.ebuild
index 209f09bd340..572ece14301 100644
--- a/media-libs/libldac/libldac-2.0.2-r1.ebuild
+++ b/media-libs/libldac/libldac-2.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/EHfive/ldacBT/releases/download/${PACKAGING_VERSION}
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
DEPEND=""
diff --git a/media-libs/libmad/libmad-0.15.1b-r9.ebuild b/media-libs/libmad/libmad-0.15.1b-r9.ebuild
index 2d0c176efc8..3e9f227a270 100644
--- a/media-libs/libmad/libmad-0.15.1b-r9.ebuild
+++ b/media-libs/libmad/libmad-0.15.1b-r9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mad/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="debug static-libs"
DEPEND=""
diff --git a/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild b/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild
index fd6648be558..70f28afc0d3 100644
--- a/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild
+++ b/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/mikmod/${P}.tar.gz"
LICENSE="LGPL-2+ LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="+alsa altivec coreaudio debug nas openal oss pulseaudio cpu_flags_x86_sse2 static-libs +threads"
REQUIRED_USE="|| ( alsa coreaudio nas openal oss pulseaudio )"
diff --git a/media-libs/libmng/libmng-2.0.3.ebuild b/media-libs/libmng/libmng-2.0.3.ebuild
index 2ca2f7a8bb9..9107ff79dbf 100644
--- a/media-libs/libmng/libmng-2.0.3.ebuild
+++ b/media-libs/libmng/libmng-2.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/libmng/${P}.tar.xz"
LICENSE="libmng"
SLOT="0/2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="lcms static-libs"
RDEPEND="
diff --git a/media-libs/libmodplug/libmodplug-0.8.9.0.ebuild b/media-libs/libmodplug/libmodplug-0.8.9.0.ebuild
index c3202a8ff8e..ac2262a3276 100644
--- a/media-libs/libmodplug/libmodplug-0.8.9.0.ebuild
+++ b/media-libs/libmodplug/libmodplug-0.8.9.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://modplug-xmms.sourceforge.net/"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="static-libs"
RDEPEND=""
diff --git a/media-libs/libmp4v2/libmp4v2-2.0.0-r1.ebuild b/media-libs/libmp4v2/libmp4v2-2.0.0-r1.ebuild
index ac46eba9f9a..5601470bb0e 100644
--- a/media-libs/libmp4v2/libmp4v2-2.0.0-r1.ebuild
+++ b/media-libs/libmp4v2/libmp4v2-2.0.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://mp4v2.googlecode.com/files/${MY_P}.tar.bz2"
LICENSE="MPL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="static-libs test utils"
RESTRICT="!test? ( test )"
diff --git a/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild b/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild
index d35177d8cee..c2028719211 100644
--- a/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild
+++ b/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://libmpeg2.sourceforge.net/files/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
IUSE="sdl static-libs X"
RDEPEND="sdl? ( media-libs/libsdl )
diff --git a/media-libs/libmpeg3/libmpeg3-1.8-r1.ebuild b/media-libs/libmpeg3/libmpeg3-1.8-r1.ebuild
index 0944dfb0590..f907c5aacc6 100644
--- a/media-libs/libmpeg3/libmpeg3-1.8-r1.ebuild
+++ b/media-libs/libmpeg3/libmpeg3-1.8-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/heroines/${P}-src.tar.bz2
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
IUSE="cpu_flags_x86_mmx"
RDEPEND="sys-libs/zlib
diff --git a/media-libs/libogg/libogg-1.3.3.ebuild b/media-libs/libogg/libogg-1.3.3.ebuild
index 9e9954f814c..8962648b14d 100644
--- a/media-libs/libogg/libogg-1.3.3.ebuild
+++ b/media-libs/libogg/libogg-1.3.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://downloads.xiph.org/releases/ogg/${P}.tar.xz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
DOCS=( AUTHORS CHANGES )
diff --git a/media-libs/libogg/libogg-1.3.4.ebuild b/media-libs/libogg/libogg-1.3.4.ebuild
index 201b09e29f1..c5b5550a63d 100644
--- a/media-libs/libogg/libogg-1.3.4.ebuild
+++ b/media-libs/libogg/libogg-1.3.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://downloads.xiph.org/releases/ogg/${P}.tar.xz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
DOCS=( AUTHORS CHANGES )
diff --git a/media-libs/libpng-compat/libpng-compat-1.2.59.ebuild b/media-libs/libpng-compat/libpng-compat-1.2.59.ebuild
index c785849ddb9..4fa1efb0d88 100644
--- a/media-libs/libpng-compat/libpng-compat-1.2.59.ebuild
+++ b/media-libs/libpng-compat/libpng-compat-1.2.59.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -15,7 +15,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="libpng"
SLOT="1.2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
diff --git a/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild b/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild
index 79fc3abbfcd..d0ba31d9b8d 100644
--- a/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild
+++ b/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="libpng"
SLOT="1.5"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="apng neon"
RDEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
diff --git a/media-libs/libpng/libpng-1.6.37.ebuild b/media-libs/libpng/libpng-1.6.37.ebuild
index 8a48b2ebd55..fab1365b9eb 100644
--- a/media-libs/libpng/libpng-1.6.37.ebuild
+++ b/media-libs/libpng/libpng-1.6.37.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
LICENSE="libpng2"
SLOT="0/16"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="apng cpu_flags_x86_sse neon static-libs"
RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libsamplerate/libsamplerate-0.1.9.ebuild b/media-libs/libsamplerate/libsamplerate-0.1.9.ebuild
index cfb79f0d50b..c736ac8c811 100644
--- a/media-libs/libsamplerate/libsamplerate-0.1.9.ebuild
+++ b/media-libs/libsamplerate/libsamplerate-0.1.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.mega-nerd.com/SRC/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="sndfile static-libs"
RDEPEND="sndfile? ( >=media-libs/libsndfile-1.0.2 )"
diff --git a/media-libs/libsamplerate/libsamplerate-9999.ebuild b/media-libs/libsamplerate/libsamplerate-9999.ebuild
index 64a39257945..99d01539ddc 100644
--- a/media-libs/libsamplerate/libsamplerate-9999.ebuild
+++ b/media-libs/libsamplerate/libsamplerate-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://github.com/erikd/libsamplerate.git"
else
SRC_URI="http://www.mega-nerd.com/SRC/${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
fi
LICENSE="BSD-2"
diff --git a/media-libs/libsdl/libsdl-1.2.15-r9.ebuild b/media-libs/libsdl/libsdl-1.2.15-r9.ebuild
index 442c2b5622c..0d3592e1d11 100644
--- a/media-libs/libsdl/libsdl-1.2.15-r9.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.15-r9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.libsdl.org/release/SDL-${PV}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
# WARNING:
# If you turn on the custom-cflags use flag in USE and something breaks,
# you pick up the pieces. Be prepared for bug reports to be marked INVALID.
diff --git a/media-libs/libshout/libshout-2.4.1-r2.ebuild b/media-libs/libshout/libshout-2.4.1-r2.ebuild
index d6b09e129f8..8d38ad45787 100644
--- a/media-libs/libshout/libshout-2.4.1-r2.ebuild
+++ b/media-libs/libshout/libshout-2.4.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.gz"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86"
IUSE="libressl speex static-libs theora"
RDEPEND="
diff --git a/media-libs/libshout/libshout-2.4.2.ebuild b/media-libs/libshout/libshout-2.4.2.ebuild
index 3f47fb37583..c3546dc9019 100644
--- a/media-libs/libshout/libshout-2.4.2.ebuild
+++ b/media-libs/libshout/libshout-2.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.gz"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="libressl speex static-libs theora"
RDEPEND="
diff --git a/media-libs/libshout/libshout-2.4.3.ebuild b/media-libs/libshout/libshout-2.4.3.ebuild
index 96a7f60e203..7677ed58885 100644
--- a/media-libs/libshout/libshout-2.4.3.ebuild
+++ b/media-libs/libshout/libshout-2.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.gz"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="libressl speex static-libs theora"
RDEPEND="
diff --git a/media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild b/media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild
index 9d70049aeac..2b32e2c65b2 100644
--- a/media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild
+++ b/media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild
@@ -19,7 +19,7 @@ fi
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="alsa minimal sqlite static-libs test"
RESTRICT="!test? ( test )"
diff --git a/media-libs/libsndfile/libsndfile-1.0.29_pre2_p20191024.ebuild b/media-libs/libsndfile/libsndfile-1.0.29_pre2_p20191024.ebuild
index 1a1ff9ab655..cb2856695fd 100644
--- a/media-libs/libsndfile/libsndfile-1.0.29_pre2_p20191024.ebuild
+++ b/media-libs/libsndfile/libsndfile-1.0.29_pre2_p20191024.ebuild
@@ -10,7 +10,7 @@ inherit autotools python-any-r1 multilib-minimal
MY_COMMIT="97a361afc24202b16489d8c06910277c06b18b53"
SRC_URI="https://github.com/erikd/libsndfile/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
DESCRIPTION="C library for reading and writing files containing sampled sound"
HOMEPAGE="http://www.mega-nerd.com/libsndfile"
diff --git a/media-libs/libsndfile/libsndfile-9999.ebuild b/media-libs/libsndfile/libsndfile-9999.ebuild
index d8aeacbde19..3ef48c7a328 100644
--- a/media-libs/libsndfile/libsndfile-9999.ebuild
+++ b/media-libs/libsndfile/libsndfile-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://github.com/erikd/libsndfile.git"
else
SRC_URI="http://www.mega-nerd.com/libsndfile/files/${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
inherit python-any-r1 multilib-minimal
diff --git a/media-libs/libtheora/libtheora-1.1.1-r2.ebuild b/media-libs/libtheora/libtheora-1.1.1-r2.ebuild
index fe363ad98b4..857b311d9ea 100644
--- a/media-libs/libtheora/libtheora-1.1.1-r2.ebuild
+++ b/media-libs/libtheora/libtheora-1.1.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.xiph.org/releases/theora/${P/_}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="doc +encode examples static-libs"
REQUIRED_USE="examples? ( encode )" #285895
diff --git a/media-libs/libuninameslist/libuninameslist-20091231-r1.ebuild b/media-libs/libuninameslist/libuninameslist-20091231-r1.ebuild
index e3e49705335..f1c4c3dc186 100644
--- a/media-libs/libuninameslist/libuninameslist-20091231-r1.ebuild
+++ b/media-libs/libuninameslist/libuninameslist-20091231-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/libuninameslist/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-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=""
S="${WORKDIR}/${PN}"
diff --git a/media-libs/libv4l/libv4l-1.10.1.ebuild b/media-libs/libv4l/libv4l-1.10.1.ebuild
index 8ea50fc4974..d1c579dc682 100644
--- a/media-libs/libv4l/libv4l-1.10.1.ebuild
+++ b/media-libs/libv4l/libv4l-1.10.1.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 sh 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="jpeg"
# The libraries only link to -ljpeg, therefore multilib depend only for virtual/jpeg.
diff --git a/media-libs/libv4l/libv4l-1.16.3.ebuild b/media-libs/libv4l/libv4l-1.16.3.ebuild
index aca7697a07b..f5aa891dab9 100644
--- a/media-libs/libv4l/libv4l-1.16.3.ebuild
+++ b/media-libs/libv4l/libv4l-1.16.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -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 ~sh ~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="jpeg"
RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
diff --git a/media-libs/libv4l/libv4l-1.16.6.ebuild b/media-libs/libv4l/libv4l-1.16.6.ebuild
index b518b7a9219..3972a179a40 100644
--- a/media-libs/libv4l/libv4l-1.16.6.ebuild
+++ b/media-libs/libv4l/libv4l-1.16.6.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 ~sh ~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="jpeg"
RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
diff --git a/media-libs/libv4l/libv4l-1.18.0.ebuild b/media-libs/libv4l/libv4l-1.18.0.ebuild
index 3aa96279592..7d3bcdb7678 100644
--- a/media-libs/libv4l/libv4l-1.18.0.ebuild
+++ b/media-libs/libv4l/libv4l-1.18.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 ~sh ~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="jpeg"
RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
diff --git a/media-libs/libv4l/libv4l-1.6.2.ebuild b/media-libs/libv4l/libv4l-1.6.2.ebuild
index 4f0831e7431..e3a4752054a 100644
--- a/media-libs/libv4l/libv4l-1.6.2.ebuild
+++ b/media-libs/libv4l/libv4l-1.6.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.bz2"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 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="jpeg"
# The libraries only link to -ljpeg, therefore multilib depend only for virtual/jpeg.
diff --git a/media-libs/libvorbis/libvorbis-1.3.6-r1.ebuild b/media-libs/libvorbis/libvorbis-1.3.6-r1.ebuild
index c77ce2098f1..632d5e954c4 100644
--- a/media-libs/libvorbis/libvorbis-1.3.6-r1.ebuild
+++ b/media-libs/libvorbis/libvorbis-1.3.6-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://downloads.xiph.org/releases/vorbis/${P}.tar.xz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs test"
RESTRICT="!test? ( test )"
diff --git a/media-libs/libvorbis/libvorbis-1.3.6.ebuild b/media-libs/libvorbis/libvorbis-1.3.6.ebuild
index 838ec6bcf35..6cad46947ef 100644
--- a/media-libs/libvorbis/libvorbis-1.3.6.ebuild
+++ b/media-libs/libvorbis/libvorbis-1.3.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.xiph.org/releases/vorbis/${P}.tar.xz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
RDEPEND=">=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild b/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
index 9c8056e7941..1824c44f16d 100644
--- a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A library for reading vector images in Microsoft's Windows Metafile
HOMEPAGE="https://wvware.sourceforge.net/"
SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
LICENSE="LGPL-2"
SLOT="0"
IUSE="debug doc expat X"
diff --git a/media-libs/mesa/mesa-19.3.5.ebuild b/media-libs/mesa/mesa-19.3.5.ebuild
index e0d7de8eec7..918227485e9 100644
--- a/media-libs/mesa/mesa-19.3.5.ebuild
+++ b/media-libs/mesa/mesa-19.3.5.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
else
SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-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"
fi
LICENSE="MIT"
diff --git a/media-libs/mesa/mesa-20.0.1-r1.ebuild b/media-libs/mesa/mesa-20.0.1-r1.ebuild
index e893b342e58..e62a7bef4c8 100644
--- a/media-libs/mesa/mesa-20.0.1-r1.ebuild
+++ b/media-libs/mesa/mesa-20.0.1-r1.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
else
SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-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"
fi
LICENSE="MIT"
diff --git a/media-libs/mesa/mesa-20.0.2.ebuild b/media-libs/mesa/mesa-20.0.2.ebuild
index e893b342e58..e62a7bef4c8 100644
--- a/media-libs/mesa/mesa-20.0.2.ebuild
+++ b/media-libs/mesa/mesa-20.0.2.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
else
SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-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"
fi
LICENSE="MIT"
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 24b3afdd1fc..f0f83ac221d 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
else
SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-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"
fi
LICENSE="MIT"
diff --git a/media-libs/nas/nas-1.9.4-r2.ebuild b/media-libs/nas/nas-1.9.4-r2.ebuild
index c48fb50682c..e8fb89c0ce7 100644
--- a/media-libs/nas/nas-1.9.4-r2.ebuild
+++ b/media-libs/nas/nas-1.9.4-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz"
LICENSE="HPND MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE="doc static-libs"
RDEPEND="
diff --git a/media-libs/netpbm/netpbm-10.66.00.ebuild b/media-libs/netpbm/netpbm-10.66.00.ebuild
index 653df0d99b8..a8703a981dc 100644
--- a/media-libs/netpbm/netpbm-10.66.00.ebuild
+++ b/media-libs/netpbm/netpbm-10.66.00.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="doc jbig jpeg png rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
RDEPEND="jbig? ( media-libs/jbigkit )
diff --git a/media-libs/netpbm/netpbm-10.70.00.ebuild b/media-libs/netpbm/netpbm-10.70.00.ebuild
index 2ee31c25a4f..bb739f1bf08 100644
--- a/media-libs/netpbm/netpbm-10.70.00.ebuild
+++ b/media-libs/netpbm/netpbm-10.70.00.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="doc jbig jpeg png rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
RDEPEND="jbig? ( media-libs/jbigkit )
diff --git a/media-libs/netpbm/netpbm-10.76.00.ebuild b/media-libs/netpbm/netpbm-10.76.00.ebuild
index acb6ec3e2bb..d723f9c1760 100644
--- a/media-libs/netpbm/netpbm-10.76.00.ebuild
+++ b/media-libs/netpbm/netpbm-10.76.00.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 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"
RDEPEND="jbig? ( media-libs/jbigkit )
diff --git a/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild b/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild
index 2ef44a80bc3..843306c65b4 100644
--- a/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild
+++ b/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}.mirror/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0/5" # based on SONAME
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc static-libs test"
RDEPEND="
diff --git a/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild b/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild
index bead29384de..867181a30f4 100644
--- a/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.1-r1.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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc static-libs test"
RESTRICT="!test? ( test )"
diff --git a/media-libs/openjpeg/openjpeg-2.3.1.ebuild b/media-libs/openjpeg/openjpeg-2.3.1.ebuild
index b2d977dc0fc..9cfc8e401cd 100644
--- a/media-libs/openjpeg/openjpeg-2.3.1.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.1.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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc static-libs test"
RESTRICT="!test? ( test )"
diff --git a/media-libs/portaudio/portaudio-19.06.00-r1.ebuild b/media-libs/portaudio/portaudio-19.06.00-r1.ebuild
index 183c05388f7..bafb292b478 100644
--- a/media-libs/portaudio/portaudio-19.06.00-r1.ebuild
+++ b/media-libs/portaudio/portaudio-19.06.00-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.portaudio.com/archives/pa_stable_v190600_20161030.tgz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
IUSE="alsa +cxx debug doc jack oss static-libs"
RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
diff --git a/media-libs/portaudio/portaudio-19.06.00-r2.ebuild b/media-libs/portaudio/portaudio-19.06.00-r2.ebuild
index ba41ecb8438..f1945f99dd2 100644
--- a/media-libs/portaudio/portaudio-19.06.00-r2.ebuild
+++ b/media-libs/portaudio/portaudio-19.06.00-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://www.portaudio.com/archives/pa_stable_v190600_20161030.tgz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="alsa +cxx debug doc jack oss static-libs"
RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
index c24c05fcb3e..3654f2131a4 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
LICENSE="ZLIB"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg static-libs timidity vorbis +wav"
REQUIRED_USE="
midi? ( || ( timidity fluidsynth ) )
diff --git a/media-libs/smpeg/smpeg-0.4.4-r10.ebuild b/media-libs/smpeg/smpeg-0.4.4-r10.ebuild
index 1eb46da14d1..26759ef77e5 100644
--- a/media-libs/smpeg/smpeg-0.4.4-r10.ebuild
+++ b/media-libs/smpeg/smpeg-0.4.4-r10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.lokigames.com/pub/open-source/smpeg/${P}.tar.gz
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="X debug cpu_flags_x86_mmx opengl static-libs"
RDEPEND="
diff --git a/media-libs/speex/speex-1.2.0-r1.ebuild b/media-libs/speex/speex-1.2.0-r1.ebuild
index cb6de1d3fea..aa5e1878b0b 100644
--- a/media-libs/speex/speex-1.2.0-r1.ebuild
+++ b/media-libs/speex/speex-1.2.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="cpu_flags_arm_v4 cpu_flags_arm_v5 cpu_flags_arm_v6 cpu_flags_x86_sse static-libs utils +vbr"
RDEPEND="
diff --git a/media-libs/speexdsp/speexdsp-1.2_rc3-r2.ebuild b/media-libs/speexdsp/speexdsp-1.2_rc3-r2.ebuild
index 889189c89a6..f4e380a58a8 100644
--- a/media-libs/speexdsp/speexdsp-1.2_rc3-r2.ebuild
+++ b/media-libs/speexdsp/speexdsp-1.2_rc3-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_arm_neon static-libs"
RDEPEND="!<media-libs/speex-1.2.0"
diff --git a/media-libs/t1lib/t1lib-5.1.2-r2.ebuild b/media-libs/t1lib/t1lib-5.1.2-r2.ebuild
index 8a8d6b1b4af..a2da77f2524 100644
--- a/media-libs/t1lib/t1lib-5.1.2-r2.ebuild
+++ b/media-libs/t1lib/t1lib-5.1.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://sunsite.unc.edu/pub/Linux/libs/graphics/${P}.tar.gz"
LICENSE="LGPL-2 GPL-2"
SLOT="5"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-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="X doc static-libs"
RDEPEND="X? (
diff --git a/media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild b/media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild
index e784a86cd29..f07c8de0ea0 100644
--- a/media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild
+++ b/media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://taglib.github.io/"
SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2.1 MPL-1.1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
SLOT="0"
IUSE="debug examples test"
RESTRICT="!test? ( test )"
diff --git a/media-libs/tiff/tiff-4.1.0.ebuild b/media-libs/tiff/tiff-4.1.0.ebuild
index e2849b68f39..52dc23febc9 100644
--- a/media-libs/tiff/tiff-4.1.0.ebuild
+++ b/media-libs/tiff/tiff-4.1.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 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+cxx jbig jpeg lzma static-libs test webp zlib zstd"
RESTRICT="!test? ( test )"
diff --git a/media-libs/urt/urt-3.1b-r1.ebuild b/media-libs/urt/urt-3.1b-r1.ebuild
index ae143e0f346..65b56d75cd0 100644
--- a/media-libs/urt/urt-3.1b-r1.ebuild
+++ b/media-libs/urt/urt-3.1b-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.iastate.edu/pub/utah-raster/${P}.tar.Z"
LICENSE="URT gif? ( free-noncomm )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="gif postscript tiff X"
RDEPEND="X? ( x11-libs/libXext )
diff --git a/media-libs/urt/urt-3.1b-r3.ebuild b/media-libs/urt/urt-3.1b-r3.ebuild
index 855490db623..363130febbc 100644
--- a/media-libs/urt/urt-3.1b-r3.ebuild
+++ b/media-libs/urt/urt-3.1b-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.iastate.edu/pub/utah-raster/${P}.tar.Z"
LICENSE="URT gif? ( free-noncomm )"
SLOT="0/3.1b-r2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="gif postscript static-libs tiff tools X"
RDEPEND="
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.2.1.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.2.1.ebuild
index bee2b48b523..f740dc6bd27 100644
--- a/media-plugins/alsa-plugins/alsa-plugins-1.2.1.ebuild
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.2.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/plugins/${P}.tar.bz2"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux"
IUSE="arcam_av debug ffmpeg jack libav libsamplerate +mix oss pulseaudio speex +usb_stream"
RDEPEND="
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.2.2.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.2.2.ebuild
index 1c05a56d907..5bf8914feab 100644
--- a/media-plugins/alsa-plugins/alsa-plugins-1.2.2.ebuild
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.2.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/plugins/${P}.tar.bz2"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
IUSE="arcam_av debug ffmpeg jack libav libsamplerate +mix oss pulseaudio speex +usb_stream"
RDEPEND="
diff --git a/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.14.3.ebuild b/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.14.3.ebuild
index bf20efd7511..f876431327b 100644
--- a/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.14.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
inherit gstreamer
DESCRIPTION="ATSC A/52 audio decoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
IUSE="+orc"
RDEPEND="
diff --git a/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.14.3.ebuild b/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.14.3.ebuild
index 388f35c1d5a..f0a9a389932 100644
--- a/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.14.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
inherit gstreamer
DESCRIPTION="DVD read plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
IUSE=""
RDEPEND=">=media-libs/libdvdread-4.2.0-r1:=[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-flac/gst-plugins-flac-1.14.5.ebuild b/media-plugins/gst-plugins-flac/gst-plugins-flac-1.14.5.ebuild
index 79188301b17..f935737bebc 100644
--- a/media-plugins/gst-plugins-flac/gst-plugins-flac-1.14.5.ebuild
+++ b/media-plugins/gst-plugins-flac/gst-plugins-flac-1.14.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
inherit gstreamer
DESCRIPTION="FLAC encoder/decoder/tagger plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
IUSE=""
RDEPEND=">=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.14.5.ebuild b/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.14.5.ebuild
index 84f7b79982e..674ef174628 100644
--- a/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.14.5.ebuild
+++ b/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.14.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
inherit gstreamer
DESCRIPION="Image decoder, overlay and sink plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
IUSE=""
RDEPEND=">=x11-libs/gdk-pixbuf-2.30.7:2[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.14.3.ebuild b/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.14.3.ebuild
index b60b62d8bfa..70305e47cb7 100644
--- a/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.14.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
inherit gstreamer
DESCRIPTION="MPEG2 decoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=">=media-libs/libmpeg2-0.5.1-r2[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-oss/gst-plugins-oss-1.14.5.ebuild b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.14.5.ebuild
index b0998ca74ef..ef180aaf127 100644
--- a/media-plugins/gst-plugins-oss/gst-plugins-oss-1.14.5.ebuild
+++ b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.14.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
inherit gstreamer
DESCRIPTION="OSS (Open Sound System) support plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
IUSE=""
RDEPEND=""
diff --git a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.14.5.ebuild b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.14.5.ebuild
index 7d714995f10..21be80f72bc 100644
--- a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.14.5.ebuild
+++ b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.14.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
inherit gstreamer
DESCRIPTION="PulseAudio sound server plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
IUSE=""
RDEPEND="
diff --git a/media-sound/alsa-utils/alsa-utils-1.2.1.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.1.ebuild
index 3b5d439a2f6..8fdca901d84 100644
--- a/media-sound/alsa-utils/alsa-utils-1.2.1.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.2.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0.9"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE="bat doc +libsamplerate +ncurses nls selinux"
CDEPEND=">=media-libs/alsa-lib-${PV}
diff --git a/media-sound/alsa-utils/alsa-utils-1.2.2.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.2.ebuild
index 564a4e6888f..24b8ba3949f 100644
--- a/media-sound/alsa-utils/alsa-utils-1.2.2.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.2.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0.9"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE="bat doc +libsamplerate +ncurses nls selinux"
CDEPEND=">=media-libs/alsa-lib-${PV}
diff --git a/media-sound/aumix/aumix-2.9.1.ebuild b/media-sound/aumix/aumix-2.9.1.ebuild
index c7476065d07..9cd68625bcb 100644
--- a/media-sound/aumix/aumix-2.9.1.ebuild
+++ b/media-sound/aumix/aumix-2.9.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://jpj.net/~trevor/aumix/releases/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE="gpm gtk nls"
RDEPEND="sys-libs/ncurses:0=
diff --git a/media-sound/flac123/flac123-0.0.12.ebuild b/media-sound/flac123/flac123-0.0.12.ebuild
index c9c1814ac3e..93b3c7f825e 100644
--- a/media-sound/flac123/flac123-0.0.12.ebuild
+++ b/media-sound/flac123/flac123-0.0.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/flac-tools/${P}-release.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ppc ppc64 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ppc ppc64 sparc x86"
IUSE=""
RDEPEND="
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild
index e48b7b6831b..f2028c2367e 100644
--- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.jackaudio.org/downloads/${P}.tar.gz"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86"
IUSE="cpu_flags_x86_3dnow altivec alsa coreaudio doc debug examples oss cpu_flags_x86_sse pam"
# readline: only used for jack_transport -> useless for non native ABIs
diff --git a/media-sound/lame/lame-3.100-r1.ebuild b/media-sound/lame/lame-3.100-r1.ebuild
index d179be3fa37..c543f8c9470 100644
--- a/media-sound/lame/lame-3.100-r1.ebuild
+++ b/media-sound/lame/lame-3.100-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="debug cpu_flags_x86_mmx +frontend mp3rtp sndfile static-libs"
# These deps are without MULTILIB_USEDEP and are correct since we only build
diff --git a/media-sound/lame/lame-3.100-r2.ebuild b/media-sound/lame/lame-3.100-r2.ebuild
index 1942d0ed7c8..ba8bcd5af90 100644
--- a/media-sound/lame/lame-3.100-r2.ebuild
+++ b/media-sound/lame/lame-3.100-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="debug cpu_flags_x86_mmx +frontend mp3rtp sndfile static-libs"
# These deps are without MULTILIB_USEDEP and are correct since we only build
diff --git a/media-sound/mpd/mpd-0.21.18-r1.ebuild b/media-sound/mpd/mpd-0.21.18-r1.ebuild
index 45f52d26051..540d4c5ec34 100644
--- a/media-sound/mpd/mpd-0.21.18-r1.ebuild
+++ b/media-sound/mpd/mpd-0.21.18-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~sh x86 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 x86 ~x64-macos"
IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
+ipv6 jack lame libav libmpdclient libsamplerate libsoxr +mad mikmod mms
diff --git a/media-sound/mpd/mpd-0.21.19-r1.ebuild b/media-sound/mpd/mpd-0.21.19-r1.ebuild
index 8299659372f..731ab04c695 100644
--- a/media-sound/mpd/mpd-0.21.19-r1.ebuild
+++ b/media-sound/mpd/mpd-0.21.19-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sh ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x64-macos"
IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
+ipv6 jack lame libav libmpdclient libsamplerate libsoxr +mad mikmod mms
diff --git a/media-sound/mpd/mpd-0.21.20.ebuild b/media-sound/mpd/mpd-0.21.20.ebuild
index 8299659372f..731ab04c695 100644
--- a/media-sound/mpd/mpd-0.21.20.ebuild
+++ b/media-sound/mpd/mpd-0.21.20.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sh ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x64-macos"
IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
+ipv6 jack lame libav libmpdclient libsamplerate libsoxr +mad mikmod mms
diff --git a/media-sound/mpd/mpd-0.21.21.ebuild b/media-sound/mpd/mpd-0.21.21.ebuild
index 8299659372f..731ab04c695 100644
--- a/media-sound/mpd/mpd-0.21.21.ebuild
+++ b/media-sound/mpd/mpd-0.21.21.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sh ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x64-macos"
IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
+ipv6 jack lame libav libmpdclient libsamplerate libsoxr +mad mikmod mms
diff --git a/media-sound/mt-daapd/mt-daapd-0.2.4.2.ebuild b/media-sound/mt-daapd/mt-daapd-0.2.4.2.ebuild
index 572b7c21787..bb376b2c40a 100644
--- a/media-sound/mt-daapd/mt-daapd-0.2.4.2.ebuild
+++ b/media-sound/mt-daapd/mt-daapd-0.2.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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 arm ~hppa ~mips ppc sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~hppa ~mips ppc sparc x86 ~amd64-linux ~x86-linux"
IUSE="vorbis"
RDEPEND="
diff --git a/media-sound/pulseaudio/pulseaudio-13.0.ebuild b/media-sound/pulseaudio/pulseaudio-13.0.ebuild
index 4ed747d0402..95a6fd0a211 100644
--- a/media-sound/pulseaudio/pulseaudio-13.0.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-13.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
# +alsa-plugin as discussed in bug #519530
IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer elogind gconf
diff --git a/media-video/mpeg2vidcodec/mpeg2vidcodec-12-r1.ebuild b/media-video/mpeg2vidcodec/mpeg2vidcodec-12-r1.ebuild
index d36a12117c5..933b65ab9d7 100644
--- a/media-video/mpeg2vidcodec/mpeg2vidcodec-12-r1.ebuild
+++ b/media-video/mpeg2vidcodec/mpeg2vidcodec-12-r1.ebuild
@@ -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 sh 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/media-video/vcdimager/vcdimager-0.7.24.ebuild b/media-video/vcdimager/vcdimager-0.7.24.ebuild
index 3865bb82813..399af2e0173 100644
--- a/media-video/vcdimager/vcdimager-0.7.24.ebuild
+++ b/media-video/vcdimager/vcdimager-0.7.24.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
IUSE="+xml static-libs"
RDEPEND="
diff --git a/media-video/vcdimager/vcdimager-2.0.1.ebuild b/media-video/vcdimager/vcdimager-2.0.1.ebuild
index b8623b59736..9e8cd061307 100644
--- a/media-video/vcdimager/vcdimager-2.0.1.ebuild
+++ b/media-video/vcdimager/vcdimager-2.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ~ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ~ppc64 sparc x86"
IUSE="static-libs +xml"
RDEPEND="
diff --git a/net-analyzer/arping/arping-2.17.ebuild b/net-analyzer/arping/arping-2.17.ebuild
index 349568e6798..a10424905cd 100644
--- a/net-analyzer/arping/arping-2.17.ebuild
+++ b/net-analyzer/arping/arping-2.17.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.habets.pp.se/synscan/files/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="2"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/net-analyzer/arping/arping-2.20.ebuild b/net-analyzer/arping/arping-2.20.ebuild
index 2af28124c81..7c39a6fb1a5 100644
--- a/net-analyzer/arping/arping-2.20.ebuild
+++ b/net-analyzer/arping/arping-2.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/ThomasHabets/${PN}/archive/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/net-analyzer/arping/arping-2.21.ebuild b/net-analyzer/arping/arping-2.21.ebuild
index f6da9ed0cd9..7c39a6fb1a5 100644
--- a/net-analyzer/arping/arping-2.21.ebuild
+++ b/net-analyzer/arping/arping-2.21.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/ThomasHabets/${PN}/archive/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild b/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild
index a2c8b3a67b0..20ec0cc369d 100644
--- a/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild
+++ b/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://fedorahosted.org/releases/${PN:0:1}/${PN:1:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2 doc? ( FDL-1.1 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="doc"
RESTRICT="test"
diff --git a/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r2.ebuild b/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r2.ebuild
index 1cb32750a71..0295b3c1261 100644
--- a/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r2.ebuild
+++ b/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="http://fedorahosted.org/releases/${PN:0:1}/${PN:1:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2 doc? ( FDL-1.1 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="doc"
RESTRICT="test"
diff --git a/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r3.ebuild b/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r3.ebuild
index 12ba38d3c69..960fddbae48 100644
--- a/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r3.ebuild
+++ b/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/iptraf-ng/iptraf-ng/archive/v${PV}.tar.gz -> ${P}-gi
LICENSE="GPL-2 doc? ( FDL-1.1 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="doc"
RDEPEND="
diff --git a/net-analyzer/mtr/mtr-0.87.ebuild b/net-analyzer/mtr/mtr-0.87.ebuild
index 68c3b68c2b2..8d110dbfb39 100644
--- a/net-analyzer/mtr/mtr-0.87.ebuild
+++ b/net-analyzer/mtr/mtr-0.87.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.bitwizard.nl/mtr/files/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="gtk ipv6"
RDEPEND="
diff --git a/net-analyzer/mtr/mtr-0.92-r1.ebuild b/net-analyzer/mtr/mtr-0.92-r1.ebuild
index f3684cc00ec..703412cb920 100644
--- a/net-analyzer/mtr/mtr-0.92-r1.ebuild
+++ b/net-analyzer/mtr/mtr-0.92-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://www.bitwizard.nl/mtr/files/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="gtk ipv6 ncurses"
RDEPEND="
diff --git a/net-analyzer/mtr/mtr-0.93-r1.ebuild b/net-analyzer/mtr/mtr-0.93-r1.ebuild
index d9d46576472..c0b5cae918d 100644
--- a/net-analyzer/mtr/mtr-0.93-r1.ebuild
+++ b/net-analyzer/mtr/mtr-0.93-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://www.bitwizard.nl/mtr/files/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="gtk ipv6 ncurses"
RDEPEND="
diff --git a/net-analyzer/net-snmp/net-snmp-5.8-r3.ebuild b/net-analyzer/net-snmp/net-snmp-5.8-r3.ebuild
index ac6797d27dc..46d2c9f690a 100644
--- a/net-analyzer/net-snmp/net-snmp-5.8-r3.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.8-r3.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${P/_/.}
# GPL-2 for the init scripts
LICENSE="HPND BSD GPL-2"
SLOT="0/35"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh 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 pci perl python rpm selinux smux ssl tcpd ucd-compat zlib"
COMMON_DEPEND="
diff --git a/net-analyzer/net-snmp/net-snmp-5.8-r4.ebuild b/net-analyzer/net-snmp/net-snmp-5.8-r4.ebuild
index ced28fac187..a9de9b05549 100644
--- a/net-analyzer/net-snmp/net-snmp-5.8-r4.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.8-r4.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${P/_/.}
# GPL-2 for the init scripts
LICENSE="HPND BSD GPL-2"
SLOT="0/35"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~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 pci perl python rpm selinux smux ssl tcpd ucd-compat zlib"
COMMON_DEPEND="
diff --git a/net-analyzer/net-snmp/net-snmp-5.8-r5.ebuild b/net-analyzer/net-snmp/net-snmp-5.8-r5.ebuild
index fd31b84d6b6..19e92f52359 100644
--- a/net-analyzer/net-snmp/net-snmp-5.8-r5.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.8-r5.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${P/_/.}
# GPL-2 for the init scripts
LICENSE="HPND BSD GPL-2"
SLOT="0/35"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~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/net-snmp/net-snmp-5.8.1_pre1-r1.ebuild b/net-analyzer/net-snmp/net-snmp-5.8.1_pre1-r1.ebuild
index 3f60c5340f9..c40fd89123d 100644
--- a/net-analyzer/net-snmp/net-snmp-5.8.1_pre1-r1.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.8.1_pre1-r1.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${P/_/.}
# GPL-2 for the init scripts
LICENSE="HPND BSD GPL-2"
SLOT="0/35"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~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/net-snmp/net-snmp-5.8.1_pre2.ebuild b/net-analyzer/net-snmp/net-snmp-5.8.1_pre2.ebuild
index d853e1f035c..1418de67f9f 100644
--- a/net-analyzer/net-snmp/net-snmp-5.8.1_pre2.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.8.1_pre2.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${P/_/.}
# GPL-2 for the init scripts
LICENSE="HPND BSD GPL-2"
SLOT="0/35"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~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 f2efeefc7fb..a5257804fab 100644
--- a/net-analyzer/netcat/netcat-110-r9.ebuild
+++ b/net-analyzer/netcat/netcat-110-r9.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/nc110/${MY_P}.tgz
LICENSE="netcat"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 ~x86-macos ~sparc64-solaris ~x64-solaris"
IUSE="crypt ipv6 static"
LIB_DEPEND="crypt? ( dev-libs/libmix[static-libs(+)] )"
diff --git a/net-analyzer/netcat/netcat-110.20180111.ebuild b/net-analyzer/netcat/netcat-110.20180111.ebuild
index df0524891b0..da20c98247b 100644
--- a/net-analyzer/netcat/netcat-110.20180111.ebuild
+++ b/net-analyzer/netcat/netcat-110.20180111.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/nc110/${MY_P}.tar.xz"
LICENSE="netcat"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 ~x86-macos ~sparc64-solaris ~x64-solaris"
IUSE="ipv6 static"
S=${WORKDIR}/nc110
diff --git a/net-analyzer/netselect/netselect-0.4-r1.ebuild b/net-analyzer/netselect/netselect-0.4-r1.ebuild
index 00f427e799d..ac501ed70f9 100644
--- a/net-analyzer/netselect/netselect-0.4-r1.ebuild
+++ b/net-analyzer/netselect/netselect-0.4-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="ipv6"
PATCHES=(
diff --git a/net-analyzer/ngrep/ngrep-1.45-r3.ebuild b/net-analyzer/ngrep/ngrep-1.45-r3.ebuild
index b55f3909d22..b35489f1363 100644
--- a/net-analyzer/ngrep/ngrep-1.45-r3.ebuild
+++ b/net-analyzer/ngrep/ngrep-1.45-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/ngrep/${P}.tar.bz2"
LICENSE="ngrep"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sh 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/ngrep/ngrep-1.47.ebuild b/net-analyzer/ngrep/ngrep-1.47.ebuild
index 0372332adb1..5b7b863658a 100644
--- a/net-analyzer/ngrep/ngrep-1.47.ebuild
+++ b/net-analyzer/ngrep/ngrep-1.47.ebuild
@@ -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 ~sh ~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/nmap/nmap-7.80-r1.ebuild b/net-analyzer/nmap/nmap-7.80-r1.ebuild
index f0e760e7435..04304abe9e8 100644
--- a/net-analyzer/nmap/nmap-7.80-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.80-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
https://nmap.org/dist/${MY_P}.tar.bz2
https://dev.gentoo.org/~jer/nmap-logo-64.png
"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
LICENSE="GPL-2"
SLOT="0"
diff --git a/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild
index fe2284a9133..b359fc818dd 100644
--- a/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0/8.0.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/net-analyzer/rrdtool/rrdtool-1.7.1.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.1.ebuild
index ff22873538e..c6feaa1b781 100644
--- a/net-analyzer/rrdtool/rrdtool-1.7.1.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.7.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0/8.0.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild
index 858ec12f829..9ca47c565ce 100644
--- a/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0/8.0.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/net-analyzer/tcpdump/tcpdump-4.9.3-r1.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.3-r1.ebuild
index 2fc6154ef96..8374b080d4e 100644
--- a/net-analyzer/tcpdump/tcpdump-4.9.3-r1.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.9.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~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.9.3.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.3.ebuild
index 32094766b85..fa9ea4cb071 100644
--- a/net-analyzer/tcpdump/tcpdump-4.9.3.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.9.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh 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-9999.ebuild b/net-analyzer/tcpdump/tcpdump-9999.ebuild
index cb1394377af..ac642f4be7b 100644
--- a/net-analyzer/tcpdump/tcpdump-9999.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-9999.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == "9999" ]] ; then
KEYWORDS=""
else
SRC_URI="https://github.com/the-${PN}-group/${PN}/archive/${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
fi
RDEPEND="
diff --git a/net-analyzer/traceroute/traceroute-2.0.20.ebuild b/net-analyzer/traceroute/traceroute-2.0.20.ebuild
index 9fb51908a41..d4d4963380b 100644
--- a/net-analyzer/traceroute/traceroute-2.0.20.ebuild
+++ b/net-analyzer/traceroute/traceroute-2.0.20.ebuild
@@ -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 sh 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-analyzer/traceroute/traceroute-2.0.22.ebuild b/net-analyzer/traceroute/traceroute-2.0.22.ebuild
index ca0995b4e8e..c9dea6ed056 100644
--- a/net-analyzer/traceroute/traceroute-2.0.22.ebuild
+++ b/net-analyzer/traceroute/traceroute-2.0.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -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 ~sh ~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-analyzer/traceroute/traceroute-2.1.0.ebuild b/net-analyzer/traceroute/traceroute-2.1.0.ebuild
index f82dabcc9bd..79e608a9eed 100644
--- a/net-analyzer/traceroute/traceroute-2.1.0.ebuild
+++ b/net-analyzer/traceroute/traceroute-2.1.0.ebuild
@@ -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 ~sh 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 ef811883bab..74e8ead33d2 100644
--- a/net-dialup/linux-atm/linux-atm-2.5.2.ebuild
+++ b/net-dialup/linux-atm/linux-atm-2.5.2.ebuild
@@ -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 sh 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 6fb0595483f..292312d3bd3 100644
--- a/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild
+++ b/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild
@@ -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 sh 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 e045c3315e9..48a806daa72 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 ~sh ~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/mgetty/mgetty-1.2.1.ebuild b/net-dialup/mgetty/mgetty-1.2.1.ebuild
index 69a228ee58a..24e0d7c3509 100644
--- a/net-dialup/mgetty/mgetty-1.2.1.ebuild
+++ b/net-dialup/mgetty/mgetty-1.2.1.ebuild
@@ -25,7 +25,7 @@ RDEPEND="${DEPEND}
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE="+fax fidonet"
pkg_setup() {
diff --git a/net-dialup/minicom/minicom-2.7.1.ebuild b/net-dialup/minicom/minicom-2.7.1.ebuild
index eb4db24cc74..2cf2990651a 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 sh 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-dialup/ppp-scripts/ppp-scripts-0.ebuild b/net-dialup/ppp-scripts/ppp-scripts-0.ebuild
index 3b28abc0689..123c204d71c 100644
--- a/net-dialup/ppp-scripts/ppp-scripts-0.ebuild
+++ b/net-dialup/ppp-scripts/ppp-scripts-0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
DEPEND="!<net-dialup/ppp-2.4.7-r1"
RDEPEND="${DEPEND}"
diff --git a/net-dialup/ppp/ppp-2.4.7-r7.ebuild b/net-dialup/ppp/ppp-2.4.7-r7.ebuild
index b3622128a45..9d5af0507ed 100644
--- a/net-dialup/ppp/ppp-2.4.7-r7.ebuild
+++ b/net-dialup/ppp/ppp-2.4.7-r7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://download.samba.org/pub/ppp/${P}.tar.gz
LICENSE="BSD GPL-2"
SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="activefilter atm dhcp eap-tls gtk ipv6 libressl pam radius"
DEPEND="
diff --git a/net-dialup/ppp/ppp-2.4.8.ebuild b/net-dialup/ppp/ppp-2.4.8.ebuild
index 00368a869f4..f0e050ae426 100644
--- a/net-dialup/ppp/ppp-2.4.8.ebuild
+++ b/net-dialup/ppp/ppp-2.4.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/paulusmack/ppp/archive/${P}.tar.gz
LICENSE="BSD GPL-2"
SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="activefilter atm dhcp eap-tls gtk ipv6 libressl pam radius"
DEPEND="
diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.12-r1.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.12-r1.ebuild
index a39d8543be1..794d3432c0d 100644
--- a/net-dialup/rp-pppoe/rp-pppoe-3.12-r1.ebuild
+++ b/net-dialup/rp-pppoe/rp-pppoe-3.12-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.roaringpenguin.com/files/download/${P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
IUSE="tk"
RDEPEND="
diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.13.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.13.ebuild
index 988fa7c8d81..0f8969df89a 100644
--- a/net-dialup/rp-pppoe/rp-pppoe-3.13.ebuild
+++ b/net-dialup/rp-pppoe/rp-pppoe-3.13.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dianne.skoll.ca/projects/rp-pppoe/download/${P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE="tk"
RDEPEND="
diff --git a/net-dns/bind-tools/bind-tools-9.14.11.ebuild b/net-dns/bind-tools/bind-tools-9.14.11.ebuild
index 8868521f0f3..b4e1f595e91 100644
--- a/net-dns/bind-tools/bind-tools-9.14.11.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.14.11.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.gz"
LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+caps doc gssapi idn ipv6 libedit libressl readline xml"
# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
diff --git a/net-dns/bind-tools/bind-tools-9.14.8.ebuild b/net-dns/bind-tools/bind-tools-9.14.8.ebuild
index 215b109028d..6094cca684f 100644
--- a/net-dns/bind-tools/bind-tools-9.14.8.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.14.8.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.gz"
LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+caps doc gssapi idn ipv6 libedit libressl readline xml"
# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
diff --git a/net-dns/bind-tools/bind-tools-9.14.9.ebuild b/net-dns/bind-tools/bind-tools-9.14.9.ebuild
index 8868521f0f3..b4e1f595e91 100644
--- a/net-dns/bind-tools/bind-tools-9.14.9.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.14.9.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.gz"
LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+caps doc gssapi idn ipv6 libedit libressl readline xml"
# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
diff --git a/net-dns/bind-tools/bind-tools-9.16.1.ebuild b/net-dns/bind-tools/bind-tools-9.16.1.ebuild
index 0e49a3df65d..43003876270 100644
--- a/net-dns/bind-tools/bind-tools-9.16.1.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.16.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz"
LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+caps doc gssapi idn ipv6 libedit libressl readline xml"
# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
diff --git a/net-dns/bind/bind-9.14.11.ebuild b/net-dns/bind/bind-9.14.11.ebuild
index 1a057167b9e..99596a75135 100644
--- a/net-dns/bind/bind-9.14.11.ebuild
+++ b/net-dns/bind/bind-9.14.11.ebuild
@@ -36,7 +36,7 @@ SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.gz
LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# -berkdb by default re bug 602682
IUSE="-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi
json ldap libressl lmdb mysql odbc postgres python selinux static-libs
diff --git a/net-dns/bind/bind-9.14.8.ebuild b/net-dns/bind/bind-9.14.8.ebuild
index 71849d180ed..6607d0b5524 100644
--- a/net-dns/bind/bind-9.14.8.ebuild
+++ b/net-dns/bind/bind-9.14.8.ebuild
@@ -36,7 +36,7 @@ SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.gz
LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# -berkdb by default re bug 602682
IUSE="-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi
json ldap libressl lmdb mysql odbc postgres python selinux static-libs
diff --git a/net-dns/bind/bind-9.14.9.ebuild b/net-dns/bind/bind-9.14.9.ebuild
index 1a057167b9e..99596a75135 100644
--- a/net-dns/bind/bind-9.14.9.ebuild
+++ b/net-dns/bind/bind-9.14.9.ebuild
@@ -36,7 +36,7 @@ SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.gz
LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# -berkdb by default re bug 602682
IUSE="-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi
json ldap libressl lmdb mysql odbc postgres python selinux static-libs
diff --git a/net-dns/bind/bind-9.16.1.ebuild b/net-dns/bind/bind-9.16.1.ebuild
index f5658f0a4de..9628c36243a 100644
--- a/net-dns/bind/bind-9.16.1.ebuild
+++ b/net-dns/bind/bind-9.16.1.ebuild
@@ -36,7 +36,7 @@ SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.xz
LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# -berkdb by default re bug 602682
IUSE="-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi
json ldap libressl lmdb mysql odbc postgres python selinux static-libs
diff --git a/net-dns/c-ares/c-ares-1.13.0.ebuild b/net-dns/c-ares/c-ares-1.13.0.ebuild
index 9477cdd1ff0..b6b46687d35 100644
--- a/net-dns/c-ares/c-ares-1.13.0.ebuild
+++ b/net-dns/c-ares/c-ares-1.13.0.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 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
IUSE="static-libs"
# Subslot = SONAME of libcares.so.2
diff --git a/net-dns/c-ares/c-ares-1.14.0.ebuild b/net-dns/c-ares/c-ares-1.14.0.ebuild
index 3e621769f26..00d4c05f1ef 100644
--- a/net-dns/c-ares/c-ares-1.14.0.ebuild
+++ b/net-dns/c-ares/c-ares-1.14.0.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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
IUSE="static-libs"
# Subslot = SONAME of libcares.so.2
diff --git a/net-dns/c-ares/c-ares-1.15.0.ebuild b/net-dns/c-ares/c-ares-1.15.0.ebuild
index 27a3aae31e7..5cd509bf9c1 100644
--- a/net-dns/c-ares/c-ares-1.15.0.ebuild
+++ b/net-dns/c-ares/c-ares-1.15.0.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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
IUSE="static-libs"
# Subslot = SONAME of libcares.so.2
diff --git a/net-dns/dnsmasq/dnsmasq-2.80-r1.ebuild b/net-dns/dnsmasq/dnsmasq-2.80-r1.ebuild
index 21ac335b7b8..ba0e02d6731 100644
--- a/net-dns/dnsmasq/dnsmasq-2.80-r1.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.80-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz"
LICENSE="|| ( GPL-2 GPL-3 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec +dumpfile id idn libidn2"
IUSE+=" +inotify ipv6 lua nls script selinux static tftp"
diff --git a/net-dns/dnssec-root/dnssec-root-20181220-r1.ebuild b/net-dns/dnssec-root/dnssec-root-20181220-r1.ebuild
index 9c33658f21c..11cc3150096 100644
--- a/net-dns/dnssec-root/dnssec-root-20181220-r1.ebuild
+++ b/net-dns/dnssec-root/dnssec-root-20181220-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -11,7 +11,7 @@ SRC_URI="https://data.iana.org/root-anchors/root-anchors.xml -> root-anchors-${P
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~x64-macos"
IUSE=""
BDEPEND=">=dev-perl/XML-XPath-1.420.0"
diff --git a/net-dns/idnkit/idnkit-1.0-r2.ebuild b/net-dns/idnkit/idnkit-1.0-r2.ebuild
index ffada10d166..82797bb1d0e 100644
--- a/net-dns/idnkit/idnkit-1.0-r2.ebuild
+++ b/net-dns/idnkit/idnkit-1.0-r2.ebuild
@@ -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 sh 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 054a15cae6f..65ccde2d26d 100644
--- a/net-dns/idnkit/idnkit-2.3.ebuild
+++ b/net-dns/idnkit/idnkit-2.3.ebuild
@@ -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 ~sh ~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/ldns-utils/ldns-utils-1.7.0-r1.ebuild b/net-dns/ldns-utils/ldns-utils-1.7.0-r1.ebuild
index d8eb251073b..12fdbe9fc87 100644
--- a/net-dns/ldns-utils/ldns-utils-1.7.0-r1.ebuild
+++ b/net-dns/ldns-utils/ldns-utils-1.7.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.nlnetlabs.nl/downloads/ldns/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="+dane ecdsa examples gost ssl"
REQUIRED_USE="
diff --git a/net-dns/ldns-utils/ldns-utils-1.7.1.ebuild b/net-dns/ldns-utils/ldns-utils-1.7.1.ebuild
index 43f84b976da..75f950d2d98 100644
--- a/net-dns/ldns-utils/ldns-utils-1.7.1.ebuild
+++ b/net-dns/ldns-utils/ldns-utils-1.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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/ldns/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="+dane ecdsa ed25519 ed448 examples gost ssl"
REQUIRED_USE="
diff --git a/net-dns/libidn/libidn-1.35.ebuild b/net-dns/libidn/libidn-1.35.ebuild
index f37edd20c66..5853750d45e 100644
--- a/net-dns/libidn/libidn-1.35.ebuild
+++ b/net-dns/libidn/libidn-1.35.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 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc emacs java mono nls static-libs"
DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS TODO )
diff --git a/net-dns/libidn2/libidn2-2.1.1a-r1.ebuild b/net-dns/libidn2/libidn2-2.1.1a-r1.ebuild
index c67611ebd56..f93e96bb797 100644
--- a/net-dns/libidn2/libidn2-2.1.1a-r1.ebuild
+++ b/net-dns/libidn2/libidn2-2.1.1a-r1.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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
RDEPEND="
diff --git a/net-dns/libidn2/libidn2-2.3.0.ebuild b/net-dns/libidn2/libidn2-2.3.0.ebuild
index fe57c727640..b9f268e6d5d 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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
RDEPEND="
diff --git a/net-dns/openresolv/openresolv-3.9.0.ebuild b/net-dns/openresolv/openresolv-3.9.0.ebuild
index 04477061b26..845b3e4f2eb 100644
--- a/net-dns/openresolv/openresolv-3.9.0.ebuild
+++ b/net-dns/openresolv/openresolv-3.9.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://roy.marples.name/downloads/${PN}/${P}.tar.xz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
IUSE="selinux"
DEPEND="!net-dns/resolvconf-gentoo
diff --git a/net-dns/openresolv/openresolv-3.9.2.ebuild b/net-dns/openresolv/openresolv-3.9.2.ebuild
index 0d725c4c13e..7efc80a0a9a 100644
--- a/net-dns/openresolv/openresolv-3.9.2.ebuild
+++ b/net-dns/openresolv/openresolv-3.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://roy.marples.name/downloads/${PN}/${P}.tar.xz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="selinux"
DEPEND="!net-dns/resolvconf-gentoo
diff --git a/net-firewall/iptables/iptables-1.6.1-r3.ebuild b/net-firewall/iptables/iptables-1.6.1-r3.ebuild
index d8603b1de21..0c3c5c35f96 100644
--- a/net-firewall/iptables/iptables-1.6.1-r3.ebuild
+++ b/net-firewall/iptables/iptables-1.6.1-r3.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
# Subslot tracks libxtables as that's the one other packages generally link
# against and iptables changes. Will have to revisit if other sonames change.
SLOT="0/12"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE="conntrack ipv6 netlink nftables pcap static-libs"
COMMON_DEPEND="
diff --git a/net-firewall/iptables/iptables-1.6.2-r2.ebuild b/net-firewall/iptables/iptables-1.6.2-r2.ebuild
index 40d1b1f8de5..abd85bcb2eb 100644
--- a/net-firewall/iptables/iptables-1.6.2-r2.ebuild
+++ b/net-firewall/iptables/iptables-1.6.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
# Subslot tracks libxtables as that's the one other packages generally link
# against and iptables changes. Will have to revisit if other sonames change.
SLOT="0/12"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="conntrack ipv6 netlink nftables pcap static-libs"
COMMON_DEPEND="
diff --git a/net-firewall/iptables/iptables-1.8.3-r1.ebuild b/net-firewall/iptables/iptables-1.8.3-r1.ebuild
index 52246a8ac41..a1da5ac8f6a 100644
--- a/net-firewall/iptables/iptables-1.8.3-r1.ebuild
+++ b/net-firewall/iptables/iptables-1.8.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,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 ~sh ~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"
COMMON_DEPEND="
diff --git a/net-firewall/iptables/iptables-1.8.4-r1.ebuild b/net-firewall/iptables/iptables-1.8.4-r1.ebuild
index 5fd44252e76..80ef3dd2877 100644
--- a/net-firewall/iptables/iptables-1.8.4-r1.ebuild
+++ b/net-firewall/iptables/iptables-1.8.4-r1.ebuild
@@ -16,7 +16,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 ~sh ~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"
COMMON_DEPEND="
diff --git a/net-firewall/iptables/iptables-1.8.4.ebuild b/net-firewall/iptables/iptables-1.8.4.ebuild
index 8cb78dfb30b..ba0c606aedf 100644
--- a/net-firewall/iptables/iptables-1.8.4.ebuild
+++ b/net-firewall/iptables/iptables-1.8.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,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 ~sh ~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"
COMMON_DEPEND="
diff --git a/net-fs/cifs-utils/cifs-utils-6.7.ebuild b/net-fs/cifs-utils/cifs-utils-6.7.ebuild
index 1e9336b79ac..94290c80cef 100644
--- a/net-fs/cifs-utils/cifs-utils-6.7.ebuild
+++ b/net-fs/cifs-utils/cifs-utils-6.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-linux"
IUSE="+acl +ads +caps +caps-ng creds pam"
RDEPEND="
diff --git a/net-fs/cifs-utils/cifs-utils-6.8-r1.ebuild b/net-fs/cifs-utils/cifs-utils-6.8-r1.ebuild
index 9e5e310b652..faf4ebc7e01 100644
--- a/net-fs/cifs-utils/cifs-utils-6.8-r1.ebuild
+++ b/net-fs/cifs-utils/cifs-utils-6.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux"
IUSE="+acl +ads +caps creds pam"
RDEPEND="
diff --git a/net-fs/cifs-utils/cifs-utils-6.9-r1.ebuild b/net-fs/cifs-utils/cifs-utils-6.9-r1.ebuild
index e34b368397d..23f6c30df5a 100644
--- a/net-fs/cifs-utils/cifs-utils-6.9-r1.ebuild
+++ b/net-fs/cifs-utils/cifs-utils-6.9-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-linux"
IUSE="+acl +ads +caps creds pam"
RDEPEND="
diff --git a/net-fs/libnfs/libnfs-2.0.0.ebuild b/net-fs/libnfs/libnfs-2.0.0.ebuild
index 0fe24efcde1..c1c0befd623 100644
--- a/net-fs/libnfs/libnfs-2.0.0.ebuild
+++ b/net-fs/libnfs/libnfs-2.0.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/sahlberg/${PN}/archive/${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 x86"
fi
DESCRIPTION="Client library for accessing NFS shares over a network"
diff --git a/net-fs/libnfs/libnfs-3.0.0.ebuild b/net-fs/libnfs/libnfs-3.0.0.ebuild
index 96606a99d49..e5153c2d254 100644
--- a/net-fs/libnfs/libnfs-3.0.0.ebuild
+++ b/net-fs/libnfs/libnfs-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 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 ~sh ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~x86"
S="${WORKDIR}/${PN}-${P}"
fi
diff --git a/net-fs/libnfs/libnfs-4.0.0.ebuild b/net-fs/libnfs/libnfs-4.0.0.ebuild
index 66c1685f120..13cae771f02 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-2019 Gentoo Authors
+# Copyright 1999-2020 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 ~sh ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~x86"
S="${WORKDIR}/${PN}-${P}"
fi
diff --git a/net-fs/libnfs/libnfs-9999.ebuild b/net-fs/libnfs/libnfs-9999.ebuild
index 66c1685f120..13cae771f02 100644
--- a/net-fs/libnfs/libnfs-9999.ebuild
+++ b/net-fs/libnfs/libnfs-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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 ~sh ~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.3.4.ebuild b/net-fs/nfs-utils/nfs-utils-2.3.4.ebuild
index d260858f6a5..58819779e89 100644
--- a/net-fs/nfs-utils/nfs-utils-2.3.4.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.3.4.ebuild
@@ -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 sh sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
fi
LICENSE="GPL-2"
diff --git a/net-fs/nfs-utils/nfs-utils-2.4.1-r4.ebuild b/net-fs/nfs-utils/nfs-utils-2.4.1-r4.ebuild
index b948484ed11..a6f513ec4fb 100644
--- a/net-fs/nfs-utils/nfs-utils-2.4.1-r4.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.4.1-r4.ebuild
@@ -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 sh sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
fi
LICENSE="GPL-2"
diff --git a/net-fs/nfs-utils/nfs-utils-2.4.2-r1.ebuild b/net-fs/nfs-utils/nfs-utils-2.4.2-r1.ebuild
index 7fad4a5f6cc..60e7f090e12 100644
--- a/net-fs/nfs-utils/nfs-utils-2.4.2-r1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.4.2-r1.ebuild
@@ -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 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
fi
LICENSE="GPL-2"
diff --git a/net-fs/nfs-utils/nfs-utils-2.4.3.ebuild b/net-fs/nfs-utils/nfs-utils-2.4.3.ebuild
index 8f309e2af7e..62e71ea7793 100644
--- a/net-fs/nfs-utils/nfs-utils-2.4.3.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.4.3.ebuild
@@ -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 ~sh ~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 9b818719ad4..71c32ea43c7 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
@@ -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 sh 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-r3.ebuild b/net-ftp/ftpbase/ftpbase-0.01-r3.ebuild
index af588e5b6ba..7461aa776f4 100644
--- a/net-ftp/ftpbase/ftpbase-0.01-r3.ebuild
+++ b/net-ftp/ftpbase/ftpbase-0.01-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 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/ncftp/ncftp-3.2.6-r1.ebuild b/net-ftp/ncftp/ncftp-3.2.6-r1.ebuild
index 7c177b45e9f..1d4e5c3cf8f 100644
--- a/net-ftp/ncftp/ncftp-3.2.6-r1.ebuild
+++ b/net-ftp/ncftp/ncftp-3.2.6-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
LICENSE="Clarified-Artistic"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
IUSE="pch"
DEPEND="
diff --git a/net-ftp/ncftp/ncftp-3.2.6.ebuild b/net-ftp/ncftp/ncftp-3.2.6.ebuild
index 68aad34002a..ebaab604707 100644
--- a/net-ftp/ncftp/ncftp-3.2.6.ebuild
+++ b/net-ftp/ncftp/ncftp-3.2.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
LICENSE="Clarified-Artistic"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
IUSE="pch"
DEPEND="
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 78723b2d830..b47965bd309 100644
--- a/net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild
+++ b/net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild
@@ -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 sh 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 b5dea09d687..c8b40206403 100644
--- a/net-ftp/vsftpd/vsftpd-3.0.3-r3.ebuild
+++ b/net-ftp/vsftpd/vsftpd-3.0.3-r3.ebuild
@@ -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 sh 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 )
--git a/net-irc/irssi/irssi-1.2.2.ebuild b/net-irc/irssi/irssi-1.2.2.ebuild
index e7cbf3211e7..c459dee83a0 100644
--- a/net-irc/irssi/irssi-1.2.2.ebuild
+++ b/net-irc/irssi/irssi-1.2.2.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 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 48c42361f18..cd37b54cf54 100644
--- a/net-libs/c-client/c-client-2007f-r6.ebuild
+++ b/net-libs/c-client/c-client-2007f-r6.ebuild
@@ -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 ~sh 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.66.4.ebuild b/net-libs/courier-authlib/courier-authlib-0.66.4.ebuild
index 2aa2cb765ad..5501bf9cbee 100644
--- a/net-libs/courier-authlib/courier-authlib-0.66.4.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.66.4.ebuild
@@ -4,7 +4,7 @@
EAPI=5
inherit eutils flag-o-matic multilib user
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 ~arm 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.67.0.ebuild b/net-libs/courier-authlib/courier-authlib-0.67.0.ebuild
index f23fa23f03b..41a7ebef371 100644
--- a/net-libs/courier-authlib/courier-authlib-0.67.0.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.67.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit flag-o-matic
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~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.68.0-r1.ebuild b/net-libs/courier-authlib/courier-authlib-0.68.0-r1.ebuild
index c83f2a20ba9..3757bee9300 100644
--- a/net-libs/courier-authlib/courier-authlib-0.68.0-r1.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.68.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit flag-o-matic
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~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.69.0-r1.ebuild b/net-libs/courier-authlib/courier-authlib-0.69.0-r1.ebuild
index caa9550e1a3..0c07658ad1f 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
@@ -4,7 +4,7 @@
EAPI=7
inherit flag-o-matic
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh 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.ebuild b/net-libs/courier-unicode/courier-unicode-2.1.ebuild
index dfa62d318f4..36e48636ef7 100644
--- a/net-libs/courier-unicode/courier-unicode-2.1.ebuild
+++ b/net-libs/courier-unicode/courier-unicode-2.1.ebuild
@@ -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 sh 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.60.3.ebuild b/net-libs/glib-networking/glib-networking-2.60.3.ebuild
index 4b873b20e95..622fc27d08a 100644
--- a/net-libs/glib-networking/glib-networking-2.60.3.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.60.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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
>=dev-libs/glib-2.55.1:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/glib-networking/glib-networking-2.60.4.ebuild b/net-libs/glib-networking/glib-networking-2.60.4.ebuild
index 6e5bef5bb52..6451e657264 100644
--- a/net-libs/glib-networking/glib-networking-2.60.4.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.60.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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
>=dev-libs/glib-2.55.1:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/glib-networking/glib-networking-2.62.3.ebuild b/net-libs/glib-networking/glib-networking-2.62.3.ebuild
index 8862fff92c3..ed132f187d7 100644
--- a/net-libs/glib-networking/glib-networking-2.62.3.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.62.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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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.0.ebuild b/net-libs/glib-networking/glib-networking-2.64.0.ebuild
index 1ea5388a902..f4858b4fe70 100644
--- a/net-libs/glib-networking/glib-networking-2.64.0.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.64.0.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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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.11.1-r1.ebuild b/net-libs/gnutls/gnutls-3.6.11.1-r1.ebuild
index 86457bd17c4..1ceb87d0c50 100644
--- a/net-libs/gnutls/gnutls-3.6.11.1-r1.ebuild
+++ b/net-libs/gnutls/gnutls-3.6.11.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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/gnutls/gnutls-3.6.12.ebuild b/net-libs/gnutls/gnutls-3.6.12.ebuild
index 5fb2da5dd55..1ceb87d0c50 100644
--- a/net-libs/gnutls/gnutls-3.6.12.ebuild
+++ b/net-libs/gnutls/gnutls-3.6.12.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 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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/gnutls/gnutls-3.6.7-r1.ebuild b/net-libs/gnutls/gnutls-3.6.7-r1.ebuild
index 77d5e2d7426..9d27ca1f72f 100644
--- a/net-libs/gnutls/gnutls-3.6.7-r1.ebuild
+++ b/net-libs/gnutls/gnutls-3.6.7-r1.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 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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.0-r2.ebuild b/net-libs/ldns/ldns-1.7.0-r2.ebuild
index 54e088c681c..0d65f0cf243 100644
--- a/net-libs/ldns/ldns-1.7.0-r2.ebuild
+++ b/net-libs/ldns/ldns-1.7.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh 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 gost libressl python static-libs vim-syntax"
# configure will die if ecdsa is enabled and ssl is not
diff --git a/net-libs/ldns/ldns-1.7.1-r1.ebuild b/net-libs/ldns/ldns-1.7.1-r1.ebuild
index 811a38789a9..9c697a8881f 100644
--- a/net-libs/ldns/ldns-1.7.1-r1.ebuild
+++ b/net-libs/ldns/ldns-1.7.1-r1.ebuild
@@ -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 ~sh ~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/libasyncns/libasyncns-0.8-r4.ebuild b/net-libs/libasyncns/libasyncns-0.8-r4.ebuild
index 954f4a89c02..3eccb8c9248 100644
--- a/net-libs/libasyncns/libasyncns-0.8-r4.ebuild
+++ b/net-libs/libasyncns/libasyncns-0.8-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://0pointer.de/lennart/projects/libasyncns/${P}.tar.gz"
SLOT="0"
LICENSE="LGPL-2.1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
IUSE="doc debug"
diff --git a/net-libs/libesmtp/libesmtp-1.0.6-r3.ebuild b/net-libs/libesmtp/libesmtp-1.0.6-r3.ebuild
index 5e07c50b09c..dc2ff70792a 100644
--- a/net-libs/libesmtp/libesmtp-1.0.6-r3.ebuild
+++ b/net-libs/libesmtp/libesmtp-1.0.6-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://brianstafford.info/${PN}/${P}.tar.bz2"
LICENSE="LGPL-2.1 GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
IUSE="debug libressl ntlm ssl static-libs threads"
RDEPEND="
diff --git a/net-libs/libgssglue/libgssglue-0.4-r1.ebuild b/net-libs/libgssglue/libgssglue-0.4-r1.ebuild
index 75a3d39f778..9c567517026 100644
--- a/net-libs/libgssglue/libgssglue-0.4-r1.ebuild
+++ b/net-libs/libgssglue/libgssglue-0.4-r1.ebuild
@@ -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 sh 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 e8d43cd207a..4876552bc14 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="static-libs"
RDEPEND="acct-group/mail"
diff --git a/net-libs/libmnl/libmnl-1.0.3-r1.ebuild b/net-libs/libmnl/libmnl-1.0.3-r1.ebuild
index 20d9161ac1a..6e1b9061c35 100644
--- a/net-libs/libmnl/libmnl-1.0.3-r1.ebuild
+++ b/net-libs/libmnl/libmnl-1.0.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux"
IUSE="examples static-libs"
src_configure() {
diff --git a/net-libs/libmnl/libmnl-1.0.4.ebuild b/net-libs/libmnl/libmnl-1.0.4.ebuild
index 593ef4ea5b7..75402e50be9 100644
--- a/net-libs/libmnl/libmnl-1.0.4.ebuild
+++ b/net-libs/libmnl/libmnl-1.0.4.ebuild
@@ -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 sh 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/libnet/libnet-1.2.ebuild b/net-libs/libnet/libnet-1.2.ebuild
index a45d3c034c3..9a5471d7346 100644
--- a/net-libs/libnet/libnet-1.2.ebuild
+++ b/net-libs/libnet/libnet-1.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
LICENSE="BSD BSD-2 HPND"
SLOT="1.1"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="static-libs"
DOCS=(
diff --git a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.4.ebuild b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.4.ebuild
index eeefc4da14b..2a60f619cb0 100644
--- a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.4.ebuild
+++ b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.4.ebuild
@@ -10,7 +10,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 ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sparc x86"
IUSE="static-libs"
RDEPEND="
diff --git a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.5.ebuild b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.5.ebuild
index f345796e98b..05b3c46e72d 100644
--- a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.5.ebuild
+++ b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -10,7 +10,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 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="static-libs"
RDEPEND="
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 3ff936d2383..592184bee6d 100644
--- a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.6.ebuild
+++ b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.6.ebuild
@@ -10,7 +10,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 sh 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 35b8102ee1e..fce41470c42 100644
--- a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.7.ebuild
+++ b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.7.ebuild
@@ -10,7 +10,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 ~sh ~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 26088b852aa..8854413fccb 100644
--- a/net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild
+++ b/net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 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 36ce538d051..a8d4bbb8f94 100644
--- a/net-libs/libnfsidmap/libnfsidmap-0.27.ebuild
+++ b/net-libs/libnfsidmap/libnfsidmap-0.27.ebuild
@@ -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 sh 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 ee2ea685bfb..7aaeec2d706 100644
--- a/net-libs/libnsl/libnsl-0-r1.ebuild
+++ b/net-libs/libnsl/libnsl-0-r1.ebuild
@@ -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 sh 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.2.0.ebuild b/net-libs/libnsl/libnsl-1.2.0.ebuild
index 013966713b9..954a1991f41 100644
--- a/net-libs/libnsl/libnsl-1.2.0.ebuild
+++ b/net-libs/libnsl/libnsl-1.2.0.ebuild
@@ -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 sh 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/libpcap/libpcap-1.9.1-r2.ebuild b/net-libs/libpcap/libpcap-1.9.1-r2.ebuild
index 19c8f320172..47631759bbe 100644
--- a/net-libs/libpcap/libpcap-1.9.1-r2.ebuild
+++ b/net-libs/libpcap/libpcap-1.9.1-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="bluetooth dbus netlink -remote static-libs usb -yydebug"
RDEPEND="
diff --git a/net-libs/libpcap/libpcap-1.9.1.ebuild b/net-libs/libpcap/libpcap-1.9.1.ebuild
index ab9d35c786f..4c811cf132c 100644
--- a/net-libs/libpcap/libpcap-1.9.1.ebuild
+++ b/net-libs/libpcap/libpcap-1.9.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="bluetooth dbus netlink static-libs usb"
RDEPEND="
diff --git a/net-libs/libproxy/libproxy-0.4.13-r2.ebuild b/net-libs/libproxy/libproxy-0.4.13-r2.ebuild
index 191ad591cc0..6e4fbc6bbb5 100644
--- a/net-libs/libproxy/libproxy-0.4.13-r2.ebuild
+++ b/net-libs/libproxy/libproxy-0.4.13-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/libproxy/libproxy/archive/${PV}.tar.gz -> ${P}.tar.g
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="gnome kde mono networkmanager perl python spidermonkey test webkit"
RESTRICT="!test? ( test )"
diff --git a/net-libs/libproxy/libproxy-0.4.15-r1.ebuild b/net-libs/libproxy/libproxy-0.4.15-r1.ebuild
index 16852065bae..4b24fb8b64f 100644
--- a/net-libs/libproxy/libproxy-0.4.15-r1.ebuild
+++ b/net-libs/libproxy/libproxy-0.4.15-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libproxy/libproxy/archive/${PV}.tar.gz -> ${P}.tar.g
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="gnome kde mono networkmanager spidermonkey test webkit"
RESTRICT="!test? ( test )"
diff --git a/net-libs/librsync/librsync-0.9.7-r3.ebuild b/net-libs/librsync/librsync-0.9.7-r3.ebuild
index df599b245df..dae10e03f76 100644
--- a/net-libs/librsync/librsync-0.9.7-r3.ebuild
+++ b/net-libs/librsync/librsync-0.9.7-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0/1"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="static-libs"
RDEPEND="dev-libs/popt"
diff --git a/net-libs/librsync/librsync-2.0.1-r1.ebuild b/net-libs/librsync/librsync-2.0.1-r1.ebuild
index c0e8c59f185..92d015b9707 100644
--- a/net-libs/librsync/librsync-2.0.1-r1.ebuild
+++ b/net-libs/librsync/librsync-2.0.1-r1.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"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
RDEPEND="dev-libs/popt"
DEPEND="${RDEPEND}"
diff --git a/net-libs/librsync/librsync-2.0.2.ebuild b/net-libs/librsync/librsync-2.0.2.ebuild
index 84ff4a031d8..17d5c77e925 100644
--- a/net-libs/librsync/librsync-2.0.2.ebuild
+++ b/net-libs/librsync/librsync-2.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
RDEPEND="
dev-libs/popt
diff --git a/net-libs/librsync/librsync-2.1.0.ebuild b/net-libs/librsync/librsync-2.1.0.ebuild
index 19f0d6f4bb2..755db27d3f5 100644
--- a/net-libs/librsync/librsync-2.1.0.ebuild
+++ b/net-libs/librsync/librsync-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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.1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
RDEPEND="
dev-libs/popt
diff --git a/net-libs/librsync/librsync-2.2.1.ebuild b/net-libs/librsync/librsync-2.2.1.ebuild
index 93d015f1bb9..4a6965cbd50 100644
--- a/net-libs/librsync/librsync-2.2.1.ebuild
+++ b/net-libs/librsync/librsync-2.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
RDEPEND="
dev-libs/popt
diff --git a/net-libs/libsmi/libsmi-0.4.8-r1.ebuild b/net-libs/libsmi/libsmi-0.4.8-r1.ebuild
index 3d9ba6c15aa..b59177b70c8 100644
--- a/net-libs/libsmi/libsmi-0.4.8-r1.ebuild
+++ b/net-libs/libsmi/libsmi-0.4.8-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.ibr.cs.tu-bs.de/projects/libsmi/"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86"
IUSE="static-libs"
src_prepare() {
diff --git a/net-libs/libsmi/libsmi-0.5.0.ebuild b/net-libs/libsmi/libsmi-0.5.0.ebuild
index aa462e64eee..22f53d929ec 100644
--- a/net-libs/libsmi/libsmi-0.5.0.ebuild
+++ b/net-libs/libsmi/libsmi-0.5.0.ebuild
@@ -10,7 +10,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 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="static-libs"
src_configure() {
diff --git a/net-libs/libsoup/libsoup-2.62.3.ebuild b/net-libs/libsoup/libsoup-2.62.3.ebuild
index be1d814a4b5..46a37bc4500 100644
--- a/net-libs/libsoup/libsoup-2.62.3.ebuild
+++ b/net-libs/libsoup/libsoup-2.62.3.ebuild
@@ -18,7 +18,7 @@ IUSE="debug gssapi +introspection samba ssl test +vala"
RESTRICT="!test? ( test )"
REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild b/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
index b21da734749..23dd431b7e6 100644
--- a/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
+++ b/net-libs/libssh2/libssh2-1.9.0_p20190913.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${EGIT_COMMIT}
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh 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.5.ebuild b/net-libs/libtirpc/libtirpc-1.2.5.ebuild
index 0abd7d25782..74c816254fa 100644
--- a/net-libs/libtirpc/libtirpc-1.2.5.ebuild
+++ b/net-libs/libtirpc/libtirpc-1.2.5.ebuild
@@ -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 ~sh 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/libvncserver/libvncserver-0.9.12-r4.ebuild b/net-libs/libvncserver/libvncserver-0.9.12-r4.ebuild
index 114a6529ee8..8107ea3c05f 100644
--- a/net-libs/libvncserver/libvncserver-0.9.12-r4.ebuild
+++ b/net-libs/libvncserver/libvncserver-0.9.12-r4.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${MY_P}"
LICENSE="GPL-2+ LGPL-2.1+ BSD MIT"
# no sub slot wanted (yet), see #578958
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="+24bpp gcrypt gnutls ipv6 +jpeg libressl lzo +png sasl ssl systemd +threads +zlib"
# https://bugs.gentoo.org/690202
# https://bugs.gentoo.org/435326
diff --git a/net-libs/libvncserver/libvncserver-0.9.12-r5.ebuild b/net-libs/libvncserver/libvncserver-0.9.12-r5.ebuild
index 87aad236303..ce651b6b1c9 100644
--- a/net-libs/libvncserver/libvncserver-0.9.12-r5.ebuild
+++ b/net-libs/libvncserver/libvncserver-0.9.12-r5.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${MY_P}"
LICENSE="GPL-2+ LGPL-2.1+ BSD MIT"
# no sub slot wanted (yet), see #578958
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="+24bpp gcrypt gnutls ipv6 +jpeg libressl lzo +png sasl ssl systemd +threads +zlib"
# https://bugs.gentoo.org/690202
# https://bugs.gentoo.org/435326
diff --git a/net-libs/mbedtls/mbedtls-2.17.0.ebuild b/net-libs/mbedtls/mbedtls-2.17.0.ebuild
index fa71e95eebe..ffb19c04d7a 100644
--- a/net-libs/mbedtls/mbedtls-2.17.0.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.17.0.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${P}
LICENSE="Apache-2.0"
SLOT="0/12" # slot for libmbedtls.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
RESTRICT="!test? ( test )"
diff --git a/net-libs/mbedtls/mbedtls-2.19.1-r2.ebuild b/net-libs/mbedtls/mbedtls-2.19.1-r2.ebuild
index f2bbecaeb14..327ba3dfa20 100644
--- a/net-libs/mbedtls/mbedtls-2.19.1-r2.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.19.1-r2.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${PN}-${P}
LICENSE="Apache-2.0"
SLOT="0/13" # slot for libmbedtls.so
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
RESTRICT="!test? ( test )"
diff --git a/net-libs/neon/neon-0.30.2.ebuild b/net-libs/neon/neon-0.30.2.ebuild
index f1b70455989..8a49da75fc0 100644
--- a/net-libs/neon/neon-0.30.2.ebuild
+++ b/net-libs/neon/neon-0.30.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://webdav.org/neon/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0/27"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc expat gnutls kerberos libproxy libressl nls pkcs11 ssl static-libs zlib"
RESTRICT="test"
diff --git a/net-libs/nghttp2/nghttp2-1.39.2.ebuild b/net-libs/nghttp2/nghttp2-1.39.2.ebuild
index 3f4657a99a2..597f0a16a31 100644
--- a/net-libs/nghttp2/nghttp2-1.39.2.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.39.2.ebuild
@@ -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 s390 ~sh sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
fi
DESCRIPTION="HTTP/2 C Library"
diff --git a/net-libs/nghttp2/nghttp2-1.40.0.ebuild b/net-libs/nghttp2/nghttp2-1.40.0.ebuild
index 03ca4686ee0..160ce60ce4b 100644
--- a/net-libs/nghttp2/nghttp2-1.40.0.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.40.0.ebuild
@@ -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 s390 ~sh sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
fi
DESCRIPTION="HTTP/2 C Library"
diff --git a/net-libs/nghttp2/nghttp2-9999.ebuild b/net-libs/nghttp2/nghttp2-9999.ebuild
index 4600d9387e9..a740e69ea79 100644
--- a/net-libs/nghttp2/nghttp2-9999.ebuild
+++ b/net-libs/nghttp2/nghttp2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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 ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
fi
DESCRIPTION="HTTP/2 C Library"
diff --git a/net-libs/rpcsvc-proto/rpcsvc-proto-0.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-0.ebuild
index bf9fff00b94..10bb86900b4 100644
--- a/net-libs/rpcsvc-proto/rpcsvc-proto-0.ebuild
+++ b/net-libs/rpcsvc-proto/rpcsvc-proto-0.ebuild
@@ -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 sh 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-r1.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4-r1.ebuild
index bea100de534..e3735263caf 100644
--- a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4-r1.ebuild
+++ b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4-r1.ebuild
@@ -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 ~sh 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-libs/rpcsvc-proto/rpcsvc-proto-1.4.1.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.1.ebuild
index 4b863b0cd4d..33e92d687c1 100644
--- a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.1.ebuild
+++ b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.1.ebuild
@@ -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 ~sh ~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-libs/serf/serf-1.3.8-r1.ebuild b/net-libs/serf/serf-1.3.8-r1.ebuild
index 65488051ac4..cf4b879d204 100644
--- a/net-libs/serf/serf-1.3.8-r1.ebuild
+++ b/net-libs/serf/serf-1.3.8-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/${PN}/${P}.tar.bz2"
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
IUSE="kerberos static-libs libressl"
RESTRICT="test"
diff --git a/net-libs/serf/serf-1.3.8.ebuild b/net-libs/serf/serf-1.3.8.ebuild
index 0071ed7279c..4f475c4f0d0 100644
--- a/net-libs/serf/serf-1.3.8.ebuild
+++ b/net-libs/serf/serf-1.3.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/${PN}/${P}.tar.bz2"
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="kerberos"
RESTRICT="test"
diff --git a/net-libs/serf/serf-1.3.9-r1.ebuild b/net-libs/serf/serf-1.3.9-r1.ebuild
index c01698dc85d..71fe28dbbe1 100644
--- a/net-libs/serf/serf-1.3.9-r1.ebuild
+++ b/net-libs/serf/serf-1.3.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/${PN}/${P}.tar.bz2"
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
IUSE="kerberos static-libs libressl"
RESTRICT="test"
diff --git a/net-libs/serf/serf-1.3.9.ebuild b/net-libs/serf/serf-1.3.9.ebuild
index bf6fda46ca8..dc69ebc5c16 100644
--- a/net-libs/serf/serf-1.3.9.ebuild
+++ b/net-libs/serf/serf-1.3.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/${PN}/${P}.tar.bz2"
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
IUSE="kerberos static-libs libressl"
RESTRICT="test"
diff --git a/net-mail/autorespond/autorespond-2.0.4.ebuild b/net-mail/autorespond/autorespond-2.0.4.ebuild
index a4c094b9d87..b0f3598356b 100644
--- a/net-mail/autorespond/autorespond-2.0.4.ebuild
+++ b/net-mail/autorespond/autorespond-2.0.4.ebuild
@@ -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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc s390 sparc x86"
RDEPEND="virtual/qmail"
PATCHES=(
diff --git a/net-mail/autorespond/autorespond-2.0.5.ebuild b/net-mail/autorespond/autorespond-2.0.5.ebuild
index 5f8e4a3be0d..ef3e2880e15 100644
--- a/net-mail/autorespond/autorespond-2.0.5.ebuild
+++ b/net-mail/autorespond/autorespond-2.0.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://qmail.ixip.net/download/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~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 36c36731ce5..cd3159469b8 100644
--- a/net-mail/checkpassword/checkpassword-0.90-r4.ebuild
+++ b/net-mail/checkpassword/checkpassword-0.90-r4.ebuild
@@ -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 sh 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 853bda0a3bf..0c3e8f9eae2 100644
--- a/net-mail/cmd5checkpw/cmd5checkpw-0.30-r2.ebuild
+++ b/net-mail/cmd5checkpw/cmd5checkpw-0.30-r2.ebuild
@@ -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 sh 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/cmd5checkpw/cmd5checkpw-0.30-r3.ebuild b/net-mail/cmd5checkpw/cmd5checkpw-0.30-r3.ebuild
index 38ddd2149fd..e093568697b 100644
--- a/net-mail/cmd5checkpw/cmd5checkpw-0.30-r3.ebuild
+++ b/net-mail/cmd5checkpw/cmd5checkpw-0.30-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
DEPEND="acct-group/cmd5checkpw"
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 342fd9c16fd..f74d18e5501 100644
--- a/net-mail/dot-forward/dot-forward-0.71-r4.ebuild
+++ b/net-mail/dot-forward/dot-forward-0.71-r4.ebuild
@@ -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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE=""
# See bug 97850
diff --git a/net-mail/fetchmail/fetchmail-6.4.1-r3.ebuild b/net-mail/fetchmail/fetchmail-6.4.1-r3.ebuild
index f45d07587a6..34ca2b998be 100644
--- a/net-mail/fetchmail/fetchmail-6.4.1-r3.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.4.1-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
LICENSE="GPL-2 public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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/fetchmail/fetchmail-6.4.1.ebuild b/net-mail/fetchmail/fetchmail-6.4.1.ebuild
index 455ed8f51fe..d0877e879de 100644
--- a/net-mail/fetchmail/fetchmail-6.4.1.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
LICENSE="GPL-2 public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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/fetchmail/fetchmail-6.4.2.ebuild b/net-mail/fetchmail/fetchmail-6.4.2.ebuild
index 109bd30c3ec..68cdd9ef3de 100644
--- a/net-mail/fetchmail/fetchmail-6.4.2.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.4.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
LICENSE="GPL-2 public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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-r1.ebuild b/net-mail/mailbase/mailbase-1.5-r1.ebuild
index 5651f95e74f..dbfd2bd1c15 100644
--- a/net-mail/mailbase/mailbase-1.5-r1.ebuild
+++ b/net-mail/mailbase/mailbase-1.5-r1.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 sh 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 55fb5c01c45..53af1ca5eb2 100644
--- a/net-mail/metamail/metamail-2.7.53.3-r2.ebuild
+++ b/net-mail/metamail/metamail-2.7.53.3-r2.ebuild
@@ -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 sh 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 3e99cdd3a1a..9f071578507 100644
--- a/net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild
+++ b/net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 arm ~hppa ia64 ppc s390 sh 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/qmailadmin/qmailadmin-1.2.16.ebuild b/net-mail/qmailadmin/qmailadmin-1.2.16.ebuild
index 95b5cf72f3a..b474f7e6dbf 100644
--- a/net-mail/qmailadmin/qmailadmin-1.2.16.ebuild
+++ b/net-mail/qmailadmin/qmailadmin-1.2.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~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 d0cfb8c6a89..9faa535f7f2 100644
--- a/net-mail/queue-fix/queue-fix-1.4-r3.ebuild
+++ b/net-mail/queue-fix/queue-fix-1.4-r3.ebuild
@@ -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 sh 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-r1.ebuild b/net-mail/queue-repair/queue-repair-0.9.0-r1.ebuild
index e62635a6cac..ab22321293c 100644
--- a/net-mail/queue-repair/queue-repair-0.9.0-r1.ebuild
+++ b/net-mail/queue-repair/queue-repair-0.9.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://pyropus.ca/software/queue-repair/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/net-mail/smtptools/smtptools-0.2.3.ebuild b/net-mail/smtptools/smtptools-0.2.3.ebuild
index 7a273481690..02c26956aab 100644
--- a/net-mail/smtptools/smtptools-0.2.3.ebuild
+++ b/net-mail/smtptools/smtptools-0.2.3.ebuild
@@ -11,7 +11,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 sh x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 x86"
IUSE=""
RDEPEND="!net-mail/qtools"
diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r6.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r6.ebuild
index 94742bbf88c..8eabbfacda3 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33-r6.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE="clearpasswd ipalias maildrop mysql postgres spamassassin"
REQUIRED_USE="mysql? ( !postgres )"
diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild
index ceca711c4a4..face2fb6b99 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="clearpasswd ipalias maildrop mysql postgres spamassassin"
REQUIRED_USE="mysql? ( !postgres )"
diff --git a/net-misc/curl/curl-7.66.0.ebuild b/net-misc/curl/curl-7.66.0.ebuild
index 2149bb3acbe..b10738850d9 100644
--- a/net-misc/curl/curl-7.66.0.ebuild
+++ b/net-misc/curl/curl-7.66.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="adns alt-svc brotli http2 idn ipv6 kerberos ldap metalink +progress-meter rtmp samba ssh ssl static-libs test threads"
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/curl/curl-7.67.0-r1.ebuild b/net-misc/curl/curl-7.67.0-r1.ebuild
index 82221e8ad5e..9fe9aaefbf2 100644
--- a/net-misc/curl/curl-7.67.0-r1.ebuild
+++ b/net-misc/curl/curl-7.67.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -11,7 +11,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="adns alt-svc brotli http2 idn ipv6 kerberos ldap metalink +progress-meter rtmp samba ssh ssl static-libs test threads"
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/curl/curl-7.68.0.ebuild b/net-misc/curl/curl-7.68.0.ebuild
index bef0b1999c5..c77b211488d 100644
--- a/net-misc/curl/curl-7.68.0.ebuild
+++ b/net-misc/curl/curl-7.68.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="adns alt-svc brotli http2 idn ipv6 kerberos ldap metalink +progress-meter rtmp samba ssh ssl static-libs test threads"
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/curl/curl-7.69.0.ebuild b/net-misc/curl/curl-7.69.0.ebuild
index d2544cba1b3..cf06aa6240d 100644
--- a/net-misc/curl/curl-7.69.0.ebuild
+++ b/net-misc/curl/curl-7.69.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="adns alt-svc brotli http2 idn ipv6 kerberos ldap metalink +progress-meter rtmp samba ssh ssl static-libs test threads"
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/curl/curl-7.69.1.ebuild b/net-misc/curl/curl-7.69.1.ebuild
index d2544cba1b3..cf06aa6240d 100644
--- a/net-misc/curl/curl-7.69.1.ebuild
+++ b/net-misc/curl/curl-7.69.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="adns alt-svc brotli http2 idn ipv6 kerberos ldap metalink +progress-meter rtmp samba ssh ssl static-libs test threads"
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/dhcp/dhcp-4.4.1.ebuild b/net-misc/dhcp/dhcp-4.4.1.ebuild
index 3e283795220..b88a3198a0e 100644
--- a/net-misc/dhcp/dhcp-4.4.1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
LICENSE="MPL-2.0 BSD SSLeay GPL-2" # GPL-2 only for init script
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
DEPEND="
diff --git a/net-misc/dhcp/dhcp-4.4.2-r2.ebuild b/net-misc/dhcp/dhcp-4.4.2-r2.ebuild
index 87b562df602..650a485d9d6 100644
--- a/net-misc/dhcp/dhcp-4.4.2-r2.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.2-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
LICENSE="MPL-2.0 BSD SSLeay GPL-2" # GPL-2 only for init script
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
DEPEND="
diff --git a/net-misc/dhcp/dhcp-4.4.2.ebuild b/net-misc/dhcp/dhcp-4.4.2.ebuild
index 560df3f8af2..251ffeb42ec 100644
--- a/net-misc/dhcp/dhcp-4.4.2.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
LICENSE="MPL-2.0 BSD SSLeay GPL-2" # GPL-2 only for init script
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
DEPEND="
diff --git a/net-misc/dhcpcd/dhcpcd-7.2.3.ebuild b/net-misc/dhcpcd/dhcpcd-7.2.3.ebuild
index f7b4a7148b8..1b5b53c3599 100644
--- a/net-misc/dhcpcd/dhcpcd-7.2.3.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-7.2.3.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 sh 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-7.2.5.ebuild b/net-misc/dhcpcd/dhcpcd-7.2.5.ebuild
index 97babad6cfa..504876b53cf 100644
--- a/net-misc/dhcpcd/dhcpcd-7.2.5.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-7.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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 ~sh ~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-8.0.6.ebuild b/net-misc/dhcpcd/dhcpcd-8.0.6.ebuild
index 97babad6cfa..504876b53cf 100644
--- a/net-misc/dhcpcd/dhcpcd-8.0.6.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-8.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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 ~sh ~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-8.1.5.ebuild b/net-misc/dhcpcd/dhcpcd-8.1.5.ebuild
index 4526f6e55cd..504876b53cf 100644
--- a/net-misc/dhcpcd/dhcpcd-8.1.5.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-8.1.5.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 ~sh ~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-8.1.6.ebuild b/net-misc/dhcpcd/dhcpcd-8.1.6.ebuild
index 4526f6e55cd..504876b53cf 100644
--- a/net-misc/dhcpcd/dhcpcd-8.1.6.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-8.1.6.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 ~sh ~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-9999.ebuild b/net-misc/dhcpcd/dhcpcd-9999.ebuild
index e83bb217a35..573ee2cc786 100644
--- a/net-misc/dhcpcd/dhcpcd-9999.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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 ~sh ~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-2017.75.ebuild b/net-misc/dropbear/dropbear-2017.75.ebuild
index f0abfda41d0..ea753868e9a 100644
--- a/net-misc/dropbear/dropbear-2017.75.ebuild
+++ b/net-misc/dropbear/dropbear-2017.75.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 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="bsdpty minimal multicall pam +shadow static +syslog zlib"
LIB_DEPEND="zlib? ( sys-libs/zlib[static-libs(+)] )
diff --git a/net-misc/dropbear/dropbear-2018.76.ebuild b/net-misc/dropbear/dropbear-2018.76.ebuild
index cc44e579cc2..0eaa06d25d9 100644
--- a/net-misc/dropbear/dropbear-2018.76.ebuild
+++ b/net-misc/dropbear/dropbear-2018.76.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -12,7 +12,7 @@ SRC_URI="https://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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="bsdpty minimal multicall pam +shadow static +syslog zlib"
LIB_DEPEND="zlib? ( sys-libs/zlib[static-libs(+)] )
diff --git a/net-misc/dropbear/dropbear-2019.78.ebuild b/net-misc/dropbear/dropbear-2019.78.ebuild
index df256300ce7..1bcd08533b2 100644
--- a/net-misc/dropbear/dropbear-2019.78.ebuild
+++ b/net-misc/dropbear/dropbear-2019.78.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh 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="bsdpty minimal multicall pam +shadow static +syslog zlib"
LIB_DEPEND="zlib? ( sys-libs/zlib[static-libs(+)] )
diff --git a/net-misc/ethertypes/ethertypes-0.ebuild b/net-misc/ethertypes/ethertypes-0.ebuild
index eee8b62d6f1..55613d1c6a5 100644
--- a/net-misc/ethertypes/ethertypes-0.ebuild
+++ b/net-misc/ethertypes/ethertypes-0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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/~floppym/dist/${P}.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~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/fakeidentd/fakeidentd-2.6-r1.ebuild b/net-misc/fakeidentd/fakeidentd-2.6-r1.ebuild
index 2d40b9f005c..b76149336ba 100644
--- a/net-misc/fakeidentd/fakeidentd-2.6-r1.ebuild
+++ b/net-misc/fakeidentd/fakeidentd-2.6-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.guru-group.fi/~too/sw/identd.readme -> ${P}.readme
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86"
IUSE=""
echoit() {
diff --git a/net-misc/htpdate/htpdate-1.0.7.ebuild b/net-misc/htpdate/htpdate-1.0.7.ebuild
index a5d577a24e4..e44a2ee46ba 100644
--- a/net-misc/htpdate/htpdate-1.0.7.ebuild
+++ b/net-misc/htpdate/htpdate-1.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -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 sh 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/htpdate/htpdate-1.2.0.ebuild b/net-misc/htpdate/htpdate-1.2.0.ebuild
index 4e36dc3cd67..c438c8666e1 100644
--- a/net-misc/htpdate/htpdate-1.2.0.ebuild
+++ b/net-misc/htpdate/htpdate-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 ~sh 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/htpdate/htpdate-1.2.2.ebuild b/net-misc/htpdate/htpdate-1.2.2.ebuild
index e004eb864ac..40bf07ab11b 100644
--- a/net-misc/htpdate/htpdate-1.2.2.ebuild
+++ b/net-misc/htpdate/htpdate-1.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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 ~sh ~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.41.ebuild b/net-misc/ipcalc/ipcalc-0.41.ebuild
index 18d8276b433..4264d468f11 100644
--- a/net-misc/ipcalc/ipcalc-0.41.ebuild
+++ b/net-misc/ipcalc/ipcalc-0.41.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://jodies.de/ipcalc"
SRC_URI="http://jodies.de/ipcalc-archive/${P}.tar.gz"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
RDEPEND=">=dev-lang/perl-5.6.0"
diff --git a/net-misc/iputils/iputils-20180629.ebuild b/net-misc/iputils/iputils-20180629.ebuild
index db782177e0b..438ae1a30f3 100644
--- a/net-misc/iputils/iputils-20180629.ebuild
+++ b/net-misc/iputils/iputils-20180629.ebuild
@@ -24,7 +24,7 @@ if [[ ${PV} == "99999999" ]] ; then
else
SRC_URI="https://github.com/iputils/iputils/archive/s${MY_PV}.tar.gz -> ${P}.tar.gz
https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${MY_PV}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux"
fi
DESCRIPTION="Network monitoring tools including ping and ping6"
diff --git a/net-misc/iputils/iputils-20190515.ebuild b/net-misc/iputils/iputils-20190515.ebuild
index 4e88cd74204..dbeb6834c85 100644
--- a/net-misc/iputils/iputils-20190515.ebuild
+++ b/net-misc/iputils/iputils-20190515.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# For released versions, we precompile the man/html pages and store
@@ -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 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux"
fi
DESCRIPTION="Network monitoring tools including ping and ping6"
diff --git a/net-misc/iputils/iputils-20190709.ebuild b/net-misc/iputils/iputils-20190709.ebuild
index a0cc3dfdbee..bdf494ae2e6 100644
--- a/net-misc/iputils/iputils-20190709.ebuild
+++ b/net-misc/iputils/iputils-20190709.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 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux"
fi
DESCRIPTION="Network monitoring tools including ping and ping6"
diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild
index c93df829254..cc025fe8be3 100644
--- a/net-misc/iputils/iputils-99999999.ebuild
+++ b/net-misc/iputils/iputils-99999999.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 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~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 366d00b2c38..3dc156973c6 100644
--- a/net-misc/jwhois/jwhois-4.0-r1.ebuild
+++ b/net-misc/jwhois/jwhois-4.0-r1.ebuild
@@ -11,7 +11,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 sh 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.1.ebuild b/net-misc/keychain/keychain-2.8.1.ebuild
index ac818ce2e56..b6002f49e5c 100644
--- a/net-misc/keychain/keychain-2.8.1.ebuild
+++ b/net-misc/keychain/keychain-2.8.1.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 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="dev-lang/perl"
diff --git a/net-misc/keychain/keychain-2.8.5.ebuild b/net-misc/keychain/keychain-2.8.5.ebuild
index 9e9b72b800d..2f542677af9 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 ~sh ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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.17.ebuild b/net-misc/lksctp-tools/lksctp-tools-1.0.17.ebuild
index 216d04ab056..a6b2e1760bd 100644
--- a/net-misc/lksctp-tools/lksctp-tools-1.0.17.ebuild
+++ b/net-misc/lksctp-tools/lksctp-tools-1.0.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/lksctp/${P}.tar.gz"
LICENSE="|| ( GPL-2+ LGPL-2.1 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sparc x86"
IUSE="kernel_linux static-libs"
# This is only supposed to work with Linux to begin with.
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 7b8e8421b75..3f696ca7327 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 ~sh 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.5.22.ebuild b/net-misc/memcached/memcached-1.5.22.ebuild
index e5bb4f023b6..cb03d6bae45 100644
--- a/net-misc/memcached/memcached-1.5.22.ebuild
+++ b/net-misc/memcached/memcached-1.5.22.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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later
RDEPEND=">=dev-libs/libevent-1.4:=
diff --git a/net-misc/memcached/memcached-1.6.2.ebuild b/net-misc/memcached/memcached-1.6.2.ebuild
index f5940b47e3f..75cbb9370f3 100644
--- a/net-misc/memcached/memcached-1.6.2.ebuild
+++ b/net-misc/memcached/memcached-1.6.2.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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 6e61ada2606..64967d98b5c 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-2019 Gentoo Authors
+# Copyright 1999-2020 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 sh sparc x86"
+KEYWORDS="amd64 arm ~mips s390 sparc x86"
S="${WORKDIR}/${PN}"
diff --git a/net-misc/netifrc/netifrc-0.2.2.ebuild b/net-misc/netifrc/netifrc-0.2.2.ebuild
index 6081f5a9355..654edee03d3 100644
--- a/net-misc/netifrc/netifrc-0.2.2.ebuild
+++ b/net-misc/netifrc/netifrc-0.2.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
inherit git-2
else
SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
- KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
fi
LICENSE="BSD-2"
diff --git a/net-misc/netifrc/netifrc-0.2.3.ebuild b/net-misc/netifrc/netifrc-0.2.3.ebuild
index b319f4a06c1..de75c551b62 100644
--- a/net-misc/netifrc/netifrc-0.2.3.ebuild
+++ b/net-misc/netifrc/netifrc-0.2.3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
inherit git-2
else
SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
fi
LICENSE="BSD-2"
diff --git a/net-misc/netifrc/netifrc-0.2.4.ebuild b/net-misc/netifrc/netifrc-0.2.4.ebuild
index a2917e7c6a1..1badea6f8fe 100644
--- a/net-misc/netifrc/netifrc-0.2.4.ebuild
+++ b/net-misc/netifrc/netifrc-0.2.4.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
inherit git-2
else
SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
fi
LICENSE="BSD-2"
diff --git a/net-misc/netifrc/netifrc-0.3.0.ebuild b/net-misc/netifrc/netifrc-0.3.0.ebuild
index d592a9dd0ce..84585ecbe75 100644
--- a/net-misc/netifrc/netifrc-0.3.0.ebuild
+++ b/net-misc/netifrc/netifrc-0.3.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
inherit git-r3
else
SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
fi
LICENSE="BSD-2"
diff --git a/net-misc/netifrc/netifrc-0.3.1.ebuild b/net-misc/netifrc/netifrc-0.3.1.ebuild
index 08120d91360..d3bea305aa3 100644
--- a/net-misc/netifrc/netifrc-0.3.1.ebuild
+++ b/net-misc/netifrc/netifrc-0.3.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
inherit git-r3
else
SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
fi
LICENSE="BSD-2"
diff --git a/net-misc/netifrc/netifrc-0.4.0-r1.ebuild b/net-misc/netifrc/netifrc-0.4.0-r1.ebuild
index 93fcd558f62..d7ce7aded1a 100644
--- a/net-misc/netifrc/netifrc-0.4.0-r1.ebuild
+++ b/net-misc/netifrc/netifrc-0.4.0-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
inherit git-r3
else
SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
fi
LICENSE="BSD-2"
diff --git a/net-misc/netifrc/netifrc-0.4.0.ebuild b/net-misc/netifrc/netifrc-0.4.0.ebuild
index 08120d91360..d3bea305aa3 100644
--- a/net-misc/netifrc/netifrc-0.4.0.ebuild
+++ b/net-misc/netifrc/netifrc-0.4.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
inherit git-r3
else
SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
fi
LICENSE="BSD-2"
diff --git a/net-misc/netifrc/netifrc-0.5.0.ebuild b/net-misc/netifrc/netifrc-0.5.0.ebuild
index 229ea9afb26..2b64f017563 100644
--- a/net-misc/netifrc/netifrc-0.5.0.ebuild
+++ b/net-misc/netifrc/netifrc-0.5.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
inherit git-r3
else
SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
fi
LICENSE="BSD-2"
diff --git a/net-misc/netifrc/netifrc-0.5.1.ebuild b/net-misc/netifrc/netifrc-0.5.1.ebuild
index bd74069f6d4..4d878bdd659 100644
--- a/net-misc/netifrc/netifrc-0.5.1.ebuild
+++ b/net-misc/netifrc/netifrc-0.5.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
inherit git-r3
else
SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
- KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 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/netifrc/netifrc-0.6.0.ebuild b/net-misc/netifrc/netifrc-0.6.0.ebuild
index 98c3339d853..bb7be675c2b 100644
--- a/net-misc/netifrc/netifrc-0.6.0.ebuild
+++ b/net-misc/netifrc/netifrc-0.6.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
inherit git-r3
else
SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~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/netifrc/netifrc-0.6.1.ebuild b/net-misc/netifrc/netifrc-0.6.1.ebuild
index 2718eb87d9b..fa0a59bb5e6 100644
--- a/net-misc/netifrc/netifrc-0.6.1.ebuild
+++ b/net-misc/netifrc/netifrc-0.6.1.ebuild
@@ -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 ~sh ~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/netifrc/netifrc-0.7.1.ebuild b/net-misc/netifrc/netifrc-0.7.1.ebuild
index 87a586c35fd..1d4150067e4 100644
--- a/net-misc/netifrc/netifrc-0.7.1.ebuild
+++ b/net-misc/netifrc/netifrc-0.7.1.ebuild
@@ -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 ~sh 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/netifrc/netifrc-9999.ebuild b/net-misc/netifrc/netifrc-9999.ebuild
index 2718eb87d9b..fa0a59bb5e6 100644
--- a/net-misc/netifrc/netifrc-9999.ebuild
+++ b/net-misc/netifrc/netifrc-9999.ebuild
@@ -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 ~sh ~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 05b6c4462df..5044f4f1cfb 100644
--- a/net-misc/netkit-fingerd/netkit-fingerd-0.17-r3.ebuild
+++ b/net-misc/netkit-fingerd/netkit-fingerd-0.17-r3.ebuild
@@ -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 sh 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-r10.ebuild b/net-misc/netkit-rsh/netkit-rsh-0.17-r10.ebuild
index 7202e33be2d..bbb65f0f3b2 100644
--- a/net-misc/netkit-rsh/netkit-rsh-0.17-r10.ebuild
+++ b/net-misc/netkit-rsh/netkit-rsh-0.17-r10.ebuild
@@ -14,7 +14,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 sh 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=">=sys-libs/ncurses-5.2
diff --git a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r10.ebuild b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r10.ebuild
index a543bc37a96..7e876db52d7 100644
--- a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r10.ebuild
+++ b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r10.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://gentoo/netkit-telnet-${PV}.tar.gz
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE=""
DEPEND=">=sys-libs/ncurses-5.2:=
diff --git a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r12.ebuild b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r12.ebuild
index 4c17078b18a..aacfc0d9e90 100644
--- a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r12.ebuild
+++ b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r12.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://gentoo/netkit-telnet-${PV}.tar.gz
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
DEPEND=">=sys-libs/ncurses-5.2:=
diff --git a/net-misc/ntp/ntp-4.2.8_p13-r2.ebuild b/net-misc/ntp/ntp-4.2.8_p13-r2.ebuild
index 2150ef08bd9..a50710aa1a3 100644
--- a/net-misc/ntp/ntp-4.2.8_p13-r2.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p13-r2.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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint"
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/ntp/ntp-4.2.8_p13.ebuild b/net-misc/ntp/ntp-4.2.8_p13.ebuild
index 1a92b7b4bce..e5e8c205dab 100644
--- a/net-misc/ntp/ntp-4.2.8_p13.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p13.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 sh sparc x86 ~amd64-linux ~x86-linux ~m68k-mint"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~m68k-mint"
IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf"
CDEPEND="readline? ( >=sys-libs/readline-4.1:0= )
diff --git a/net-misc/ntp/ntp-4.2.8_p14-r2.ebuild b/net-misc/ntp/ntp-4.2.8_p14-r2.ebuild
index 61130e1b1da..b2cbb8b926a 100644
--- a/net-misc/ntp/ntp-4.2.8_p14-r2.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p14-r2.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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint"
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/oidentd/oidentd-2.4.0.ebuild b/net-misc/oidentd/oidentd-2.4.0.ebuild
index f47f07b80bf..ab5115a61ef 100644
--- a/net-misc/oidentd/oidentd-2.4.0.ebuild
+++ b/net-misc/oidentd/oidentd-2.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://files.janikrabe.com/pub/${PN}/releases/${PV}/${P}.tar.xz"
LICENSE="BSD-2 GPL-2 LGPL-2+ MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
IUSE="debug ipv6 masquerade selinux"
DEPEND="masquerade? ( net-libs/libnetfilter_conntrack )"
diff --git a/net-misc/openntpd/openntpd-6.0_p1.ebuild b/net-misc/openntpd/openntpd-6.0_p1.ebuild
index 8b2c9daf99e..5a4178c1d9e 100644
--- a/net-misc/openntpd/openntpd-6.0_p1.ebuild
+++ b/net-misc/openntpd/openntpd-6.0_p1.ebuild
@@ -11,7 +11,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 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE="libressl selinux"
DEPEND="!<=net-misc/ntp-4.2.0-r2
diff --git a/net-misc/openntpd/openntpd-6.2_p3-r1.ebuild b/net-misc/openntpd/openntpd-6.2_p3-r1.ebuild
index db3edb458e5..acec71efeba 100644
--- a/net-misc/openntpd/openntpd-6.2_p3-r1.ebuild
+++ b/net-misc/openntpd/openntpd-6.2_p3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="libressl selinux"
DEPEND="
diff --git a/net-misc/openntpd/openntpd-6.2_p3.ebuild b/net-misc/openntpd/openntpd-6.2_p3.ebuild
index d8fc96246d8..2250abea65c 100644
--- a/net-misc/openntpd/openntpd-6.2_p3.ebuild
+++ b/net-misc/openntpd/openntpd-6.2_p3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,7 +14,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 ~sh ~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-7.5_p1-r5.ebuild b/net-misc/openssh/openssh-7.5_p1-r5.ebuild
index 863231391d3..532ed58c90b 100644
--- a/net-misc/openssh/openssh-7.5_p1-r5.ebuild
+++ b/net-misc/openssh/openssh-7.5_p1-r5.ebuild
@@ -25,7 +25,7 @@ SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
LICENSE="BSD GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# Probably want to drop ssl defaulting to on in a future version.
IUSE="abi_mips_n32 audit bindist debug ${HPN_PATCH:++}hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey ssh1 +ssl static test X X509"
RESTRICT="!test? ( test )"
diff --git a/net-misc/openssh/openssh-7.7_p1-r10.ebuild b/net-misc/openssh/openssh-7.7_p1-r10.ebuild
index 75d4fbb38af..5ee28d9a170 100644
--- a/net-misc/openssh/openssh-7.7_p1-r10.ebuild
+++ b/net-misc/openssh/openssh-7.7_p1-r10.ebuild
@@ -26,7 +26,7 @@ SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
LICENSE="BSD GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# 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 sctp selinux skey +ssl static test X X509"
RESTRICT="!test? ( test )"
diff --git a/net-misc/openssh/openssh-7.9_p1-r5.ebuild b/net-misc/openssh/openssh-7.9_p1-r5.ebuild
index cebcb4d0ee3..fde4c2d01c8 100644
--- a/net-misc/openssh/openssh-7.9_p1-r5.ebuild
+++ b/net-misc/openssh/openssh-7.9_p1-r5.ebuild
@@ -33,7 +33,7 @@ SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
LICENSE="BSD GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# 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 sctp selinux +ssl static test X X509"
RESTRICT="!test? ( test )"
diff --git a/net-misc/openssh/openssh-8.0_p1-r5.ebuild b/net-misc/openssh/openssh-8.0_p1-r5.ebuild
index bbf251ac7e7..2001af2bcd0 100644
--- a/net-misc/openssh/openssh-8.0_p1-r5.ebuild
+++ b/net-misc/openssh/openssh-8.0_p1-r5.ebuild
@@ -32,7 +32,7 @@ SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
LICENSE="BSD GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# 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 sctp selinux +ssl static test X X509 xmss"
RESTRICT="!test? ( test )"
diff --git a/net-misc/openssh/openssh-8.1_p1-r3.ebuild b/net-misc/openssh/openssh-8.1_p1-r3.ebuild
index 08b2365d6a2..9b58f2d78d1 100644
--- a/net-misc/openssh/openssh-8.1_p1-r3.ebuild
+++ b/net-misc/openssh/openssh-8.1_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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# 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 sctp selinux +ssl static test X X509 xmss"
diff --git a/net-misc/openssh/openssh-8.2_p1-r5.ebuild b/net-misc/openssh/openssh-8.2_p1-r5.ebuild
index de7168fcee1..83bb3bd37ed 100644
--- a/net-misc/openssh/openssh-8.2_p1-r5.ebuild
+++ b/net-misc/openssh/openssh-8.2_p1-r5.ebuild
@@ -31,7 +31,7 @@ S="${WORKDIR}/${PARCH}"
LICENSE="BSD GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# 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 sctp security-key selinux +ssl static test X X509 xmss"
diff --git a/net-misc/openssh/openssh-8.2_p1-r6.ebuild b/net-misc/openssh/openssh-8.2_p1-r6.ebuild
index f4ae4ce1e37..55d2852ebb9 100644
--- a/net-misc/openssh/openssh-8.2_p1-r6.ebuild
+++ b/net-misc/openssh/openssh-8.2_p1-r6.ebuild
@@ -31,7 +31,7 @@ S="${WORKDIR}/${PARCH}"
LICENSE="BSD GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# 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 sctp security-key selinux +ssl static test X X509 xmss"
diff --git a/net-misc/proxytunnel/proxytunnel-1.9.1-r1.ebuild b/net-misc/proxytunnel/proxytunnel-1.9.1-r1.ebuild
index 4807d1daeff..64fea4ae5b4 100644
--- a/net-misc/proxytunnel/proxytunnel-1.9.1-r1.ebuild
+++ b/net-misc/proxytunnel/proxytunnel-1.9.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/proxytunnel/proxytunnel/archive/${PV}.tar.gz -> ${P}
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="static"
RDEPEND="dev-libs/openssl:="
diff --git a/net-misc/proxytunnel/proxytunnel-1.9.1-r2.ebuild b/net-misc/proxytunnel/proxytunnel-1.9.1-r2.ebuild
index a8815f6b96e..0e62845f44f 100644
--- a/net-misc/proxytunnel/proxytunnel-1.9.1-r2.ebuild
+++ b/net-misc/proxytunnel/proxytunnel-1.9.1-r2.ebuild
@@ -30,7 +30,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 ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
fi
src_prepare() {
diff --git a/net-misc/proxytunnel/proxytunnel-9999.ebuild b/net-misc/proxytunnel/proxytunnel-9999.ebuild
index 2622cf67023..dff3deb21c6 100644
--- a/net-misc/proxytunnel/proxytunnel-9999.ebuild
+++ b/net-misc/proxytunnel/proxytunnel-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -26,7 +26,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 ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
fi
src_prepare() {
diff --git a/net-misc/rsync/rsync-3.1.3.ebuild b/net-misc/rsync/rsync-3.1.3.ebuild
index a9811a73aa3..ab756e63571 100644
--- a/net-misc/rsync/rsync-3.1.3.ebuild
+++ b/net-misc/rsync/rsync-3.1.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://rsync.samba.org/ftp/rsync/src/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
[[ ${PV} = *_pre* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="acl examples iconv ipv6 static stunnel xattr"
LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
diff --git a/net-misc/socat/socat-1.7.3.2.ebuild b/net-misc/socat/socat-1.7.3.2.ebuild
index fabfafe08ad..faecb24eeec 100644
--- a/net-misc/socat/socat-1.7.3.2.ebuild
+++ b/net-misc/socat/socat-1.7.3.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="bindist libressl ssl readline ipv6 tcpd"
DEPEND="
diff --git a/net-misc/socat/socat-1.7.3.3.ebuild b/net-misc/socat/socat-1.7.3.3.ebuild
index 5d48079d56c..b12695499bb 100644
--- a/net-misc/socat/socat-1.7.3.3.ebuild
+++ b/net-misc/socat/socat-1.7.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="bindist libressl ssl readline ipv6 tcpd"
DEPEND="
diff --git a/net-misc/socat/socat-1.7.3.4.ebuild b/net-misc/socat/socat-1.7.3.4.ebuild
index d964ea01444..bb9b7b39d9a 100644
--- a/net-misc/socat/socat-1.7.3.4.ebuild
+++ b/net-misc/socat/socat-1.7.3.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="bindist libressl ssl readline ipv6 tcpd"
DEPEND="
diff --git a/net-misc/sslh/sslh-1.20.ebuild b/net-misc/sslh/sslh-1.20.ebuild
index c81931d15a9..58cd75f35f9 100644
--- a/net-misc/sslh/sslh-1.20.ebuild
+++ b/net-misc/sslh/sslh-1.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://github.com/yrutschle/sslh.git"
inherit git-r3
else
- KEYWORDS="amd64 ~arm ~m68k ~mips ~s390 ~sh x86"
+ KEYWORDS="amd64 ~arm ~m68k ~mips ~s390 x86"
MY_P="${PN}-v${PV}"
SRC_URI="https://www.rutschle.net/tech/${PN}/${MY_P}.tar.gz"
S=${WORKDIR}/${MY_P}
diff --git a/net-misc/sslh/sslh-9999.ebuild b/net-misc/sslh/sslh-9999.ebuild
index 5e0b8c52112..802f410ba5d 100644
--- a/net-misc/sslh/sslh-9999.ebuild
+++ b/net-misc/sslh/sslh-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://github.com/yrutschle/sslh.git"
inherit git-r3
else
- KEYWORDS="~amd64 ~arm ~m68k ~mips ~s390 ~sh ~x86"
+ KEYWORDS="~amd64 ~arm ~m68k ~mips ~s390 ~x86"
MY_P="${PN}-v${PV}"
SRC_URI="https://www.rutschle.net/tech/${PN}/${MY_P}.tar.gz"
S=${WORKDIR}/${MY_P}
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 e84ce3b4d87..50fbf75bb84 100644
--- a/net-misc/telnet-bsd/telnet-bsd-1.2-r1.ebuild
+++ b/net-misc/telnet-bsd/telnet-bsd-1.2-r1.ebuild
@@ -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 sh 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/tigervnc/tigervnc-1.9.0-r1.ebuild b/net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild
index cc911154225..32ade9b4e9a 100644
--- a/net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE="dri3 +drm gnutls java libressl nls +opengl pam server xinerama +xorgmodule"
CDEPEND="
diff --git a/net-misc/wget/wget-1.20.3-r1.ebuild b/net-misc/wget/wget-1.20.3-r1.ebuild
index a3967da1331..306a547fb7f 100644
--- a/net-misc/wget/wget-1.20.3-r1.ebuild
+++ b/net-misc/wget/wget-1.20.3-r1.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 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib"
REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
RESTRICT="!test? ( test )"
diff --git a/net-misc/wget/wget-1.20.3-r3.ebuild b/net-misc/wget/wget-1.20.3-r3.ebuild
index 00bf74f0865..dc1e481def7 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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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.4.3.ebuild b/net-misc/whois/whois-5.4.3.ebuild
index 08d0eda4031..3c42e3d61a8 100644
--- a/net-misc/whois/whois-5.4.3.ebuild
+++ b/net-misc/whois/whois-5.4.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 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="iconv idn nls"
RESTRICT="test" #59327
diff --git a/net-misc/whois/whois-5.5.5.ebuild b/net-misc/whois/whois-5.5.5.ebuild
index 5c2065a97ce..d99078f32be 100644
--- a/net-misc/whois/whois-5.5.5.ebuild
+++ b/net-misc/whois/whois-5.5.5.ebuild
@@ -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 ~sh ~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-misc/whois/whois-5.5.6.ebuild b/net-misc/whois/whois-5.5.6.ebuild
index 5c2065a97ce..d99078f32be 100644
--- a/net-misc/whois/whois-5.5.6.ebuild
+++ b/net-misc/whois/whois-5.5.6.ebuild
@@ -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 ~sh ~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-misc/whois/whois-9999.ebuild b/net-misc/whois/whois-9999.ebuild
index 8b649d81bce..84b8abe1134 100644
--- a/net-misc/whois/whois-9999.ebuild
+++ b/net-misc/whois/whois-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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 ~sh ~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/gssproxy/gssproxy-0.8.2.ebuild b/net-nds/gssproxy/gssproxy-0.8.2.ebuild
index 01f02860449..38015df5e4a 100644
--- a/net-nds/gssproxy/gssproxy-0.8.2.ebuild
+++ b/net-nds/gssproxy/gssproxy-0.8.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://releases.pagure.org/gssproxy/${P}.tar.gz"
LICENSE="BSD-1"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
IUSE="debug selinux systemd hardened"
COMMON_DEPEND=">=dev-libs/libverto-0.2.2
diff --git a/net-nds/openldap/openldap-2.4.48.ebuild b/net-nds/openldap/openldap-2.4.48.ebuild
index 2c74c836815..2875f0498ad 100644
--- a/net-nds/openldap/openldap-2.4.48.ebuild
+++ b/net-nds/openldap/openldap-2.4.48.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${P}.tgz
LICENSE="OPENLDAP GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x86-solaris"
IUSE_DAEMON="crypt samba slp tcpd experimental minimal"
IUSE_BACKEND="+berkdb"
diff --git a/net-nds/openldap/openldap-2.4.49-r1.ebuild b/net-nds/openldap/openldap-2.4.49-r1.ebuild
index 8859904cbf5..c82a49b7878 100644
--- a/net-nds/openldap/openldap-2.4.49-r1.ebuild
+++ b/net-nds/openldap/openldap-2.4.49-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${P}.tgz
LICENSE="OPENLDAP GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~x86-solaris"
IUSE_DAEMON="crypt samba tcpd experimental minimal"
IUSE_BACKEND="+berkdb"
diff --git a/net-nds/openldap/openldap-2.4.49-r2.ebuild b/net-nds/openldap/openldap-2.4.49-r2.ebuild
index 7dfac101a8b..21df99a4271 100644
--- a/net-nds/openldap/openldap-2.4.49-r2.ebuild
+++ b/net-nds/openldap/openldap-2.4.49-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${P}.tgz
LICENSE="OPENLDAP GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~x86-solaris"
IUSE_DAEMON="crypt samba tcpd experimental minimal"
IUSE_BACKEND="+berkdb"
diff --git a/net-nds/rpcbind/rpcbind-1.2.5.ebuild b/net-nds/rpcbind/rpcbind-1.2.5.ebuild
index 94504b953c9..bbab50c4c16 100644
--- a/net-nds/rpcbind/rpcbind-1.2.5.ebuild
+++ b/net-nds/rpcbind/rpcbind-1.2.5.ebuild
@@ -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 ~sh 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-nds/rpcbind/rpcbind-9999.ebuild b/net-nds/rpcbind/rpcbind-9999.ebuild
index eccd9dd4139..aada63a8585 100644
--- a/net-nds/rpcbind/rpcbind-9999.ebuild
+++ b/net-nds/rpcbind/rpcbind-9999.ebuild
@@ -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 ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
fi
DESCRIPTION="portmap replacement which supports RPC over various protocols"
diff --git a/net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild b/net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild
index 85457d846cf..0c54c21409a 100644
--- a/net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild
+++ b/net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/dtorrent/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 arm ppc ~s390 ~sh ~sparc x86"
+KEYWORDS="amd64 arm ppc ~s390 ~sparc x86"
IUSE="libressl"
RDEPEND="
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 3239233637b..4b353c421fe 100644
--- a/net-print/cups-windows/cups-windows-6.0-r1.ebuild
+++ b/net-print/cups-windows/cups-windows-6.0-r1.ebuild
@@ -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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE=""
RDEPEND=">=net-print/cups-1.2"
diff --git a/net-print/cups/cups-2.2.13.ebuild b/net-print/cups/cups-2.2.13.ebuild
index dce403cc575..71c59e865dd 100644
--- a/net-print/cups/cups-2.2.13.ebuild
+++ b/net-print/cups/cups-2.2.13.ebuild
@@ -21,7 +21,7 @@ if [[ ${PV} == *9999 ]]; then
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${PV}/${P}-source.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~m68k-mint"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~m68k-mint"
fi
DESCRIPTION="The Common Unix Printing System"
diff --git a/net-print/cups/cups-2.3.1.ebuild b/net-print/cups/cups-2.3.1.ebuild
index 46eed692790..241cb46e426 100644
--- a/net-print/cups/cups-2.3.1.ebuild
+++ b/net-print/cups/cups-2.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -21,7 +21,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 ~sh ~sparc ~x86 ~m68k-mint"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~m68k-mint"
fi
fi
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index 46eed692790..241cb46e426 100644
--- a/net-print/cups/cups-9999.ebuild
+++ b/net-print/cups/cups-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -21,7 +21,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 ~sh ~sparc ~x86 ~m68k-mint"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~m68k-mint"
fi
fi
diff --git a/net-print/foomatic-db-engine/foomatic-db-engine-4.0.12.ebuild b/net-print/foomatic-db-engine/foomatic-db-engine-4.0.12.ebuild
index 2a6b4d1e978..5f832fb2b16 100644
--- a/net-print/foomatic-db-engine/foomatic-db-engine-4.0.12.ebuild
+++ b/net-print/foomatic-db-engine/foomatic-db-engine-4.0.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.openprinting.org/download/foomatic/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
DEPEND="net-print/cups
diff --git a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20170331.ebuild b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20170331.ebuild
index 7b8a654ba22..facd947a3c0 100644
--- a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20170331.ebuild
+++ b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20170331.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://linuxprinting.org/download/foomatic/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
S="${WORKDIR}/${PN/-ppds}-$(get_version_component_range 3 ${PV})"
diff --git a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20180126.ebuild b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20180126.ebuild
index 93843a46d84..725401eb0c1 100644
--- a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20180126.ebuild
+++ b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20180126.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="http://linuxprinting.org/download/foomatic/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
S="${WORKDIR}/${PN/-ppds}-$(get_version_component_range 3 ${PV})"
diff --git a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20190226.ebuild b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20190226.ebuild
index 3bbad353923..509ab6d4b68 100644
--- a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20190226.ebuild
+++ b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20190226.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="http://linuxprinting.org/download/foomatic/${MY_P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
S="${WORKDIR}/${PN/-ppds}-$(get_version_component_range 3 ${PV})"
diff --git a/net-print/foomatic-db/foomatic-db-4.0.20170331.ebuild b/net-print/foomatic-db/foomatic-db-4.0.20170331.ebuild
index 6f0079adac1..ea11e903e06 100644
--- a/net-print/foomatic-db/foomatic-db-4.0.20170331.ebuild
+++ b/net-print/foomatic-db/foomatic-db-4.0.20170331.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.openprinting.org/download/foomatic/${PN}-$(replace_version_s
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
DEPEND=""
diff --git a/net-print/foomatic-db/foomatic-db-4.0.20180126.ebuild b/net-print/foomatic-db/foomatic-db-4.0.20180126.ebuild
index 6f5d5933e67..dc60de17c67 100644
--- a/net-print/foomatic-db/foomatic-db-4.0.20180126.ebuild
+++ b/net-print/foomatic-db/foomatic-db-4.0.20180126.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.openprinting.org/download/foomatic/${PN}-$(replace_version_s
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
DEPEND=""
diff --git a/net-print/foomatic-db/foomatic-db-4.0.20190226.ebuild b/net-print/foomatic-db/foomatic-db-4.0.20190226.ebuild
index 41b16804fff..dc60de17c67 100644
--- a/net-print/foomatic-db/foomatic-db-4.0.20190226.ebuild
+++ b/net-print/foomatic-db/foomatic-db-4.0.20190226.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.openprinting.org/download/foomatic/${PN}-$(replace_version_s
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
DEPEND=""
diff --git a/net-print/libgnomecups/libgnomecups-0.2.3-r3.ebuild b/net-print/libgnomecups/libgnomecups-0.2.3-r3.ebuild
index d4a38b17a1f..6175e1180f4 100644
--- a/net-print/libgnomecups/libgnomecups-0.2.3-r3.ebuild
+++ b/net-print/libgnomecups/libgnomecups-0.2.3-r3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.gnome.org/"
LICENSE="GPL-2 LGPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
IUSE=""
RDEPEND="
diff --git a/net-print/libgnomecups/libgnomecups-0.2.3-r5.ebuild b/net-print/libgnomecups/libgnomecups-0.2.3-r5.ebuild
index 15342a0e5db..58a49d9a50f 100644
--- a/net-print/libgnomecups/libgnomecups-0.2.3-r5.ebuild
+++ b/net-print/libgnomecups/libgnomecups-0.2.3-r5.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.gnome.org/"
LICENSE="GPL-2 LGPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
IUSE=""
RDEPEND="
diff --git a/net-proxy/dante/dante-1.4.1-r2.ebuild b/net-proxy/dante/dante-1.4.1-r2.ebuild
index fd68ade1bc7..740a74e2134 100644
--- a/net-proxy/dante/dante-1.4.1-r2.ebuild
+++ b/net-proxy/dante/dante-1.4.1-r2.ebuild
@@ -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 ~sh 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/net-proxy/pingtunnel/pingtunnel-0.72.ebuild b/net-proxy/pingtunnel/pingtunnel-0.72.ebuild
index 0536913f746..a9c9139962c 100644
--- a/net-proxy/pingtunnel/pingtunnel-0.72.ebuild
+++ b/net-proxy/pingtunnel/pingtunnel-0.72.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.cs.uit.no/~daniels/PingTunnel/PingTunnel-${PV}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sh ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
IUSE="selinux"
RDEPEND="
diff --git a/net-vpn/openvpn/openvpn-2.4.6-r1.ebuild b/net-vpn/openvpn/openvpn-2.4.6-r1.ebuild
index da73ce7b6eb..3c4d220281f 100644
--- a/net-vpn/openvpn/openvpn-2.4.6-r1.ebuild
+++ b/net-vpn/openvpn/openvpn-2.4.6-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://openvpn.net/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
IUSE="down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam"
IUSE+=" pkcs11 +plugins selinux +ssl systemd test userland_BSD"
diff --git a/net-vpn/openvpn/openvpn-2.4.6.ebuild b/net-vpn/openvpn/openvpn-2.4.6.ebuild
index f7489160c24..10ead6b8b39 100644
--- a/net-vpn/openvpn/openvpn-2.4.6.ebuild
+++ b/net-vpn/openvpn/openvpn-2.4.6.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://openvpn.net/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
IUSE="down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam"
IUSE+=" pkcs11 +plugins selinux +ssl systemd test userland_BSD"
diff --git a/net-vpn/openvpn/openvpn-2.4.7-r1.ebuild b/net-vpn/openvpn/openvpn-2.4.7-r1.ebuild
index 7c4fa29d886..2e66d10b553 100644
--- a/net-vpn/openvpn/openvpn-2.4.7-r1.ebuild
+++ b/net-vpn/openvpn/openvpn-2.4.7-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://openvpn.net/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
IUSE="down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam"
IUSE+=" pkcs11 +plugins selinux +ssl systemd test userland_BSD"
diff --git a/net-vpn/openvpn/openvpn-2.4.8.ebuild b/net-vpn/openvpn/openvpn-2.4.8.ebuild
index 395ba5e6873..0310e511f60 100644
--- a/net-vpn/openvpn/openvpn-2.4.8.ebuild
+++ b/net-vpn/openvpn/openvpn-2.4.8.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://openvpn.net/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
IUSE="down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam"
IUSE+=" pkcs11 +plugins selinux +ssl systemd test userland_BSD"
diff --git a/net-vpn/wireguard-modules/wireguard-modules-0.0.20200318.ebuild b/net-vpn/wireguard-modules/wireguard-modules-0.0.20200318.ebuild
index e0049debd88..16df945c1ab 100644
--- a/net-vpn/wireguard-modules/wireguard-modules-0.0.20200318.ebuild
+++ b/net-vpn/wireguard-modules/wireguard-modules-0.0.20200318.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
else
SRC_URI="https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${PV}.tar.xz"
S="${WORKDIR}/wireguard-linux-compat-${PV}"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
fi
LICENSE="GPL-2"
diff --git a/net-vpn/wireguard-modules/wireguard-modules-9999.ebuild b/net-vpn/wireguard-modules/wireguard-modules-9999.ebuild
index 7c5072266bf..16df945c1ab 100644
--- a/net-vpn/wireguard-modules/wireguard-modules-9999.ebuild
+++ b/net-vpn/wireguard-modules/wireguard-modules-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
else
SRC_URI="https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${PV}.tar.xz"
S="${WORKDIR}/wireguard-linux-compat-${PV}"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
fi
LICENSE="GPL-2"
diff --git a/net-vpn/wireguard-tools/wireguard-tools-1.0.20200319.ebuild b/net-vpn/wireguard-tools/wireguard-tools-1.0.20200319.ebuild
index 0e00d9ddbb6..3d39a1a08d1 100644
--- a/net-vpn/wireguard-tools/wireguard-tools-1.0.20200319.ebuild
+++ b/net-vpn/wireguard-tools/wireguard-tools-1.0.20200319.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
KEYWORDS=""
else
SRC_URI="https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${PV}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
fi
LICENSE="GPL-2"
diff --git a/net-wireless/irda-utils/irda-utils-0.9.18-r6.ebuild b/net-wireless/irda-utils/irda-utils-0.9.18-r6.ebuild
index 8c24b6ba5ad..352f6fc2020 100644
--- a/net-wireless/irda-utils/irda-utils-0.9.18-r6.ebuild
+++ b/net-wireless/irda-utils/irda-utils-0.9.18-r6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/irda/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~sh x86"
+KEYWORDS="amd64 ~arm ppc x86"
IUSE=""
RDEPEND="
diff --git a/net-wireless/wireless-tools/wireless-tools-30_pre9-r1.ebuild b/net-wireless/wireless-tools/wireless-tools-30_pre9-r1.ebuild
index 80e134bad77..9013ba6595e 100644
--- a/net-wireless/wireless-tools/wireless-tools-30_pre9-r1.ebuild
+++ b/net-wireless/wireless-tools/wireless-tools-30_pre9-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE="multicall"
DEPEND="sys-apps/sed"
diff --git a/net-wireless/wireless-tools/wireless-tools-30_pre9.ebuild b/net-wireless/wireless-tools/wireless-tools-30_pre9.ebuild
index 5d1c1e64940..987d6d3f25b 100644
--- a/net-wireless/wireless-tools/wireless-tools-30_pre9.ebuild
+++ b/net-wireless/wireless-tools/wireless-tools-30_pre9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="4"
@@ -15,7 +15,7 @@ SRC_URI="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86"
IUSE="multicall"
DEPEND="sys-apps/sed"
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 d4712fbd7e5..9e5acb1da3d 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 7ce1fc1eaf6..2488beff208 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="virtual/perl-IO-Compress"
diff --git a/perl-core/Module-Loaded/Module-Loaded-0.80.0-r1.ebuild b/perl-core/Module-Loaded/Module-Loaded-0.80.0-r1.ebuild
index 6f2caffab5b..01eb321c0ec 100644
--- a/perl-core/Module-Loaded/Module-Loaded-0.80.0-r1.ebuild
+++ b/perl-core/Module-Loaded/Module-Loaded-0.80.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Mark modules as loaded or unloaded"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~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"
IUSE=""
SRC_TEST=do
diff --git a/perl-core/Params-Check/Params-Check-0.380.0-r1.ebuild b/perl-core/Params-Check/Params-Check-0.380.0-r1.ebuild
index 11402e2b486..28d056284d9 100644
--- a/perl-core/Params-Check/Params-Check-0.380.0-r1.ebuild
+++ b/perl-core/Params-Check/Params-Check-0.380.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="A generic input parsing/checking mechanism"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="virtual/perl-Locale-Maketext-Simple"
diff --git a/perl-core/Text-Tabs+Wrap/Text-Tabs+Wrap-2013.52.300-r1.ebuild b/perl-core/Text-Tabs+Wrap/Text-Tabs+Wrap-2013.52.300-r1.ebuild
index 9a3d19ca540..ff12df4952d 100644
--- a/perl-core/Text-Tabs+Wrap/Text-Tabs+Wrap-2013.52.300-r1.ebuild
+++ b/perl-core/Text-Tabs+Wrap/Text-Tabs+Wrap-2013.52.300-r1.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Expand/unexpand tabs per unix expand and line wrapping"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
SRC_TEST=do
diff --git a/sci-calculators/pcalc/pcalc-3-r1.ebuild b/sci-calculators/pcalc/pcalc-3-r1.ebuild
index 650dbb7d6c2..8d7390474e8 100644
--- a/sci-calculators/pcalc/pcalc-3-r1.ebuild
+++ b/sci-calculators/pcalc/pcalc-3-r1.ebuild
@@ -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 sh 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-calculators/pcalc/pcalc-4.ebuild b/sci-calculators/pcalc/pcalc-4.ebuild
index 0b083d62120..6f7040033fe 100644
--- a/sci-calculators/pcalc/pcalc-4.ebuild
+++ b/sci-calculators/pcalc/pcalc-4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 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 ~sh ~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-electronics/iverilog/iverilog-10.3.ebuild b/sci-electronics/iverilog/iverilog-10.3.ebuild
index b4ec6051198..55e7f1e7c1c 100644
--- a/sci-electronics/iverilog/iverilog-10.3.ebuild
+++ b/sci-electronics/iverilog/iverilog-10.3.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://github.com/steveicarus/${PN}.git"
else
SRC_URI="https://github.com/steveicarus/${PN}/archive/v${GITHUB_PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc x86"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
S="${WORKDIR}/${PN}-${GITHUB_PV}"
fi
diff --git a/sci-electronics/iverilog/iverilog-9999.ebuild b/sci-electronics/iverilog/iverilog-9999.ebuild
index 0ed7834f3f0..4592e8c4277 100644
--- a/sci-electronics/iverilog/iverilog-9999.ebuild
+++ b/sci-electronics/iverilog/iverilog-9999.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://github.com/steveicarus/${PN}.git"
else
SRC_URI="https://github.com/steveicarus/${PN}/archive/v${GITHUB_PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
S="${WORKDIR}/${PN}-${GITHUB_PV}"
fi
diff --git a/sci-libs/djbfft/djbfft-0.76-r2.ebuild b/sci-libs/djbfft/djbfft-0.76-r2.ebuild
index 1c50b652579..4bf66301628 100644
--- a/sci-libs/djbfft/djbfft-0.76-r2.ebuild
+++ b/sci-libs/djbfft/djbfft-0.76-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://cr.yp.to/djbfft/${P}.tar.gz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
DOCS=( CHANGES README TODO VERSION )
diff --git a/sci-libs/gsl/gsl-1.16.ebuild b/sci-libs/gsl/gsl-1.16.ebuild
index 2a36189f93e..f10edb2e805 100644
--- a/sci-libs/gsl/gsl-1.16.ebuild
+++ b/sci-libs/gsl/gsl-1.16.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="cblas-external static-libs"
RDEPEND="cblas-external? ( virtual/cblas )"
diff --git a/sci-libs/gsl/gsl-2.4.ebuild b/sci-libs/gsl/gsl-2.4.ebuild
index 0a8ef9c699a..717234335f1 100644
--- a/sci-libs/gsl/gsl-2.4.ebuild
+++ b/sci-libs/gsl/gsl-2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
LICENSE="GPL-3"
SLOT="0/23"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="cblas-external +deprecated static-libs"
RDEPEND="cblas-external? ( virtual/cblas:= )"
diff --git a/sci-libs/gsl/gsl-2.5-r1.ebuild b/sci-libs/gsl/gsl-2.5-r1.ebuild
index 8351dad0a78..26298bf6c4b 100644
--- a/sci-libs/gsl/gsl-2.5-r1.ebuild
+++ b/sci-libs/gsl/gsl-2.5-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
LICENSE="GPL-3"
SLOT="0/23"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="cblas-external +deprecated static-libs"
RDEPEND="cblas-external? ( virtual/cblas:= )"
diff --git a/sci-libs/gsl/gsl-2.5.ebuild b/sci-libs/gsl/gsl-2.5.ebuild
index 86760d3ddcc..491d3cbe761 100644
--- a/sci-libs/gsl/gsl-2.5.ebuild
+++ b/sci-libs/gsl/gsl-2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
LICENSE="GPL-3"
SLOT="0/23"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="cblas-external +deprecated static-libs"
RDEPEND="cblas-external? ( virtual/cblas:= )"
diff --git a/sci-libs/mpir/mpir-3.0.0.ebuild b/sci-libs/mpir/mpir-3.0.0.ebuild
index 6efc062bb0a..dd1e6cc41e8 100644
--- a/sci-libs/mpir/mpir-3.0.0.ebuild
+++ b/sci-libs/mpir/mpir-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.mpir.org/${P}.tar.bz2"
LICENSE="LGPL-3"
SLOT="0/23"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux"
IUSE="+cxx cpudetection static-libs"
DEPEND="
diff --git a/sys-apps/acl/acl-2.2.53.ebuild b/sys-apps/acl/acl-2.2.53.ebuild
index 04d9190a8f8..6dc53ee3523 100644
--- a/sys-apps/acl/acl-2.2.53.ebuild
+++ b/sys-apps/acl/acl-2.2.53.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 sh 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-r3.ebuild b/sys-apps/attr/attr-2.4.48-r3.ebuild
index 038c0676914..6c2adfbfe7d 100644
--- a/sys-apps/attr/attr-2.4.48-r3.ebuild
+++ b/sys-apps/attr/attr-2.4.48-r3.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 sh 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"
DEPEND="nls? ( sys-devel/gettext )"
diff --git a/sys-apps/attr/attr-9999.ebuild b/sys-apps/attr/attr-9999.ebuild
index 98b154406a3..72f0547d9c0 100644
--- a/sys-apps/attr/attr-9999.ebuild
+++ b/sys-apps/attr/attr-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then
inherit autotools git-r3
else
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~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="mirror://nongnu/${PN}/${P}.tar.gz"
fi
diff --git a/sys-apps/baobab/baobab-3.34.0.ebuild b/sys-apps/baobab/baobab-3.34.0.ebuild
index bc167557c80..0202a6950ad 100644
--- a/sys-apps/baobab/baobab-3.34.0.ebuild
+++ b/sys-apps/baobab/baobab-3.34.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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/Baobab"
LICENSE="GPL-2+ FDL-1.1+"
SLOT="0"
IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
RDEPEND="
>=dev-libs/glib-2.44:2
diff --git a/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild b/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild
index 5a90c252207..ca4ba62b19f 100644
--- a/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild
+++ b/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild
@@ -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 sh 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.6-r1.ebuild b/sys-apps/baselayout/baselayout-2.6-r1.ebuild
index 1ec17ae2c42..f3c71272cd8 100644
--- a/sys-apps/baselayout/baselayout-2.6-r1.ebuild
+++ b/sys-apps/baselayout/baselayout-2.6-r1.ebuild
@@ -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 ~sh ~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/baselayout/baselayout-2.7.ebuild b/sys-apps/baselayout/baselayout-2.7.ebuild
index ea29ca415bd..104cf105212 100644
--- a/sys-apps/baselayout/baselayout-2.7.ebuild
+++ b/sys-apps/baselayout/baselayout-2.7.ebuild
@@ -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 ~sh ~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/baselayout/baselayout-9999.ebuild b/sys-apps/baselayout/baselayout-9999.ebuild
index a4b8ca535ac..a94078654b8 100644
--- a/sys-apps/baselayout/baselayout-9999.ebuild
+++ b/sys-apps/baselayout/baselayout-9999.ebuild
@@ -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 ~sh ~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.31.1-r2.ebuild b/sys-apps/busybox/busybox-1.31.1-r2.ebuild
index 7a1026203c9..369b0a84f57 100644
--- a/sys-apps/busybox/busybox-1.31.1-r2.ebuild
+++ b/sys-apps/busybox/busybox-1.31.1-r2.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 sh 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/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild
index c15fa90610c..bf29c9fb1d8 100644
--- a/sys-apps/busybox/busybox-9999.ebuild
+++ b/sys-apps/busybox/busybox-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# See `man savedconfig.eclass` for info on how to use USE=savedconfig.
@@ -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 ~sh ~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.30.ebuild b/sys-apps/coreutils/coreutils-8.30.ebuild
index 99156b6acf8..31cd486a2e8 100644
--- a/sys-apps/coreutils/coreutils-8.30.ebuild
+++ b/sys-apps/coreutils/coreutils-8.30.ebuild
@@ -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 s390 sh sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~x86-linux"
IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test userland_BSD vanilla xattr"
RESTRICT="!test? ( test )"
diff --git a/sys-apps/coreutils/coreutils-8.31-r1.ebuild b/sys-apps/coreutils/coreutils-8.31-r1.ebuild
index 20a02c388fa..e99abae0f9e 100644
--- a/sys-apps/coreutils/coreutils-8.31-r1.ebuild
+++ b/sys-apps/coreutils/coreutils-8.31-r1.ebuild
@@ -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 sh 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.31.ebuild b/sys-apps/coreutils/coreutils-8.31.ebuild
index 6cb35ca90f1..bfb7b35dce7 100644
--- a/sys-apps/coreutils/coreutils-8.31.ebuild
+++ b/sys-apps/coreutils/coreutils-8.31.ebuild
@@ -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 ~sh ~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 userland_BSD 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 392344c990c..d63be698dcc 100644
--- a/sys-apps/coreutils/coreutils-8.32-r1.ebuild
+++ b/sys-apps/coreutils/coreutils-8.32-r1.ebuild
@@ -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 ~sh ~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/cracklib-words/cracklib-words-2.9.6.ebuild b/sys-apps/cracklib-words/cracklib-words-2.9.6.ebuild
index 9c9830ccf55..cf446612d09 100644
--- a/sys-apps/cracklib-words/cracklib-words-2.9.6.ebuild
+++ b/sys-apps/cracklib-words/cracklib-words-2.9.6.ebuild
@@ -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 sh 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 e1f8092e35f..89d33c50fae 100644
--- a/sys-apps/daisydog/daisydog-2014.05.30.ebuild
+++ b/sys-apps/daisydog/daisydog-2014.05.30.ebuild
@@ -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 sh 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/dbus/dbus-1.12.16.ebuild b/sys-apps/dbus/dbus-1.12.16.ebuild
index 66161f460be..76f8a5171b4 100644
--- a/sys-apps/dbus/dbus-1.12.16.ebuild
+++ b/sys-apps/dbus/dbus-1.12.16.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
LICENSE="|| ( AFL-2.1 GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug doc elogind kernel_linux selinux static-libs systemd test user-session X"
RESTRICT="!test? ( test )"
diff --git a/sys-apps/debianutils/debianutils-4.8.3.ebuild b/sys-apps/debianutils/debianutils-4.8.3.ebuild
index d35eed7065f..9e4adc59766 100644
--- a/sys-apps/debianutils/debianutils-4.8.3.ebuild
+++ b/sys-apps/debianutils/debianutils-4.8.3.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 s390 sh sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~x86-linux"
IUSE="kernel_linux static"
PATCHES=( "${FILESDIR}"/${PN}-3.4.2-no-bs-namespace.patch )
diff --git a/sys-apps/debianutils/debianutils-4.8.6.3.ebuild b/sys-apps/debianutils/debianutils-4.8.6.3.ebuild
index 70b2be0d742..45100517a24 100644
--- a/sys-apps/debianutils/debianutils-4.8.6.3.ebuild
+++ b/sys-apps/debianutils/debianutils-4.8.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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 ~sh ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
IUSE="+installkernel static"
PATCHES=( "${FILESDIR}"/${PN}-3.4.2-no-bs-namespace.patch )
diff --git a/sys-apps/debianutils/debianutils-4.9.1.ebuild b/sys-apps/debianutils/debianutils-4.9.1.ebuild
index bebf1792cc3..31a787b0af6 100644
--- a/sys-apps/debianutils/debianutils-4.9.1.ebuild
+++ b/sys-apps/debianutils/debianutils-4.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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 ~sh ~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.9.ebuild b/sys-apps/debianutils/debianutils-4.9.ebuild
index 70b2be0d742..45100517a24 100644
--- a/sys-apps/debianutils/debianutils-4.9.ebuild
+++ b/sys-apps/debianutils/debianutils-4.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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 ~sh ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
IUSE="+installkernel static"
PATCHES=( "${FILESDIR}"/${PN}-3.4.2-no-bs-namespace.patch )
diff --git a/sys-apps/diffutils/diffutils-3.6-r1.ebuild b/sys-apps/diffutils/diffutils-3.6-r1.ebuild
index 9abd1fbe45e..69b66638350 100644
--- a/sys-apps/diffutils/diffutils-3.6-r1.ebuild
+++ b/sys-apps/diffutils/diffutils-3.6-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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="nls static"
DEPEND="app-arch/xz-utils
diff --git a/sys-apps/diffutils/diffutils-3.7.ebuild b/sys-apps/diffutils/diffutils-3.7.ebuild
index 21455d5ea62..d67de2ba947 100644
--- a/sys-apps/diffutils/diffutils-3.7.ebuild
+++ b/sys-apps/diffutils/diffutils-3.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="nls static"
DEPEND="app-arch/xz-utils
diff --git a/sys-apps/dmapi/dmapi-2.2.12-r1.ebuild b/sys-apps/dmapi/dmapi-2.2.12-r1.ebuild
index b8ba4f29909..545be192ae8 100644
--- a/sys-apps/dmapi/dmapi-2.2.12-r1.ebuild
+++ b/sys-apps/dmapi/dmapi-2.2.12-r1.ebuild
@@ -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 sh 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/dtc/dtc-1.4.4.ebuild b/sys-apps/dtc/dtc-1.4.4.ebuild
index 1c399e8ac9c..cd85d987078 100644
--- a/sys-apps/dtc/dtc-1.4.4.ebuild
+++ b/sys-apps/dtc/dtc-1.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
else
SRC_URI="https://www.kernel.org/pub/software/utils/${PN}/${P}.tar.xz"
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
fi
DESCRIPTION="Open Firmware device tree compiler"
diff --git a/sys-apps/dtc/dtc-1.4.6.ebuild b/sys-apps/dtc/dtc-1.4.6.ebuild
index 993c494b9b1..14d8b75bd04 100644
--- a/sys-apps/dtc/dtc-1.4.6.ebuild
+++ b/sys-apps/dtc/dtc-1.4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
else
SRC_URI="https://www.kernel.org/pub/software/utils/${PN}/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
fi
DESCRIPTION="Open Firmware device tree compiler"
diff --git a/sys-apps/dtc/dtc-1.5.0.ebuild b/sys-apps/dtc/dtc-1.5.0.ebuild
index cbe4052e612..b99a6c23469 100644
--- a/sys-apps/dtc/dtc-1.5.0.ebuild
+++ b/sys-apps/dtc/dtc-1.5.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
else
SRC_URI="https://www.kernel.org/pub/software/utils/${PN}/${P}.tar.xz"
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc x86"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
fi
DESCRIPTION="Open Firmware device tree compiler"
diff --git a/sys-apps/dtc/dtc-9999.ebuild b/sys-apps/dtc/dtc-9999.ebuild
index ba8b6a02661..d60b43b0b33 100644
--- a/sys-apps/dtc/dtc-9999.ebuild
+++ b/sys-apps/dtc/dtc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
else
SRC_URI="https://www.kernel.org/pub/software/utils/${PN}/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
fi
DESCRIPTION="Open Firmware device tree compiler"
diff --git a/sys-apps/ed/ed-1.15-r1.ebuild b/sys-apps/ed/ed-1.15-r1.ebuild
index 80f051ad728..debce46f876 100644
--- a/sys-apps/ed/ed-1.15-r1.ebuild
+++ b/sys-apps/ed/ed-1.15-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="sys-apps/texinfo"
diff --git a/sys-apps/ed/ed-1.16.ebuild b/sys-apps/ed/ed-1.16.ebuild
index 52585afedc8..d558c52fa98 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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="sys-apps/texinfo"
diff --git a/sys-apps/ethtool/ethtool-4.19.ebuild b/sys-apps/ethtool/ethtool-4.19.ebuild
index 8e3d87bbb1e..ddfa15266a2 100644
--- a/sys-apps/ethtool/ethtool-4.19.ebuild
+++ b/sys-apps/ethtool/ethtool-4.19.ebuild
@@ -9,6 +9,6 @@ SRC_URI="https://www.kernel.org/pub/software/network/ethtool/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
DEPEND="app-arch/xz-utils"
diff --git a/sys-apps/ethtool/ethtool-5.3.ebuild b/sys-apps/ethtool/ethtool-5.3.ebuild
index 7a20a1bbc62..11b54c89968 100644
--- a/sys-apps/ethtool/ethtool-5.3.ebuild
+++ b/sys-apps/ethtool/ethtool-5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,6 +9,6 @@ SRC_URI="https://www.kernel.org/pub/software/network/ethtool/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
DEPEND="app-arch/xz-utils"
diff --git a/sys-apps/ethtool/ethtool-5.4.ebuild b/sys-apps/ethtool/ethtool-5.4.ebuild
index ae3e22f3417..11b54c89968 100644
--- a/sys-apps/ethtool/ethtool-5.4.ebuild
+++ b/sys-apps/ethtool/ethtool-5.4.ebuild
@@ -9,6 +9,6 @@ SRC_URI="https://www.kernel.org/pub/software/network/ethtool/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
DEPEND="app-arch/xz-utils"
diff --git a/sys-apps/fbset/fbset-2.1.ebuild b/sys-apps/fbset/fbset-2.1.ebuild
index 6c9480f461f..d3fc26b5ebf 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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86"
IUSE="static"
DEPEND="sys-devel/bison
diff --git a/sys-apps/file/file-5.37-r1.ebuild b/sys-apps/file/file-5.37-r1.ebuild
index 32e7248373f..ddb72b0b149 100644
--- a/sys-apps/file/file-5.37-r1.ebuild
+++ b/sys-apps/file/file-5.37-r1.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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="identify a file's format by scanning binary data for patterns"
diff --git a/sys-apps/file/file-5.38.ebuild b/sys-apps/file/file-5.38.ebuild
index ed9e8dbc5bb..db7ed0b820b 100644
--- a/sys-apps/file/file-5.38.ebuild
+++ b/sys-apps/file/file-5.38.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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="identify a file's format by scanning binary data for patterns"
diff --git a/sys-apps/file/file-9999.ebuild b/sys-apps/file/file-9999.ebuild
index 18f5920b53c..b092e57eb18 100644
--- a/sys-apps/file/file-9999.ebuild
+++ b/sys-apps/file/file-9999.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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="identify a file's format by scanning binary data for patterns"
diff --git a/sys-apps/findutils/findutils-4.6.0-r1.ebuild b/sys-apps/findutils/findutils-4.6.0-r1.ebuild
index bec6913975c..e8aceaefc6f 100644
--- a/sys-apps/findutils/findutils-4.6.0-r1.ebuild
+++ b/sys-apps/findutils/findutils-4.6.0-r1.ebuild
@@ -13,7 +13,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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="nls selinux static test"
RESTRICT="!test? ( test )"
diff --git a/sys-apps/findutils/findutils-4.7.0.ebuild b/sys-apps/findutils/findutils-4.7.0.ebuild
index 25322b2560d..4a1769ba835 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 811ba6d753d..0d5ec8010fc 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="mpfr nls readline"
RDEPEND="
diff --git a/sys-apps/gawk/gawk-5.0.0.ebuild b/sys-apps/gawk/gawk-5.0.0.ebuild
index 403c0d5ab7e..1a1bc35f4c0 100644
--- a/sys-apps/gawk/gawk-5.0.0.ebuild
+++ b/sys-apps/gawk/gawk-5.0.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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 d07f70d6d8e..6ee180218e5 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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="mpfr nls readline"
RDEPEND="
diff --git a/sys-apps/gentoo-functions/gentoo-functions-0.12.ebuild b/sys-apps/gentoo-functions/gentoo-functions-0.12.ebuild
index f4946e19d14..f5e92dc7f23 100644
--- a/sys-apps/gentoo-functions/gentoo-functions-0.12.ebuild
+++ b/sys-apps/gentoo-functions/gentoo-functions-0.12.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://github.com/gentoo/${PN}.git"
else
SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
fi
inherit toolchain-funcs flag-o-matic
diff --git a/sys-apps/gentoo-functions/gentoo-functions-0.13.ebuild b/sys-apps/gentoo-functions/gentoo-functions-0.13.ebuild
index c06e9afa838..04f1a329e9e 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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
fi
inherit toolchain-funcs flag-o-matic
diff --git a/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild b/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild
index c06e9afa838..04f1a329e9e 100644
--- a/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild
+++ b/sys-apps/gentoo-functions/gentoo-functions-9999.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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
fi
inherit toolchain-funcs flag-o-matic
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.32.1.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.32.1.ebuild
index a5810d668f9..cba48c95092 100644
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.32.1.ebuild
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.32.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ LICENSE="GPL-2+"
SLOT="0"
IUSE="fat elogind gnome systemd"
REQUIRED_USE="?? ( elogind systemd )"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
COMMON_DEPEND="
>=dev-libs/glib-2.31:2
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.34.5.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.34.5.ebuild
index a46e8ca17e2..6f3bb0f36d1 100644
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.34.5.ebuild
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.34.5.ebuild
@@ -12,7 +12,7 @@ LICENSE="GPL-2+"
SLOT="0"
IUSE="fat elogind gnome systemd"
REQUIRED_USE="?? ( elogind systemd )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
DEPEND="
>=media-libs/libdvdread-4.2.0:0=
diff --git a/sys-apps/grep/grep-3.1-r1.ebuild b/sys-apps/grep/grep-3.1-r1.ebuild
index 00b81c08d75..31d87638614 100644
--- a/sys-apps/grep/grep-3.1-r1.ebuild
+++ b/sys-apps/grep/grep-3.1-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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="nls pcre static"
LIB_DEPEND="pcre? ( >=dev-libs/libpcre-7.8-r1[static-libs(+)] )"
diff --git a/sys-apps/grep/grep-3.3-r1.ebuild b/sys-apps/grep/grep-3.3-r1.ebuild
index a5085e94590..d6120e3ca4e 100644
--- a/sys-apps/grep/grep-3.3-r1.ebuild
+++ b/sys-apps/grep/grep-3.3-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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="nls pcre static"
LIB_DEPEND="pcre? ( >=dev-libs/libpcre-7.8-r1[static-libs(+)] )"
diff --git a/sys-apps/grep/grep-3.4.ebuild b/sys-apps/grep/grep-3.4.ebuild
index db80d522f83..a581969446e 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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="nls pcre static"
LIB_DEPEND="pcre? ( >=dev-libs/libpcre-7.8-r1[static-libs(+)] )"
diff --git a/sys-apps/groff/groff-1.22.2.ebuild b/sys-apps/groff/groff-1.22.2.ebuild
index 159d8fc62c2..f258942af68 100644
--- a/sys-apps/groff/groff-1.22.2.ebuild
+++ b/sys-apps/groff/groff-1.22.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/groff/${P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="examples X l10n_ja"
RDEPEND="
diff --git a/sys-apps/groff/groff-1.22.3.ebuild b/sys-apps/groff/groff-1.22.3.ebuild
index 6930f36949c..eca6bff36d6 100644
--- a/sys-apps/groff/groff-1.22.3.ebuild
+++ b/sys-apps/groff/groff-1.22.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/groff/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="examples X"
RDEPEND="
diff --git a/sys-apps/groff/groff-1.22.4.ebuild b/sys-apps/groff/groff-1.22.4.ebuild
index 0dc67cae3b7..79613e8cf45 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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="examples X"
RDEPEND="
diff --git a/sys-apps/hdparm/hdparm-9.56.ebuild b/sys-apps/hdparm/hdparm-9.56.ebuild
index 2bde55c045a..76224faeef0 100644
--- a/sys-apps/hdparm/hdparm-9.56.ebuild
+++ b/sys-apps/hdparm/hdparm-9.56.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz"
LICENSE="BSD GPL-2" # GPL-2 only
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh 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"
PATCHES=(
diff --git a/sys-apps/hdparm/hdparm-9.58.ebuild b/sys-apps/hdparm/hdparm-9.58.ebuild
index 71243dbbf09..f84377ef981 100644
--- a/sys-apps/hdparm/hdparm-9.58.ebuild
+++ b/sys-apps/hdparm/hdparm-9.58.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz"
LICENSE="BSD GPL-2" # GPL-2 only
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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"
PATCHES=(
diff --git a/sys-apps/help2man/help2man-1.47.10.ebuild b/sys-apps/help2man/help2man-1.47.10.ebuild
index eeef70f2966..5b913e46dfa 100644
--- a/sys-apps/help2man/help2man-1.47.10.ebuild
+++ b/sys-apps/help2man/help2man-1.47.10.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 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="nls"
RDEPEND="dev-lang/perl
diff --git a/sys-apps/help2man/help2man-1.47.12.ebuild b/sys-apps/help2man/help2man-1.47.12.ebuild
index a2e138b9d74..79ed067d185 100644
--- a/sys-apps/help2man/help2man-1.47.12.ebuild
+++ b/sys-apps/help2man/help2man-1.47.12.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 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="nls"
RDEPEND="dev-lang/perl
diff --git a/sys-apps/help2man/help2man-1.47.13.ebuild b/sys-apps/help2man/help2man-1.47.13.ebuild
index a2e138b9d74..79ed067d185 100644
--- a/sys-apps/help2man/help2man-1.47.13.ebuild
+++ b/sys-apps/help2man/help2man-1.47.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 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="nls"
RDEPEND="dev-lang/perl
diff --git a/sys-apps/hwids/hwids-20190316.ebuild b/sys-apps/hwids/hwids-20190316.ebuild
index db2449e5385..c48b957399b 100644
--- a/sys-apps/hwids/hwids-20190316.ebuild
+++ b/sys-apps/hwids/hwids-20190316.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 sh 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-20190818.ebuild b/sys-apps/hwids/hwids-20190818.ebuild
index c3ee9793f0c..44dd62d969f 100644
--- a/sys-apps/hwids/hwids-20190818.ebuild
+++ b/sys-apps/hwids/hwids-20190818.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 sh 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-20191025.ebuild b/sys-apps/hwids/hwids-20191025.ebuild
index bca039bc189..bbe6c639f9b 100644
--- a/sys-apps/hwids/hwids-20191025.ebuild
+++ b/sys-apps/hwids/hwids-20191025.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 ~sh ~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-20200204.ebuild b/sys-apps/hwids/hwids-20200204.ebuild
index c3ee9793f0c..44dd62d969f 100644
--- a/sys-apps/hwids/hwids-20200204.ebuild
+++ b/sys-apps/hwids/hwids-20200204.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 sh 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-20200306.ebuild b/sys-apps/hwids/hwids-20200306.ebuild
index bca039bc189..bbe6c639f9b 100644
--- a/sys-apps/hwids/hwids-20200306.ebuild
+++ b/sys-apps/hwids/hwids-20200306.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 ~sh ~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-99999999.ebuild b/sys-apps/hwids/hwids-99999999.ebuild
index bca039bc189..bbe6c639f9b 100644
--- a/sys-apps/hwids/hwids-99999999.ebuild
+++ b/sys-apps/hwids/hwids-99999999.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 ~sh ~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 75f8e73a727..4990f650869 100644
--- a/sys-apps/install-xattr/install-xattr-0.5.ebuild
+++ b/sys-apps/install-xattr/install-xattr-0.5.ebuild
@@ -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 sh 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/install-xattr/install-xattr-0.7.ebuild b/sys-apps/install-xattr/install-xattr-0.7.ebuild
index 484fbb66976..44b01b811bb 100644
--- a/sys-apps/install-xattr/install-xattr-0.7.ebuild
+++ b/sys-apps/install-xattr/install-xattr-0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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 ~riscv ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
S=${WORKDIR}/${PN}
fi
diff --git a/sys-apps/install-xattr/install-xattr-0.8.ebuild b/sys-apps/install-xattr/install-xattr-0.8.ebuild
index 484fbb66976..44b01b811bb 100644
--- a/sys-apps/install-xattr/install-xattr-0.8.ebuild
+++ b/sys-apps/install-xattr/install-xattr-0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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 ~riscv ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
S=${WORKDIR}/${PN}
fi
diff --git a/sys-apps/install-xattr/install-xattr-9999.ebuild b/sys-apps/install-xattr/install-xattr-9999.ebuild
index 484fbb66976..44b01b811bb 100644
--- a/sys-apps/install-xattr/install-xattr-9999.ebuild
+++ b/sys-apps/install-xattr/install-xattr-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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 ~riscv ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
S=${WORKDIR}/${PN}
fi
diff --git a/sys-apps/iproute2/iproute2-4.19.0-r1.ebuild b/sys-apps/iproute2/iproute2-4.19.0-r1.ebuild
index 6e21a2e8bf4..abf60e71f9d 100644
--- a/sys-apps/iproute2/iproute2-4.19.0-r1.ebuild
+++ b/sys-apps/iproute2/iproute2-4.19.0-r1.ebuild
@@ -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 s390 sh sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
fi
DESCRIPTION="kernel routing and traffic control utilities"
diff --git a/sys-apps/iproute2/iproute2-5.2.0-r1.ebuild b/sys-apps/iproute2/iproute2-5.2.0-r1.ebuild
index 281a05dd99b..7ddf01282a5 100644
--- a/sys-apps/iproute2/iproute2-5.2.0-r1.ebuild
+++ b/sys-apps/iproute2/iproute2-5.2.0-r1.ebuild
@@ -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 sh 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/iproute2/iproute2-5.4.0.ebuild b/sys-apps/iproute2/iproute2-5.4.0.ebuild
index 9d1acf39062..9e2e1f7f4e5 100644
--- a/sys-apps/iproute2/iproute2-5.4.0.ebuild
+++ b/sys-apps/iproute2/iproute2-5.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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 ~sh ~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/iproute2/iproute2-5.5.0.ebuild b/sys-apps/iproute2/iproute2-5.5.0.ebuild
index e40c1b857ce..9e2e1f7f4e5 100644
--- a/sys-apps/iproute2/iproute2-5.5.0.ebuild
+++ b/sys-apps/iproute2/iproute2-5.5.0.ebuild
@@ -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 ~sh ~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/iproute2/iproute2-9999.ebuild b/sys-apps/iproute2/iproute2-9999.ebuild
index 9d1acf39062..9e2e1f7f4e5 100644
--- a/sys-apps/iproute2/iproute2-9999.ebuild
+++ b/sys-apps/iproute2/iproute2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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 ~sh ~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/kbd/kbd-2.0.4-r1.ebuild b/sys-apps/kbd/kbd-2.0.4-r1.ebuild
index 58d6b6dfff5..aeabdfc9bae 100644
--- a/sys-apps/kbd/kbd-2.0.4-r1.ebuild
+++ b/sys-apps/kbd/kbd-2.0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
EGIT_BRANCH="master"
else
SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
fi
DESCRIPTION="Keyboard and console utilities"
diff --git a/sys-apps/kbd/kbd-2.0.4.ebuild b/sys-apps/kbd/kbd-2.0.4.ebuild
index a6ae0a3ff35..59c3e3c78cb 100644
--- a/sys-apps/kbd/kbd-2.0.4.ebuild
+++ b/sys-apps/kbd/kbd-2.0.4.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
EGIT_BRANCH="master"
else
SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
fi
inherit eutils ${SCM}
diff --git a/sys-apps/kbd/kbd-2.2.0-r2.ebuild b/sys-apps/kbd/kbd-2.2.0-r2.ebuild
index 19c32fde0ff..465bc5b881e 100644
--- a/sys-apps/kbd/kbd-2.2.0-r2.ebuild
+++ b/sys-apps/kbd/kbd-2.2.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
EGIT_BRANCH="master"
else
SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
fi
DESCRIPTION="Keyboard and console utilities"
diff --git a/sys-apps/kbd/kbd-9999.ebuild b/sys-apps/kbd/kbd-9999.ebuild
index 85d24416714..faad110fb54 100644
--- a/sys-apps/kbd/kbd-9999.ebuild
+++ b/sys-apps/kbd/kbd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
EGIT_BRANCH="master"
else
SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
fi
DESCRIPTION="Keyboard and console utilities"
diff --git a/sys-apps/keyutils/keyutils-1.6.1.ebuild b/sys-apps/keyutils/keyutils-1.6.1.ebuild
index 408c30fa721..a3038f35745 100644
--- a/sys-apps/keyutils/keyutils-1.6.1.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.1.ebuild
@@ -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 sh 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-26-r5.ebuild b/sys-apps/kmod/kmod-26-r5.ebuild
index 55fb119f24f..83d21efbdec 100644
--- a/sys-apps/kmod/kmod-26-r5.ebuild
+++ b/sys-apps/kmod/kmod-26-r5.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
inherit autotools 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 sh 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-27-r1.ebuild b/sys-apps/kmod/kmod-27-r1.ebuild
index f7ff20bf0db..c9e60cdc33f 100644
--- a/sys-apps/kmod/kmod-27-r1.ebuild
+++ b/sys-apps/kmod/kmod-27-r1.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 ~sh ~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-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild
index f7ff20bf0db..c9e60cdc33f 100644
--- a/sys-apps/kmod/kmod-9999.ebuild
+++ b/sys-apps/kmod/kmod-9999.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 ~sh ~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-530.ebuild b/sys-apps/less/less-530.ebuild
index c116c181b9a..c0ab0962a90 100644
--- a/sys-apps/less/less-530.ebuild
+++ b/sys-apps/less/less-530.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="pcre unicode"
DEPEND=">=app-misc/editor-wrapper-3
diff --git a/sys-apps/less/less-531.ebuild b/sys-apps/less/less-531.ebuild
index 6b7e2924c6f..6f1f5eca46b 100644
--- a/sys-apps/less/less-531.ebuild
+++ b/sys-apps/less/less-531.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 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="pcre unicode"
DEPEND=">=app-misc/editor-wrapper-3
diff --git a/sys-apps/less/less-551.ebuild b/sys-apps/less/less-551.ebuild
index ca1de415f4e..cfb8aa8c207 100644
--- a/sys-apps/less/less-551.ebuild
+++ b/sys-apps/less/less-551.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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="pcre unicode"
DEPEND=">=app-misc/editor-wrapper-3
diff --git a/sys-apps/less/less-554.ebuild b/sys-apps/less/less-554.ebuild
index 826f236b361..375e2585ca5 100644
--- a/sys-apps/less/less-554.ebuild
+++ b/sys-apps/less/less-554.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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="pcre unicode"
DEPEND=">=app-misc/editor-wrapper-3
diff --git a/sys-apps/less/less-556.ebuild b/sys-apps/less/less-556.ebuild
index 826f236b361..375e2585ca5 100644
--- a/sys-apps/less/less-556.ebuild
+++ b/sys-apps/less/less-556.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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 199d89be273..630132ca261 100644
--- a/sys-apps/lsb-release/lsb-release-1.4-r3.ebuild
+++ b/sys-apps/lsb-release/lsb-release-1.4-r3.ebuild
@@ -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 sh 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 38f97ce736a..08b25b9da5e 100644
--- a/sys-apps/makedev/makedev-3.23.1-r1.ebuild
+++ b/sys-apps/makedev/makedev-3.23.1-r1.ebuild
@@ -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 sh 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.7.6.1-r2.ebuild b/sys-apps/man-db/man-db-2.7.6.1-r2.ebuild
index 005af9aa14a..e5085755dca 100644
--- a/sys-apps/man-db/man-db-2.7.6.1-r2.ebuild
+++ b/sys-apps/man-db/man-db-2.7.6.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 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="berkdb +gdbm +manpager nls selinux static-libs zlib"
CDEPEND=">=dev-libs/libpipeline-1.4.0
diff --git a/sys-apps/man-db/man-db-2.8.7.ebuild b/sys-apps/man-db/man-db-2.8.7.ebuild
index ce3d896ca60..a66fb0d3be1 100644
--- a/sys-apps/man-db/man-db-2.8.7.ebuild
+++ b/sys-apps/man-db/man-db-2.8.7.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 sh 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-db/man-db-2.9.0.ebuild b/sys-apps/man-db/man-db-2.9.0.ebuild
index dffc4b56907..92546556c66 100644
--- a/sys-apps/man-db/man-db-2.9.0.ebuild
+++ b/sys-apps/man-db/man-db-2.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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://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 ~sh ~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-db/man-db-2.9.1.ebuild b/sys-apps/man-db/man-db-2.9.1.ebuild
index 9cc7f136966..92546556c66 100644
--- a/sys-apps/man-db/man-db-2.9.1.ebuild
+++ b/sys-apps/man-db/man-db-2.9.1.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 ~sh ~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-db/man-db-9999.ebuild b/sys-apps/man-db/man-db-9999.ebuild
index dffc4b56907..92546556c66 100644
--- a/sys-apps/man-db/man-db-9999.ebuild
+++ b/sys-apps/man-db/man-db-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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://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 ~sh ~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 bd7ae5ff105..9ecf61391ec 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE=""
RESTRICT="binchecks"
diff --git a/sys-apps/man-pages/man-pages-5.04.ebuild b/sys-apps/man-pages/man-pages-5.04.ebuild
index 6450c0bbb0a..3fc0d361719 100644
--- a/sys-apps/man-pages/man-pages-5.04.ebuild
+++ b/sys-apps/man-pages/man-pages-5.04.ebuild
@@ -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 sh 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="nls ${IUSE_L10N// / l10n_}"
RESTRICT="binchecks"
diff --git a/sys-apps/man-pages/man-pages-5.05-r1.ebuild b/sys-apps/man-pages/man-pages-5.05-r1.ebuild
index abfdae6c9e0..b571464046f 100644
--- a/sys-apps/man-pages/man-pages-5.05-r1.ebuild
+++ b/sys-apps/man-pages/man-pages-5.05-r1.ebuild
@@ -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 ~sh ~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="nls ${IUSE_L10N// / l10n_}"
RESTRICT="binchecks"
diff --git a/sys-apps/man-pages/man-pages-5.05.ebuild b/sys-apps/man-pages/man-pages-5.05.ebuild
index 63013ab5b77..97f0792fb4e 100644
--- a/sys-apps/man-pages/man-pages-5.05.ebuild
+++ b/sys-apps/man-pages/man-pages-5.05.ebuild
@@ -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 ~sh ~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="nls ${IUSE_L10N// / l10n_}"
RESTRICT="binchecks"
diff --git a/sys-apps/man2html/man2html-1.6g.ebuild b/sys-apps/man2html/man2html-1.6g.ebuild
index cc39059ea14..99353d5bfc0 100644
--- a/sys-apps/man2html/man2html-1.6g.ebuild
+++ b/sys-apps/man2html/man2html-1.6g.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://primates.ximian.com/~flucifredi/man/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND="!sys-apps/man"
diff --git a/sys-apps/mawk/mawk-1.3.4_p20161120.ebuild b/sys-apps/mawk/mawk-1.3.4_p20161120.ebuild
index e40aa830d63..1d32415ea40 100644
--- a/sys-apps/mawk/mawk-1.3.4_p20161120.ebuild
+++ b/sys-apps/mawk/mawk-1.3.4_p20161120.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://invisible-island.net/mawk/${MY_P}.tgz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
RDEPEND="app-eselect/eselect-awk"
DEPEND="${RDEPEND}"
diff --git a/sys-apps/mawk/mawk-1.3.4_p20190203-r1.ebuild b/sys-apps/mawk/mawk-1.3.4_p20190203-r1.ebuild
index 110cbc7c9a0..c65ac1f6422 100644
--- a/sys-apps/mawk/mawk-1.3.4_p20190203-r1.ebuild
+++ b/sys-apps/mawk/mawk-1.3.4_p20190203-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.invisible-island.net/mawk/${MY_P}.tgz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
RDEPEND="app-eselect/eselect-awk"
DEPEND="${RDEPEND}"
diff --git a/sys-apps/mawk/mawk-1.3.4_p20200106-r1.ebuild b/sys-apps/mawk/mawk-1.3.4_p20200106-r1.ebuild
index 7645505ca1f..03a7db27a51 100644
--- a/sys-apps/mawk/mawk-1.3.4_p20200106-r1.ebuild
+++ b/sys-apps/mawk/mawk-1.3.4_p20200106-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://invisible-mirror.net/archives/${PN}/${MY_P}.tgz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
RDEPEND="app-eselect/eselect-awk"
DEPEND="${RDEPEND}"
diff --git a/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild b/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild
index aa11dccf1ee..786566fca43 100644
--- a/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild
+++ b/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/miscfiles/${P}.tar.gz
LICENSE="GPL-2 unicode"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
IUSE="minimal"
# Collides with older versions/revisions
diff --git a/sys-apps/mlocate/mlocate-0.26-r2.ebuild b/sys-apps/mlocate/mlocate-0.26-r2.ebuild
index 307d5450366..763d527e58b 100644
--- a/sys-apps/mlocate/mlocate-0.26-r2.ebuild
+++ b/sys-apps/mlocate/mlocate-0.26-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://releases.pagure.org/mlocate/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="nls selinux"
RDEPEND="!sys-apps/slocate
diff --git a/sys-apps/modutils/modutils-2.4.27-r2.ebuild b/sys-apps/modutils/modutils-2.4.27-r2.ebuild
index a693294a408..a646d7d8f6c 100644
--- a/sys-apps/modutils/modutils-2.4.27-r2.ebuild
+++ b/sys-apps/modutils/modutils-2.4.27-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/${PN}/v2.4/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
RDEPEND="!sys-apps/module-init-tools
!sys-apps/kmod"
diff --git a/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild b/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild
index b3792e86fa2..24feb6c824b 100644
--- a/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild
+++ b/sys-apps/net-tools/net-tools-1.60_p20161110235919.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 s390 sh 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
DESCRIPTION="Standard Linux networking tools"
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 b307e83834d..ee2cf59f17b 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 sh 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/net-tools/net-tools-9999.ebuild b/sys-apps/net-tools/net-tools-9999.ebuild
index d678d61450d..1fd92a62a67 100644
--- a/sys-apps/net-tools/net-tools-9999.ebuild
+++ b/sys-apps/net-tools/net-tools-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 ~sh ~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/nosig/nosig-2.ebuild b/sys-apps/nosig/nosig-2.ebuild
index 1868fbf57f9..80ba9d2a3af 100644
--- a/sys-apps/nosig/nosig-2.ebuild
+++ b/sys-apps/nosig/nosig-2.ebuild
@@ -9,5 +9,5 @@ SRC_URI="https://github.com/vapier/nosig/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~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/sys-apps/openrc/openrc-0.41.2.ebuild b/sys-apps/openrc/openrc-0.41.2.ebuild
index b745d7207f3..e7c2db8640b 100644
--- a/sys-apps/openrc/openrc-0.41.2.ebuild
+++ b/sys-apps/openrc/openrc-0.41.2.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 ~sh 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/openrc/openrc-0.42.1.ebuild b/sys-apps/openrc/openrc-0.42.1.ebuild
index 46f3497690d..4cb3adc2619 100644
--- a/sys-apps/openrc/openrc-0.42.1.ebuild
+++ b/sys-apps/openrc/openrc-0.42.1.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 ~sh 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/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index 5dd01f8740f..d07f1b87288 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.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 ~sh ~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 8b981e55483..8ca05f91904 100644
--- a/sys-apps/opentmpfiles/opentmpfiles-0.1.1.ebuild
+++ b/sys-apps/opentmpfiles/opentmpfiles-0.1.1.ebuild
@@ -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 sh 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 47fc6ab9843..c6654b1ab7a 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-2017 Gentoo Foundation
+# Copyright 1999-2020 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 sh ~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-r1.ebuild b/sys-apps/opentmpfiles/opentmpfiles-0.1.3-r1.ebuild
index a4bf9588891..b650b3c1134 100644
--- a/sys-apps/opentmpfiles/opentmpfiles-0.1.3-r1.ebuild
+++ b/sys-apps/opentmpfiles/opentmpfiles-0.1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 ~s390 ~sh ~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"
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 5399f5c659c..de4ada483ff 100644
--- a/sys-apps/opentmpfiles/opentmpfiles-0.1.3.ebuild
+++ b/sys-apps/opentmpfiles/opentmpfiles-0.1.3.ebuild
@@ -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 sh 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 c91a199340a..2530630d985 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 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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/opentmpfiles/opentmpfiles-9999.ebuild b/sys-apps/opentmpfiles/opentmpfiles-9999.ebuild
index 405b02bc738..1bdbb4ca414 100644
--- a/sys-apps/opentmpfiles/opentmpfiles-9999.ebuild
+++ b/sys-apps/opentmpfiles/opentmpfiles-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 ~s390 ~sh ~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"
fi
DESCRIPTION="A standalone utility to process systemd-style tmpfiles.d files"
diff --git a/sys-apps/paxctl/paxctl-0.7-r2.ebuild b/sys-apps/paxctl/paxctl-0.7-r2.ebuild
index 81c900164e3..508c72cbf5c 100644
--- a/sys-apps/paxctl/paxctl-0.7-r2.ebuild
+++ b/sys-apps/paxctl/paxctl-0.7-r2.ebuild
@@ -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.bz2"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
LICENSE="GPL-2"
SLOT="0"
diff --git a/sys-apps/paxctl/paxctl-0.8.ebuild b/sys-apps/paxctl/paxctl-0.8.ebuild
index d312a62fe96..6727771993f 100644
--- a/sys-apps/paxctl/paxctl-0.8.ebuild
+++ b/sys-apps/paxctl/paxctl-0.8.ebuild
@@ -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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE=""
LICENSE="GPL-2"
SLOT="0"
diff --git a/sys-apps/paxctl/paxctl-0.9.ebuild b/sys-apps/paxctl/paxctl-0.9.ebuild
index 3a0964c832d..8edf9b3f53f 100644
--- a/sys-apps/paxctl/paxctl-0.9.ebuild
+++ b/sys-apps/paxctl/paxctl-0.9.ebuild
@@ -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 sh 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 010634ababa..63012e1a00e 100644
--- a/sys-apps/pciutils/pciutils-3.5.6-r1.ebuild
+++ b/sys-apps/pciutils/pciutils-3.5.6-r1.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 sh 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.2-r1.ebuild b/sys-apps/pciutils/pciutils-3.6.2-r1.ebuild
index 6b4cfffa226..bab8c6b3195 100644
--- a/sys-apps/pciutils/pciutils-3.6.2-r1.ebuild
+++ b/sys-apps/pciutils/pciutils-3.6.2-r1.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 ~sh ~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.3.ebuild b/sys-apps/pciutils/pciutils-3.6.3.ebuild
index d7349d7b867..cc2e5824111 100644
--- a/sys-apps/pciutils/pciutils-3.6.3.ebuild
+++ b/sys-apps/pciutils/pciutils-3.6.3.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 ~sh ~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 d7349d7b867..cc2e5824111 100644
--- a/sys-apps/pciutils/pciutils-3.6.4.ebuild
+++ b/sys-apps/pciutils/pciutils-3.6.4.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 ~sh ~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/pcmciautils/pcmciautils-018_p8-r1.ebuild b/sys-apps/pcmciautils/pcmciautils-018_p8-r1.ebuild
index b5f7e994248..798f5715900 100644
--- a/sys-apps/pcmciautils/pcmciautils-018_p8-r1.ebuild
+++ b/sys-apps/pcmciautils/pcmciautils-018_p8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${MY_PV}.orig.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 arm ppc sh x86"
+KEYWORDS="amd64 arm ppc x86"
IUSE="debug staticsocket"
RDEPEND="virtual/modutils"
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.8.25-r1.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.8.25-r1.ebuild
index d4b4b46d057..fe8fc89e30c 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.8.25-r1.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.8.25-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.bz2"
# upstream.
LICENSE="BSD ISC MIT GPL-3+ GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
# This is called libusb so that it doesn't fool people in thinking that
# it is _required_ for USB support. Otherwise they'll disable udev and
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.8.26.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.8.26.ebuild
index e962566ef38..0cd633a0948 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.8.26.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.8.26.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.bz2"
# upstream.
LICENSE="BSD ISC MIT GPL-3+ GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
# This is called libusb so that it doesn't fool people in thinking that
# it is _required_ for USB support. Otherwise they'll disable udev and
diff --git a/sys-apps/pkgcore/pkgcore-0.10.11.ebuild b/sys-apps/pkgcore/pkgcore-0.10.11.ebuild
index fb6266da912..801f60a204e 100644
--- a/sys-apps/pkgcore/pkgcore-0.10.11.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.10.11.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
inherit git-r3
else
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
fi
diff --git a/sys-apps/pkgcore/pkgcore-9999.ebuild b/sys-apps/pkgcore/pkgcore-9999.ebuild
index fb6266da912..801f60a204e 100644
--- a/sys-apps/pkgcore/pkgcore-9999.ebuild
+++ b/sys-apps/pkgcore/pkgcore-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
inherit git-r3
else
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
fi
diff --git a/sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild b/sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild
index 5b47eedb2d2..2a8a6511ac6 100644
--- a/sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild
+++ b/sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild
@@ -11,7 +11,7 @@ S=${WORKDIR}/${P/_/-}
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
IUSE="crypt"
RDEPEND="
diff --git a/sys-apps/portage/portage-2.3.69.ebuild b/sys-apps/portage/portage-2.3.69.ebuild
index 2ccc4a89c02..49902cf1a58 100644
--- a/sys-apps/portage/portage-2.3.69.ebuild
+++ b/sys-apps/portage/portage-2.3.69.ebuild
@@ -13,7 +13,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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
SLOT="0"
IUSE="build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
diff --git a/sys-apps/portage/portage-2.3.89-r1.ebuild b/sys-apps/portage/portage-2.3.89-r1.ebuild
index 01603e07361..56ecbbc6bb9 100644
--- a/sys-apps/portage/portage-2.3.89-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.89-r1.ebuild
@@ -13,7 +13,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 sh 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-2.3.94.ebuild b/sys-apps/portage/portage-2.3.94.ebuild
index 1e0dc18322b..aa35e924a82 100644
--- a/sys-apps/portage/portage-2.3.94.ebuild
+++ b/sys-apps/portage/portage-2.3.94.ebuild
@@ -13,7 +13,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 ~sh ~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-2.3.95.ebuild b/sys-apps/portage/portage-2.3.95.ebuild
index 1e0dc18322b..aa35e924a82 100644
--- a/sys-apps/portage/portage-2.3.95.ebuild
+++ b/sys-apps/portage/portage-2.3.95.ebuild
@@ -13,7 +13,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 ~sh ~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-2.3.96-r1.ebuild b/sys-apps/portage/portage-2.3.96-r1.ebuild
index 3c6d08531c7..9267d9bd83e 100644
--- a/sys-apps/portage/portage-2.3.96-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.96-r1.ebuild
@@ -13,7 +13,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 ~sh ~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/rescan-scsi-bus/rescan-scsi-bus-1.57-r1.ebuild b/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.57-r1.ebuild
index 2a39aed8a3d..f4b75e59f36 100644
--- a/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.57-r1.ebuild
+++ b/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.57-r1.ebuild
@@ -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 ~sh 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/sandbox/sandbox-2.12.ebuild b/sys-apps/sandbox/sandbox-2.12.ebuild
index aa634d6f7be..d977c175e77 100644
--- a/sys-apps/sandbox/sandbox-2.12.ebuild
+++ b/sys-apps/sandbox/sandbox-2.12.ebuild
@@ -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 ~sh 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/sandbox/sandbox-2.13.ebuild b/sys-apps/sandbox/sandbox-2.13.ebuild
index 8eec394c5b8..3f4624d4ba8 100644
--- a/sys-apps/sandbox/sandbox-2.13.ebuild
+++ b/sys-apps/sandbox/sandbox-2.13.ebuild
@@ -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 sh 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/sandbox/sandbox-2.14.ebuild b/sys-apps/sandbox/sandbox-2.14.ebuild
index 412726e4b75..fbb175e5832 100644
--- a/sys-apps/sandbox/sandbox-2.14.ebuild
+++ b/sys-apps/sandbox/sandbox-2.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -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 ~sh ~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/sandbox/sandbox-2.15.ebuild b/sys-apps/sandbox/sandbox-2.15.ebuild
index 412726e4b75..fbb175e5832 100644
--- a/sys-apps/sandbox/sandbox-2.15.ebuild
+++ b/sys-apps/sandbox/sandbox-2.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -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 ~sh ~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/sandbox/sandbox-2.17.ebuild b/sys-apps/sandbox/sandbox-2.17.ebuild
index eb2a93af25c..4374f137b71 100644
--- a/sys-apps/sandbox/sandbox-2.17.ebuild
+++ b/sys-apps/sandbox/sandbox-2.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~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/sandbox/sandbox-2.18.ebuild b/sys-apps/sandbox/sandbox-2.18.ebuild
index 179163388c4..b8d0959d8ea 100644
--- a/sys-apps/sandbox/sandbox-2.18.ebuild
+++ b/sys-apps/sandbox/sandbox-2.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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/~slyfox/distfiles/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~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/sdparm/sdparm-1.10.ebuild b/sys-apps/sdparm/sdparm-1.10.ebuild
index 08b6a01be91..c8dca61c5b2 100644
--- a/sys-apps/sdparm/sdparm-1.10.ebuild
+++ b/sys-apps/sdparm/sdparm-1.10.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://sg.danny.cz/sg/p/${P}.tgz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
# Older releases contain a conflicting sas_disk_blink
diff --git a/sys-apps/sdparm/sdparm-1.11.ebuild b/sys-apps/sdparm/sdparm-1.11.ebuild
index 52318ece3a5..a78e56a4ff3 100644
--- a/sys-apps/sdparm/sdparm-1.11.ebuild
+++ b/sys-apps/sdparm/sdparm-1.11.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://sg.danny.cz/sg/p/${P}.tgz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE=""
# Older releases contain a conflicting sas_disk_blink
diff --git a/sys-apps/sed/sed-4.5.ebuild b/sys-apps/sed/sed-4.5.ebuild
index 2e5c67c6d5f..a71e56b1bf0 100644
--- a/sys-apps/sed/sed-4.5.ebuild
+++ b/sys-apps/sed/sed-4.5.ebuild
@@ -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 sh 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.7.ebuild b/sys-apps/sed/sed-4.7.ebuild
index 151b3627577..0ad5d3a4fa8 100644
--- a/sys-apps/sed/sed-4.7.ebuild
+++ b/sys-apps/sed/sed-4.7.ebuild
@@ -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 ~sh 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 20eb0d11292..66b31632c46 100644
--- a/sys-apps/sed/sed-4.8.ebuild
+++ b/sys-apps/sed/sed-4.8.ebuild
@@ -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 ~sh ~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 a63aeddef0f..455f2338bb9 100644
--- a/sys-apps/setserial/setserial-2.17-r5.ebuild
+++ b/sys-apps/setserial/setserial-2.17-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh 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/sg3_utils/sg3_utils-1.42.ebuild b/sys-apps/sg3_utils/sg3_utils-1.42.ebuild
index 722e2ce9304..86f6996e8a3 100644
--- a/sys-apps/sg3_utils/sg3_utils-1.42.ebuild
+++ b/sys-apps/sg3_utils/sg3_utils-1.42.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://sg.danny.cz/sg/p/${P}.tgz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="static-libs"
DEPEND="sys-devel/libtool"
diff --git a/sys-apps/sg3_utils/sg3_utils-1.44.ebuild b/sys-apps/sg3_utils/sg3_utils-1.44.ebuild
index ae865a592aa..f55011099d7 100644
--- a/sys-apps/sg3_utils/sg3_utils-1.44.ebuild
+++ b/sys-apps/sg3_utils/sg3_utils-1.44.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://sg.danny.cz/sg/p/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="static-libs"
DEPEND="sys-devel/libtool"
diff --git a/sys-apps/sg3_utils/sg3_utils-1.45-r1.ebuild b/sys-apps/sg3_utils/sg3_utils-1.45-r1.ebuild
index 8a91099271b..f5f7118c4ef 100644
--- a/sys-apps/sg3_utils/sg3_utils-1.45-r1.ebuild
+++ b/sys-apps/sg3_utils/sg3_utils-1.45-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://sg.danny.cz/sg/p/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="static-libs"
DEPEND="sys-devel/libtool"
diff --git a/sys-apps/shadow/shadow-4.6.ebuild b/sys-apps/shadow/shadow-4.6.ebuild
index d62faed1a9f..13d3510df05 100644
--- a/sys-apps/shadow/shadow-4.6.ebuild
+++ b/sys-apps/shadow/shadow-4.6.ebuild
@@ -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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
IUSE="acl audit +cracklib nls pam selinux skey split-usr 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/shadow/shadow-4.7-r2.ebuild b/sys-apps/shadow/shadow-4.7-r2.ebuild
index 1b8f45f3e2f..f30ee5ed23c 100644
--- a/sys-apps/shadow/shadow-4.7-r2.ebuild
+++ b/sys-apps/shadow/shadow-4.7-r2.ebuild
@@ -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 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="acl audit +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/shadow/shadow-4.8-r4.ebuild b/sys-apps/shadow/shadow-4.8-r4.ebuild
index d57ad90778d..887492b83ce 100644
--- a/sys-apps/shadow/shadow-4.8-r4.ebuild
+++ b/sys-apps/shadow/shadow-4.8-r4.ebuild
@@ -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 ~sh 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/shadow/shadow-4.8.1-r2.ebuild b/sys-apps/shadow/shadow-4.8.1-r2.ebuild
index 76252c06bed..956699aaf99 100644
--- a/sys-apps/shadow/shadow-4.8.1-r2.ebuild
+++ b/sys-apps/shadow/shadow-4.8.1-r2.ebuild
@@ -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 ~sh ~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.93.ebuild b/sys-apps/sysvinit/sysvinit-2.93.ebuild
index 0e94e5a614f..7131b060d4c 100644
--- a/sys-apps/sysvinit/sysvinit-2.93.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.93.ebuild
@@ -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 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE="selinux ibm static kernel_FreeBSD"
CDEPEND="
diff --git a/sys-apps/sysvinit/sysvinit-2.95-r1.ebuild b/sys-apps/sysvinit/sysvinit-2.95-r1.ebuild
index 6dd6484ee44..882813ce1d8 100644
--- a/sys-apps/sysvinit/sysvinit-2.95-r1.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.95-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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 ~sh ~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/sysvinit/sysvinit-2.96.ebuild b/sys-apps/sysvinit/sysvinit-2.96.ebuild
index 6dd6484ee44..882813ce1d8 100644
--- a/sys-apps/sysvinit/sysvinit-2.96.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.96.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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 ~sh ~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/tcp-wrappers/tcp-wrappers-7.6.28.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild
index 9cf5a630490..9f1c6516e5f 100644
--- a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild
+++ b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://ftp.porcupine.org/pub/security/${MY_P}.tar.gz
LICENSE="tcp_wrappers_license"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh 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 netgroups static-libs"
RDEPEND=""
diff --git a/sys-apps/texinfo/texinfo-6.6-r1.ebuild b/sys-apps/texinfo/texinfo-6.6-r1.ebuild
index 76be975837c..e8e013e2778 100644
--- a/sys-apps/texinfo/texinfo-6.6-r1.ebuild
+++ b/sys-apps/texinfo/texinfo-6.6-r1.ebuild
@@ -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 sh 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 3fb41fee741..df1e867f002 100644
--- a/sys-apps/texinfo/texinfo-6.7.ebuild
+++ b/sys-apps/texinfo/texinfo-6.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="nls +standalone static"
RDEPEND="
diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.94-r1.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.94-r1.ebuild
index 1eacdb41049..10f3c90cb76 100644
--- a/sys-apps/ucspi-ssl/ucspi-ssl-0.94-r1.ebuild
+++ b/sys-apps/ucspi-ssl/ucspi-ssl-0.94-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.fehcom.de/ipnet/ucspi-ssl/${P}.tgz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ppc ppc64 s390 sparc x86"
IUSE="perl"
DEPEND="
diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.97.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.97.ebuild
index 4aedc6d67c9..ca948ff4384 100644
--- a/sys-apps/ucspi-ssl/ucspi-ssl-0.97.ebuild
+++ b/sys-apps/ucspi-ssl/ucspi-ssl-0.97.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.fehcom.de/ipnet/ucspi-ssl/${P}.tgz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="perl"
DEPEND="
diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.98b.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.98b.ebuild
index b02355b0c47..aafef7060ff 100644
--- a/sys-apps/ucspi-ssl/ucspi-ssl-0.98b.ebuild
+++ b/sys-apps/ucspi-ssl/ucspi-ssl-0.98b.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.fehcom.de/ipnet/ucspi-ssl/${P}.tgz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="perl"
DEPEND="
diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.99.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.99.ebuild
index 2aecf246535..7d270cb39f7 100644
--- a/sys-apps/ucspi-ssl/ucspi-ssl-0.99.ebuild
+++ b/sys-apps/ucspi-ssl/ucspi-ssl-0.99.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.fehcom.de/ipnet/ucspi-ssl/${P}.tgz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="perl"
DEPEND="dev-libs/openssl:=
diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild
index 6e5ce201a11..50b5ef4f3c9 100644
--- a/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild
+++ b/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.fehcom.de/ipnet/ucspi-ssl/${P}.tgz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="bindist perl libressl"
DEPEND="libressl? ( dev-libs/libressl:0= )
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 e0582431e66..82fa9d1b571 100644
--- a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild
+++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm 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-009.ebuild b/sys-apps/usbutils/usbutils-009.ebuild
index 4b0c304ebe5..51e4dc50dfc 100644
--- a/sys-apps/usbutils/usbutils-009.ebuild
+++ b/sys-apps/usbutils/usbutils-009.ebuild
@@ -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 sh 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-010-r1.ebuild b/sys-apps/usbutils/usbutils-010-r1.ebuild
index 911395f9fef..d4942c55fc5 100644
--- a/sys-apps/usbutils/usbutils-010-r1.ebuild
+++ b/sys-apps/usbutils/usbutils-010-r1.ebuild
@@ -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 sh 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-012.ebuild b/sys-apps/usbutils/usbutils-012.ebuild
index b426a3157d3..7f1f23f3b16 100644
--- a/sys-apps/usbutils/usbutils-012.ebuild
+++ b/sys-apps/usbutils/usbutils-012.ebuild
@@ -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 ~sh ~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 3a15dcf1f76..5423f43fc21 100644
--- a/sys-apps/utempter/utempter-0.5.5.6.ebuild
+++ b/sys-apps/utempter/utempter-0.5.5.6.ebuild
@@ -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 sh 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 479dd486b00..8030b6f9872 100644
--- a/sys-apps/util-linux/util-linux-2.33.2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.33.2.ebuild
@@ -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 sh 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.34-r3.ebuild b/sys-apps/util-linux/util-linux-2.34-r3.ebuild
index 60611bb1505..92f5cc3aaa2 100644
--- a/sys-apps/util-linux/util-linux-2.34-r3.ebuild
+++ b/sys-apps/util-linux/util-linux-2.34-r3.ebuild
@@ -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 ~sh ~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.1.ebuild b/sys-apps/util-linux/util-linux-2.35.1.ebuild
index 6c0d78321cc..9153eb2da12 100644
--- a/sys-apps/util-linux/util-linux-2.35.1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.35.1.ebuild
@@ -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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~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.ebuild b/sys-apps/util-linux/util-linux-2.35.ebuild
index 07268ccec44..4505fc5a4b9 100644
--- a/sys-apps/util-linux/util-linux-2.35.ebuild
+++ b/sys-apps/util-linux/util-linux-2.35.ebuild
@@ -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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~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-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index 66feb7a972f..1e2105f4d53 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -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 ~sh ~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/watchdog/watchdog-5.15.ebuild b/sys-apps/watchdog/watchdog-5.15.ebuild
index 1907cbce3c0..88927995858 100644
--- a/sys-apps/watchdog/watchdog-5.15.ebuild
+++ b/sys-apps/watchdog/watchdog-5.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sparc x86"
IUSE="nfs"
RDEPEND="nfs? ( net-libs/libtirpc )"
diff --git a/sys-apps/which/which-2.21.ebuild b/sys-apps/which/which-2.21.ebuild
index aac86a2c22d..088d2515094 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
src_configure() {
diff --git a/sys-apps/xinetd/xinetd-2.3.15-r3.ebuild b/sys-apps/xinetd/xinetd-2.3.15-r3.ebuild
index 10fa6664577..c985df27040 100644
--- a/sys-apps/xinetd/xinetd-2.3.15-r3.ebuild
+++ b/sys-apps/xinetd/xinetd-2.3.15-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.xinetd.org/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="perl rpc tcpd"
DEPEND="tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )
diff --git a/sys-apps/xinetd/xinetd-2.3.15.3-r2.ebuild b/sys-apps/xinetd/xinetd-2.3.15.3-r2.ebuild
index 92bc834e7df..d5c268f31bb 100644
--- a/sys-apps/xinetd/xinetd-2.3.15.3-r2.ebuild
+++ b/sys-apps/xinetd/xinetd-2.3.15.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -11,7 +11,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 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="perl rpc selinux tcpd"
DEPEND="
diff --git a/sys-apps/xinetd/xinetd-2.3.15.3.ebuild b/sys-apps/xinetd/xinetd-2.3.15.3.ebuild
index 24a441fc9a8..da40b215b06 100644
--- a/sys-apps/xinetd/xinetd-2.3.15.3.ebuild
+++ b/sys-apps/xinetd/xinetd-2.3.15.3.ebuild
@@ -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 sh 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-apps/xinetd/xinetd-2.3.15.4.ebuild b/sys-apps/xinetd/xinetd-2.3.15.4.ebuild
index 73781412652..5cac335e332 100644
--- a/sys-apps/xinetd/xinetd-2.3.15.4.ebuild
+++ b/sys-apps/xinetd/xinetd-2.3.15.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -11,7 +11,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 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="perl rpc selinux tcpd"
DEPEND="
diff --git a/sys-auth/consolekit/consolekit-0.4.6.ebuild b/sys-auth/consolekit/consolekit-0.4.6.ebuild
index a10bcad769d..7b5321ef2aa 100644
--- a/sys-auth/consolekit/consolekit-0.4.6.ebuild
+++ b/sys-auth/consolekit/consolekit-0.4.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.freedesktop.org/software/${MY_PN}/dist/${MY_P}.tar.xz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="acl debug doc kernel_linux pam policykit selinux systemd-units test"
RESTRICT="!test? ( test )"
diff --git a/sys-auth/google-authenticator/google-authenticator-1.08.ebuild b/sys-auth/google-authenticator/google-authenticator-1.08.ebuild
index a087b7c5550..9e10ede621f 100644
--- a/sys-auth/google-authenticator/google-authenticator-1.08.ebuild
+++ b/sys-auth/google-authenticator/google-authenticator-1.08.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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/google/google-authenticator-libpam/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
S="${WORKDIR}/google-authenticator-libpam-${PV}"
fi
diff --git a/sys-auth/google-authenticator/google-authenticator-9999.ebuild b/sys-auth/google-authenticator/google-authenticator-9999.ebuild
index a087b7c5550..9e10ede621f 100644
--- a/sys-auth/google-authenticator/google-authenticator-9999.ebuild
+++ b/sys-auth/google-authenticator/google-authenticator-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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/google/google-authenticator-libpam/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
S="${WORKDIR}/google-authenticator-libpam-${PV}"
fi
diff --git a/sys-auth/pam_krb5/pam_krb5-4.6.ebuild b/sys-auth/pam_krb5/pam_krb5-4.6.ebuild
index 4ff33a03a31..14d8eba4c48 100644
--- a/sys-auth/pam_krb5/pam_krb5-4.6.ebuild
+++ b/sys-auth/pam_krb5/pam_krb5-4.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archives.eyrie.org/software/ARCHIVE/pam-krb5/pam-krb5-${PV}.tar
LICENSE="|| ( BSD-2 GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86"
IUSE=""
DEPEND="
diff --git a/sys-auth/pam_krb5/pam_krb5-4.7.ebuild b/sys-auth/pam_krb5/pam_krb5-4.7.ebuild
index 3f8d0f11039..2bebb433646 100644
--- a/sys-auth/pam_krb5/pam_krb5-4.7.ebuild
+++ b/sys-auth/pam_krb5/pam_krb5-4.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="https://archives.eyrie.org/software/ARCHIVE/pam-krb5/pam-krb5-${PV}.tar
LICENSE="|| ( BSD-2 GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
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 8c8d209cb31..e4c72b5b8ed 100644
--- a/sys-auth/pam_mktemp/pam_mktemp-1.1.1.ebuild
+++ b/sys-auth/pam_mktemp/pam_mktemp-1.1.1.ebuild
@@ -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 sh 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_passwdqc/pam_passwdqc-1.3.0.ebuild b/sys-auth/pam_passwdqc/pam_passwdqc-1.3.0.ebuild
index 95a8a32085a..1fa67800f14 100644
--- a/sys-auth/pam_passwdqc/pam_passwdqc-1.3.0.ebuild
+++ b/sys-auth/pam_passwdqc/pam_passwdqc-1.3.0.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="http://www.openwall.com/passwdqc/"
LICENSE="Openwall BSD public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
DEPEND="sys-auth/passwdqc[pam]"
RDEPEND="${DEPEND}"
diff --git a/sys-auth/pam_ssh/pam_ssh-2.3.ebuild b/sys-auth/pam_ssh/pam_ssh-2.3.ebuild
index 9e0521598ff..cc3e80446c2 100644
--- a/sys-auth/pam_ssh/pam_ssh-2.3.ebuild
+++ b/sys-auth/pam_ssh/pam_ssh-2.3.ebuild
@@ -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 s390 ~sh 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=""
# Only supports OpenSSH via `ssh-agent` #282993
diff --git a/sys-auth/pambase/pambase-20190402.ebuild b/sys-auth/pambase/pambase-20190402.ebuild
index c68735d9d42..d41471024f3 100644
--- a/sys-auth/pambase/pambase-20190402.ebuild
+++ b/sys-auth/pambase/pambase-20190402.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/gentoo/pambase/archive/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 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="consolekit +cracklib debug elogind minimal mktemp +nullok pam_krb5 pam_ssh passwdqc securetty selinux +sha512 systemd"
RESTRICT="binchecks"
diff --git a/sys-auth/pambase/pambase-20191128.ebuild b/sys-auth/pambase/pambase-20191128.ebuild
index 89fd6353aec..63a2fcc63a5 100644
--- a/sys-auth/pambase/pambase-20191128.ebuild
+++ b/sys-auth/pambase/pambase-20191128.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/gentoo/pambase/archive/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~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 consolekit +cracklib debug elogind minimal mktemp +nullok pam_krb5 pam_ssh passwdqc securetty selinux +sha512 systemd"
RESTRICT="binchecks"
diff --git a/sys-auth/pambase/pambase-20200304.ebuild b/sys-auth/pambase/pambase-20200304.ebuild
index dec07bfc81d..63a2fcc63a5 100644
--- a/sys-auth/pambase/pambase-20200304.ebuild
+++ b/sys-auth/pambase/pambase-20200304.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/gentoo/pambase/archive/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~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 consolekit +cracklib debug elogind minimal mktemp +nullok pam_krb5 pam_ssh passwdqc securetty selinux +sha512 systemd"
RESTRICT="binchecks"
diff --git a/sys-auth/passwdqc/passwdqc-1.3.0.ebuild b/sys-auth/passwdqc/passwdqc-1.3.0.ebuild
index 115ea58524c..d3e2b9ecd04 100644
--- a/sys-auth/passwdqc/passwdqc-1.3.0.ebuild
+++ b/sys-auth/passwdqc/passwdqc-1.3.0.ebuild
@@ -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 s390 sh 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 utils"
RDEPEND="
diff --git a/sys-auth/polkit/polkit-0.115-r4.ebuild b/sys-auth/polkit/polkit-0.115-r4.ebuild
index ba4313e9b6a..5eff5ffebac 100644
--- a/sys-auth/polkit/polkit-0.115-r4.ebuild
+++ b/sys-auth/polkit/polkit-0.115-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE="consolekit elogind examples gtk +introspection jit kde nls pam selinux systemd test"
RESTRICT="!test? ( test )"
diff --git a/sys-auth/polkit/polkit-0.116-r1.ebuild b/sys-auth/polkit/polkit-0.116-r1.ebuild
index 4de2acf495f..72517d8031e 100644
--- a/sys-auth/polkit/polkit-0.116-r1.ebuild
+++ b/sys-auth/polkit/polkit-0.116-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="consolekit elogind examples gtk +introspection jit kde nls pam selinux systemd test"
RESTRICT="!test? ( test )"
diff --git a/sys-auth/realtime-base/realtime-base-0.1.ebuild b/sys-auth/realtime-base/realtime-base-0.1.ebuild
index bdf5b778cea..c07d4538086 100644
--- a/sys-auth/realtime-base/realtime-base-0.1.ebuild
+++ b/sys-auth/realtime-base/realtime-base-0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86"
IUSE=""
DEPEND=""
diff --git a/sys-auth/rtkit/rtkit-0.11-r2.ebuild b/sys-auth/rtkit/rtkit-0.11-r2.ebuild
index 01562410aef..6aab4c1cf29 100644
--- a/sys-auth/rtkit/rtkit-0.11-r2.ebuild
+++ b/sys-auth/rtkit/rtkit-0.11-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://0pointer.de/public/${P}.tar.xz"
LICENSE="GPL-3 BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86"
IUSE=""
RDEPEND="
diff --git a/sys-auth/rtkit/rtkit-0.11-r3.ebuild b/sys-auth/rtkit/rtkit-0.11-r3.ebuild
index d11ce72f4f0..67b2970cb4e 100644
--- a/sys-auth/rtkit/rtkit-0.11-r3.ebuild
+++ b/sys-auth/rtkit/rtkit-0.11-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://0pointer.de/public/${P}.tar.xz"
LICENSE="GPL-3 BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
RDEPEND="acct-group/rtkit
diff --git a/sys-auth/rtkit/rtkit-0.12.ebuild b/sys-auth/rtkit/rtkit-0.12.ebuild
index 125517d132b..e37504af139 100644
--- a/sys-auth/rtkit/rtkit-0.12.ebuild
+++ b/sys-auth/rtkit/rtkit-0.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/heftig/${PN}/releases/download/v${PV}/${P}.tar.xz"
LICENSE="GPL-3 BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="systemd"
BDEPEND="virtual/pkgconfig"
diff --git a/sys-auth/skey/skey-1.1.5-r11.ebuild b/sys-auth/skey/skey-1.1.5-r11.ebuild
index b9084d0be4a..d87d796097e 100644
--- a/sys-auth/skey/skey-1.1.5-r11.ebuild
+++ b/sys-auth/skey/skey-1.1.5-r11.ebuild
@@ -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 ~sh 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-auth/sssd/sssd-1.16.3-r3.ebuild b/sys-auth/sssd/sssd-1.16.3-r3.ebuild
index bcfee45e6ab..a887a0cb720 100644
--- a/sys-auth/sssd/sssd-1.16.3-r3.ebuild
+++ b/sys-auth/sssd/sssd-1.16.3-r3.ebuild
@@ -8,7 +8,7 @@ inherit autotools flag-o-matic linux-info multilib-minimal pam systemd toolchain
DESCRIPTION="System Security Services Daemon provides access to identity and authentication"
HOMEPAGE="https://pagure.io/SSSD/sssd"
SRC_URI="http://releases.pagure.org/SSSD/${PN}/${P}.tar.gz"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
LICENSE="GPL-3"
SLOT="0"
diff --git a/sys-auth/sssd/sssd-2.1.0-r1.ebuild b/sys-auth/sssd/sssd-2.1.0-r1.ebuild
index 19224eba79a..98af8535a88 100644
--- a/sys-auth/sssd/sssd-2.1.0-r1.ebuild
+++ b/sys-auth/sssd/sssd-2.1.0-r1.ebuild
@@ -8,7 +8,7 @@ inherit autotools flag-o-matic linux-info multilib-minimal pam systemd toolchain
DESCRIPTION="System Security Services Daemon provides access to identity and authentication"
HOMEPAGE="https://pagure.io/SSSD/sssd"
SRC_URI="http://releases.pagure.org/SSSD/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
LICENSE="GPL-3"
SLOT="0"
diff --git a/sys-auth/sssd/sssd-2.2.0-r1.ebuild b/sys-auth/sssd/sssd-2.2.0-r1.ebuild
index 19224eba79a..98af8535a88 100644
--- a/sys-auth/sssd/sssd-2.2.0-r1.ebuild
+++ b/sys-auth/sssd/sssd-2.2.0-r1.ebuild
@@ -8,7 +8,7 @@ inherit autotools flag-o-matic linux-info multilib-minimal pam systemd toolchain
DESCRIPTION="System Security Services Daemon provides access to identity and authentication"
HOMEPAGE="https://pagure.io/SSSD/sssd"
SRC_URI="http://releases.pagure.org/SSSD/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
LICENSE="GPL-3"
SLOT="0"
diff --git a/sys-auth/sssd/sssd-2.2.2.ebuild b/sys-auth/sssd/sssd-2.2.2.ebuild
index 19224eba79a..98af8535a88 100644
--- a/sys-auth/sssd/sssd-2.2.2.ebuild
+++ b/sys-auth/sssd/sssd-2.2.2.ebuild
@@ -8,7 +8,7 @@ inherit autotools flag-o-matic linux-info multilib-minimal pam systemd toolchain
DESCRIPTION="System Security Services Daemon provides access to identity and authentication"
HOMEPAGE="https://pagure.io/SSSD/sssd"
SRC_URI="http://releases.pagure.org/SSSD/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
LICENSE="GPL-3"
SLOT="0"
diff --git a/sys-auth/sssd/sssd-2.2.3.ebuild b/sys-auth/sssd/sssd-2.2.3.ebuild
index 19224eba79a..98af8535a88 100644
--- a/sys-auth/sssd/sssd-2.2.3.ebuild
+++ b/sys-auth/sssd/sssd-2.2.3.ebuild
@@ -8,7 +8,7 @@ inherit autotools flag-o-matic linux-info multilib-minimal pam systemd toolchain
DESCRIPTION="System Security Services Daemon provides access to identity and authentication"
HOMEPAGE="https://pagure.io/SSSD/sssd"
SRC_URI="http://releases.pagure.org/SSSD/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
LICENSE="GPL-3"
SLOT="0"
diff --git a/sys-block/disktype/disktype-9.ebuild b/sys-block/disktype/disktype-9.ebuild
index 4df6283ed74..a24eae149a3 100644
--- a/sys-block/disktype/disktype-9.ebuild
+++ b/sys-block/disktype/disktype-9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=4
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/disktype/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 arm ppc sh sparc x86"
+KEYWORDS="amd64 arm ppc sparc x86"
IUSE=""
src_compile() {
diff --git a/sys-block/parted/parted-3.2-r1.ebuild b/sys-block/parted/parted-3.2-r1.ebuild
index e11c1718e0b..8e7e11cbad9 100644
--- a/sys-block/parted/parted-3.2-r1.ebuild
+++ b/sys-block/parted/parted-3.2-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="+debug device-mapper nls readline selinux static-libs"
RESTRICT="test"
diff --git a/sys-block/parted/parted-3.2_p23.ebuild b/sys-block/parted/parted-3.2_p23.ebuild
index 23b6fd869b5..c02bd5426f6 100644
--- a/sys-block/parted/parted-3.2_p23.ebuild
+++ b/sys-block/parted/parted-3.2_p23.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="+debug device-mapper nls readline selinux static-libs"
RESTRICT="test"
diff --git a/sys-block/parted/parted-3.2_p25.ebuild b/sys-block/parted/parted-3.2_p25.ebuild
index 4e4c2d823f4..fceabd18435 100644
--- a/sys-block/parted/parted-3.2_p25.ebuild
+++ b/sys-block/parted/parted-3.2_p25.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="+debug device-mapper nls readline selinux static-libs"
RESTRICT="test"
diff --git a/sys-block/parted/parted-3.3-r1.ebuild b/sys-block/parted/parted-3.3-r1.ebuild
index aa26a6fbc5b..20e7c295951 100644
--- a/sys-block/parted/parted-3.3-r1.ebuild
+++ b/sys-block/parted/parted-3.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="+debug device-mapper nls readline selinux static-libs"
RESTRICT="test"
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 cd40e9e4fa3..e918b5d7741 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
@@ -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 ~sh 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-block/thin-provisioning-tools/thin-provisioning-tools-0.7.6.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.6.ebuild
index 5804a752f1f..faad3397c9c 100644
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.6.ebuild
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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 ~sh ~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-block/thin-provisioning-tools/thin-provisioning-tools-0.8.3.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.8.3.ebuild
index 9cbdba2134a..172223fe821 100644
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.8.3.ebuild
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.8.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/jthornber/thin-provisioning-tools"
if [[ ${PV} != *9999 ]]; then
SRC_URI="https://github.com/jthornber/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
else
inherit git-r3
EGIT_REPO_URI='https://github.com/jthornber/thin-provisioning-tools.git'
diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.8.5.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.8.5.ebuild
index 690cc6877c7..a0281ec0a0b 100644
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.8.5.ebuild
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.8.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/jthornber/thin-provisioning-tools"
if [[ ${PV} != *9999 ]]; then
SRC_URI="https://github.com/jthornber/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
else
inherit git-r3
EGIT_REPO_URI='https://github.com/jthornber/thin-provisioning-tools.git'
diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild
index 9cbdba2134a..172223fe821 100644
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/jthornber/thin-provisioning-tools"
if [[ ${PV} != *9999 ]]; then
SRC_URI="https://github.com/jthornber/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
else
inherit git-r3
EGIT_REPO_URI='https://github.com/jthornber/thin-provisioning-tools.git'
diff --git a/sys-boot/shlilo-lantank/shlilo-lantank-20040408.ebuild b/sys-boot/shlilo-lantank/shlilo-lantank-20040408.ebuild
index 2226078e9a1..703fbdccaec 100644
--- a/sys-boot/shlilo-lantank/shlilo-lantank-20040408.ebuild
+++ b/sys-boot/shlilo-lantank/shlilo-lantank-20040408.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
LICENSE="GPL-2+ BSD"
SLOT="0"
-KEYWORDS="-* sh"
+KEYWORDS="-*"
IUSE=""
RESTRICT="strip"
diff --git a/sys-cluster/sanlock/sanlock-3.6.0.ebuild b/sys-cluster/sanlock/sanlock-3.6.0.ebuild
index 9158bc79f62..455c1532763 100644
--- a/sys-cluster/sanlock/sanlock-3.6.0.ebuild
+++ b/sys-cluster/sanlock/sanlock-3.6.0.ebuild
@@ -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 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE="python"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sys-cluster/sanlock/sanlock-3.8.0.ebuild b/sys-cluster/sanlock/sanlock-3.8.0.ebuild
index bdccb698195..5ef0911432c 100644
--- a/sys-cluster/sanlock/sanlock-3.8.0.ebuild
+++ b/sys-cluster/sanlock/sanlock-3.8.0.ebuild
@@ -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 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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 77da6d6841c..4878a032f6c 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 4afd97d7cbf..5229f079b74 100644
--- a/sys-devel/autoconf-archive/autoconf-archive-2019.01.06.ebuild
+++ b/sys-devel/autoconf-archive/autoconf-archive-2019.01.06.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 94a1c855113..309a1552dfb 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
S="${WORKDIR}"
diff --git a/sys-devel/autoconf/autoconf-2.13-r1.ebuild b/sys-devel/autoconf/autoconf-2.13-r1.ebuild
index 2e95a1fc1be..0def08fa7bb 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 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 a6daebf1232..eac4ea271b7 100644
--- a/sys-devel/autoconf/autoconf-2.64-r1.ebuild
+++ b/sys-devel/autoconf/autoconf-2.64-r1.ebuild
@@ -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 sh 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-r4.ebuild b/sys-devel/autoconf/autoconf-2.69-r4.ebuild
index c70a9705858..5c54db43bda 100644
--- a/sys-devel/autoconf/autoconf-2.69-r4.ebuild
+++ b/sys-devel/autoconf/autoconf-2.69-r4.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
else
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
inherit toolchain-autoconf
diff --git a/sys-devel/autoconf/autoconf-2.69-r5.ebuild b/sys-devel/autoconf/autoconf-2.69-r5.ebuild
index 190228a8696..7694eca770a 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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
inherit toolchain-autoconf
diff --git a/sys-devel/autoconf/autoconf-9999.ebuild b/sys-devel/autoconf/autoconf-9999.ebuild
index 22cc7e63dcd..155a08e8f7a 100644
--- a/sys-devel/autoconf/autoconf-9999.ebuild
+++ b/sys-devel/autoconf/autoconf-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
else
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-linux"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
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 57e03872d85..2ed66d4579d 100644
--- a/sys-devel/autogen/autogen-5.18.16-r1.ebuild
+++ b/sys-devel/autogen/autogen-5.18.16-r1.ebuild
@@ -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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="libopts static-libs"
RDEPEND=">=dev-scheme/guile-2.0:=
diff --git a/sys-devel/autogen/autogen-5.18.16.ebuild b/sys-devel/autogen/autogen-5.18.16.ebuild
index 6dadf34a218..f75fb0c086f 100644
--- a/sys-devel/autogen/autogen-5.18.16.ebuild
+++ b/sys-devel/autogen/autogen-5.18.16.ebuild
@@ -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 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="libopts static-libs"
RDEPEND=">=dev-scheme/guile-2.0:=
diff --git a/sys-devel/automake-wrapper/automake-wrapper-10.ebuild b/sys-devel/automake-wrapper/automake-wrapper-10.ebuild
index 6f74f32cb99..69b76d5d4ba 100644
--- a/sys-devel/automake-wrapper/automake-wrapper-10.ebuild
+++ b/sys-devel/automake-wrapper/automake-wrapper-10.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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
S=${WORKDIR}
diff --git a/sys-devel/automake-wrapper/automake-wrapper-11.ebuild b/sys-devel/automake-wrapper/automake-wrapper-11.ebuild
index 61876131a8d..c893c7d6a62 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 bdd8de5ea1d..b4ad82063a7 100644
--- a/sys-devel/automake/automake-1.10.3-r3.ebuild
+++ b/sys-devel/automake/automake-1.10.3-r3.ebuild
@@ -13,7 +13,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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/sys-devel/automake/automake-1.11.6-r3.ebuild b/sys-devel/automake/automake-1.11.6-r3.ebuild
index 34609c5553f..7e42c9231ea 100644
--- a/sys-devel/automake/automake-1.11.6-r3.ebuild
+++ b/sys-devel/automake/automake-1.11.6-r3.ebuild
@@ -13,7 +13,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 sh 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/sys-devel/automake/automake-1.12.6-r2.ebuild b/sys-devel/automake/automake-1.12.6-r2.ebuild
index 4dffe576f56..92bf4418134 100644
--- a/sys-devel/automake/automake-1.12.6-r2.ebuild
+++ b/sys-devel/automake/automake-1.12.6-r2.ebuild
@@ -13,7 +13,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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/sys-devel/automake/automake-1.13.4-r2.ebuild b/sys-devel/automake/automake-1.13.4-r2.ebuild
index 7f0cdd6e98f..93cb0abd529 100644
--- a/sys-devel/automake/automake-1.13.4-r2.ebuild
+++ b/sys-devel/automake/automake-1.13.4-r2.ebuild
@@ -13,7 +13,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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/sys-devel/automake/automake-1.14.1-r2.ebuild b/sys-devel/automake/automake-1.14.1-r2.ebuild
index 9ec6d887711..2f1a87cefe1 100644
--- a/sys-devel/automake/automake-1.14.1-r2.ebuild
+++ b/sys-devel/automake/automake-1.14.1-r2.ebuild
@@ -24,7 +24,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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/sys-devel/automake/automake-1.15.1-r2.ebuild b/sys-devel/automake/automake-1.15.1-r2.ebuild
index fcd8d2e092d..9861a2837a6 100644
--- a/sys-devel/automake/automake-1.15.1-r2.ebuild
+++ b/sys-devel/automake/automake-1.15.1-r2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then
inherit git-r3
else
- KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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.1-r1.ebuild b/sys-devel/automake/automake-1.16.1-r1.ebuild
index 681f16a302b..218e326c2c3 100644
--- a/sys-devel/automake/automake-1.16.1-r1.ebuild
+++ b/sys-devel/automake/automake-1.16.1-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then
inherit git-r3
else
- KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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.1-r2.ebuild b/sys-devel/automake/automake-1.16.1-r2.ebuild
index 47c426b024c..e66657f4e19 100644
--- a/sys-devel/automake/automake-1.16.1-r2.ebuild
+++ b/sys-devel/automake/automake-1.16.1-r2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then
inherit git-r3
else
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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.ebuild b/sys-devel/automake/automake-1.16.2.ebuild
index eec850ff724..fc05add3e37 100644
--- a/sys-devel/automake/automake-1.16.2.ebuild
+++ b/sys-devel/automake/automake-1.16.2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then
inherit git-r3
else
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 af9ad342bda..d656b78215d 100644
--- a/sys-devel/automake/automake-1.4_p6-r2.ebuild
+++ b/sys-devel/automake/automake-1.4_p6-r2.ebuild
@@ -13,7 +13,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 sh 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 d429eaa2bc4..8f639f27cde 100644
--- a/sys-devel/automake/automake-1.5-r2.ebuild
+++ b/sys-devel/automake/automake-1.5-r2.ebuild
@@ -12,7 +12,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 sh 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 a76e625d0ec..6880a2d57bc 100644
--- a/sys-devel/automake/automake-1.6.3-r2.ebuild
+++ b/sys-devel/automake/automake-1.6.3-r2.ebuild
@@ -12,7 +12,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 sh 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 cd38a07287e..6f575f135de 100644
--- a/sys-devel/automake/automake-1.7.9-r3.ebuild
+++ b/sys-devel/automake/automake-1.7.9-r3.ebuild
@@ -12,7 +12,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 sh 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 f1310fa4ad9..a64217092d7 100644
--- a/sys-devel/automake/automake-1.8.5-r5.ebuild
+++ b/sys-devel/automake/automake-1.8.5-r5.ebuild
@@ -12,7 +12,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 sh 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 d56283717d4..43c387b6190 100644
--- a/sys-devel/automake/automake-1.9.6-r5.ebuild
+++ b/sys-devel/automake/automake-1.9.6-r5.ebuild
@@ -13,7 +13,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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/sys-devel/automake/automake-9999.ebuild b/sys-devel/automake/automake-9999.ebuild
index eec850ff724..fc05add3e37 100644
--- a/sys-devel/automake/automake-9999.ebuild
+++ b/sys-devel/automake/automake-9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then
inherit git-r3
else
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
if [[ ${PV/_beta} == ${PV} ]]; then
MY_P="${P}"
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
diff --git a/sys-devel/bc/bc-1.06.95-r2.ebuild b/sys-devel/bc/bc-1.06.95-r2.ebuild
index 984899c25d5..3016efe8aba 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="mirror://gnu-alpha/bc/${P}.tar.bz2
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 33e7244ef02..7dbe77693f6 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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="libedit readline static"
RDEPEND="
diff --git a/sys-devel/binutils-config/binutils-config-5.1-r1.ebuild b/sys-devel/binutils-config/binutils-config-5.1-r1.ebuild
index d124f18c027..8ac4f07789f 100644
--- a/sys-devel/binutils-config/binutils-config-5.1-r1.ebuild
+++ b/sys-devel/binutils-config/binutils-config-5.1-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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
IUSE=""
# We also RDEPEND on sys-apps/findutils which is in base @system
diff --git a/sys-devel/binutils-config/binutils-config-5.2.ebuild b/sys-devel/binutils-config/binutils-config-5.2.ebuild
index f06a03d1369..a94c800a604 100644
--- a/sys-devel/binutils-config/binutils-config-5.2.ebuild
+++ b/sys-devel/binutils-config/binutils-config-5.2.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 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
IUSE=""
# We also RDEPEND on sys-apps/findutils which is in base @system
diff --git a/sys-devel/binutils/binutils-2.32-r1.ebuild b/sys-devel/binutils/binutils-2.32-r1.ebuild
index a97a41e7845..2d2feb64357 100644
--- a/sys-devel/binutils/binutils-2.32-r1.ebuild
+++ b/sys-devel/binutils/binutils-2.32-r1.ebuild
@@ -45,7 +45,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 sh 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.32-r2.ebuild b/sys-devel/binutils/binutils-2.32-r2.ebuild
index 0242f709569..cf99b9f8608 100644
--- a/sys-devel/binutils/binutils-2.32-r2.ebuild
+++ b/sys-devel/binutils/binutils-2.32-r2.ebuild
@@ -42,7 +42,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 ~sh ~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 5a6771f28b6..816185fad9b 100644
--- a/sys-devel/binutils/binutils-2.33.1-r1.ebuild
+++ b/sys-devel/binutils/binutils-2.33.1-r1.ebuild
@@ -42,7 +42,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 ~sh 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.ebuild b/sys-devel/binutils/binutils-2.34.ebuild
index c4909daf1c2..805c709df2a 100644
--- a/sys-devel/binutils/binutils-2.34.ebuild
+++ b/sys-devel/binutils/binutils-2.34.ebuild
@@ -42,7 +42,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 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
;;
esac
diff --git a/sys-devel/bison/bison-3.1.ebuild b/sys-devel/bison/bison-3.1.ebuild
index 862b16ed7c7..c110383913b 100644
--- a/sys-devel/bison/bison-3.1.ebuild
+++ b/sys-devel/bison/bison-3.1.ebuild
@@ -12,7 +12,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 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="examples nls static test"
RESTRICT="!test? ( test )"
diff --git a/sys-devel/bison/bison-3.3.2.ebuild b/sys-devel/bison/bison-3.3.2.ebuild
index 1c864d8b237..a936a5c81de 100644
--- a/sys-devel/bison/bison-3.3.2.ebuild
+++ b/sys-devel/bison/bison-3.3.2.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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="examples nls static test"
RESTRICT="!test? ( test )"
diff --git a/sys-devel/bison/bison-3.4.2.ebuild b/sys-devel/bison/bison-3.4.2.ebuild
index 55c19a6514d..8d0a6041d05 100644
--- a/sys-devel/bison/bison-3.4.2.ebuild
+++ b/sys-devel/bison/bison-3.4.2.ebuild
@@ -16,7 +16,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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="examples nls static test"
RESTRICT="!test? ( test )"
diff --git a/sys-devel/bison/bison-3.5.2.ebuild b/sys-devel/bison/bison-3.5.2.ebuild
index 6c9a25cfeca..f2977ccb4e9 100644
--- a/sys-devel/bison/bison-3.5.2.ebuild
+++ b/sys-devel/bison/bison-3.5.2.ebuild
@@ -16,7 +16,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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="examples nls static test"
RESTRICT="!test? ( test )"
diff --git a/sys-devel/bison/bison-3.5.3.ebuild b/sys-devel/bison/bison-3.5.3.ebuild
index 6c9a25cfeca..f2977ccb4e9 100644
--- a/sys-devel/bison/bison-3.5.3.ebuild
+++ b/sys-devel/bison/bison-3.5.3.ebuild
@@ -16,7 +16,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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="examples nls static test"
RESTRICT="!test? ( test )"
diff --git a/sys-devel/crossdev/crossdev-20200125.ebuild b/sys-devel/crossdev/crossdev-20200125.ebuild
index 8f6b8bd4866..357acbfd38e 100644
--- a/sys-devel/crossdev/crossdev-20200125.ebuild
+++ b/sys-devel/crossdev/crossdev-20200125.ebuild
@@ -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 sh 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/crossdev/crossdev-20200131.ebuild b/sys-devel/crossdev/crossdev-20200131.ebuild
index e37579ff62f..80947886394 100644
--- a/sys-devel/crossdev/crossdev-20200131.ebuild
+++ b/sys-devel/crossdev/crossdev-20200131.ebuild
@@ -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 ~sh ~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/crossdev/crossdev-99999999.ebuild b/sys-devel/crossdev/crossdev-99999999.ebuild
index b9ef8900b80..c2897f17972 100644
--- a/sys-devel/crossdev/crossdev-99999999.ebuild
+++ b/sys-devel/crossdev/crossdev-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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 ~sh ~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-r1.ebuild b/sys-devel/distcc/distcc-3.3.3-r1.ebuild
index 64a80a215ec..5b055f4b13e 100644
--- a/sys-devel/distcc/distcc-3.3.3-r1.ebuild
+++ b/sys-devel/distcc/distcc-3.3.3-r1.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 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
IUSE="gnome gssapi gtk hardened ipv6 selinux xinetd zeroconf"
RESTRICT="test"
diff --git a/sys-devel/flex/flex-2.6.1.ebuild b/sys-devel/flex/flex-2.6.1.ebuild
index d3b1aa4e85e..66da477dbb5 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 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="nls static test"
RESTRICT="!test? ( test )"
diff --git a/sys-devel/flex/flex-2.6.3-r1.ebuild b/sys-devel/flex/flex-2.6.3-r1.ebuild
index be6acefa30b..845ab457766 100644
--- a/sys-devel/flex/flex-2.6.3-r1.ebuild
+++ b/sys-devel/flex/flex-2.6.3-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 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="nls static test"
RESTRICT="!test? ( test )"
diff --git a/sys-devel/flex/flex-2.6.3.ebuild b/sys-devel/flex/flex-2.6.3.ebuild
index f2a60b83bbe..8cc2ec6deb0 100644
--- a/sys-devel/flex/flex-2.6.3.ebuild
+++ b/sys-devel/flex/flex-2.6.3.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 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 1357a7c0cd2..3e376e44e65 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="nls static test"
RESTRICT="!test? ( test )"
diff --git a/sys-devel/flex/flex-2.6.4.ebuild b/sys-devel/flex/flex-2.6.4.ebuild
index 8f61cd8ee37..51d7ff1d293 100644
--- a/sys-devel/flex/flex-2.6.4.ebuild
+++ b/sys-devel/flex/flex-2.6.4.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 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="nls static test"
RESTRICT="!test? ( test )"
diff --git a/sys-devel/gcc-config/gcc-config-2.1.ebuild b/sys-devel/gcc-config/gcc-config-2.1.ebuild
index 96b1f1393f8..8de3d0c2695 100644
--- a/sys-devel/gcc-config/gcc-config-2.1.ebuild
+++ b/sys-devel/gcc-config/gcc-config-2.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; 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 sh 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.2.1.ebuild b/sys-devel/gcc-config/gcc-config-2.2.1.ebuild
index dc534ed0b1f..51af50911b8 100644
--- a/sys-devel/gcc-config/gcc-config-2.2.1.ebuild
+++ b/sys-devel/gcc-config/gcc-config-2.2.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; 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 sh 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-9999.ebuild b/sys-devel/gcc-config/gcc-config-9999.ebuild
index f79e8cf5bc7..c27a2a1f2a8 100644
--- a/sys-devel/gcc-config/gcc-config-9999.ebuild
+++ b/sys-devel/gcc-config/gcc-config-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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="mirror://gentoo/${P}.tar.xz
https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
fi
DESCRIPTION="Utility to manage compilers"
diff --git a/sys-devel/gcc/gcc-3.4.6-r5.ebuild b/sys-devel/gcc/gcc-3.4.6-r5.ebuild
index ac91373ace7..0357792e1a4 100644
--- a/sys-devel/gcc/gcc-3.4.6-r5.ebuild
+++ b/sys-devel/gcc/gcc-3.4.6-r5.ebuild
@@ -12,7 +12,7 @@ D_VER="0.24"
inherit eutils toolchain toolchain-funcs
-KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
# we need a proper glibc version for the Scrt1.o provided to the pie-ssp specs
# NOTE: we SHOULD be using at least binutils 2.15.90.0.1 everywhere for proper
diff --git a/sys-devel/gcc/gcc-4.1.2-r2.ebuild b/sys-devel/gcc/gcc-4.1.2-r2.ebuild
index 439973da5a9..43ffaf10312 100644
--- a/sys-devel/gcc/gcc-4.1.2-r2.ebuild
+++ b/sys-devel/gcc/gcc-4.1.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -9,7 +9,7 @@ D_VER="0.24"
inherit eutils toolchain
-KEYWORDS="-* ~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="-* ~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
RDEPEND=""
DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.3.6-r4.ebuild b/sys-devel/gcc/gcc-4.3.6-r4.ebuild
index fbb4b15a052..fc9bca983e4 100644
--- a/sys-devel/gcc/gcc-4.3.6-r4.ebuild
+++ b/sys-devel/gcc/gcc-4.3.6-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -8,7 +8,7 @@ UCLIBC_VER="1.0"
inherit toolchain
-KEYWORDS="~alpha ~amd64 ~arm -hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm -hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
RDEPEND=""
DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.4.7-r3.ebuild b/sys-devel/gcc/gcc-4.4.7-r3.ebuild
index 75b290303ee..52dfcf6ac1d 100644
--- a/sys-devel/gcc/gcc-4.4.7-r3.ebuild
+++ b/sys-devel/gcc/gcc-4.4.7-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -8,7 +8,7 @@ UCLIBC_VER="1.0"
inherit eutils toolchain
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
RDEPEND=""
DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.5.4-r3.ebuild b/sys-devel/gcc/gcc-4.5.4-r3.ebuild
index 29074def7cf..9c67148b0b4 100644
--- a/sys-devel/gcc/gcc-4.5.4-r3.ebuild
+++ b/sys-devel/gcc/gcc-4.5.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -8,7 +8,7 @@ UCLIBC_VER="1.0"
inherit eutils toolchain
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
RDEPEND=""
DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.6.4-r3.ebuild b/sys-devel/gcc/gcc-4.6.4-r3.ebuild
index 2ec6905d63c..a8e9019da81 100644
--- a/sys-devel/gcc/gcc-4.6.4-r3.ebuild
+++ b/sys-devel/gcc/gcc-4.6.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -8,7 +8,7 @@ UCLIBC_VER="1.0"
inherit eutils toolchain
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
RDEPEND=""
DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.7.4-r3.ebuild b/sys-devel/gcc/gcc-4.7.4-r3.ebuild
index 06c6d69ad26..adda46087cd 100644
--- a/sys-devel/gcc/gcc-4.7.4-r3.ebuild
+++ b/sys-devel/gcc/gcc-4.7.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -21,7 +21,7 @@ SSP_UCLIBC_STABLE="x86 amd64 ppc ppc64 arm"
inherit eutils toolchain
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
RDEPEND=""
DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.8.5-r3.ebuild b/sys-devel/gcc/gcc-4.8.5-r3.ebuild
index 4c11d5d3918..e446dbb082a 100644
--- a/sys-devel/gcc/gcc-4.8.5-r3.ebuild
+++ b/sys-devel/gcc/gcc-4.8.5-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -21,7 +21,7 @@ SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
inherit eutils toolchain
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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-4.9.4-r1.ebuild b/sys-devel/gcc/gcc-4.9.4-r1.ebuild
index a1f1723df03..7113d1a7160 100644
--- a/sys-devel/gcc/gcc-4.9.4-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.9.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -21,7 +21,7 @@ SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
inherit eutils toolchain
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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-5.5.0.ebuild b/sys-devel/gcc/gcc-5.5.0.ebuild
index 629e831d74a..946792672fb 100644
--- a/sys-devel/gcc/gcc-5.5.0.ebuild
+++ b/sys-devel/gcc/gcc-5.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -21,7 +21,7 @@ SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
inherit toolchain
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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-6.5.0-r1.ebuild b/sys-devel/gcc/gcc-6.5.0-r1.ebuild
index 013df482995..19a803b55ff 100644
--- a/sys-devel/gcc/gcc-6.5.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-6.5.0-r1.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="3"
inherit toolchain
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 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.4.0-r2.ebuild b/sys-devel/gcc/gcc-7.4.0-r2.ebuild
index 6a2a19d998d..61e76b1a11e 100644
--- a/sys-devel/gcc/gcc-7.4.0-r2.ebuild
+++ b/sys-devel/gcc/gcc-7.4.0-r2.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="1.2"
inherit toolchain
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 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-7.5.0.ebuild b/sys-devel/gcc/gcc-7.5.0.ebuild
index 442f3cbb1e6..0b0e96d9b73 100644
--- a/sys-devel/gcc/gcc-7.5.0.ebuild
+++ b/sys-devel/gcc/gcc-7.5.0.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="2"
inherit toolchain
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 sh 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.3.0-r1.ebuild b/sys-devel/gcc/gcc-8.3.0-r1.ebuild
index 2209d7327b7..66a0cbce791 100644
--- a/sys-devel/gcc/gcc-8.3.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-8.3.0-r1.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="1.1"
inherit toolchain
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 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.3.0-r3.ebuild b/sys-devel/gcc/gcc-8.3.0-r3.ebuild
index 5ac907e0fbe..26edefd5142 100644
--- a/sys-devel/gcc/gcc-8.3.0-r3.ebuild
+++ b/sys-devel/gcc/gcc-8.3.0-r3.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="3"
inherit toolchain
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sh 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.ebuild b/sys-devel/gcc/gcc-8.4.0.ebuild
index ecdde41c0bc..e4e2688066e 100644
--- a/sys-devel/gcc/gcc-8.4.0.ebuild
+++ b/sys-devel/gcc/gcc-8.4.0.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="1"
inherit toolchain
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~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.2.0-r2.ebuild b/sys-devel/gcc/gcc-9.2.0-r2.ebuild
index 97327a27655..29fae6066a6 100644
--- a/sys-devel/gcc/gcc-9.2.0-r2.ebuild
+++ b/sys-devel/gcc/gcc-9.2.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 ~sh 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.2.0-r3.ebuild b/sys-devel/gcc/gcc-9.2.0-r3.ebuild
index 807cdd974ba..b1ae22cf7f4 100644
--- a/sys-devel/gcc/gcc-9.2.0-r3.ebuild
+++ b/sys-devel/gcc/gcc-9.2.0-r3.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="4"
inherit toolchain
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~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.2.0-r4.ebuild b/sys-devel/gcc/gcc-9.2.0-r4.ebuild
index b4fc3ebfcce..c5057f857b7 100644
--- a/sys-devel/gcc/gcc-9.2.0-r4.ebuild
+++ b/sys-devel/gcc/gcc-9.2.0-r4.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="6"
inherit toolchain
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~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.ebuild b/sys-devel/gcc/gcc-9.3.0.ebuild
index ecdde41c0bc..e4e2688066e 100644
--- a/sys-devel/gcc/gcc-9.3.0.ebuild
+++ b/sys-devel/gcc/gcc-9.3.0.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="1"
inherit toolchain
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~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-8.3.1-r1.ebuild b/sys-devel/gdb/gdb-8.3.1-r1.ebuild
index 61a550b1cec..2d2ec2e6952 100644
--- a/sys-devel/gdb/gdb-8.3.1-r1.ebuild
+++ b/sys-devel/gdb/gdb-8.3.1-r1.ebuild
@@ -45,7 +45,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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-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-aix ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
IUSE="+client lzma multitarget nls +python +server source-highlight test vanilla xml"
REQUIRED_USE="
diff --git a/sys-devel/gdb/gdb-8.3.1.ebuild b/sys-devel/gdb/gdb-8.3.1.ebuild
index 38a8945f038..ac1ce8d7b8e 100644
--- a/sys-devel/gdb/gdb-8.3.1.ebuild
+++ b/sys-devel/gdb/gdb-8.3.1.ebuild
@@ -46,7 +46,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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-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-aix ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
IUSE="+client lzma multitarget nls +python +server source-highlight test vanilla xml"
REQUIRED_USE="
diff --git a/sys-devel/gdb/gdb-9.1.ebuild b/sys-devel/gdb/gdb-9.1.ebuild
index 4142a5f19f3..25d315a975f 100644
--- a/sys-devel/gdb/gdb-9.1.ebuild
+++ b/sys-devel/gdb/gdb-9.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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-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-aix ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
IUSE="+client lzma multitarget nls +python +server source-highlight test vanilla xml xxhash"
REQUIRED_USE="
diff --git a/sys-devel/gdb/gdb-9999.ebuild b/sys-devel/gdb/gdb-9999.ebuild
index 9eeecb75885..9e181d9e64b 100644
--- a/sys-devel/gdb/gdb-9999.ebuild
+++ b/sys-devel/gdb/gdb-9999.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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-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-aix ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
IUSE="+client lzma multitarget nls +python +server source-highlight test vanilla xml xxhash"
REQUIRED_USE="
diff --git a/sys-devel/gettext/gettext-0.20.1.ebuild b/sys-devel/gettext/gettext-0.20.1.ebuild
index 8bea4b979fc..70b1700907f 100644
--- a/sys-devel/gettext/gettext-0.20.1.ebuild
+++ b/sys-devel/gettext/gettext-0.20.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
# so put that license behind USE=cxx.
LICENSE="GPL-3+ cxx? ( LGPL-2.1+ )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
IUSE="acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs"
# only runtime goes multilib
diff --git a/sys-devel/gettext/gettext-0.21_rc1.ebuild b/sys-devel/gettext/gettext-0.21_rc1.ebuild
index 286653708ac..5904f3a059c 100644
--- a/sys-devel/gettext/gettext-0.21_rc1.ebuild
+++ b/sys-devel/gettext/gettext-0.21_rc1.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 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
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-20190912.ebuild b/sys-devel/gnuconfig/gnuconfig-20190912.ebuild
index 9a1ccd61f36..e5dbd8fa7ef 100644
--- a/sys-devel/gnuconfig/gnuconfig-20190912.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-20190912.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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
S="${WORKDIR}"
fi
diff --git a/sys-devel/gnuconfig/gnuconfig-99999999.ebuild b/sys-devel/gnuconfig/gnuconfig-99999999.ebuild
index 5d49b8940d9..7eb2a8392c5 100644
--- a/sys-devel/gnuconfig/gnuconfig-99999999.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
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 d6c57a67a5a..d23ceb4befa 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
fi
DESCRIPTION="A shared library tool for developers"
diff --git a/sys-devel/libtool/libtool-9999.ebuild b/sys-devel/libtool/libtool-9999.ebuild
index a929635d35d..edb5530b280 100644
--- a/sys-devel/libtool/libtool-9999.ebuild
+++ b/sys-devel/libtool/libtool-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
fi
DESCRIPTION="A shared library tool for developers"
diff --git a/sys-devel/m4/m4-1.4.17.ebuild b/sys-devel/m4/m4-1.4.17.ebuild
index f631b9bb591..305e3734f9d 100644
--- a/sys-devel/m4/m4-1.4.17.ebuild
+++ b/sys-devel/m4/m4-1.4.17.ebuild
@@ -11,7 +11,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 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="examples"
# remember: cannot dep on autoconf since it needs us
diff --git a/sys-devel/m4/m4-1.4.18-r1.ebuild b/sys-devel/m4/m4-1.4.18-r1.ebuild
index e66cc931ab4..07872f38206 100644
--- a/sys-devel/m4/m4-1.4.18-r1.ebuild
+++ b/sys-devel/m4/m4-1.4.18-r1.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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 9b1456665f0..a1ef4a12e1c 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 e15a331d242..08f05795abe 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="mirror://gnu-alpha//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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 ed5ef83af67..e8c6e8690ab 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static test xattr"
RESTRICT="!test? ( test )"
diff --git a/sys-devel/remake/remake-4.2.1.1.4-r1.ebuild b/sys-devel/remake/remake-4.2.1.1.4-r1.ebuild
index 41c67840755..16971ea8179 100644
--- a/sys-devel/remake/remake-4.2.1.1.4-r1.ebuild
+++ b/sys-devel/remake/remake-4.2.1.1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/bashdb/${MY_P}.tar.bz2"
LICENSE="GPL-1"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sparc x86"
IUSE="guile readline"
RDEPEND="readline? ( sys-libs/readline:0= )
diff --git a/sys-devel/smatch/smatch-1.60.ebuild b/sys-devel/smatch/smatch-1.60.ebuild
index ad8cb599056..e8505ae64d2 100644
--- a/sys-devel/smatch/smatch-1.60.ebuild
+++ b/sys-devel/smatch/smatch-1.60.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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="http://repo.or.cz/w/smatch.git/snapshot/${PV}.tar.gz -> ${P}.tar.gz
mirror://gentoo/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
S=${WORKDIR}/${PN}
fi
diff --git a/sys-devel/smatch/smatch-9999.ebuild b/sys-devel/smatch/smatch-9999.ebuild
index 7d4f2ee5897..4e3cca48e99 100644
--- a/sys-devel/smatch/smatch-9999.ebuild
+++ b/sys-devel/smatch/smatch-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
else
SRC_URI="http://repo.or.cz/w/smatch.git/snapshot/${PV}.tar.gz -> ${P}.tar.gz
mirror://gentoo/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
S=${WORKDIR}/${PN}
fi
diff --git a/sys-devel/sparse/sparse-0.5.1.ebuild b/sys-devel/sparse/sparse-0.5.1.ebuild
index 42e03465b17..45819e26886 100644
--- a/sys-devel/sparse/sparse-0.5.1.ebuild
+++ b/sys-devel/sparse/sparse-0.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
KEYWORDS=""
else
SRC_URI="https://www.kernel.org/pub/software/devel/${PN}/dist/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
fi
LICENSE="MIT"
diff --git a/sys-devel/sparse/sparse-0.5.2_rc1.ebuild b/sys-devel/sparse/sparse-0.5.2_rc1.ebuild
index 345c634dc18..ad1d4593113 100644
--- a/sys-devel/sparse/sparse-0.5.2_rc1.ebuild
+++ b/sys-devel/sparse/sparse-0.5.2_rc1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
KEYWORDS=""
else
SRC_URI="https://git.kernel.org/pub/scm/devel/${PN}/${PN}.git/snapshot/${PN}-${RC_COMMIT}.tar.gz -> ${PN}-${PV/_/-}.tar.gz"
- KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
fi
LICENSE="MIT"
diff --git a/sys-devel/sparse/sparse-0.6.0.ebuild b/sys-devel/sparse/sparse-0.6.0.ebuild
index fa4c7a97fab..1b776ebd0a1 100644
--- a/sys-devel/sparse/sparse-0.6.0.ebuild
+++ b/sys-devel/sparse/sparse-0.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
KEYWORDS=""
else
SRC_URI="https://www.kernel.org/pub/software/devel/${PN}/dist/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
fi
LICENSE="MIT"
diff --git a/sys-devel/sparse/sparse-0.6.1.ebuild b/sys-devel/sparse/sparse-0.6.1.ebuild
index 8df52ef8a1e..ca577f5defa 100644
--- a/sys-devel/sparse/sparse-0.6.1.ebuild
+++ b/sys-devel/sparse/sparse-0.6.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
KEYWORDS=""
else
SRC_URI="https://www.kernel.org/pub/software/devel/${PN}/dist/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
fi
LICENSE="MIT"
diff --git a/sys-devel/sparse/sparse-9999.ebuild b/sys-devel/sparse/sparse-9999.ebuild
index 8df52ef8a1e..ca577f5defa 100644
--- a/sys-devel/sparse/sparse-9999.ebuild
+++ b/sys-devel/sparse/sparse-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
KEYWORDS=""
else
SRC_URI="https://www.kernel.org/pub/software/devel/${PN}/dist/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
fi
LICENSE="MIT"
diff --git a/sys-firmware/seabios/seabios-1.10.2.ebuild b/sys-firmware/seabios/seabios-1.10.2.ebuild
index 35dd9f2f363..11231f42e3b 100644
--- a/sys-firmware/seabios/seabios-1.10.2.ebuild
+++ b/sys-firmware/seabios/seabios-1.10.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* || -n "${EGIT_COMMIT}" ]] ; then
EGIT_REPO_URI="git://git.seabios.org/seabios.git"
inherit git-r3
else
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
# Binary versions taken from fedora:
# http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/Packages/s/
diff --git a/sys-firmware/seabios/seabios-1.11.0-r1.ebuild b/sys-firmware/seabios/seabios-1.11.0-r1.ebuild
index bec4935ce78..794dcb1afda 100644
--- a/sys-firmware/seabios/seabios-1.11.0-r1.ebuild
+++ b/sys-firmware/seabios/seabios-1.11.0-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* || -n "${EGIT_COMMIT}" ]] ; then
EGIT_REPO_URI="git://git.seabios.org/seabios.git"
inherit git-r3
else
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
# Binary versions taken from fedora:
# http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/Packages/s/
diff --git a/sys-firmware/seabios/seabios-1.11.0.ebuild b/sys-firmware/seabios/seabios-1.11.0.ebuild
index 5d966e192c4..43e3d9d88e7 100644
--- a/sys-firmware/seabios/seabios-1.11.0.ebuild
+++ b/sys-firmware/seabios/seabios-1.11.0.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* || -n "${EGIT_COMMIT}" ]] ; then
EGIT_REPO_URI="git://git.seabios.org/seabios.git"
inherit git-r3
else
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
# Binary versions taken from fedora:
# http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/Packages/s/
diff --git a/sys-firmware/seabios/seabios-1.12.0.ebuild b/sys-firmware/seabios/seabios-1.12.0.ebuild
index d09ddbb9097..80dc73a3d8c 100644
--- a/sys-firmware/seabios/seabios-1.12.0.ebuild
+++ b/sys-firmware/seabios/seabios-1.12.0.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* || -n "${EGIT_COMMIT}" ]] ; then
EGIT_REPO_URI="git://git.seabios.org/seabios.git"
inherit git-r3
else
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
# Binary versions taken from fedora:
# http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/Packages/s/
diff --git a/sys-firmware/sgabios/sgabios-0.1_pre8-r1.ebuild b/sys-firmware/sgabios/sgabios-0.1_pre8-r1.ebuild
index 290221c8a6a..f12696f77a4 100644
--- a/sys-firmware/sgabios/sgabios-0.1_pre8-r1.ebuild
+++ b/sys-firmware/sgabios/sgabios-0.1_pre8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
IUSE="+binary"
REQUIRED_USE="!amd64? ( !x86? ( binary ) )"
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 7689960a3e9..bd335d6bcee 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
@@ -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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc s390 sparc x86"
IUSE=""
src_prepare() {
diff --git a/sys-fs/cryptsetup/cryptsetup-1.7.5-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-1.7.5-r1.ebuild
index b2fe088b2eb..2fda621bc4b 100644
--- a/sys-fs/cryptsetup/cryptsetup-1.7.5-r1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-1.7.5-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(get_version_component_r
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 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/cryptsetup/cryptsetup-2.2.1-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.2.1-r1.ebuild
index 9fff0c1f1a9..a018cc91c59 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.2.1-r1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.2.1-r1.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 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 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/cryptsetup/cryptsetup-2.2.2.ebuild b/sys-fs/cryptsetup/cryptsetup-2.2.2.ebuild
index 96540049dc7..7e9de1fc052 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.2.2.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.2.2.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 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 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/cryptsetup/cryptsetup-2.3.0.ebuild b/sys-fs/cryptsetup/cryptsetup-2.3.0.ebuild
index cf95b7a30b0..d911035b085 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.0.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.0.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 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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/cryptsetup/cryptsetup-2.3.1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.3.1.ebuild
index cf95b7a30b0..d911035b085 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.1.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 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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 942ae83bb63..c2fe4bb51a5 100644
--- a/sys-fs/dosfstools/dosfstools-4.1.ebuild
+++ b/sys-fs/dosfstools/dosfstools-4.1.ebuild
@@ -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 sh 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.4.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.45.4.ebuild
index 66b7b0b7014..db28efccf15 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.45.4.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.45.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.xz
LICENSE="GPL-2 BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~m68k-mint"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~m68k-mint"
IUSE="cron fuse nls static-libs elibc_FreeBSD"
RDEPEND="~sys-libs/${PN}-libs-${PV}
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.45.5.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.45.5.ebuild
index 074e09f8859..2be6b804acd 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.45.5.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.45.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.xz
LICENSE="GPL-2 BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~m68k-mint"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~m68k-mint"
IUSE="cron fuse nls static-libs elibc_FreeBSD"
RDEPEND="~sys-libs/${PN}-libs-${PV}
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.45.6.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.45.6.ebuild
index c89dd215ca8..31effc07757 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.45.6.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.45.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.xz
LICENSE="GPL-2 BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint"
IUSE="cron fuse nls static-libs elibc_FreeBSD"
RDEPEND="~sys-libs/${PN}-libs-${PV}
diff --git a/sys-fs/eudev/eudev-3.2.9.ebuild b/sys-fs/eudev/eudev-3.2.9.ebuild
index ea0b7409447..b7e89f072b4 100644
--- a/sys-fs/eudev/eudev-3.2.9.ebuild
+++ b/sys-fs/eudev/eudev-3.2.9.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 sh 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/exfat-utils/exfat-utils-1.3.0.ebuild b/sys-fs/exfat-utils/exfat-utils-1.3.0.ebuild
index f9ed414654f..beb517f6c48 100644
--- a/sys-fs/exfat-utils/exfat-utils-1.3.0.ebuild
+++ b/sys-fs/exfat-utils/exfat-utils-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/relan/exfat/releases/download/v${PV}/${P}.tar.gz"
# COPYING is GPL-2 but ChangeLog says "Relicensed the project from GPLv3+ to GPLv2+"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~x86-linux"
src_install() {
default
diff --git a/sys-fs/fuse-common/fuse-common-3.2.6.ebuild b/sys-fs/fuse-common/fuse-common-3.2.6.ebuild
index 56a8e875d41..ed53cc1a686 100644
--- a/sys-fs/fuse-common/fuse-common-3.2.6.ebuild
+++ b/sys-fs/fuse-common/fuse-common-3.2.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libfuse/libfuse/releases/download/fuse-${PV}/fuse-${
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
DEPEND="virtual/pkgconfig"
RDEPEND="!<sys-fs/fuse-2.9.7-r1:0"
diff --git a/sys-fs/fuse-common/fuse-common-3.8.0.ebuild b/sys-fs/fuse-common/fuse-common-3.8.0.ebuild
index b775eb8fb16..1562ff02eb9 100644
--- a/sys-fs/fuse-common/fuse-common-3.8.0.ebuild
+++ b/sys-fs/fuse-common/fuse-common-3.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libfuse/libfuse/releases/download/fuse-${PV}/fuse-${
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
BDEPEND="virtual/pkgconfig"
RDEPEND="!<sys-fs/fuse-2.9.7-r1:0"
diff --git a/sys-fs/fuse-common/fuse-common-3.9.0.ebuild b/sys-fs/fuse-common/fuse-common-3.9.0.ebuild
index b775eb8fb16..1562ff02eb9 100644
--- a/sys-fs/fuse-common/fuse-common-3.9.0.ebuild
+++ b/sys-fs/fuse-common/fuse-common-3.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libfuse/libfuse/releases/download/fuse-${PV}/fuse-${
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
BDEPEND="virtual/pkgconfig"
RDEPEND="!<sys-fs/fuse-2.9.7-r1:0"
diff --git a/sys-fs/fuse-exfat/fuse-exfat-1.3.0.ebuild b/sys-fs/fuse-exfat/fuse-exfat-1.3.0.ebuild
index e9825ca85a4..662b14d6d61 100644
--- a/sys-fs/fuse-exfat/fuse-exfat-1.3.0.ebuild
+++ b/sys-fs/fuse-exfat/fuse-exfat-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/relan/exfat/releases/download/v${PV}/${P}.tar.gz"
# COPYING is GPL-2 but ChangeLog says "Relicensed the project from GPLv3+ to GPLv2+"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~x86-linux"
IUSE="suid"
RDEPEND="sys-fs/fuse:0"
diff --git a/sys-fs/fuse/fuse-2.9.8.ebuild b/sys-fs/fuse/fuse-2.9.8.ebuild
index fed4e5da73d..b2398798a73 100644
--- a/sys-fs/fuse/fuse-2.9.8.ebuild
+++ b/sys-fs/fuse/fuse-2.9.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh 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 kernel_linux kernel_FreeBSD static-libs"
PDEPEND="kernel_FreeBSD? ( sys-fs/fuse4bsd )"
diff --git a/sys-fs/fuse/fuse-2.9.9-r1.ebuild b/sys-fs/fuse/fuse-2.9.9-r1.ebuild
index 5ad8a0105f2..4a145b23892 100644
--- a/sys-fs/fuse/fuse-2.9.9-r1.ebuild
+++ b/sys-fs/fuse/fuse-2.9.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~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="examples kernel_linux kernel_FreeBSD static-libs"
PDEPEND="kernel_FreeBSD? ( sys-fs/fuse4bsd )"
diff --git a/sys-fs/fuse/fuse-3.8.0.ebuild b/sys-fs/fuse/fuse-3.8.0.ebuild
index 947ec7caa8e..bcea225f2d8 100644
--- a/sys-fs/fuse/fuse-3.8.0.ebuild
+++ b/sys-fs/fuse/fuse-3.8.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.xz"
LICENSE="GPL-2 LGPL-2.1"
SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="+suid test"
RESTRICT="!test? ( test )"
diff --git a/sys-fs/fuse/fuse-3.9.0.ebuild b/sys-fs/fuse/fuse-3.9.0.ebuild
index 947ec7caa8e..bcea225f2d8 100644
--- a/sys-fs/fuse/fuse-3.9.0.ebuild
+++ b/sys-fs/fuse/fuse-3.9.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.xz"
LICENSE="GPL-2 LGPL-2.1"
SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="+suid test"
RESTRICT="!test? ( test )"
diff --git a/sys-fs/fuse/fuse-3.9.1.ebuild b/sys-fs/fuse/fuse-3.9.1.ebuild
index 947ec7caa8e..bcea225f2d8 100644
--- a/sys-fs/fuse/fuse-3.9.1.ebuild
+++ b/sys-fs/fuse/fuse-3.9.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.xz"
LICENSE="GPL-2 LGPL-2.1"
SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="+suid test"
RESTRICT="!test? ( test )"
diff --git a/sys-fs/jfsutils/jfsutils-1.1.15.ebuild b/sys-fs/jfsutils/jfsutils-1.1.15.ebuild
index 808f6a3eff1..8964868f9f7 100644
--- a/sys-fs/jfsutils/jfsutils-1.1.15.ebuild
+++ b/sys-fs/jfsutils/jfsutils-1.1.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://jfs.sourceforge.net/project/pub/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sparc x86"
IUSE="static"
DOCS=( AUTHORS ChangeLog NEWS README )
diff --git a/sys-fs/lvm2/lvm2-2.02.116.ebuild b/sys-fs/lvm2/lvm2-2.02.116.ebuild
index 2cc483c49bc..725a5c7c841 100644
--- a/sys-fs/lvm2/lvm2-2.02.116.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.116.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 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="readline static static-libs systemd lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only"
REQUIRED_USE="device-mapper-only? ( !lvm1 !lvm2create_initrd !thin )
systemd? ( udev )
diff --git a/sys-fs/lvm2/lvm2-2.02.145-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.145-r2.ebuild
index 815ea6fad38..10963e70c3d 100644
--- a/sys-fs/lvm2/lvm2-2.02.145-r2.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.145-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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="readline static static-libs systemd lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only"
REQUIRED_USE="device-mapper-only? ( !lvm1 !lvm2create_initrd !thin )
systemd? ( udev )"
diff --git a/sys-fs/lvm2/lvm2-2.02.184-r5.ebuild b/sys-fs/lvm2/lvm2-2.02.184-r5.ebuild
index 6575e869d5a..c4a962bac29 100644
--- a/sys-fs/lvm2/lvm2-2.02.184-r5.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.184-r5.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 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 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/lvm2/lvm2-2.02.186-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.186-r2.ebuild
index 759415d9d98..b8abffaea8a 100644
--- a/sys-fs/lvm2/lvm2-2.02.186-r2.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.186-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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/lvm2/lvm2-2.03.08.ebuild b/sys-fs/lvm2/lvm2-2.03.08.ebuild
index b70771ade08..17bc946ea78 100644
--- a/sys-fs/lvm2/lvm2-2.03.08.ebuild
+++ b/sys-fs/lvm2/lvm2-2.03.08.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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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.3-r2.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3-r2.ebuild
index 976a025e5de..9d6dd672264 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-4.3-r2.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.3-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/squashfs/squashfs${PV}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE="debug lz4 lzma lzo static xattr +xz"
LIB_DEPEND="sys-libs/zlib[static-libs(+)]
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3_p12.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3_p12.ebuild
index 38f641534a5..a27640c99e3 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-4.3_p12.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.3_p12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="debug lz4 lzma lzo static xattr +xz zstd"
LIB_DEPEND="
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3_p7.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3_p7.ebuild
index 68fb28d7da5..a00c3cc35c4 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-4.3_p7.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.3_p7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE="debug lz4 lzma lzo static xattr +xz"
LIB_DEPEND="
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.4.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.4.ebuild
index fcc3ce5bf79..c3edcf8f001 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-4.4.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/plougher/squashfs-tools/archive/${PV}.tar.gz -> ${P}
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
IUSE="debug lz4 lzma lzo static xattr +xz zstd"
LIB_DEPEND="
diff --git a/sys-fs/static-dev/static-dev-0.1.ebuild b/sys-fs/static-dev/static-dev-0.1.ebuild
index dc1fd002898..4f2714c822d 100644
--- a/sys-fs/static-dev/static-dev-0.1.ebuild
+++ b/sys-fs/static-dev/static-dev-0.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh 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 af268470aae..0bad46c1ad1 100644
--- a/sys-fs/sysfsutils/sysfsutils-2.1.0.ebuild
+++ b/sys-fs/sysfsutils/sysfsutils-2.1.0.ebuild
@@ -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 sh 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 3231beca326..d864f19484c 100644
--- a/sys-fs/udev-init-scripts/udev-init-scripts-33.ebuild
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-33.ebuild
@@ -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 ~sh 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 af5f2a4d501..6086fa54d5f 100644
--- a/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
@@ -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 ~sh ~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-242.ebuild b/sys-fs/udev/udev-242.ebuild
index d61fce03628..05bef6a782a 100644
--- a/sys-fs/udev/udev-242.ebuild
+++ b/sys-fs/udev/udev-242.ebuild
@@ -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 sh 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-243-r2.ebuild b/sys-fs/udev/udev-243-r2.ebuild
index 96cb445a0a9..cf40d096261 100644
--- a/sys-fs/udev/udev-243-r2.ebuild
+++ b/sys-fs/udev/udev-243-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2003-2019 Gentoo Authors
+# Copyright 2003-2020 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 ~sh 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-243.ebuild b/sys-fs/udev/udev-243.ebuild
index d48c72b25fa..0a23777e5de 100644
--- a/sys-fs/udev/udev-243.ebuild
+++ b/sys-fs/udev/udev-243.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2003-2019 Gentoo Authors
+# Copyright 2003-2020 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 ~sh ~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.ebuild b/sys-fs/udev/udev-245.ebuild
index 52da788c7c0..4cdaa936a65 100644
--- a/sys-fs/udev/udev-245.ebuild
+++ b/sys-fs/udev/udev-245.ebuild
@@ -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 ~sh ~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-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 52da788c7c0..4cdaa936a65 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -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 ~sh ~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/udisks/udisks-1.0.5-r3.ebuild b/sys-fs/udisks/udisks-1.0.5-r3.ebuild
index f1eec45d006..f4a4725a591 100644
--- a/sys-fs/udisks/udisks-1.0.5-r3.ebuild
+++ b/sys-fs/udisks/udisks-1.0.5-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://hal.freedesktop.org/releases/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86"
IUSE="debug +lvm nls remote-access selinux"
COMMON_DEPEND=">=dev-libs/dbus-glib-0.100
diff --git a/sys-fs/xfsprogs/xfsprogs-4.19.0.ebuild b/sys-fs/xfsprogs/xfsprogs-4.19.0.ebuild
index 48dbc3c6ee8..fa53a2bf9c9 100644
--- a/sys-fs/xfsprogs/xfsprogs-4.19.0.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-4.19.0.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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE="icu libedit nls readline static-libs"
LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
diff --git a/sys-fs/xfsprogs/xfsprogs-5.4.0-r1.ebuild b/sys-fs/xfsprogs/xfsprogs-5.4.0-r1.ebuild
index c8abfc089c4..d4fd7902351 100644
--- a/sys-fs/xfsprogs/xfsprogs-5.4.0-r1.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-5.4.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 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE="icu libedit nls readline"
LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
diff --git a/sys-fs/xfsprogs/xfsprogs-5.5.0.ebuild b/sys-fs/xfsprogs/xfsprogs-5.5.0.ebuild
index 41c47a70a97..d5ba1a19466 100644
--- a/sys-fs/xfsprogs/xfsprogs-5.5.0.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-5.5.0.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 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="icu libedit nls readline"
LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
diff --git a/sys-kernel/genkernel/genkernel-3.4.52.3.ebuild b/sys-kernel/genkernel/genkernel-3.4.52.3.ebuild
index 995bb16c4d2..fb17bd379f7 100644
--- a/sys-kernel/genkernel/genkernel-3.4.52.3.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.4.52.3.ebuild
@@ -43,7 +43,7 @@ then
else
SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz
${COMMON_URI}"
- KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh 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-3.4.52.4-r1.ebuild b/sys-kernel/genkernel/genkernel-3.4.52.4-r1.ebuild
index 86dac22627b..d8c5716d5af 100644
--- a/sys-kernel/genkernel/genkernel-3.4.52.4-r1.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.4.52.4-r1.ebuild
@@ -43,7 +43,7 @@ then
else
SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz
${COMMON_URI}"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~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-3.4.52.4-r2.ebuild b/sys-kernel/genkernel/genkernel-3.4.52.4-r2.ebuild
index db0b693ab32..562eb0ee605 100644
--- a/sys-kernel/genkernel/genkernel-3.4.52.4-r2.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.4.52.4-r2.ebuild
@@ -43,7 +43,7 @@ then
else
SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz
${COMMON_URI}"
- KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh 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-3.4.52.4-r3.ebuild b/sys-kernel/genkernel/genkernel-3.4.52.4-r3.ebuild
index eb87426fd1b..64945f43989 100644
--- a/sys-kernel/genkernel/genkernel-3.4.52.4-r3.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.4.52.4-r3.ebuild
@@ -43,7 +43,7 @@ then
else
SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz
${COMMON_URI}"
- KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh 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-3.5.1.1.ebuild b/sys-kernel/genkernel/genkernel-3.5.1.1.ebuild
index 0d43db3c837..a9ef7d8fc11 100644
--- a/sys-kernel/genkernel/genkernel-3.5.1.1.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.5.1.1.ebuild
@@ -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 ~sh ~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-3.5.2.0-r1.ebuild b/sys-kernel/genkernel/genkernel-3.5.2.0-r1.ebuild
index 94791c223e2..8badb9dc013 100644
--- a/sys-kernel/genkernel/genkernel-3.5.2.0-r1.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.5.2.0-r1.ebuild
@@ -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 ~sh ~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-3.5.2.1.ebuild b/sys-kernel/genkernel/genkernel-3.5.2.1.ebuild
index 94791c223e2..8badb9dc013 100644
--- a/sys-kernel/genkernel/genkernel-3.5.2.1.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.5.2.1.ebuild
@@ -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 ~sh ~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-3.5.2.2.ebuild b/sys-kernel/genkernel/genkernel-3.5.2.2.ebuild
index 94791c223e2..8badb9dc013 100644
--- a/sys-kernel/genkernel/genkernel-3.5.2.2.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.5.2.2.ebuild
@@ -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 ~sh ~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-3.5.2.3.ebuild b/sys-kernel/genkernel/genkernel-3.5.2.3.ebuild
index 94791c223e2..8badb9dc013 100644
--- a/sys-kernel/genkernel/genkernel-3.5.2.3.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.5.2.3.ebuild
@@ -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 ~sh ~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-3.5.2.4.ebuild b/sys-kernel/genkernel/genkernel-3.5.2.4.ebuild
index 94791c223e2..8badb9dc013 100644
--- a/sys-kernel/genkernel/genkernel-3.5.2.4.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.5.2.4.ebuild
@@ -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 ~sh ~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-3.5.2.5.ebuild b/sys-kernel/genkernel/genkernel-3.5.2.5.ebuild
index 94791c223e2..8badb9dc013 100644
--- a/sys-kernel/genkernel/genkernel-3.5.2.5.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.5.2.5.ebuild
@@ -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 ~sh ~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-3.5.3.2.ebuild b/sys-kernel/genkernel/genkernel-3.5.3.2.ebuild
index 12d860e8583..2d560709b60 100644
--- a/sys-kernel/genkernel/genkernel-3.5.3.2.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.5.3.2.ebuild
@@ -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 ~sh ~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-3.5.3.3.ebuild b/sys-kernel/genkernel/genkernel-3.5.3.3.ebuild
index 0131e6e5ef3..a4d1ea8c974 100644
--- a/sys-kernel/genkernel/genkernel-3.5.3.3.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.5.3.3.ebuild
@@ -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 sh 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.5.ebuild b/sys-kernel/genkernel/genkernel-4.0.5.ebuild
index 7cd21e997c8..73d0e9d7f78 100644
--- a/sys-kernel/genkernel/genkernel-4.0.5.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.0.5.ebuild
@@ -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 sh 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-9999.ebuild b/sys-kernel/genkernel/genkernel-9999.ebuild
index 05969d77a9e..02c5a7654bc 100644
--- a/sys-kernel/genkernel/genkernel-9999.ebuild
+++ b/sys-kernel/genkernel/genkernel-9999.ebuild
@@ -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 ~sh ~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/gentoo-sources/gentoo-sources-4.14.166.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.166.ebuild
index f6bb2c9755a..0f91fffa2dc 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.14.166.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.166.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
detect_version
detect_arch
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
IUSE="experimental"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.169.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.169.ebuild
index 2e6c227eccc..9d0cca118fa 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.14.169.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.169.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
detect_version
detect_arch
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
IUSE="experimental"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.170.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.170.ebuild
index 9de3ed8cb1b..a6524760bfa 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.14.170.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.170.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
detect_version
detect_arch
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
IUSE="experimental"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.171.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.171.ebuild
index c7f01a9a829..af0d7c75739 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.14.171.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.171.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
detect_version
detect_arch
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
IUSE="experimental"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.172.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.172.ebuild
index c51592f8ec8..edeb5939a03 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.14.172.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.172.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
detect_version
detect_arch
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
IUSE="experimental"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.173.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.173.ebuild
index 9bea0ad5341..cd5e083bc09 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.14.173.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.173.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
detect_version
detect_arch
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
IUSE="experimental"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.174.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.174.ebuild
index 75185d73ed7..831354bb1f1 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.14.174.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.174.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
detect_version
detect_arch
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
IUSE="experimental"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.108.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.108.ebuild
index 56ee31699a0..4883fe16cc2 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.19.108.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.108.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
detect_version
detect_arch
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
IUSE="experimental"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.109.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.109.ebuild
index 85d27e2ae6c..438c14a2f22 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.19.109.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.109.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
detect_version
detect_arch
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
IUSE="experimental"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.110.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.110.ebuild
index ae3ee1dab20..aab7b020e13 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.19.110.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.110.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
detect_version
detect_arch
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
IUSE="experimental"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.111.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.111.ebuild
index a79ec91035e..70e20a90b7b 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.19.111.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.111.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
detect_version
detect_arch
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
IUSE="experimental"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.112.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.112.ebuild
index f0d3ac6857e..797332bd6d9 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.19.112.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.112.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
detect_version
detect_arch
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
IUSE="experimental"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.113.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.113.ebuild
index 108c7a2e894..eeacf547016 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.19.113.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.113.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
detect_version
detect_arch
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
IUSE="experimental"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.97.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.97.ebuild
index c4f68133c80..ce46c401f67 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.19.97.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.97.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
detect_version
detect_arch
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
IUSE="experimental"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.210.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.210.ebuild
index 253fe530cf9..c75cfa662fb 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.4.210.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.210.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
detect_version
detect_arch
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
IUSE="experimental"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.212.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.212.ebuild
index 14303a93ec3..e26985e94a7 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.4.212.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.212.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
detect_version
detect_arch
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
IUSE="experimental"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.213.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.213.ebuild
index e59e1549ad8..5ada2edf51e 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.4.213.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.213.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
detect_version
detect_arch
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
IUSE="experimental"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.214.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.214.ebuild
index a9a93faf5e4..c5f74117dbd 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.4.214.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.214.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
detect_version
detect_arch
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
IUSE="experimental"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.215.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.215.ebuild
index 1f61bb694d6..5316d907045 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.4.215.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.215.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
detect_version
detect_arch
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
IUSE="experimental"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.216.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.216.ebuild
index 6b333ba73f6..2922920abf3 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.4.216.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.216.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
detect_version
detect_arch
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
IUSE="experimental"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.217.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.217.ebuild
index 232fb4475f0..a0d5482fa9a 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.4.217.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.217.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
detect_version
detect_arch
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
IUSE="experimental"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.210.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.210.ebuild
index 4060af0bff2..e1e19ea6ae1 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.210.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.210.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
detect_version
detect_arch
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
IUSE="experimental"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.212.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.212.ebuild
index 1f61bb694d6..5316d907045 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.212.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.212.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
detect_version
detect_arch
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
IUSE="experimental"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.213.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.213.ebuild
index 6b333ba73f6..2922920abf3 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.213.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.213.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
detect_version
detect_arch
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
IUSE="experimental"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.214.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.214.ebuild
index 232fb4475f0..a0d5482fa9a 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.214.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.214.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
detect_version
detect_arch
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
IUSE="experimental"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.215.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.215.ebuild
index 0d495f3f923..9a03f672b2d 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.215.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.215.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
detect_version
detect_arch
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
IUSE="experimental"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.216.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.216.ebuild
index 9f25fdc9e5c..238ad822e88 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.216.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.216.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
detect_version
detect_arch
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
IUSE="experimental"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.217.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.217.ebuild
index f40ce11d516..661b8d4c313 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.217.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.217.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
detect_version
detect_arch
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
IUSE="experimental"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.24.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.24.ebuild
index 373c95156b3..2c8dbcad397 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.4.24.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.24.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
detect_version
detect_arch
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
IUSE="experimental"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.25.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.25.ebuild
index d33624fc553..8c60efcbf1d 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.4.25.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.25.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
detect_version
detect_arch
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
IUSE="experimental"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.26.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.26.ebuild
index 09b413d70dc..17637ccd629 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.4.26.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.26.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
detect_version
detect_arch
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
IUSE="experimental"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.27.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.27.ebuild
index a0151f55069..5ff24c2d6bb 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.4.27.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.27.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
detect_version
detect_arch
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
IUSE="experimental"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.28.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.28.ebuild
index 189de7bbb79..cff792ad147 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.4.28.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.28.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
detect_version
detect_arch
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
IUSE="experimental"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.5.10.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.5.10.ebuild
index 8a8c2d53df7..f35e31dc392 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.5.10.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.5.10.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
detect_version
detect_arch
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
IUSE="experimental"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.5.11.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.5.11.ebuild
index 1f510e6cf10..fea2b7a2ad8 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.5.11.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.5.11.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
detect_version
detect_arch
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
IUSE="experimental"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.5.13.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.5.13.ebuild
index 57f6aecdbf8..1098d7a4991 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.5.13.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.5.13.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
detect_version
detect_arch
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
IUSE="experimental"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.5.7.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.5.7.ebuild
index 296c114c963..f3769cf5f93 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.5.7.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.5.7.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
detect_version
detect_arch
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
IUSE="experimental"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.5.8.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.5.8.ebuild
index a8f952e6a5b..dac94ff87df 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.5.8.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.5.8.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
detect_version
detect_arch
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
IUSE="experimental"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.5.9.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.5.9.ebuild
index 343c8eac04d..0e82e47e6ea 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.5.9.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.5.9.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
detect_version
detect_arch
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
IUSE="experimental"
diff --git a/sys-kernel/git-sources/git-sources-5.6_rc1.ebuild b/sys-kernel/git-sources/git-sources-5.6_rc1.ebuild
index 4b09cc629ca..f8d82bc72e4 100644
--- a/sys-kernel/git-sources/git-sources-5.6_rc1.ebuild
+++ b/sys-kernel/git-sources/git-sources-5.6_rc1.ebuild
@@ -22,7 +22,7 @@ DESCRIPTION="The very latest -git version of the Linux kernel"
HOMEPAGE="https://www.kernel.org"
SRC_URI="${KERNEL_URI}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
diff --git a/sys-kernel/git-sources/git-sources-5.6_rc2.ebuild b/sys-kernel/git-sources/git-sources-5.6_rc2.ebuild
index 4b09cc629ca..f8d82bc72e4 100644
--- a/sys-kernel/git-sources/git-sources-5.6_rc2.ebuild
+++ b/sys-kernel/git-sources/git-sources-5.6_rc2.ebuild
@@ -22,7 +22,7 @@ DESCRIPTION="The very latest -git version of the Linux kernel"
HOMEPAGE="https://www.kernel.org"
SRC_URI="${KERNEL_URI}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
diff --git a/sys-kernel/git-sources/git-sources-5.6_rc3.ebuild b/sys-kernel/git-sources/git-sources-5.6_rc3.ebuild
index 4b09cc629ca..f8d82bc72e4 100644
--- a/sys-kernel/git-sources/git-sources-5.6_rc3.ebuild
+++ b/sys-kernel/git-sources/git-sources-5.6_rc3.ebuild
@@ -22,7 +22,7 @@ DESCRIPTION="The very latest -git version of the Linux kernel"
HOMEPAGE="https://www.kernel.org"
SRC_URI="${KERNEL_URI}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
diff --git a/sys-kernel/git-sources/git-sources-5.6_rc4.ebuild b/sys-kernel/git-sources/git-sources-5.6_rc4.ebuild
index 4b09cc629ca..f8d82bc72e4 100644
--- a/sys-kernel/git-sources/git-sources-5.6_rc4.ebuild
+++ b/sys-kernel/git-sources/git-sources-5.6_rc4.ebuild
@@ -22,7 +22,7 @@ DESCRIPTION="The very latest -git version of the Linux kernel"
HOMEPAGE="https://www.kernel.org"
SRC_URI="${KERNEL_URI}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
diff --git a/sys-kernel/git-sources/git-sources-5.6_rc5.ebuild b/sys-kernel/git-sources/git-sources-5.6_rc5.ebuild
index 4b09cc629ca..f8d82bc72e4 100644
--- a/sys-kernel/git-sources/git-sources-5.6_rc5.ebuild
+++ b/sys-kernel/git-sources/git-sources-5.6_rc5.ebuild
@@ -22,7 +22,7 @@ DESCRIPTION="The very latest -git version of the Linux kernel"
HOMEPAGE="https://www.kernel.org"
SRC_URI="${KERNEL_URI}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
diff --git a/sys-kernel/git-sources/git-sources-5.6_rc6.ebuild b/sys-kernel/git-sources/git-sources-5.6_rc6.ebuild
index 4b09cc629ca..f8d82bc72e4 100644
--- a/sys-kernel/git-sources/git-sources-5.6_rc6.ebuild
+++ b/sys-kernel/git-sources/git-sources-5.6_rc6.ebuild
@@ -22,7 +22,7 @@ DESCRIPTION="The very latest -git version of the Linux kernel"
HOMEPAGE="https://www.kernel.org"
SRC_URI="${KERNEL_URI}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
diff --git a/sys-kernel/git-sources/git-sources-5.6_rc7.ebuild b/sys-kernel/git-sources/git-sources-5.6_rc7.ebuild
index 4b09cc629ca..f8d82bc72e4 100644
--- a/sys-kernel/git-sources/git-sources-5.6_rc7.ebuild
+++ b/sys-kernel/git-sources/git-sources-5.6_rc7.ebuild
@@ -22,7 +22,7 @@ DESCRIPTION="The very latest -git version of the Linux kernel"
HOMEPAGE="https://www.kernel.org"
SRC_URI="${KERNEL_URI}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
diff --git a/sys-kernel/installkernel-gentoo/installkernel-gentoo-1.ebuild b/sys-kernel/installkernel-gentoo/installkernel-gentoo-1.ebuild
index 9a5e72e513d..9940175f4f2 100644
--- a/sys-kernel/installkernel-gentoo/installkernel-gentoo-1.ebuild
+++ b/sys-kernel/installkernel-gentoo/installkernel-gentoo-1.ebuild
@@ -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 ~sh ~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/installkernel-gentoo/installkernel-gentoo-2.ebuild b/sys-kernel/installkernel-gentoo/installkernel-gentoo-2.ebuild
index 67b7e78a024..1d40ac000cd 100644
--- a/sys-kernel/installkernel-gentoo/installkernel-gentoo-2.ebuild
+++ b/sys-kernel/installkernel-gentoo/installkernel-gentoo-2.ebuild
@@ -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 ~sh ~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-docs/linux-docs-4.19.99.ebuild b/sys-kernel/linux-docs/linux-docs-4.19.99.ebuild
index a328601e021..5e934df76de 100644
--- a/sys-kernel/linux-docs/linux-docs-4.19.99.ebuild
+++ b/sys-kernel/linux-docs/linux-docs-4.19.99.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.kernel.org/pub/linux/kernel/v4.x/${MY_P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
DEPEND="dev-python/sphinx"
diff --git a/sys-kernel/linux-docs/linux-docs-5.4.15.ebuild b/sys-kernel/linux-docs/linux-docs-5.4.15.ebuild
index 5c608872975..9d7972c70d6 100644
--- a/sys-kernel/linux-docs/linux-docs-5.4.15.ebuild
+++ b/sys-kernel/linux-docs/linux-docs-5.4.15.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.kernel.org/pub/linux/kernel/v5.x/${MY_P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
DEPEND="dev-python/sphinx"
diff --git a/sys-kernel/linux-firmware/linux-firmware-20190815.ebuild b/sys-kernel/linux-firmware/linux-firmware-20190815.ebuild
index abb61dcfafa..bf3d1fb7a24 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20190815.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20190815.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 99999999* ]]; then
else
GIT_COMMIT="07b925b450bfb4cf3e141c612ec5b104658cd020"
SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh 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-20190923.ebuild b/sys-kernel/linux-firmware/linux-firmware-20190923.ebuild
index 110889f5160..007caec5eb9 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20190923.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20190923.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 99999999* ]]; then
else
GIT_COMMIT="417a9c6e197a8d3eec792494efc87a2b42f76324"
SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh 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-20191022.ebuild b/sys-kernel/linux-firmware/linux-firmware-20191022.ebuild
index 0feb90debe1..b613e7eeaf9 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20191022.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20191022.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 99999999* ]]; then
else
GIT_COMMIT="2b016afc348ba4b5fb2016ffcb2822f4a293da0c"
SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh 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-20191215.ebuild b/sys-kernel/linux-firmware/linux-firmware-20191215.ebuild
index e3c4d975db3..2170a5a61fc 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20191215.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20191215.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 99999999* ]]; then
else
GIT_COMMIT="f1100ddf581f49aa79a54b56fe6ef0815a7ae57e"
SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh 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-20200122.ebuild b/sys-kernel/linux-firmware/linux-firmware-20200122.ebuild
index 2736b49b914..4c372dc2ca5 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20200122.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20200122.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 99999999* ]]; then
else
GIT_COMMIT="1eb2408c6feacccd10b02a49214745f15d1c6fb7"
SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh 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-20200316.ebuild b/sys-kernel/linux-firmware/linux-firmware-20200316.ebuild
index 6aa47ba4918..03209ab2fd5 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20200316.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20200316.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 99999999* ]]; then
else
GIT_COMMIT="20200316"
SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh 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-99999999.ebuild b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
index b118008def6..9e0ee88c040 100644
--- a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 99999999* ]]; then
else
GIT_COMMIT=""
SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
fi
DESCRIPTION="Linux firmware files"
--git a/sys-kernel/linux-headers/linux-headers-3.18.ebuild b/sys-kernel/linux-headers/linux-headers-3.18.ebuild
index 47c61a2e5a4..aa5c85b83b7 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 sh 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"
--git a/sys-kernel/linux-headers/linux-headers-4.13.ebuild b/sys-kernel/linux-headers/linux-headers-4.13.ebuild
index fcb2f051944..7401390e8b1 100644
--- a/sys-kernel/linux-headers/linux-headers-4.13.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-4.13.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 sh 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"
--git a/sys-kernel/linux-headers/linux-headers-4.14-r1.ebuild b/sys-kernel/linux-headers/linux-headers-4.14-r1.ebuild
index a274f2f7ad7..e127e0da6c7 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 sh 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"
--git a/sys-kernel/linux-headers/linux-headers-4.15-r1.ebuild b/sys-kernel/linux-headers/linux-headers-4.15-r1.ebuild
index 0a0a492ce1a..130b082ed1f 100644
--- a/sys-kernel/linux-headers/linux-headers-4.15-r1.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-4.15-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 ~sh ~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"
--git a/sys-kernel/linux-headers/linux-headers-4.16-r2.ebuild b/sys-kernel/linux-headers/linux-headers-4.16-r2.ebuild
index eb4259ba3fb..dccdc4b7be5 100644
--- a/sys-kernel/linux-headers/linux-headers-4.16-r2.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-4.16-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}-r1.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 ~sh ~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"
--git a/sys-kernel/linux-headers/linux-headers-4.16.ebuild b/sys-kernel/linux-headers/linux-headers-4.16.ebuild
index 3a0450d08cb..3e42502236f 100644
--- a/sys-kernel/linux-headers/linux-headers-4.16.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-4.16.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 ~sh ~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"
--git a/sys-kernel/linux-headers/linux-headers-4.17.ebuild b/sys-kernel/linux-headers/linux-headers-4.17.ebuild
index 3482c85dc92..e84130cb5db 100644
--- a/sys-kernel/linux-headers/linux-headers-4.17.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-4.17.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 ~sh ~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"
--git a/sys-kernel/linux-headers/linux-headers-4.18.ebuild b/sys-kernel/linux-headers/linux-headers-4.18.ebuild
index 658a4cadac2..961f5e63def 100644
--- a/sys-kernel/linux-headers/linux-headers-4.18.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-4.18.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 ~sh ~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"
--git a/sys-kernel/linux-headers/linux-headers-4.19.ebuild b/sys-kernel/linux-headers/linux-headers-4.19.ebuild
index a8acb7e3a0d..c0b87617336 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 sh 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"
--git a/sys-kernel/linux-headers/linux-headers-4.20.ebuild b/sys-kernel/linux-headers/linux-headers-4.20.ebuild
index 658a4cadac2..961f5e63def 100644
--- a/sys-kernel/linux-headers/linux-headers-4.20.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-4.20.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 ~sh ~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"
--git a/sys-kernel/linux-headers/linux-headers-4.4.ebuild b/sys-kernel/linux-headers/linux-headers-4.4.ebuild
index 77d8cd3d3c9..6df4351cbbb 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 sh 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"
--git a/sys-kernel/linux-headers/linux-headers-4.9.ebuild b/sys-kernel/linux-headers/linux-headers-4.9.ebuild
index 723df9a5a45..ef17eaa51ae 100644
--- a/sys-kernel/linux-headers/linux-headers-4.9.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-4.9.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 ~sh ~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"
--git a/sys-kernel/linux-headers/linux-headers-5.0-r1.ebuild b/sys-kernel/linux-headers/linux-headers-5.0-r1.ebuild
index 6a1fe7168b7..a632d2840bf 100644
--- a/sys-kernel/linux-headers/linux-headers-5.0-r1.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-5.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}-bug-679630.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 ~sh ~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"
--git a/sys-kernel/linux-headers/linux-headers-5.0.ebuild b/sys-kernel/linux-headers/linux-headers-5.0.ebuild
index 658a4cadac2..961f5e63def 100644
--- a/sys-kernel/linux-headers/linux-headers-5.0.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-5.0.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 ~sh ~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"
--git a/sys-kernel/linux-headers/linux-headers-5.1.ebuild b/sys-kernel/linux-headers/linux-headers-5.1.ebuild
index b7c0a89a495..d6b5404d2f0 100644
--- a/sys-kernel/linux-headers/linux-headers-5.1.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-5.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="${KERNEL_URI}
${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 ~sh ~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"
--git a/sys-kernel/linux-headers/linux-headers-5.2.ebuild b/sys-kernel/linux-headers/linux-headers-5.2.ebuild
index b7c0a89a495..d6b5404d2f0 100644
--- a/sys-kernel/linux-headers/linux-headers-5.2.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-5.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="${KERNEL_URI}
${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 ~sh ~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"
--git a/sys-kernel/linux-headers/linux-headers-5.3-r1.ebuild b/sys-kernel/linux-headers/linux-headers-5.3-r1.ebuild
index 104fec46850..4c185229616 100644
--- a/sys-kernel/linux-headers/linux-headers-5.3-r1.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-5.3-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 ~sh ~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"
--git a/sys-kernel/linux-headers/linux-headers-5.3.ebuild b/sys-kernel/linux-headers/linux-headers-5.3.ebuild
index d6ff088b02f..8e127c5ebcf 100644
--- a/sys-kernel/linux-headers/linux-headers-5.3.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-5.3.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 ~sh ~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"
--git a/sys-kernel/linux-headers/linux-headers-5.4.ebuild b/sys-kernel/linux-headers/linux-headers-5.4.ebuild
index 1815e8cbd19..000fc2abf68 100644
--- a/sys-kernel/linux-headers/linux-headers-5.4.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-5.4.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 ~sh 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"
--git a/sys-kernel/linux-headers/linux-headers-5.5.ebuild b/sys-kernel/linux-headers/linux-headers-5.5.ebuild
index 910d86b229b..af1145d7ef5 100644
--- a/sys-kernel/linux-headers/linux-headers-5.5.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-5.5.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 ~sh ~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/vanilla-sources/vanilla-sources-3.16.82.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.16.82.ebuild
index bdba9ff3201..26a9a84f351 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-3.16.82.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-3.16.82.ebuild
@@ -13,4 +13,4 @@ DESCRIPTION="Full sources for the Linux kernel"
HOMEPAGE="https://www.kernel.org"
SRC_URI="${KERNEL_URI}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.14.174.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.14.174.ebuild
index bdba9ff3201..26a9a84f351 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.14.174.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.14.174.ebuild
@@ -13,4 +13,4 @@ DESCRIPTION="Full sources for the Linux kernel"
HOMEPAGE="https://www.kernel.org"
SRC_URI="${KERNEL_URI}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.19.113.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.19.113.ebuild
index bdba9ff3201..26a9a84f351 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.19.113.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.19.113.ebuild
@@ -13,4 +13,4 @@ DESCRIPTION="Full sources for the Linux kernel"
HOMEPAGE="https://www.kernel.org"
SRC_URI="${KERNEL_URI}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.4.217.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.4.217.ebuild
index bdba9ff3201..26a9a84f351 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.4.217.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.4.217.ebuild
@@ -13,4 +13,4 @@ DESCRIPTION="Full sources for the Linux kernel"
HOMEPAGE="https://www.kernel.org"
SRC_URI="${KERNEL_URI}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.9.217.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.9.217.ebuild
index bdba9ff3201..26a9a84f351 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.9.217.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.9.217.ebuild
@@ -13,4 +13,4 @@ DESCRIPTION="Full sources for the Linux kernel"
HOMEPAGE="https://www.kernel.org"
SRC_URI="${KERNEL_URI}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.4.28.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.4.28.ebuild
index bdba9ff3201..26a9a84f351 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.4.28.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.4.28.ebuild
@@ -13,4 +13,4 @@ DESCRIPTION="Full sources for the Linux kernel"
HOMEPAGE="https://www.kernel.org"
SRC_URI="${KERNEL_URI}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.5.13.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.5.13.ebuild
index bdba9ff3201..26a9a84f351 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.5.13.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.5.13.ebuild
@@ -13,4 +13,4 @@ DESCRIPTION="Full sources for the Linux kernel"
HOMEPAGE="https://www.kernel.org"
SRC_URI="${KERNEL_URI}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
diff --git a/sys-libs/argp-standalone/argp-standalone-1.3-r2.ebuild b/sys-libs/argp-standalone/argp-standalone-1.3-r2.ebuild
index ebea5b9c470..e8a52b5d5a9 100644
--- a/sys-libs/argp-standalone/argp-standalone-1.3-r2.ebuild
+++ b/sys-libs/argp-standalone/argp-standalone-1.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.lysator.liu.se/~nisse/misc/argp-standalone-1.3.tar.gz"
LICENSE="public-domain GPL-2 GPL-3 XC"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~m68k ~mips ppc ppc64 ~s390 ~sh x86"
+KEYWORDS="amd64 arm arm64 ~m68k ~mips ppc ppc64 ~s390 x86"
IUSE="static-libs"
DEPEND="!sys-libs/glibc"
diff --git a/sys-libs/binutils-libs/binutils-libs-2.32-r1.ebuild b/sys-libs/binutils-libs/binutils-libs-2.32-r1.ebuild
index 2261407a205..2fc591b47ef 100644
--- a/sys-libs/binutils-libs/binutils-libs-2.32-r1.ebuild
+++ b/sys-libs/binutils-libs/binutils-libs-2.32-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 multitarget nls static-libs"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
COMMON_DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
DEPEND="${COMMON_DEPEND}
diff --git a/sys-libs/binutils-libs/binutils-libs-2.33.1-r1.ebuild b/sys-libs/binutils-libs/binutils-libs-2.33.1-r1.ebuild
index 3821e8950e8..dc283f33953 100644
--- a/sys-libs/binutils-libs/binutils-libs-2.33.1-r1.ebuild
+++ b/sys-libs/binutils-libs/binutils-libs-2.33.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 multitarget nls static-libs"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
COMMON_DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
DEPEND="${COMMON_DEPEND}
diff --git a/sys-libs/binutils-libs/binutils-libs-2.34.ebuild b/sys-libs/binutils-libs/binutils-libs-2.34.ebuild
index 54f8b2bfd0c..c7a023759fa 100644
--- a/sys-libs/binutils-libs/binutils-libs-2.34.ebuild
+++ b/sys-libs/binutils-libs/binutils-libs-2.34.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 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
BDEPEND="nls? ( sys-devel/gettext )"
DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
diff --git a/sys-libs/cracklib/cracklib-2.9.6-r2.ebuild b/sys-libs/cracklib/cracklib-2.9.6-r2.ebuild
index 67b01c26b8d..f7eb28d8f9a 100644
--- a/sys-libs/cracklib/cracklib-2.9.6-r2.ebuild
+++ b/sys-libs/cracklib/cracklib-2.9.6-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
IUSE="nls python static-libs zlib"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sys-libs/cracklib/cracklib-2.9.7.ebuild b/sys-libs/cracklib/cracklib-2.9.7.ebuild
index 32d12db7d66..e9f90459fbc 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
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 7e2658ff7c9..42c3fb8ce9b 100644
--- a/sys-libs/db/db-1.85-r4.ebuild
+++ b/sys-libs/db/db-1.85-r4.ebuild
@@ -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 sh 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-18.1.32.ebuild b/sys-libs/db/db-18.1.32.ebuild
index b44531fc25e..c8d7486e83f 100644
--- a/sys-libs/db/db-18.1.32.ebuild
+++ b/sys-libs/db/db-18.1.32.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -30,7 +30,7 @@ done
LICENSE="AGPL-3"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="doc java cxx tcl test"
REQUIRED_USE="test? ( tcl )"
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 a08f3c48659..62ea2ee30e7 100644
--- a/sys-libs/db/db-3.2.9_p2-r1.ebuild
+++ b/sys-libs/db/db-3.2.9_p2-r1.ebuild
@@ -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 sh 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-r2.ebuild b/sys-libs/db/db-4.2.52_p5-r2.ebuild
index e74218a5d07..f9454de5eef 100644
--- a/sys-libs/db/db-4.2.52_p5-r2.ebuild
+++ b/sys-libs/db/db-4.2.52_p5-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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE="tcl java doc cxx rpc"
RESTRICT="!test? ( test )"
diff --git a/sys-libs/db/db-4.3.29_p1-r2.ebuild b/sys-libs/db/db-4.3.29_p1-r2.ebuild
index b710ea697ea..81896b6e565 100644
--- a/sys-libs/db/db-4.3.29_p1-r2.ebuild
+++ b/sys-libs/db/db-4.3.29_p1-r2.ebuild
@@ -27,7 +27,7 @@ done
LICENSE="Sleepycat"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sparc x86"
IUSE="tcl java doc cxx rpc"
RESTRICT="!test? ( test )"
diff --git a/sys-libs/db/db-4.4.20_p4-r2.ebuild b/sys-libs/db/db-4.4.20_p4-r2.ebuild
index ba34f3c14a1..980ee7aa93e 100644
--- a/sys-libs/db/db-4.4.20_p4-r2.ebuild
+++ b/sys-libs/db/db-4.4.20_p4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -28,7 +28,7 @@ done
LICENSE="Sleepycat BSD"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="tcl java doc cxx rpc"
RESTRICT="!test? ( test )"
diff --git a/sys-libs/db/db-4.5.20_p2-r2.ebuild b/sys-libs/db/db-4.5.20_p2-r2.ebuild
index e5d312d7c5d..3b7360b9467 100644
--- a/sys-libs/db/db-4.5.20_p2-r2.ebuild
+++ b/sys-libs/db/db-4.5.20_p2-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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE="tcl java doc cxx rpc"
RESTRICT="!test? ( test )"
diff --git a/sys-libs/db/db-4.6.21_p4-r1.ebuild b/sys-libs/db/db-4.6.21_p4-r1.ebuild
index d62e2ffe83f..76bcc6630da 100644
--- a/sys-libs/db/db-4.6.21_p4-r1.ebuild
+++ b/sys-libs/db/db-4.6.21_p4-r1.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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE="tcl java doc cxx rpc"
RESTRICT="!test? ( test )"
diff --git a/sys-libs/db/db-4.7.25_p4-r1.ebuild b/sys-libs/db/db-4.7.25_p4-r1.ebuild
index 3a78c89cd14..a75117aac7b 100644
--- a/sys-libs/db/db-4.7.25_p4-r1.ebuild
+++ b/sys-libs/db/db-4.7.25_p4-r1.ebuild
@@ -29,7 +29,7 @@ done
LICENSE="Sleepycat"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sparc x86"
IUSE="doc java cxx tcl test rpc"
# 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 c7077ddb38b..52a626fbf4d 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 sh 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.1.29-r2.ebuild b/sys-libs/db/db-5.1.29-r2.ebuild
index fa1ad448f71..210615eeed8 100644
--- a/sys-libs/db/db-5.1.29-r2.ebuild
+++ b/sys-libs/db/db-5.1.29-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -29,7 +29,7 @@ done
LICENSE="Sleepycat"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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-r2.ebuild b/sys-libs/db/db-5.3.28-r2.ebuild
index 99dffeadf8c..d6214034762 100644
--- a/sys-libs/db/db-5.3.28-r2.ebuild
+++ b/sys-libs/db/db-5.3.28-r2.ebuild
@@ -29,7 +29,7 @@ done
LICENSE="Sleepycat"
SLOT="5.3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 ~riscv ~s390 ~sh 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/db/db-5.3.28-r4.ebuild b/sys-libs/db/db-5.3.28-r4.ebuild
index d7e61dc35ab..01c3e5b1835 100644
--- a/sys-libs/db/db-5.3.28-r4.ebuild
+++ b/sys-libs/db/db-5.3.28-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -29,7 +29,7 @@ done
LICENSE="Sleepycat"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sh ~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/db/db-6.0.35-r2.ebuild b/sys-libs/db/db-6.0.35-r2.ebuild
index b10a1424460..9b1696e96c3 100644
--- a/sys-libs/db/db-6.0.35-r2.ebuild
+++ b/sys-libs/db/db-6.0.35-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -29,7 +29,7 @@ done
LICENSE="AGPL-3"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sh ~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/db/db-6.1.38.ebuild b/sys-libs/db/db-6.1.38.ebuild
index fa361fed901..3609e94268b 100644
--- a/sys-libs/db/db-6.1.38.ebuild
+++ b/sys-libs/db/db-6.1.38.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -29,7 +29,7 @@ done
LICENSE="AGPL-3"
SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sh ~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/db/db-6.2.38.ebuild b/sys-libs/db/db-6.2.38.ebuild
index 574e8c6fda3..965668160fc 100644
--- a/sys-libs/db/db-6.2.38.ebuild
+++ b/sys-libs/db/db-6.2.38.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -29,7 +29,7 @@ done
LICENSE="AGPL-3"
SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sh ~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.4.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.4.ebuild
index c58bec60eb5..dbb9df4b7ac 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.4.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${MY_P}.tar.xz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~m68k-mint ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~m68k-mint ~x86-solaris"
IUSE="static-libs"
RDEPEND="!sys-libs/com_err
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.5.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.5.ebuild
index ecd79600014..f88bcc30ad9 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.5.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${MY_P}.tar.xz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~m68k-mint ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~m68k-mint ~x86-solaris"
IUSE="static-libs"
RDEPEND="!sys-libs/com_err
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 cbb2657079b..cd86eb815c2 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.6.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${MY_P}.tar.xz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint ~x86-solaris"
IUSE="static-libs"
RDEPEND="!sys-libs/com_err
diff --git a/sys-libs/gdbm/gdbm-1.13-r2.ebuild b/sys-libs/gdbm/gdbm-1.13-r2.ebuild
index a49c6376e47..6777ea6d00d 100644
--- a/sys-libs/gdbm/gdbm-1.13-r2.ebuild
+++ b/sys-libs/gdbm/gdbm-1.13-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/gdbm/${P}.tar.gz
LICENSE="GPL-3"
SLOT="0/1.13"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+berkdb exporter nls +readline static-libs"
DEPEND="
diff --git a/sys-libs/gdbm/gdbm-1.14.1.ebuild b/sys-libs/gdbm/gdbm-1.14.1.ebuild
index 57f48be157d..cf94e26b346 100644
--- a/sys-libs/gdbm/gdbm-1.14.1.ebuild
+++ b/sys-libs/gdbm/gdbm-1.14.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/gdbm/${P}.tar.gz
LICENSE="GPL-3"
SLOT="0/5" # libgdbm.so version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+berkdb exporter nls +readline static-libs"
DEPEND="
diff --git a/sys-libs/gdbm/gdbm-1.17.ebuild b/sys-libs/gdbm/gdbm-1.17.ebuild
index 17c5c708904..c60d587a05e 100644
--- a/sys-libs/gdbm/gdbm-1.17.ebuild
+++ b/sys-libs/gdbm/gdbm-1.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+berkdb nls +readline static-libs"
DEPEND="
diff --git a/sys-libs/gdbm/gdbm-1.18.1.ebuild b/sys-libs/gdbm/gdbm-1.18.1.ebuild
index 46bf7393060..5ed06c51213 100644
--- a/sys-libs/gdbm/gdbm-1.18.1.ebuild
+++ b/sys-libs/gdbm/gdbm-1.18.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+berkdb nls +readline static-libs"
DEPEND="
diff --git a/sys-libs/gdbm/gdbm-1.18.ebuild b/sys-libs/gdbm/gdbm-1.18.ebuild
index 42d02cb592a..52e70d61afa 100644
--- a/sys-libs/gdbm/gdbm-1.18.ebuild
+++ b/sys-libs/gdbm/gdbm-1.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+berkdb nls +readline static-libs"
DEPEND="
diff --git a/sys-libs/glibc/glibc-2.24-r4.ebuild b/sys-libs/glibc/glibc-2.24-r4.ebuild
index d6831c0403b..567bb161517 100644
--- a/sys-libs/glibc/glibc-2.24-r4.ebuild
+++ b/sys-libs/glibc/glibc-2.24-r4.ebuild
@@ -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 ~sh ~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.25-r11.ebuild b/sys-libs/glibc/glibc-2.25-r11.ebuild
index 8c30e398b3e..6914514594d 100644
--- a/sys-libs/glibc/glibc-2.25-r11.ebuild
+++ b/sys-libs/glibc/glibc-2.25-r11.ebuild
@@ -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 sh 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.26-r7.ebuild b/sys-libs/glibc/glibc-2.26-r7.ebuild
index 2dd4e66f29b..b69d954f54f 100644
--- a/sys-libs/glibc/glibc-2.26-r7.ebuild
+++ b/sys-libs/glibc/glibc-2.26-r7.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://sourceware.org/git/glibc.git"
inherit git-r3
else
- KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
fi
diff --git a/sys-libs/glibc/glibc-2.27-r6.ebuild b/sys-libs/glibc/glibc-2.27-r6.ebuild
index bc34884497c..e40018426cc 100644
--- a/sys-libs/glibc/glibc-2.27-r6.ebuild
+++ b/sys-libs/glibc/glibc-2.27-r6.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://sourceware.org/git/glibc.git"
inherit git-r3
else
- KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
fi
diff --git a/sys-libs/glibc/glibc-2.28-r6.ebuild b/sys-libs/glibc/glibc-2.28-r6.ebuild
index c31d58fa7cf..335f081dbdd 100644
--- a/sys-libs/glibc/glibc-2.28-r6.ebuild
+++ b/sys-libs/glibc/glibc-2.28-r6.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://sourceware.org/git/glibc.git"
inherit git-r3
else
- KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
fi
diff --git a/sys-libs/glibc/glibc-2.29-r7.ebuild b/sys-libs/glibc/glibc-2.29-r7.ebuild
index cdc045a5834..b883c878e01 100644
--- a/sys-libs/glibc/glibc-2.29-r7.ebuild
+++ b/sys-libs/glibc/glibc-2.29-r7.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://sourceware.org/git/glibc.git"
inherit git-r3
else
- KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sh 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"
fi
diff --git a/sys-libs/glibc/glibc-2.30-r6.ebuild b/sys-libs/glibc/glibc-2.30-r6.ebuild
index a2c6434e559..00846478a13 100644
--- a/sys-libs/glibc/glibc-2.30-r6.ebuild
+++ b/sys-libs/glibc/glibc-2.30-r6.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://sourceware.org/git/glibc.git"
inherit git-r3
else
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~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"
fi
diff --git a/sys-libs/gpm/gpm-1.20.7-r2.ebuild b/sys-libs/gpm/gpm-1.20.7-r2.ebuild
index df485bea459..7691b56e4b4 100644
--- a/sys-libs/gpm/gpm-1.20.7-r2.ebuild
+++ b/sys-libs/gpm/gpm-1.20.7-r2.ebuild
@@ -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 sh 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/ldb/ldb-1.1.29-r1.ebuild b/sys-libs/ldb/ldb-1.1.29-r1.ebuild
index a6c0906ceed..e2bb5dbe1f4 100644
--- a/sys-libs/ldb/ldb-1.1.29-r1.ebuild
+++ b/sys-libs/ldb/ldb-1.1.29-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.samba.org/ftp/pub/${PN}/${P}.tar.gz"
LICENSE="LGPL-3"
SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="doc +ldap python"
RDEPEND="!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
diff --git a/sys-libs/ldb/ldb-1.1.31.ebuild b/sys-libs/ldb/ldb-1.1.31.ebuild
index eefafd3a046..0e688b6baa8 100644
--- a/sys-libs/ldb/ldb-1.1.31.ebuild
+++ b/sys-libs/ldb/ldb-1.1.31.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.samba.org/ftp/pub/${PN}/${P}.tar.gz"
LICENSE="LGPL-3"
SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="doc +ldap python"
RDEPEND="!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
diff --git a/sys-libs/ldb/ldb-1.2.4.ebuild b/sys-libs/ldb/ldb-1.2.4.ebuild
index cf8a380ede1..905b17d44ad 100644
--- a/sys-libs/ldb/ldb-1.2.4.ebuild
+++ b/sys-libs/ldb/ldb-1.2.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.samba.org/ftp/pub/${PN}/${P}.tar.gz"
LICENSE="LGPL-3"
SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="doc +ldap python"
RDEPEND="!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
diff --git a/sys-libs/ldb/ldb-1.3.6.ebuild b/sys-libs/ldb/ldb-1.3.6.ebuild
index 4dddfa79824..3520bccc0a9 100644
--- a/sys-libs/ldb/ldb-1.3.6.ebuild
+++ b/sys-libs/ldb/ldb-1.3.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.samba.org/ftp/pub/${PN}/${P}.tar.gz"
LICENSE="LGPL-3"
SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
IUSE="doc +ldap python"
RDEPEND="
diff --git a/sys-libs/ldb/ldb-1.3.8.ebuild b/sys-libs/ldb/ldb-1.3.8.ebuild
index c67965ec43e..1e57d9ba250 100644
--- a/sys-libs/ldb/ldb-1.3.8.ebuild
+++ b/sys-libs/ldb/ldb-1.3.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.samba.org/ftp/pub/${PN}/${P}.tar.gz"
LICENSE="LGPL-3"
SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="doc +ldap python"
RDEPEND="
diff --git a/sys-libs/ldb/ldb-1.4.8.ebuild b/sys-libs/ldb/ldb-1.4.8.ebuild
index 79adbc97587..50c21d13f34 100644
--- a/sys-libs/ldb/ldb-1.4.8.ebuild
+++ b/sys-libs/ldb/ldb-1.4.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.samba.org/ftp/pub/${PN}/${P}.tar.gz"
LICENSE="LGPL-3"
SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="doc +ldap +lmdb python"
RDEPEND="
diff --git a/sys-libs/ldb/ldb-1.5.4.ebuild b/sys-libs/ldb/ldb-1.5.4.ebuild
index 4d482e98434..8183ac7b626 100644
--- a/sys-libs/ldb/ldb-1.5.4.ebuild
+++ b/sys-libs/ldb/ldb-1.5.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.samba.org/ftp/pub/${PN}/${P}.tar.gz"
LICENSE="LGPL-3"
SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="doc +ldap +lmdb python"
RDEPEND="
diff --git a/sys-libs/ldb/ldb-1.5.6.ebuild b/sys-libs/ldb/ldb-1.5.6.ebuild
index e923eb6743d..f3e083016cd 100644
--- a/sys-libs/ldb/ldb-1.5.6.ebuild
+++ b/sys-libs/ldb/ldb-1.5.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.samba.org/ftp/pub/${PN}/${P}.tar.gz"
LICENSE="LGPL-3"
SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="doc +ldap +lmdb python"
RDEPEND="
diff --git a/sys-libs/ldb/ldb-1.6.3.ebuild b/sys-libs/ldb/ldb-1.6.3.ebuild
index e923eb6743d..f3e083016cd 100644
--- a/sys-libs/ldb/ldb-1.6.3.ebuild
+++ b/sys-libs/ldb/ldb-1.6.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.samba.org/ftp/pub/${PN}/${P}.tar.gz"
LICENSE="LGPL-3"
SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="doc +ldap +lmdb python"
RDEPEND="
diff --git a/sys-libs/ldb/ldb-2.0.8.ebuild b/sys-libs/ldb/ldb-2.0.8.ebuild
index 7907603045a..b469a3f5627 100644
--- a/sys-libs/ldb/ldb-2.0.8.ebuild
+++ b/sys-libs/ldb/ldb-2.0.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.samba.org/ftp/pub/${PN}/${P}.tar.gz"
LICENSE="LGPL-3"
SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
IUSE="doc +ldap +lmdb python test"
RESTRICT="!test? ( test )"
diff --git a/sys-libs/ldb/ldb-2.0.9.ebuild b/sys-libs/ldb/ldb-2.0.9.ebuild
index 5c37afb9697..0054406aec4 100644
--- a/sys-libs/ldb/ldb-2.0.9.ebuild
+++ b/sys-libs/ldb/ldb-2.0.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.samba.org/ftp/pub/${PN}/${P}.tar.gz"
LICENSE="LGPL-3"
SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="doc +ldap +lmdb python test"
RESTRICT="!test? ( test )"
diff --git a/sys-libs/ldb/ldb-2.1.1.ebuild b/sys-libs/ldb/ldb-2.1.1.ebuild
index 19553e018dd..c8b8d655586 100644
--- a/sys-libs/ldb/ldb-2.1.1.ebuild
+++ b/sys-libs/ldb/ldb-2.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.samba.org/ftp/pub/${PN}/${P}.tar.gz"
LICENSE="LGPL-3"
SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="doc +ldap +lmdb python test"
RESTRICT="!test? ( test )"
diff --git a/sys-libs/libcap-ng/libcap-ng-0.7.10.ebuild b/sys-libs/libcap-ng/libcap-ng-0.7.10.ebuild
index 03baf68eeb4..f5bb0b976dc 100644
--- a/sys-libs/libcap-ng/libcap-ng-0.7.10.ebuild
+++ b/sys-libs/libcap-ng/libcap-ng-0.7.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://people.redhat.com/sgrubb/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
IUSE="python static-libs"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sys-libs/libcap-ng/libcap-ng-0.7.8.ebuild b/sys-libs/libcap-ng/libcap-ng-0.7.8.ebuild
index a9bbeaa640b..176aa7fbebb 100644
--- a/sys-libs/libcap-ng/libcap-ng-0.7.8.ebuild
+++ b/sys-libs/libcap-ng/libcap-ng-0.7.8.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://people.redhat.com/sgrubb/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~x86-linux"
IUSE="python static-libs"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sys-libs/libcap-ng/libcap-ng-0.7.9.ebuild b/sys-libs/libcap-ng/libcap-ng-0.7.9.ebuild
index 202648aebe3..55399eace03 100644
--- a/sys-libs/libcap-ng/libcap-ng-0.7.9.ebuild
+++ b/sys-libs/libcap-ng/libcap-ng-0.7.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://people.redhat.com/sgrubb/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
IUSE="python static-libs"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sys-libs/libcap/libcap-2.26-r2.ebuild b/sys-libs/libcap/libcap-2.26-r2.ebuild
index d6057a7e760..434a636cbc7 100644
--- a/sys-libs/libcap/libcap-2.26-r2.ebuild
+++ b/sys-libs/libcap/libcap-2.26-r2.ebuild
@@ -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 sh 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/libcap/libcap-2.27.ebuild b/sys-libs/libcap/libcap-2.27.ebuild
index f33205f74b2..534badc5a28 100644
--- a/sys-libs/libcap/libcap-2.27.ebuild
+++ b/sys-libs/libcap/libcap-2.27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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/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 ~sh ~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/libcap/libcap-2.32.ebuild b/sys-libs/libcap/libcap-2.32.ebuild
index 019cf1be2c6..0f7d52538c1 100644
--- a/sys-libs/libcap/libcap-2.32.ebuild
+++ b/sys-libs/libcap/libcap-2.32.ebuild
@@ -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 ~sh ~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/libcap/libcap-2.33.ebuild b/sys-libs/libcap/libcap-2.33.ebuild
index 81f165bc931..2e603412b5e 100644
--- a/sys-libs/libcap/libcap-2.33.ebuild
+++ b/sys-libs/libcap/libcap-2.33.ebuild
@@ -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 ~sh ~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/libraw1394/libraw1394-2.1.2-r1.ebuild b/sys-libs/libraw1394/libraw1394-2.1.2-r1.ebuild
index 17f614e2119..5ece71af366 100644
--- a/sys-libs/libraw1394/libraw1394-2.1.2-r1.ebuild
+++ b/sys-libs/libraw1394/libraw1394-2.1.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/libs/ieee1394/${P}.tar.xz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
IUSE=""
multilib_src_configure() {
diff --git a/sys-libs/libutempter/libutempter-1.1.6-r3.ebuild b/sys-libs/libutempter/libutempter-1.1.6-r3.ebuild
index 00420c6927b..333f579e1cf 100644
--- a/sys-libs/libutempter/libutempter-1.1.6-r3.ebuild
+++ b/sys-libs/libutempter/libutempter-1.1.6-r3.ebuild
@@ -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 ~sh 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 54bdb38ab79..4e640537468 100644
--- a/sys-libs/mtdev/mtdev-1.1.6.ebuild
+++ b/sys-libs/mtdev/mtdev-1.1.6.ebuild
@@ -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 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE=""
DEPEND=">=sys-kernel/linux-headers-2.6.31"
diff --git a/sys-libs/ncurses-compat/ncurses-compat-5.9.ebuild b/sys-libs/ncurses-compat/ncurses-compat-5.9.ebuild
index 62fc318dbef..eddb1f97757 100644
--- a/sys-libs/ncurses-compat/ncurses-compat-5.9.ebuild
+++ b/sys-libs/ncurses-compat/ncurses-compat-5.9.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz"
LICENSE="MIT"
# The subslot reflects the SONAME.
SLOT="5/5"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE="gpm tinfo unicode"
DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
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 562dbc4e4df..13a0da5e700 100644
--- a/sys-libs/ncurses-compat/ncurses-compat-6.1_p20190609.ebuild
+++ b/sys-libs/ncurses-compat/ncurses-compat-6.1_p20190609.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# This version is just for the ABI .5 library
@@ -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 ~sh ~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.1_p20181020.ebuild b/sys-libs/ncurses/ncurses-6.1_p20181020.ebuild
index 2b25945830a..9539dd7a758 100644
--- a/sys-libs/ncurses/ncurses-6.1_p20181020.ebuild
+++ b/sys-libs/ncurses/ncurses-6.1_p20181020.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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
IUSE="ada +cxx debug doc gpm minimal profile static-libs test threads tinfo trace unicode"
RESTRICT="!test? ( test )"
diff --git a/sys-libs/ncurses/ncurses-6.1_p20190609.ebuild b/sys-libs/ncurses/ncurses-6.1_p20190609.ebuild
index f7e2f98a667..149eafe7da9 100644
--- a/sys-libs/ncurses/ncurses-6.1_p20190609.ebuild
+++ b/sys-libs/ncurses/ncurses-6.1_p20190609.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
IUSE="ada +cxx debug doc gpm minimal profile static-libs test threads tinfo trace unicode"
RESTRICT="!test? ( test )"
diff --git a/sys-libs/ncurses/ncurses-6.2-r1.ebuild b/sys-libs/ncurses/ncurses-6.2-r1.ebuild
index 6c96fc33f99..89fccf97ba4 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 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="ada +cxx debug doc gpm minimal profile static-libs test threads tinfo trace unicode"
RESTRICT="!test? ( test )"
diff --git a/sys-libs/newlib/newlib-2.2.0.ebuild b/sys-libs/newlib/newlib-2.2.0.ebuild
index 434c9cb4e2a..c75fa8872d7 100644
--- a/sys-libs/newlib/newlib-2.2.0.ebuild
+++ b/sys-libs/newlib/newlib-2.2.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
else
SRC_URI="ftp://sourceware.org/pub/newlib/${P}.tar.gz"
- KEYWORDS="-* arm hppa m68k ~mips ppc ppc64 sh sparc x86"
+ KEYWORDS="-* arm hppa m68k ~mips ppc ppc64 sparc x86"
fi
export CBUILD=${CBUILD:-${CHOST}}
diff --git a/sys-libs/newlib/newlib-2.5.0.ebuild b/sys-libs/newlib/newlib-2.5.0.ebuild
index bf7a456c81d..f2b9ba72e10 100644
--- a/sys-libs/newlib/newlib-2.5.0.ebuild
+++ b/sys-libs/newlib/newlib-2.5.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
else
SRC_URI="ftp://sourceware.org/pub/newlib/${P}.tar.gz"
if [[ ${PV} != *.201[5-9]???? ]] ; then
- KEYWORDS="-* ~arm ~hppa ~m68k ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+ KEYWORDS="-* ~arm ~hppa ~m68k ~mips ~ppc ~ppc64 ~sparc ~x86"
fi
fi
diff --git a/sys-libs/newlib/newlib-3.1.0.ebuild b/sys-libs/newlib/newlib-3.1.0.ebuild
index 345bb529dcd..db1a3fad9cf 100644
--- a/sys-libs/newlib/newlib-3.1.0.ebuild
+++ b/sys-libs/newlib/newlib-3.1.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
else
SRC_URI="ftp://sourceware.org/pub/newlib/${P}.tar.gz"
- KEYWORDS="-* ~arm ~hppa ~m68k ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+ KEYWORDS="-* ~arm ~hppa ~m68k ~mips ~ppc ~ppc64 ~sparc ~x86"
fi
export CBUILD=${CBUILD:-${CHOST}}
diff --git a/sys-libs/newlib/newlib-3.3.0.ebuild b/sys-libs/newlib/newlib-3.3.0.ebuild
index 345bb529dcd..db1a3fad9cf 100644
--- a/sys-libs/newlib/newlib-3.3.0.ebuild
+++ b/sys-libs/newlib/newlib-3.3.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
else
SRC_URI="ftp://sourceware.org/pub/newlib/${P}.tar.gz"
- KEYWORDS="-* ~arm ~hppa ~m68k ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+ KEYWORDS="-* ~arm ~hppa ~m68k ~mips ~ppc ~ppc64 ~sparc ~x86"
fi
export CBUILD=${CBUILD:-${CHOST}}
diff --git a/sys-libs/newlib/newlib-9999.ebuild b/sys-libs/newlib/newlib-9999.ebuild
index 345bb529dcd..db1a3fad9cf 100644
--- a/sys-libs/newlib/newlib-9999.ebuild
+++ b/sys-libs/newlib/newlib-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
else
SRC_URI="ftp://sourceware.org/pub/newlib/${P}.tar.gz"
- KEYWORDS="-* ~arm ~hppa ~m68k ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+ KEYWORDS="-* ~arm ~hppa ~m68k ~mips ~ppc ~ppc64 ~sparc ~x86"
fi
export CBUILD=${CBUILD:-${CHOST}}
diff --git a/sys-libs/pam/pam-1.3.1-r2.ebuild b/sys-libs/pam/pam-1.3.1-r2.ebuild
index 0d8769b37ab..3e691c8b897 100644
--- a/sys-libs/pam/pam-1.3.1-r2.ebuild
+++ b/sys-libs/pam/pam-1.3.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/linux-pam/linux-pam/archive/v${PV}.tar.gz -> ${P}.ta
LICENSE="|| ( BSD GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 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="audit berkdb +cracklib debug nis +pie selinux static-libs"
BDEPEND="app-text/docbook-xml-dtd:4.1.2
diff --git a/sys-libs/pam/pam-1.3.1_p20200128-r1.ebuild b/sys-libs/pam/pam-1.3.1_p20200128-r1.ebuild
index 60b2db8d249..97a36d6399c 100644
--- a/sys-libs/pam/pam-1.3.1_p20200128-r1.ebuild
+++ b/sys-libs/pam/pam-1.3.1_p20200128-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/linux-pam/linux-pam/archive/${COMMIT_HASH}.tar.gz#/$
LICENSE="|| ( BSD GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~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="audit berkdb +cracklib debug nis +pie selinux static-libs"
BDEPEND="app-text/docbook-xml-dtd:4.1.2
diff --git a/sys-libs/pwdb/pwdb-0.62-r1.ebuild b/sys-libs/pwdb/pwdb-0.62-r1.ebuild
index 97f0dec88f4..a75829942e4 100644
--- a/sys-libs/pwdb/pwdb-0.62-r1.ebuild
+++ b/sys-libs/pwdb/pwdb-0.62-r1.ebuild
@@ -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 sh 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-6.3_p8-r3.ebuild b/sys-libs/readline/readline-6.3_p8-r3.ebuild
index 06ce2a1e2a4..063ddc7b7dd 100644
--- a/sys-libs/readline/readline-6.3_p8-r3.ebuild
+++ b/sys-libs/readline/readline-6.3_p8-r3.ebuild
@@ -33,7 +33,7 @@ SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 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 utils"
RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}]"
diff --git a/sys-libs/readline/readline-7.0_p5-r1.ebuild b/sys-libs/readline/readline-7.0_p5-r1.ebuild
index 36cd5015f88..ea64774c87c 100644
--- a/sys-libs/readline/readline-7.0_p5-r1.ebuild
+++ b/sys-libs/readline/readline-7.0_p5-r1.ebuild
@@ -41,7 +41,7 @@ esac
LICENSE="GPL-3"
SLOT="0/7" # subslot matches SONAME major
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 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/readline/readline-8.0_p1-r1.ebuild b/sys-libs/readline/readline-8.0_p1-r1.ebuild
index 6b36ff730e5..25d7fd3844c 100644
--- a/sys-libs/readline/readline-8.0_p1-r1.ebuild
+++ b/sys-libs/readline/readline-8.0_p1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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 ~sh ~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/readline/readline-8.0_p4.ebuild b/sys-libs/readline/readline-8.0_p4.ebuild
index cd51e2e9352..25d7fd3844c 100644
--- a/sys-libs/readline/readline-8.0_p4.ebuild
+++ b/sys-libs/readline/readline-8.0_p4.ebuild
@@ -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 ~sh ~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 f8c6e4b7131..5532de50414 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
fi
LICENSE="GPL-2"
SLOT="0"
diff --git a/sys-libs/talloc/talloc-2.1.14.ebuild b/sys-libs/talloc/talloc-2.1.14.ebuild
index e194a48bfa9..f29bf4cb8a9 100644
--- a/sys-libs/talloc/talloc-2.1.14.ebuild
+++ b/sys-libs/talloc/talloc-2.1.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="https://www.samba.org/ftp/${PN}/${P}.tar.gz"
LICENSE="GPL-3 LGPL-3+ LGPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris"
IUSE="compat +python"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-libs/talloc/talloc-2.1.16.ebuild b/sys-libs/talloc/talloc-2.1.16.ebuild
index 04c594c54c9..e0b9f9c0439 100644
--- a/sys-libs/talloc/talloc-2.1.16.ebuild
+++ b/sys-libs/talloc/talloc-2.1.16.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.samba.org/ftp/${PN}/${P}.tar.gz"
LICENSE="GPL-3 LGPL-3+ LGPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris"
IUSE="compat +python"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-libs/talloc/talloc-2.1.9.ebuild b/sys-libs/talloc/talloc-2.1.9.ebuild
index edb48e09c90..fa3d3ab9e8c 100644
--- a/sys-libs/talloc/talloc-2.1.9.ebuild
+++ b/sys-libs/talloc/talloc-2.1.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.samba.org/ftp/${PN}/${P}.tar.gz"
LICENSE="GPL-3 LGPL-3+ LGPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris"
IUSE="compat +python"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-libs/talloc/talloc-2.2.0.ebuild b/sys-libs/talloc/talloc-2.2.0.ebuild
index 5dbf3a73981..75dad67e089 100644
--- a/sys-libs/talloc/talloc-2.2.0.ebuild
+++ b/sys-libs/talloc/talloc-2.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.samba.org/ftp/${PN}/${P}.tar.gz"
LICENSE="GPL-3 LGPL-3+ LGPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~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 ~x64-macos ~sparc-solaris ~x64-solaris"
IUSE="compat +python"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-libs/talloc/talloc-2.3.0.ebuild b/sys-libs/talloc/talloc-2.3.0.ebuild
index c5c76d2f141..46bc7917912 100644
--- a/sys-libs/talloc/talloc-2.3.0.ebuild
+++ b/sys-libs/talloc/talloc-2.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.samba.org/ftp/${PN}/${P}.tar.gz"
LICENSE="GPL-3 LGPL-3+ LGPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~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 ~x64-macos ~sparc-solaris ~x64-solaris"
IUSE="compat +python"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-libs/talloc/talloc-2.3.1.ebuild b/sys-libs/talloc/talloc-2.3.1.ebuild
index e04f7710d77..1d3e5360336 100644
--- a/sys-libs/talloc/talloc-2.3.1.ebuild
+++ b/sys-libs/talloc/talloc-2.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.samba.org/ftp/${PN}/${P}.tar.gz"
LICENSE="GPL-3 LGPL-3+ LGPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~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 ~x64-macos ~sparc-solaris ~x64-solaris"
IUSE="compat +python"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-libs/tdb/tdb-1.3.13.ebuild b/sys-libs/tdb/tdb-1.3.13.ebuild
index c78850a4368..fce5a2030d4 100644
--- a/sys-libs/tdb/tdb-1.3.13.ebuild
+++ b/sys-libs/tdb/tdb-1.3.13.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.samba.org/ftp/tdb/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="python"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-libs/tdb/tdb-1.3.16.ebuild b/sys-libs/tdb/tdb-1.3.16.ebuild
index a22451fcc1b..9c9a3c5b1d3 100644
--- a/sys-libs/tdb/tdb-1.3.16.ebuild
+++ b/sys-libs/tdb/tdb-1.3.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="http://samba.org/ftp/tdb/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="python"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-libs/tdb/tdb-1.3.18.ebuild b/sys-libs/tdb/tdb-1.3.18.ebuild
index 0583e5d9c4a..0c1d876f9e0 100644
--- a/sys-libs/tdb/tdb-1.3.18.ebuild
+++ b/sys-libs/tdb/tdb-1.3.18.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://samba.org/ftp/tdb/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="python"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-libs/tdb/tdb-1.4.0.ebuild b/sys-libs/tdb/tdb-1.4.0.ebuild
index 592a0c9e5a0..03791ce5b25 100644
--- a/sys-libs/tdb/tdb-1.4.0.ebuild
+++ b/sys-libs/tdb/tdb-1.4.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://samba.org/ftp/tdb/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="python"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-libs/tdb/tdb-1.4.2.ebuild b/sys-libs/tdb/tdb-1.4.2.ebuild
index 0583e5d9c4a..0c1d876f9e0 100644
--- a/sys-libs/tdb/tdb-1.4.2.ebuild
+++ b/sys-libs/tdb/tdb-1.4.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://samba.org/ftp/tdb/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="python"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-libs/tdb/tdb-1.4.3.ebuild b/sys-libs/tdb/tdb-1.4.3.ebuild
index a0b21e54153..12f23e54aad 100644
--- a/sys-libs/tdb/tdb-1.4.3.ebuild
+++ b/sys-libs/tdb/tdb-1.4.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://samba.org/ftp/tdb/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="python"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-libs/tevent/tevent-0.10.0.ebuild b/sys-libs/tevent/tevent-0.10.0.ebuild
index 81828a53c19..08d3a959b25 100644
--- a/sys-libs/tevent/tevent-0.10.0.ebuild
+++ b/sys-libs/tevent/tevent-0.10.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.samba.org/ftp/tevent/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux"
IUSE="elibc_glibc python"
RDEPEND="!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
diff --git a/sys-libs/tevent/tevent-0.10.1.ebuild b/sys-libs/tevent/tevent-0.10.1.ebuild
index 30cc966b6bd..fbbf34b5cf8 100644
--- a/sys-libs/tevent/tevent-0.10.1.ebuild
+++ b/sys-libs/tevent/tevent-0.10.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.samba.org/ftp/tevent/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
IUSE="elibc_glibc python"
RDEPEND="!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
diff --git a/sys-libs/tevent/tevent-0.10.2.ebuild b/sys-libs/tevent/tevent-0.10.2.ebuild
index 601f515f97b..082fdf54912 100644
--- a/sys-libs/tevent/tevent-0.10.2.ebuild
+++ b/sys-libs/tevent/tevent-0.10.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.samba.org/ftp/tevent/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux"
IUSE="elibc_glibc python"
RDEPEND="!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
diff --git a/sys-libs/tevent/tevent-0.9.31-r1.ebuild b/sys-libs/tevent/tevent-0.9.31-r1.ebuild
index 83ce1dbb35f..89cf18dfa50 100644
--- a/sys-libs/tevent/tevent-0.9.31-r1.ebuild
+++ b/sys-libs/tevent/tevent-0.9.31-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.samba.org/ftp/tevent/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x86-linux"
IUSE="python"
RDEPEND="!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
diff --git a/sys-libs/tevent/tevent-0.9.37.ebuild b/sys-libs/tevent/tevent-0.9.37.ebuild
index 56a3b6bbd36..9ac20041b76 100644
--- a/sys-libs/tevent/tevent-0.9.37.ebuild
+++ b/sys-libs/tevent/tevent-0.9.37.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://www.samba.org/ftp/tevent/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~x86-linux"
IUSE="elibc_glibc python"
RDEPEND="!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
diff --git a/sys-libs/tevent/tevent-0.9.39.ebuild b/sys-libs/tevent/tevent-0.9.39.ebuild
index ab3f7f98b89..2658de409a8 100644
--- a/sys-libs/tevent/tevent-0.9.39.ebuild
+++ b/sys-libs/tevent/tevent-0.9.39.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.samba.org/ftp/tevent/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
IUSE="elibc_glibc python"
RDEPEND="!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
diff --git a/sys-libs/timezone-data/timezone-data-2019c.ebuild b/sys-libs/timezone-data/timezone-data-2019c.ebuild
index d8bcf87b001..acfa682e439 100644
--- a/sys-libs/timezone-data/timezone-data-2019c.ebuild
+++ b/sys-libs/timezone-data/timezone-data-2019c.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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x86-macos ~x64-solaris"
IUSE="nls leaps-timezone elibc_FreeBSD"
DEPEND="nls? ( virtual/libintl )"
diff --git a/sys-libs/zlib/zlib-1.2.11-r2.ebuild b/sys-libs/zlib/zlib-1.2.11-r2.ebuild
index d5577f4739b..c9a9374ae44 100644
--- a/sys-libs/zlib/zlib-1.2.11-r2.ebuild
+++ b/sys-libs/zlib/zlib-1.2.11-r2.ebuild
@@ -14,7 +14,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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
IUSE="minizip static-libs"
DEPEND="minizip? ( ${AUTOTOOLS_DEPEND} )"
diff --git a/sys-process/audit/audit-2.6.4.ebuild b/sys-process/audit/audit-2.6.4.ebuild
index a6fe350270b..54c3bf5375f 100644
--- a/sys-process/audit/audit-2.6.4.ebuild
+++ b/sys-process/audit/audit-2.6.4.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="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~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-2.7.1.ebuild b/sys-process/audit/audit-2.7.1.ebuild
index e67e1edf8d4..c8a767b2270 100644
--- a/sys-process/audit/audit-2.7.1.ebuild
+++ b/sys-process/audit/audit-2.7.1.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="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 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-2.8.2.ebuild b/sys-process/audit/audit-2.8.2.ebuild
index 21e009e084a..6bcdd339ea4 100644
--- a/sys-process/audit/audit-2.8.2.ebuild
+++ b/sys-process/audit/audit-2.8.2.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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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-2.8.3.ebuild b/sys-process/audit/audit-2.8.3.ebuild
index 48a97c6a54d..9f09cbc922f 100644
--- a/sys-process/audit/audit-2.8.3.ebuild
+++ b/sys-process/audit/audit-2.8.3.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="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 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-2.8.4.ebuild b/sys-process/audit/audit-2.8.4.ebuild
index f67f4632c73..ebd3b1d9e9c 100644
--- a/sys-process/audit/audit-2.8.4.ebuild
+++ b/sys-process/audit/audit-2.8.4.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="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh 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-2.8.5.ebuild b/sys-process/audit/audit-2.8.5.ebuild
index 890b7db49a8..aebeceb470c 100644
--- a/sys-process/audit/audit-2.8.5.ebuild
+++ b/sys-process/audit/audit-2.8.5.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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~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/cronbase/cronbase-0.3.7-r6.ebuild b/sys-process/cronbase/cronbase-0.3.7-r6.ebuild
index be16127b8fe..2bb3229d446 100644
--- a/sys-process/cronbase/cronbase-0.3.7-r6.ebuild
+++ b/sys-process/cronbase/cronbase-0.3.7-r6.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 sh 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/cronie/cronie-1.5.4-r1.ebuild b/sys-process/cronie/cronie-1.5.4-r1.ebuild
index 4173ddc8db6..854880e901c 100644
--- a/sys-process/cronie/cronie-1.5.4-r1.ebuild
+++ b/sys-process/cronie/cronie-1.5.4-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/cronie-crond/cronie"
SRC_URI="https://github.com/cronie-crond/cronie/archive/${P}.tar.gz"
LICENSE="ISC BSD BSD-2 GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="+anacron +inotify pam selinux"
DEPEND="
diff --git a/sys-process/cronie/cronie-1.5.5.ebuild b/sys-process/cronie/cronie-1.5.5.ebuild
index b27c909f26e..f3ffbf7333e 100644
--- a/sys-process/cronie/cronie-1.5.5.ebuild
+++ b/sys-process/cronie/cronie-1.5.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/cronie-crond/cronie"
SRC_URI="https://github.com/cronie-crond/cronie/archive/${P}.tar.gz"
LICENSE="ISC BSD BSD-2 GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="+anacron +inotify pam selinux"
DEPEND="
diff --git a/sys-process/daemontools/daemontools-0.76-r8.ebuild b/sys-process/daemontools/daemontools-0.76-r8.ebuild
index e9f7896a685..136b8d85cae 100644
--- a/sys-process/daemontools/daemontools-0.76-r8.ebuild
+++ b/sys-process/daemontools/daemontools-0.76-r8.ebuild
@@ -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 sh 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 240f4bb45dc..96061768bb7 100644
--- a/sys-process/dcron/dcron-4.5-r2.ebuild
+++ b/sys-process/dcron/dcron-4.5-r2.ebuild
@@ -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 sh 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/htop/htop-2.2.0.ebuild b/sys-process/htop/htop-2.2.0.ebuild
index 318bdf97c5c..db2ebf00e89 100644
--- a/sys-process/htop/htop-2.2.0.ebuild
+++ b/sys-process/htop/htop-2.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://hisham.hm/htop/releases/${PV}/${P}.tar.gz"
LICENSE="BSD GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="kernel_FreeBSD kernel_linux openvz unicode vserver"
RDEPEND="sys-libs/ncurses:0=[unicode?]"
diff --git a/sys-process/htop/htop-3.0.0_beta5.ebuild b/sys-process/htop/htop-3.0.0_beta5.ebuild
index 3351359ceb6..0f1a86bfd19 100644
--- a/sys-process/htop/htop-3.0.0_beta5.ebuild
+++ b/sys-process/htop/htop-3.0.0_beta5.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" = *_beta* ]] ; then
S="${WORKDIR}/${P/_}"
else
SRC_URI="https://hisham.hm/htop/releases/${PV}/${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
fi
LICENSE="BSD GPL-2"
SLOT="0"
diff --git a/sys-process/lsof/lsof-4.91.ebuild b/sys-process/lsof/lsof-4.91.ebuild
index 86ae1ee2e36..5081c46ed1b 100644
--- a/sys-process/lsof/lsof-4.91.ebuild
+++ b/sys-process/lsof/lsof-4.91.ebuild
@@ -14,7 +14,7 @@ SRC_URI="ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/${MY_P}.tar.bz2
LICENSE="lsof"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~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/lsof/lsof-4.93.2-r1.ebuild b/sys-process/lsof/lsof-4.93.2-r1.ebuild
index cf32de8e2f5..35742bb38ab 100644
--- a/sys-process/lsof/lsof-4.93.2-r1.ebuild
+++ b/sys-process/lsof/lsof-4.93.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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 ~sh ~sparc ~x86 ~ppc-aix ~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 ~ppc-aix ~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/procps/procps-3.3.15-r1.ebuild b/sys-process/procps/procps-3.3.15-r1.ebuild
index d1b833ff9f1..d30636040f3 100644
--- a/sys-process/procps/procps-3.3.15-r1.ebuild
+++ b/sys-process/procps/procps-3.3.15-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}-ng/${PN}-ng-${PV}.tar.xz"
LICENSE="GPL-2"
SLOT="0/6" # libprocps.so
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 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.16-r2.ebuild b/sys-process/procps/procps-3.3.16-r2.ebuild
index 8a5e2ae740e..09f6a12956a 100644
--- a/sys-process/procps/procps-3.3.16-r2.ebuild
+++ b/sys-process/procps/procps-3.3.16-r2.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 ~sh ~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.1-r1.ebuild b/sys-process/psmisc/psmisc-23.1-r1.ebuild
index 58af48664ab..72db1daab72 100644
--- a/sys-process/psmisc/psmisc-23.1-r1.ebuild
+++ b/sys-process/psmisc/psmisc-23.1-r1.ebuild
@@ -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 s390 sh 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="ipv6 nls selinux X"
RDEPEND=">=sys-libs/ncurses-5.7-r7:0=
diff --git a/sys-process/psmisc/psmisc-23.2-r2.ebuild b/sys-process/psmisc/psmisc-23.2-r2.ebuild
index 4225c2b0e2b..c06e9f526a8 100644
--- a/sys-process/psmisc/psmisc-23.2-r2.ebuild
+++ b/sys-process/psmisc/psmisc-23.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~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/psmisc/psmisc-23.3-r1.ebuild b/sys-process/psmisc/psmisc-23.3-r1.ebuild
index 720647fe094..7565aa7d272 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-2019 Gentoo Authors
+# Copyright 1999-2020 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 ~sh ~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 056c3e7abd7..ef3da794f5d 100644
--- a/sys-process/runit/runit-2.1.1-r2.ebuild
+++ b/sys-process/runit/runit-2.1.1-r2.ebuild
@@ -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 sh 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/sys-process/runit/runit-2.1.2-r1.ebuild b/sys-process/runit/runit-2.1.2-r1.ebuild
index 9a515b6eb8b..9647df0a33f 100644
--- a/sys-process/runit/runit-2.1.2-r1.ebuild
+++ b/sys-process/runit/runit-2.1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 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 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="static"
RDEPEND="sys-apps/openrc"
diff --git a/sys-process/runit/runit-2.1.2.ebuild b/sys-process/runit/runit-2.1.2.ebuild
index 99f58d316c2..afd458efc6c 100644
--- a/sys-process/runit/runit-2.1.2.ebuild
+++ b/sys-process/runit/runit-2.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -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 ~sh ~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/sys-process/time/time-1.7-r3.ebuild b/sys-process/time/time-1.7-r3.ebuild
index 13791b168ad..aed1270a17e 100644
--- a/sys-process/time/time-1.7-r3.ebuild
+++ b/sys-process/time/time-1.7-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/time/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh 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-apps/texinfo"
diff --git a/sys-process/time/time-1.7.2.ebuild b/sys-process/time/time-1.7.2.ebuild
index e5a59b8d644..4f06011ef7d 100644
--- a/sys-process/time/time-1.7.2.ebuild
+++ b/sys-process/time/time-1.7.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://git.savannah.gnu.org/cgit/time.git/snapshot/${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh 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-apps/texinfo"
diff --git a/sys-process/time/time-1.9.ebuild b/sys-process/time/time-1.9.ebuild
index 60bee01e9b3..d0addb3bab9 100644
--- a/sys-process/time/time-1.9.ebuild
+++ b/sys-process/time/time-1.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="http://ftp.gnu.org/pub/gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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-apps/texinfo"
diff --git a/virtual/acl/acl-0-r1.ebuild b/virtual/acl/acl-0-r1.ebuild
index 5a564b8e812..5ac45eb0d78 100644
--- a/virtual/acl/acl-0-r1.ebuild
+++ b/virtual/acl/acl-0-r1.ebuild
@@ -5,7 +5,7 @@ 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 sh 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 42b22bd4c49..62e5055231f 100644
--- a/virtual/acl/acl-0-r2.ebuild
+++ b/virtual/acl/acl-0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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 ~sh 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 04d660e6a1b..b28eb0f5388 100644
--- a/virtual/acl/acl-0.ebuild
+++ b/virtual/acl/acl-0.ebuild
@@ -5,7 +5,7 @@ EAPI=5
DESCRIPTION="Virtual for acl support (sys/acl.h)"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
RDEPEND="kernel_linux? ( sys-apps/acl )
kernel_FreeBSD? ( sys-freebsd/freebsd-lib )"
diff --git a/virtual/awk/awk-1.ebuild b/virtual/awk/awk-1.ebuild
index a41a7fbc2b0..1c3e28fe845 100644
--- a/virtual/awk/awk-1.ebuild
+++ b/virtual/awk/awk-1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
DESCRIPTION="Virtual for awk implementation"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
RDEPEND="
|| (
diff --git a/virtual/cdrtools/cdrtools-0.ebuild b/virtual/cdrtools/cdrtools-0.ebuild
index c09af9aea6e..92e073a9cec 100644
--- a/virtual/cdrtools/cdrtools-0.ebuild
+++ b/virtual/cdrtools/cdrtools-0.ebuild
@@ -5,6 +5,6 @@ EAPI=5
DESCRIPTION="Virtual for command-line recorders cdrtools and cdrkit"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh 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"
RDEPEND="|| ( app-cdr/cdrtools app-cdr/cdrkit )"
diff --git a/virtual/checkpassword/checkpassword-0.ebuild b/virtual/checkpassword/checkpassword-0.ebuild
index 4792b805d2e..92b299b608d 100644
--- a/virtual/checkpassword/checkpassword-0.ebuild
+++ b/virtual/checkpassword/checkpassword-0.ebuild
@@ -5,7 +5,7 @@ EAPI=5
DESCRIPTION="Virtual for checkpassword compatible applications"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 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-r1.ebuild b/virtual/cron/cron-0-r1.ebuild
index c0c9f916644..0d0ea7921f3 100644
--- a/virtual/cron/cron-0-r1.ebuild
+++ b/virtual/cron/cron-0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for cron"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
RDEPEND="|| ( sys-process/cronie
sys-process/vixie-cron
diff --git a/virtual/daemontools/daemontools-0.ebuild b/virtual/daemontools/daemontools-0.ebuild
index 9b160e28773..52a9e63673b 100644
--- a/virtual/daemontools/daemontools-0.ebuild
+++ b/virtual/daemontools/daemontools-0.ebuild
@@ -5,7 +5,7 @@ EAPI=5
DESCRIPTION="Virtual for daemontools"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 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 e3565a8ae09..e65bc0e3552 100644
--- a/virtual/dev-manager/dev-manager-0-r2.ebuild
+++ b/virtual/dev-manager/dev-manager-0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=5
DESCRIPTION="Virtual for the device filesystem manager"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
RDEPEND="|| (
virtual/udev
diff --git a/virtual/editor/editor-0-r3.ebuild b/virtual/editor/editor-0-r3.ebuild
index 9311bea5b81..7a214e726cc 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# 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 56d9b398e0c..19cc9fc0944 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 s390 sh 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/util-linux-2.22 sys-block/eject-bsd )"
diff --git a/virtual/emacs/emacs-23.ebuild b/virtual/emacs/emacs-23.ebuild
index add18fd2322..624afc5d979 100644
--- a/virtual/emacs/emacs-23.ebuild
+++ b/virtual/emacs/emacs-23.ebuild
@@ -5,6 +5,6 @@ EAPI=6
DESCRIPTION="Virtual for GNU Emacs"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
RDEPEND="app-editors/emacs:23"
diff --git a/virtual/emacs/emacs-24.ebuild b/virtual/emacs/emacs-24.ebuild
index d853435b484..d773f59203f 100644
--- a/virtual/emacs/emacs-24.ebuild
+++ b/virtual/emacs/emacs-24.ebuild
@@ -5,6 +5,6 @@ EAPI=6
DESCRIPTION="Virtual for GNU Emacs"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
RDEPEND="app-editors/emacs:24"
diff --git a/virtual/emacs/emacs-25.ebuild b/virtual/emacs/emacs-25.ebuild
index 0641ac48af7..6991068cb82 100644
--- a/virtual/emacs/emacs-25.ebuild
+++ b/virtual/emacs/emacs-25.ebuild
@@ -5,6 +5,6 @@ EAPI=6
DESCRIPTION="Virtual for GNU Emacs"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
RDEPEND="app-editors/emacs:25"
diff --git a/virtual/emacs/emacs-26-r2.ebuild b/virtual/emacs/emacs-26-r2.ebuild
index 5014843d826..c6b431bf85e 100644
--- a/virtual/emacs/emacs-26-r2.ebuild
+++ b/virtual/emacs/emacs-26-r2.ebuild
@@ -5,6 +5,6 @@ EAPI=7
DESCRIPTION="Virtual for GNU Emacs"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
RDEPEND=">=app-editors/emacs-26.1:*"
diff --git a/virtual/fam/fam-0-r1.ebuild b/virtual/fam/fam-0-r1.ebuild
index c4586a96064..c2ee95ceeef 100644
--- a/virtual/fam/fam-0-r1.ebuild
+++ b/virtual/fam/fam-0-r1.ebuild
@@ -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 sh 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 55f48bfb682..6b71c124ef0 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 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x86-macos ~sparc-solaris"
IUSE="openmp"
RDEPEND="
diff --git a/virtual/freedesktop-icon-theme/freedesktop-icon-theme-0-r3.ebuild b/virtual/freedesktop-icon-theme/freedesktop-icon-theme-0-r3.ebuild
index c13c1978628..271ae59154b 100644
--- a/virtual/freedesktop-icon-theme/freedesktop-icon-theme-0-r3.ebuild
+++ b/virtual/freedesktop-icon-theme/freedesktop-icon-theme-0-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="A virtual to choose between different icon themes"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
RDEPEND="|| (
x11-themes/adwaita-icon-theme
diff --git a/virtual/glu/glu-9.0-r2.ebuild b/virtual/glu/glu-9.0-r2.ebuild
index a935049b01b..5ab42356be2 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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| (
diff --git a/virtual/httpd-basic/httpd-basic-0-r2.ebuild b/virtual/httpd-basic/httpd-basic-0-r2.ebuild
index 4404adfdd59..eb8c52b2c6c 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 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86"
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 32131c6754b..8f1ee2862fc 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
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 42ebad9b69d..b351fa76aa3 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
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 9b7dca42d6f..90198b45d56 100644
--- a/virtual/httpd-fastcgi/httpd-fastcgi-0-r1.ebuild
+++ b/virtual/httpd-fastcgi/httpd-fastcgi-0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
DESCRIPTION="Virtual for FastCGI-enabled webservers"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86"
RDEPEND="|| (
www-apache/mod_fcgid
diff --git a/virtual/httpd-php/httpd-php-7.2.ebuild b/virtual/httpd-php/httpd-php-7.2.ebuild
index 1ba0e57faaa..fd8b2ca9a17 100644
--- a/virtual/httpd-php/httpd-php-7.2.ebuild
+++ b/virtual/httpd-php/httpd-php-7.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
DESCRIPTION="Virtual to provide PHP-enabled webservers"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
RDEPEND="|| ( dev-lang/php:${SLOT}[fpm]
dev-lang/php:${SLOT}[apache2]
diff --git a/virtual/httpd-php/httpd-php-7.3.ebuild b/virtual/httpd-php/httpd-php-7.3.ebuild
index 1ba0e57faaa..fd8b2ca9a17 100644
--- a/virtual/httpd-php/httpd-php-7.3.ebuild
+++ b/virtual/httpd-php/httpd-php-7.3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
DESCRIPTION="Virtual to provide PHP-enabled webservers"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
RDEPEND="|| ( dev-lang/php:${SLOT}[fpm]
dev-lang/php:${SLOT}[apache2]
diff --git a/virtual/httpd-php/httpd-php-7.4.ebuild b/virtual/httpd-php/httpd-php-7.4.ebuild
index 97704cf68de..38369158ba2 100644
--- a/virtual/httpd-php/httpd-php-7.4.ebuild
+++ b/virtual/httpd-php/httpd-php-7.4.ebuild
@@ -5,7 +5,7 @@ EAPI="7"
DESCRIPTION="Virtual to provide PHP-enabled webservers"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
RDEPEND="|| ( dev-lang/php:${SLOT}[fpm]
dev-lang/php:${SLOT}[apache2]
diff --git a/virtual/imagemagick-tools/imagemagick-tools-0.ebuild b/virtual/imagemagick-tools/imagemagick-tools-0.ebuild
index 562d9eb18fc..2976c9a225d 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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-1.ebuild b/virtual/imap-c-client/imap-c-client-1.ebuild
index b183c0c89d4..1edbb61bc0a 100644
--- a/virtual/imap-c-client/imap-c-client-1.ebuild
+++ b/virtual/imap-c-client/imap-c-client-1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
DESCRIPTION="Virtual for IMAP c-client"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE="ssl"
RDEPEND=" || ( net-libs/c-client[ssl=]
diff --git a/virtual/imap-c-client/imap-c-client-2.ebuild b/virtual/imap-c-client/imap-c-client-2.ebuild
index 80abbe389dd..64c5fd93fe6 100644
--- a/virtual/imap-c-client/imap-c-client-2.ebuild
+++ b/virtual/imap-c-client/imap-c-client-2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for IMAP c-client"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh 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 3a4e33cc115..8439e19d6e2 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 sh 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/jack/jack-0.ebuild b/virtual/jack/jack-0.ebuild
index c90d2a34828..3ae27ff3b63 100644
--- a/virtual/jack/jack-0.ebuild
+++ b/virtual/jack/jack-0.ebuild
@@ -7,7 +7,7 @@ inherit multilib-build
DESCRIPTION="Virtual for JACK Audio Connection Kit"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
RDEPEND="
|| (
diff --git a/virtual/jpeg/jpeg-0-r3.ebuild b/virtual/jpeg/jpeg-0-r3.ebuild
index 2ae9b46ed66..45d3e6f0495 100644
--- a/virtual/jpeg/jpeg-0-r3.ebuild
+++ b/virtual/jpeg/jpeg-0-r3.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 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
RDEPEND="|| (
diff --git a/virtual/krb5/krb5-0-r1.ebuild b/virtual/krb5/krb5-0-r1.ebuild
index cbc8887848f..9913c22540f 100644
--- a/virtual/krb5/krb5-0-r1.ebuild
+++ b/virtual/krb5/krb5-0-r1.ebuild
@@ -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 ~sh 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 5bea505f0a9..e0e8f1bc4f5 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
dev-texlive/texlive-latexrecommended
diff --git a/virtual/libc/libc-1.ebuild b/virtual/libc/libc-1.ebuild
index 80aa2a47733..dab433be297 100644
--- a/virtual/libc/libc-1.ebuild
+++ b/virtual/libc/libc-1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
DESCRIPTION="Virtual for the C library"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# explicitly depend on SLOT 2.2 of glibc, because it sets
# a different SLOT for cross-compiling
diff --git a/virtual/libcrypt/libcrypt-1.ebuild b/virtual/libcrypt/libcrypt-1.ebuild
index 2059e2651f5..f129451da3b 100644
--- a/virtual/libcrypt/libcrypt-1.ebuild
+++ b/virtual/libcrypt/libcrypt-1.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 sh sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 2cf11b679c0..4f8916b3029 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 590eae5bd26..33f4723cbc4 100644
--- a/virtual/libelf/libelf-3.ebuild
+++ b/virtual/libelf/libelf-3.ebuild
@@ -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 sh 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="
|| (
diff --git a/virtual/libffi/libffi-3.0.13-r1.ebuild b/virtual/libffi/libffi-3.0.13-r1.ebuild
index fa923b17dfc..3b1edb7794e 100644
--- a/virtual/libffi/libffi-3.0.13-r1.ebuild
+++ b/virtual/libffi/libffi-3.0.13-r1.ebuild
@@ -10,6 +10,6 @@ inherit multilib-build
DESCRIPTION="A virtual for the Foreign Function Interface implementation"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND=">=dev-libs/libffi-3.0.13-r1[${MULTILIB_USEDEP}]"
diff --git a/virtual/libffi/libffi-3.3_rc0.ebuild b/virtual/libffi/libffi-3.3_rc0.ebuild
index b00ae9637af..1603c614b82 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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND=">=dev-libs/libffi-3.3_rc0:0/7[${MULTILIB_USEDEP}]"
diff --git a/virtual/libgudev/libgudev-215-r3.ebuild b/virtual/libgudev/libgudev-215-r3.ebuild
index 27e27f0aa5d..d5399b1f636 100644
--- a/virtual/libgudev/libgudev-215-r3.ebuild
+++ b/virtual/libgudev/libgudev-215-r3.ebuild
@@ -6,7 +6,7 @@ inherit multilib-build
DESCRIPTION="Virtual for libgudev providers"
SLOT="0/0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE="introspection static-libs systemd"
REQUIRED_USE="systemd? ( !static-libs )"
diff --git a/virtual/libgudev/libgudev-230.ebuild b/virtual/libgudev/libgudev-230.ebuild
index 0cda0a20425..a9b1a8ae184 100644
--- a/virtual/libgudev/libgudev-230.ebuild
+++ b/virtual/libgudev/libgudev-230.ebuild
@@ -6,7 +6,7 @@ inherit multilib-build
DESCRIPTION="Virtual for libgudev providers"
SLOT="0/0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="introspection static-libs"
RDEPEND="dev-libs/libgudev:0/0[${MULTILIB_USEDEP},introspection?,static-libs?]"
diff --git a/virtual/libgudev/libgudev-232.ebuild b/virtual/libgudev/libgudev-232.ebuild
index d77cd0fb257..53882006006 100644
--- a/virtual/libgudev/libgudev-232.ebuild
+++ b/virtual/libgudev/libgudev-232.ebuild
@@ -6,7 +6,7 @@ inherit multilib-build
DESCRIPTION="Virtual for libgudev providers"
SLOT="0/0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="introspection static-libs"
RDEPEND=">=dev-libs/libgudev-232:0/0[${MULTILIB_USEDEP},introspection?,static-libs?]"
diff --git a/virtual/libiconv/libiconv-0-r1.ebuild b/virtual/libiconv/libiconv-0-r1.ebuild
index 0ab9a8dfec7..30ca3f9230d 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 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="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 2a83b05b778..57005720af9 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="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 c5a70f0c71a..b0077dabb39 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 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="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 b2f6ddeebaa..95c39d7f50c 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 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 c2b2ceb9f94..e333dfa80bc 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 f05bdf64b85..f9004a38d41 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 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 6521a0f4734..26e1768f5dc 100644
--- a/virtual/libudev/libudev-215-r1.ebuild
+++ b/virtual/libudev/libudev-215-r1.ebuild
@@ -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 sh 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-r1.ebuild b/virtual/libudev/libudev-232-r1.ebuild
index 4a9bb90736b..bcfd0662d82 100644
--- a/virtual/libudev/libudev-232-r1.ebuild
+++ b/virtual/libudev/libudev-232-r1.ebuild
@@ -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 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="systemd"
RDEPEND="
diff --git a/virtual/libudev/libudev-232-r2.ebuild b/virtual/libudev/libudev-232-r2.ebuild
index 544c55b027b..2c73f29b85b 100644
--- a/virtual/libudev/libudev-232-r2.ebuild
+++ b/virtual/libudev/libudev-232-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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 sh 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 de9e3abb2a4..88b6761c9ce 100644
--- a/virtual/libudev/libudev-232-r3.ebuild
+++ b/virtual/libudev/libudev-232-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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 ~sh 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 899479563d6..f353d32093c 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
RDEPEND="|| ( >=dev-libs/libusb-compat-0.1.5-r2[${MULTILIB_USEDEP}] >=sys-freebsd/freebsd-lib-9.1-r11[usb,${MULTILIB_USEDEP}] )"
diff --git a/virtual/libusb/libusb-1-r1.ebuild b/virtual/libusb/libusb-1-r1.ebuild
index 6a12f3bbf5f..6e60ecf2698 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 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="udev"
RDEPEND="|| ( >=dev-libs/libusb-1.0.9-r2:1[udev(+)?,${MULTILIB_USEDEP}] >=sys-freebsd/freebsd-lib-9.1-r10[usb,${MULTILIB_USEDEP}] )"
diff --git a/virtual/libusb/libusb-1-r2.ebuild b/virtual/libusb/libusb-1-r2.ebuild
index d38386043c9..bf1d68cde6b 100644
--- a/virtual/libusb/libusb-1-r2.ebuild
+++ b/virtual/libusb/libusb-1-r2.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 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="udev"
# We force a recent libusb so that downstream consumers of virtual/libusb
diff --git a/virtual/linux-sources/linux-sources-3-r4.ebuild b/virtual/linux-sources/linux-sources-3-r4.ebuild
index 046bf562bda..589895dfee0 100644
--- a/virtual/linux-sources/linux-sources-3-r4.ebuild
+++ b/virtual/linux-sources/linux-sources-3-r4.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for Linux kernel sources"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="firmware"
RDEPEND="
diff --git a/virtual/logger/logger-0-r1.ebuild b/virtual/logger/logger-0-r1.ebuild
index dd558ef6425..ac62d952c98 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 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="|| (
app-admin/metalog
diff --git a/virtual/mailx/mailx-1.ebuild b/virtual/mailx/mailx-1.ebuild
index fa0e0cb83c0..68e844700d0 100644
--- a/virtual/mailx/mailx-1.ebuild
+++ b/virtual/mailx/mailx-1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
DESCRIPTION="Virtual for mail implementations"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
RDEPEND="|| ( net-mail/mailutils
mail-client/mailx
diff --git a/virtual/mailx/mailx-2.ebuild b/virtual/mailx/mailx-2.ebuild
index 3213722eb97..422c3530d8f 100644
--- a/virtual/mailx/mailx-2.ebuild
+++ b/virtual/mailx/mailx-2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
DESCRIPTION="Virtual for mail implementations"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 2cf600243bd..e9e6955af4d 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="sys-apps/man-db"
diff --git a/virtual/mda/mda-0.ebuild b/virtual/mda/mda-0.ebuild
index dc5793504b7..fc5c1c2a801 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 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
# mail-mta/citadel is from sunrise
RDEPEND="|| ( mail-filter/procmail
diff --git a/virtual/modutils/modutils-0.ebuild b/virtual/modutils/modutils-0.ebuild
index 467271aa1f3..dc090889924 100644
--- a/virtual/modutils/modutils-0.ebuild
+++ b/virtual/modutils/modutils-0.ebuild
@@ -5,6 +5,6 @@ EAPI=5
DESCRIPTION="Virtual for utilities to manage Linux kernel modules"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
RDEPEND="|| ( sys-apps/kmod[tools] sys-apps/modutils )"
diff --git a/virtual/mta/mta-1-r1.ebuild b/virtual/mta/mta-1-r1.ebuild
index e045187253d..466e87febd2 100644
--- a/virtual/mta/mta-1-r1.ebuild
+++ b/virtual/mta/mta-1-r1.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 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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.5-r2.ebuild b/virtual/mysql/mysql-5.5-r2.ebuild
index a8cc6dd6bc6..0c529acfa51 100644
--- a/virtual/mysql/mysql-5.5-r2.ebuild
+++ b/virtual/mysql/mysql-5.5-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
DESCRIPTION="Virtual for MySQL client or database"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="static static-libs"
RDEPEND="|| (
diff --git a/virtual/mysql/mysql-5.6-r13.ebuild b/virtual/mysql/mysql-5.6-r13.ebuild
index ee39f4bb232..b0618340433 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="embedded +server static"
RDEPEND="|| (
diff --git a/virtual/notification-daemon/notification-daemon-0.ebuild b/virtual/notification-daemon/notification-daemon-0.ebuild
index c6d22192263..418c61c5015 100644
--- a/virtual/notification-daemon/notification-daemon-0.ebuild
+++ b/virtual/notification-daemon/notification-daemon-0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="Virtual for notification daemon dbus service"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="gnome kde"
RDEPEND="
diff --git a/virtual/opengl/opengl-7.0-r2.ebuild b/virtual/opengl/opengl-7.0-r2.ebuild
index 63eff19db42..7d6fc06a778 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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| (
--git a/virtual/os-headers/os-headers-0-r1.ebuild b/virtual/os-headers/os-headers-0-r1.ebuild
index df7c0ea1583..9f1741673e8 100644
--- a/virtual/os-headers/os-headers-0-r1.ebuild
+++ b/virtual/os-headers/os-headers-0-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
DESCRIPTION="Virtual for operating system headers"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# depend on SLOT 0 of linux-headers, because kernel-2.eclass
# sets a different SLOT for cross-building
--git a/virtual/os-headers/os-headers-0.ebuild b/virtual/os-headers/os-headers-0.ebuild
index 47a8790f4e5..b2fe0e629e7 100644
--- a/virtual/os-headers/os-headers-0.ebuild
+++ b/virtual/os-headers/os-headers-0.ebuild
@@ -5,7 +5,7 @@ EAPI=5
DESCRIPTION="Virtual for operating system headers"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# 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 2b2afbded92..3e76055c482 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| (
--git a/virtual/pager/pager-0.ebuild b/virtual/pager/pager-0.ebuild
index ea77b4c17bc..ea8b82ed06f 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 b48949fb2cb..b641c153efd 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 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Attribute-Handlers/perl-Attribute-Handlers-1.10.0-r2.ebuild b/virtual/perl-Attribute-Handlers/perl-Attribute-Handlers-1.10.0-r2.ebuild
index ad82d47622f..11bc12d3ad9 100644
--- a/virtual/perl-Attribute-Handlers/perl-Attribute-Handlers-1.10.0-r2.ebuild
+++ b/virtual/perl-Attribute-Handlers/perl-Attribute-Handlers-1.10.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 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-AutoLoader/perl-AutoLoader-5.740.0-r8.ebuild b/virtual/perl-AutoLoader/perl-AutoLoader-5.740.0-r8.ebuild
index b48949fb2cb..b641c153efd 100644
--- a/virtual/perl-AutoLoader/perl-AutoLoader-5.740.0-r8.ebuild
+++ b/virtual/perl-AutoLoader/perl-AutoLoader-5.740.0-r8.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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =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-r5.ebuild b/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.140.0-r5.ebuild
index 3bafef2a34b..19c65177803 100644
--- a/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.140.0-r5.ebuild
+++ b/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.140.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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =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-r5.ebuild b/virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.18.0-r5.ebuild
index 3bafef2a34b..19c65177803 100644
--- a/virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.18.0-r5.ebuild
+++ b/virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.18.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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.150.10-r3.ebuild b/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.150.10-r3.ebuild
index 2fef1ec86ad..b1bad848a0d 100644
--- a/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.150.10-r3.ebuild
+++ b/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.150.10-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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =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 acc35dd2c7c..aeb6b2d3d56 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 s390 sh sparc x86 ~x64-cygwin"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Carp/perl-Carp-1.500.0-r2.ebuild b/virtual/perl-Carp/perl-Carp-1.500.0-r2.ebuild
index 3bafef2a34b..19c65177803 100644
--- a/virtual/perl-Carp/perl-Carp-1.500.0-r2.ebuild
+++ b/virtual/perl-Carp/perl-Carp-1.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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.84.0.ebuild b/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.84.0.ebuild
index 3bafef2a34b..19c65177803 100644
--- a/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.84.0.ebuild
+++ b/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~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 3bafef2a34b..19c65177803 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 7c1085d5cdc..c8a2af83a76 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 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x86-macos"
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.ebuild b/virtual/perl-Data-Dumper/perl-Data-Dumper-2.174.0.ebuild
index 3bafef2a34b..19c65177803 100644
--- a/virtual/perl-Data-Dumper/perl-Data-Dumper-2.174.0.ebuild
+++ b/virtual/perl-Data-Dumper/perl-Data-Dumper-2.174.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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =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 b48949fb2cb..b641c153efd 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 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 3bafef2a34b..19c65177803 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Digest-SHA/perl-Digest-SHA-6.20.0.ebuild b/virtual/perl-Digest-SHA/perl-Digest-SHA-6.20.0.ebuild
index 3bafef2a34b..19c65177803 100644
--- a/virtual/perl-Digest-SHA/perl-Digest-SHA-6.20.0.ebuild
+++ b/virtual/perl-Digest-SHA/perl-Digest-SHA-6.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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Digest/perl-Digest-1.170.100_rc-r9.ebuild b/virtual/perl-Digest/perl-Digest-1.170.100_rc-r9.ebuild
index 3bafef2a34b..19c65177803 100644
--- a/virtual/perl-Digest/perl-Digest-1.170.100_rc-r9.ebuild
+++ b/virtual/perl-Digest/perl-Digest-1.170.100_rc-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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =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 acc35dd2c7c..aeb6b2d3d56 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 s390 sh sparc x86 ~x64-cygwin"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 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 3bafef2a34b..19c65177803 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 3bafef2a34b..19c65177803 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 3bafef2a34b..19c65177803 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-ExtUtils-Constant/perl-ExtUtils-Constant-0.250.0-r2.ebuild b/virtual/perl-ExtUtils-Constant/perl-ExtUtils-Constant-0.250.0-r2.ebuild
index 3bafef2a34b..19c65177803 100644
--- a/virtual/perl-ExtUtils-Constant/perl-ExtUtils-Constant-0.250.0-r2.ebuild
+++ b/virtual/perl-ExtUtils-Constant/perl-ExtUtils-Constant-0.250.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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-ExtUtils-Install/perl-ExtUtils-Install-2.140.0-r2.ebuild b/virtual/perl-ExtUtils-Install/perl-ExtUtils-Install-2.140.0-r2.ebuild
index 4e56804154a..7c8a1e054f3 100644
--- a/virtual/perl-ExtUtils-Install/perl-ExtUtils-Install-2.140.0-r2.ebuild
+++ b/virtual/perl-ExtUtils-Install/perl-ExtUtils-Install-2.140.0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ExtUtils-Install"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =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 3bafef2a34b..19c65177803 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-ExtUtils-Manifest/perl-ExtUtils-Manifest-1.720.0.ebuild b/virtual/perl-ExtUtils-Manifest/perl-ExtUtils-Manifest-1.720.0.ebuild
index 3bafef2a34b..19c65177803 100644
--- a/virtual/perl-ExtUtils-Manifest/perl-ExtUtils-Manifest-1.720.0.ebuild
+++ b/virtual/perl-ExtUtils-Manifest/perl-ExtUtils-Manifest-1.720.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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.400.0.ebuild b/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.400.0.ebuild
index 3bafef2a34b..19c65177803 100644
--- a/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.400.0.ebuild
+++ b/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-File-Path/perl-File-Path-2.160.0.ebuild b/virtual/perl-File-Path/perl-File-Path-2.160.0.ebuild
index 3bafef2a34b..19c65177803 100644
--- a/virtual/perl-File-Path/perl-File-Path-2.160.0.ebuild
+++ b/virtual/perl-File-Path/perl-File-Path-2.160.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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-File-Spec/perl-File-Spec-3.780.0.ebuild b/virtual/perl-File-Spec/perl-File-Spec-3.780.0.ebuild
index 3bafef2a34b..19c65177803 100644
--- a/virtual/perl-File-Spec/perl-File-Spec-3.780.0.ebuild
+++ b/virtual/perl-File-Spec/perl-File-Spec-3.780.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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =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 2f79b6ff40e..abb04e751f5 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 f860d6e4777..0f069608e90 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 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 3bafef2a34b..19c65177803 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-HTTP-Tiny/perl-HTTP-Tiny-0.76.0.ebuild b/virtual/perl-HTTP-Tiny/perl-HTTP-Tiny-0.76.0.ebuild
index bfec933d440..fc6a60a070f 100644
--- a/virtual/perl-HTTP-Tiny/perl-HTTP-Tiny-0.76.0.ebuild
+++ b/virtual/perl-HTTP-Tiny/perl-HTTP-Tiny-0.76.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x64-cygwin"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sparc x86 ~x64-cygwin"
RDEPEND="
|| ( =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 d6b52e72518..b34cb9fda66 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 ppc ppc64 s390 sh sparc x86 ~x64-cygwin"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sparc x86 ~x64-cygwin"
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 831494c3b0a..ab89174cb44 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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-r2.ebuild b/virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.390.0-r2.ebuild
index 3bafef2a34b..19c65177803 100644
--- a/virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.390.0-r2.ebuild
+++ b/virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.390.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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-IO-Zlib/perl-IO-Zlib-1.100.0-r13.ebuild b/virtual/perl-IO-Zlib/perl-IO-Zlib-1.100.0-r13.ebuild
index b48949fb2cb..b641c153efd 100644
--- a/virtual/perl-IO-Zlib/perl-IO-Zlib-1.100.0-r13.ebuild
+++ b/virtual/perl-IO-Zlib/perl-IO-Zlib-1.100.0-r13.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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =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 3bafef2a34b..19c65177803 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 b48949fb2cb..b641c153efd 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 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 3bafef2a34b..19c65177803 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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-r9.ebuild b/virtual/perl-Locale-Maketext-Simple/perl-Locale-Maketext-Simple-0.210.100_rc-r9.ebuild
index b48949fb2cb..b641c153efd 100644
--- a/virtual/perl-Locale-Maketext-Simple/perl-Locale-Maketext-Simple-0.210.100_rc-r9.ebuild
+++ b/virtual/perl-Locale-Maketext-Simple/perl-Locale-Maketext-Simple-0.210.100_rc-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 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Locale-Maketext/perl-Locale-Maketext-1.290.0-r2.ebuild b/virtual/perl-Locale-Maketext/perl-Locale-Maketext-1.290.0-r2.ebuild
index c78556bcdb1..7ef2dad8f79 100644
--- a/virtual/perl-Locale-Maketext/perl-Locale-Maketext-1.290.0-r2.ebuild
+++ b/virtual/perl-Locale-Maketext/perl-Locale-Maketext-1.290.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 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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-MIME-Base64/perl-MIME-Base64-3.150.0-r6.ebuild b/virtual/perl-MIME-Base64/perl-MIME-Base64-3.150.0-r6.ebuild
index 3bafef2a34b..19c65177803 100644
--- a/virtual/perl-MIME-Base64/perl-MIME-Base64-3.150.0-r6.ebuild
+++ b/virtual/perl-MIME-Base64/perl-MIME-Base64-3.150.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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =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 b48949fb2cb..b641c153efd 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 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 b48949fb2cb..b641c153efd 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 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Math-BigRat/perl-Math-BigRat-0.261.400.ebuild b/virtual/perl-Math-BigRat/perl-Math-BigRat-0.261.400.ebuild
index b48949fb2cb..b641c153efd 100644
--- a/virtual/perl-Math-BigRat/perl-Math-BigRat-0.261.400.ebuild
+++ b/virtual/perl-Math-BigRat/perl-Math-BigRat-0.261.400.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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Math-Complex/perl-Math-Complex-1.590.100-r3.ebuild b/virtual/perl-Math-Complex/perl-Math-Complex-1.590.100-r3.ebuild
index b48949fb2cb..b641c153efd 100644
--- a/virtual/perl-Math-Complex/perl-Math-Complex-1.590.100-r3.ebuild
+++ b/virtual/perl-Math-Complex/perl-Math-Complex-1.590.100-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 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Memoize/perl-Memoize-1.30.100_rc-r9.ebuild b/virtual/perl-Memoize/perl-Memoize-1.30.100_rc-r9.ebuild
index b48949fb2cb..b641c153efd 100644
--- a/virtual/perl-Memoize/perl-Memoize-1.30.100_rc-r9.ebuild
+++ b/virtual/perl-Memoize/perl-Memoize-1.30.100_rc-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 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.201.911.100.ebuild b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.201.911.100.ebuild
index 95368f73750..4a69be4cd44 100644
--- a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.201.911.100.ebuild
+++ b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.201.911.100.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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# 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 b48949fb2cb..b641c153efd 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 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Module-Load/perl-Module-Load-0.340.0.ebuild b/virtual/perl-Module-Load/perl-Module-Load-0.340.0.ebuild
index 3bafef2a34b..19c65177803 100644
--- a/virtual/perl-Module-Load/perl-Module-Load-0.340.0.ebuild
+++ b/virtual/perl-Module-Load/perl-Module-Load-0.340.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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Module-Loaded/perl-Module-Loaded-0.80.0-r12.ebuild b/virtual/perl-Module-Loaded/perl-Module-Loaded-0.80.0-r12.ebuild
index b30d41174e3..e3a7d5e6eba 100644
--- a/virtual/perl-Module-Loaded/perl-Module-Loaded-0.80.0-r12.ebuild
+++ b/virtual/perl-Module-Loaded/perl-Module-Loaded-0.80.0-r12.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh 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.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 3bafef2a34b..19c65177803 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 59551078a3f..e3683203232 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 ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x86-macos"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Params-Check/perl-Params-Check-0.380.0-r9.ebuild b/virtual/perl-Params-Check/perl-Params-Check-0.380.0-r9.ebuild
index b48949fb2cb..b641c153efd 100644
--- a/virtual/perl-Params-Check/perl-Params-Check-0.380.0-r9.ebuild
+++ b/virtual/perl-Params-Check/perl-Params-Check-0.380.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 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =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-r3.ebuild b/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-2.150.10-r3.ebuild
index 3bafef2a34b..19c65177803 100644
--- a/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-2.150.10-r3.ebuild
+++ b/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-2.150.10-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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Perl-OSType/perl-Perl-OSType-1.10.0-r3.ebuild b/virtual/perl-Perl-OSType/perl-Perl-OSType-1.10.0-r3.ebuild
index 3bafef2a34b..19c65177803 100644
--- a/virtual/perl-Perl-OSType/perl-Perl-OSType-1.10.0-r3.ebuild
+++ b/virtual/perl-Perl-OSType/perl-Perl-OSType-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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Pod-Escapes/perl-Pod-Escapes-1.70.0-r6.ebuild b/virtual/perl-Pod-Escapes/perl-Pod-Escapes-1.70.0-r6.ebuild
index 9304756ecfc..f9fa8013ad9 100644
--- a/virtual/perl-Pod-Escapes/perl-Pod-Escapes-1.70.0-r6.ebuild
+++ b/virtual/perl-Pod-Escapes/perl-Pod-Escapes-1.70.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 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-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 ~x86-macos ~sparc-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Pod-Parser/perl-Pod-Parser-1.630.0-r6.ebuild b/virtual/perl-Pod-Parser/perl-Pod-Parser-1.630.0-r6.ebuild
index b48949fb2cb..b641c153efd 100644
--- a/virtual/perl-Pod-Parser/perl-Pod-Parser-1.630.0-r6.ebuild
+++ b/virtual/perl-Pod-Parser/perl-Pod-Parser-1.630.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 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
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 b48949fb2cb..b641c153efd 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 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 b48949fb2cb..b641c153efd 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 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 4107e2cdc9a..89f28c82880 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 3bafef2a34b..19c65177803 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 3bafef2a34b..19c65177803 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 3bafef2a34b..19c65177803 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 11e35e87a74..ea056629ba0 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 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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-r3.ebuild b/virtual/perl-Term-ReadLine/perl-Term-ReadLine-1.170.0-r3.ebuild
index d0c2100e2b8..0b3cd0a3b1e 100644
--- a/virtual/perl-Term-ReadLine/perl-Term-ReadLine-1.170.0-r3.ebuild
+++ b/virtual/perl-Term-ReadLine/perl-Term-ReadLine-1.170.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 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Test-Harness/perl-Test-Harness-3.420.0-r2.ebuild b/virtual/perl-Test-Harness/perl-Test-Harness-3.420.0-r2.ebuild
index 631ca424a94..510c9ab91fe 100644
--- a/virtual/perl-Test-Harness/perl-Test-Harness-3.420.0-r2.ebuild
+++ b/virtual/perl-Test-Harness/perl-Test-Harness-3.420.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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =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 e6d7a5bd86e..00d9670646d 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Test/perl-Test-1.310.0-r2.ebuild b/virtual/perl-Test/perl-Test-1.310.0-r2.ebuild
index 631ca424a94..510c9ab91fe 100644
--- a/virtual/perl-Test/perl-Test-1.310.0-r2.ebuild
+++ b/virtual/perl-Test/perl-Test-1.310.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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Text-Balanced/perl-Text-Balanced-2.30.0-r6.ebuild b/virtual/perl-Text-Balanced/perl-Text-Balanced-2.30.0-r6.ebuild
index d0c2100e2b8..0b3cd0a3b1e 100644
--- a/virtual/perl-Text-Balanced/perl-Text-Balanced-2.30.0-r6.ebuild
+++ b/virtual/perl-Text-Balanced/perl-Text-Balanced-2.30.0-r6.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 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Text-ParseWords/perl-Text-ParseWords-3.300.0-r6.ebuild b/virtual/perl-Text-ParseWords/perl-Text-ParseWords-3.300.0-r6.ebuild
index 631ca424a94..510c9ab91fe 100644
--- a/virtual/perl-Text-ParseWords/perl-Text-ParseWords-3.300.0-r6.ebuild
+++ b/virtual/perl-Text-ParseWords/perl-Text-ParseWords-3.300.0-r6.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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =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-r9.ebuild b/virtual/perl-Text-Tabs+Wrap/perl-Text-Tabs+Wrap-2013.52.300-r9.ebuild
index f76ec27d4b0..ffb918f7a6b 100644
--- a/virtual/perl-Text-Tabs+Wrap/perl-Text-Tabs+Wrap-2013.52.300-r9.ebuild
+++ b/virtual/perl-Text-Tabs+Wrap/perl-Text-Tabs+Wrap-2013.52.300-r9.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 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =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 bfec933d440..fc6a60a070f 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 ppc ppc64 s390 sh sparc x86 ~x64-cygwin"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sparc x86 ~x64-cygwin"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Thread-Semaphore/perl-Thread-Semaphore-2.130.0-r3.ebuild b/virtual/perl-Thread-Semaphore/perl-Thread-Semaphore-2.130.0-r3.ebuild
index 1f4a8c8d0c5..9ce1fc4c3a8 100644
--- a/virtual/perl-Thread-Semaphore/perl-Thread-Semaphore-2.130.0-r3.ebuild
+++ b/virtual/perl-Thread-Semaphore/perl-Thread-Semaphore-2.130.0-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x64-cygwin"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sparc x86 ~x64-cygwin"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Tie-RefHash/perl-Tie-RefHash-1.390.0-r11.ebuild b/virtual/perl-Tie-RefHash/perl-Tie-RefHash-1.390.0-r11.ebuild
index de0e29d567e..ccd0dec8ec2 100644
--- a/virtual/perl-Tie-RefHash/perl-Tie-RefHash-1.390.0-r11.ebuild
+++ b/virtual/perl-Tie-RefHash/perl-Tie-RefHash-1.390.0-r11.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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-HiRes/perl-Time-HiRes-1.976.0.ebuild b/virtual/perl-Time-HiRes/perl-Time-HiRes-1.976.0.ebuild
index 3bafef2a34b..19c65177803 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Time-Local/perl-Time-Local-1.280.0.ebuild b/virtual/perl-Time-Local/perl-Time-Local-1.280.0.ebuild
index 3bafef2a34b..19c65177803 100644
--- a/virtual/perl-Time-Local/perl-Time-Local-1.280.0.ebuild
+++ b/virtual/perl-Time-Local/perl-Time-Local-1.280.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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =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 51504829753..5a3a54e25f1 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 ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sparc x86 ~x64-cygwin ~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.ebuild b/virtual/perl-Unicode-Collate/perl-Unicode-Collate-1.270.0.ebuild
index b48949fb2cb..b641c153efd 100644
--- a/virtual/perl-Unicode-Collate/perl-Unicode-Collate-1.270.0.ebuild
+++ b/virtual/perl-Unicode-Collate/perl-Unicode-Collate-1.270.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 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =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 631ca424a94..510c9ab91fe 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-XSLoader/perl-XSLoader-0.300.0-r2.ebuild b/virtual/perl-XSLoader/perl-XSLoader-0.300.0-r2.ebuild
index 631ca424a94..510c9ab91fe 100644
--- a/virtual/perl-XSLoader/perl-XSLoader-0.300.0-r2.ebuild
+++ b/virtual/perl-XSLoader/perl-XSLoader-0.300.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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =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 d0c2100e2b8..0b3cd0a3b1e 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 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-bignum/perl-bignum-0.510.0.ebuild b/virtual/perl-bignum/perl-bignum-0.510.0.ebuild
index b48949fb2cb..b641c153efd 100644
--- a/virtual/perl-bignum/perl-bignum-0.510.0.ebuild
+++ b/virtual/perl-bignum/perl-bignum-0.510.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 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-if/perl-if-0.60.800-r2.ebuild b/virtual/perl-if/perl-if-0.60.800-r2.ebuild
index 631ca424a94..510c9ab91fe 100644
--- a/virtual/perl-if/perl-if-0.60.800-r2.ebuild
+++ b/virtual/perl-if/perl-if-0.60.800-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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-libnet/perl-libnet-3.110.0-r2.ebuild b/virtual/perl-libnet/perl-libnet-3.110.0-r2.ebuild
index 631ca424a94..510c9ab91fe 100644
--- a/virtual/perl-libnet/perl-libnet-3.110.0-r2.ebuild
+++ b/virtual/perl-libnet/perl-libnet-3.110.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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =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 3bafef2a34b..19c65177803 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 3bafef2a34b..19c65177803 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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 bfec933d440..fc6a60a070f 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 ppc ppc64 s390 sh sparc x86 ~x64-cygwin"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sparc x86 ~x64-cygwin"
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 556f208bdaf..8e50b6b1989 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 ppc ppc64 s390 sh sparc x86 ~x64-cygwin"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sparc x86 ~x64-cygwin"
RDEPEND="
|| ( =dev-lang/perl-5.30*[ithreads] ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-version/perl-version-0.992.400.ebuild b/virtual/perl-version/perl-version-0.992.400.ebuild
index 3bafef2a34b..19c65177803 100644
--- a/virtual/perl-version/perl-version-0.992.400.ebuild
+++ b/virtual/perl-version/perl-version-0.992.400.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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/pkgconfig/pkgconfig-0-r1.ebuild b/virtual/pkgconfig/pkgconfig-0-r1.ebuild
index bc2636fa43a..0f4cf36ab6c 100644
--- a/virtual/pkgconfig/pkgconfig-0-r1.ebuild
+++ b/virtual/pkgconfig/pkgconfig-0-r1.ebuild
@@ -7,7 +7,7 @@ inherit multilib-build
DESCRIPTION="Virtual for the pkg-config implementation"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| (
diff --git a/virtual/pkgconfig/pkgconfig-1.ebuild b/virtual/pkgconfig/pkgconfig-1.ebuild
index 968b2592afb..89b53f6f34d 100644
--- a/virtual/pkgconfig/pkgconfig-1.ebuild
+++ b/virtual/pkgconfig/pkgconfig-1.ebuild
@@ -7,7 +7,7 @@ inherit multilib-build
DESCRIPTION="Virtual for the pkg-config implementation"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| (
diff --git a/virtual/python-backports_abc/python-backports_abc-0.ebuild b/virtual/python-backports_abc/python-backports_abc-0.ebuild
index 72a063f7bdf..9b347b655a1 100644
--- a/virtual/python-backports_abc/python-backports_abc-0.ebuild
+++ b/virtual/python-backports_abc/python-backports_abc-0.ebuild
@@ -9,7 +9,7 @@ inherit python-r1
DESCRIPTION="A virtual for the Python 3.3+ collections.abc module"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
diff --git a/virtual/python-cffi/python-cffi-0.ebuild b/virtual/python-cffi/python-cffi-0.ebuild
index a2ae24a8e61..fa9d4e7b4cf 100644
--- a/virtual/python-cffi/python-cffi-0.ebuild
+++ b/virtual/python-cffi/python-cffi-0.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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
# built-in in PyPy and PyPy3
diff --git a/virtual/python-enum34/python-enum34-2.ebuild b/virtual/python-enum34/python-enum34-2.ebuild
index 86cb4dbb721..4e5b2ca8220 100644
--- a/virtual/python-enum34/python-enum34-2.ebuild
+++ b/virtual/python-enum34/python-enum34-2.ebuild
@@ -9,7 +9,7 @@ inherit python-r1
DESCRIPTION="A virtual for Python enum34 module"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
diff --git a/virtual/python-funcsigs/python-funcsigs-2-r1.ebuild b/virtual/python-funcsigs/python-funcsigs-2-r1.ebuild
index 6e77ecd1e93..5d0641ab903 100644
--- a/virtual/python-funcsigs/python-funcsigs-2-r1.ebuild
+++ b/virtual/python-funcsigs/python-funcsigs-2-r1.ebuild
@@ -9,7 +9,7 @@ inherit python-r1
DESCRIPTION="A Virtual for Python function signatures from PEP362 (py3.6 variant)"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh 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 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="
diff --git a/virtual/python-futures/python-futures-0.ebuild b/virtual/python-futures/python-futures-0.ebuild
index b1b584c7de4..57caf6810f9 100644
--- a/virtual/python-futures/python-futures-0.ebuild
+++ b/virtual/python-futures/python-futures-0.ebuild
@@ -9,7 +9,7 @@ inherit python-r1
DESCRIPTION="A virtual for the Python concurrent.futures module"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
diff --git a/virtual/python-futures/python-futures-1.ebuild b/virtual/python-futures/python-futures-1.ebuild
index 7c17586bfcb..b5edd0f98bb 100644
--- a/virtual/python-futures/python-futures-1.ebuild
+++ b/virtual/python-futures/python-futures-1.ebuild
@@ -9,7 +9,7 @@ inherit python-r1
DESCRIPTION="A virtual for the Python concurrent.futures module"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
diff --git a/virtual/python-ipaddress/python-ipaddress-1.0-r1.ebuild b/virtual/python-ipaddress/python-ipaddress-1.0-r1.ebuild
index 4d7e1d1001d..5de18a76ee3 100644
--- a/virtual/python-ipaddress/python-ipaddress-1.0-r1.ebuild
+++ b/virtual/python-ipaddress/python-ipaddress-1.0-r1.ebuild
@@ -9,7 +9,7 @@ inherit python-r1
DESCRIPTION="A virtual for Python ipaddress module"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
diff --git a/virtual/python-unittest-mock/python-unittest-mock-1.ebuild b/virtual/python-unittest-mock/python-unittest-mock-1.ebuild
index 60405f34714..fea4614653c 100644
--- a/virtual/python-unittest-mock/python-unittest-mock-1.ebuild
+++ b/virtual/python-unittest-mock/python-unittest-mock-1.ebuild
@@ -9,7 +9,7 @@ inherit python-r1
DESCRIPTION="A virtual for unittest.mock with mock fallback"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 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"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
diff --git a/virtual/qmail/qmail-1.03.ebuild b/virtual/qmail/qmail-1.03.ebuild
index 6e468b56abf..2d0f4b12135 100644
--- a/virtual/qmail/qmail-1.03.ebuild
+++ b/virtual/qmail/qmail-1.03.ebuild
@@ -5,7 +5,7 @@ EAPI=5
DESCRIPTION="Virtual for qmail"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
# netqmail-1.05 is a special case, because it's a vanilla
# qmail-1.03 but patched to fix some things.
diff --git a/virtual/resolvconf/resolvconf-1.ebuild b/virtual/resolvconf/resolvconf-1.ebuild
index 27f7912744b..90ec6fa4e92 100644
--- a/virtual/resolvconf/resolvconf-1.ebuild
+++ b/virtual/resolvconf/resolvconf-1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="Virtual to select between different resolvconf providers"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
RDEPEND="
|| (
diff --git a/virtual/ruby-ssl/ruby-ssl-11.ebuild b/virtual/ruby-ssl/ruby-ssl-11.ebuild
index 5c81dfb7ac8..f83ad8540bb 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 ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
ruby_targets_ruby24? ( dev-lang/ruby:2.4[ssl] )
diff --git a/virtual/rubygems/rubygems-15.ebuild b/virtual/rubygems/rubygems-15.ebuild
index 7530bd4c694..b2fbf917ba5 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 ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
ruby_targets_ruby24? ( >=dev-ruby/rubygems-2.6.11[ruby_targets_ruby24] )
diff --git a/virtual/rubygems/rubygems-16.ebuild b/virtual/rubygems/rubygems-16.ebuild
index 378e392b598..1c2c3862355 100644
--- a/virtual/rubygems/rubygems-16.ebuild
+++ b/virtual/rubygems/rubygems-16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,7 +8,7 @@ inherit ruby-ng
DESCRIPTION="Virtual ebuild for rubygems"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
ruby_targets_ruby24? ( >=dev-ruby/rubygems-2.6.11[ruby_targets_ruby24] )
diff --git a/virtual/service-manager/service-manager-0.ebuild b/virtual/service-manager/service-manager-0.ebuild
index bac0995a22e..66ab90b3cd7 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="kernel_linux prefix"
RDEPEND="
diff --git a/virtual/service-manager/service-manager-1.ebuild b/virtual/service-manager/service-manager-1.ebuild
index 270047be727..c1787cddbaa 100644
--- a/virtual/service-manager/service-manager-1.ebuild
+++ b/virtual/service-manager/service-manager-1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
DESCRIPTION="Virtual for various service managers"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="kernel_linux"
RDEPEND="
diff --git a/virtual/shadow/shadow-0.ebuild b/virtual/shadow/shadow-0.ebuild
index 4f37a2b7b80..88538e66f5a 100644
--- a/virtual/shadow/shadow-0.ebuild
+++ b/virtual/shadow/shadow-0.ebuild
@@ -6,7 +6,7 @@ EAPI=5
DESCRIPTION="Virtual for user account management utilities"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# >=shadow-4-1 is required because of bug #367633 (user.eclass needs it).
# On Prefix installations we sort of have to hope there is some shadow
diff --git a/virtual/ssh/ssh-0.ebuild b/virtual/ssh/ssh-0.ebuild
index 76001339c83..f7c41b8a492 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="minimal"
RDEPEND="
diff --git a/virtual/tex-base/tex-base-0.ebuild b/virtual/tex-base/tex-base-0.ebuild
index 2f27fa86f03..75991e0d2fe 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 152358a083d..f4c356f36d2 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x86-macos ~sparc-solaris ~x86-solaris"
RDEPEND="sys-apps/texinfo
virtual/latex-base
diff --git a/virtual/tmpfiles/tmpfiles-0.ebuild b/virtual/tmpfiles/tmpfiles-0.ebuild
index d417bb101ef..dcbaa4b2c52 100644
--- a/virtual/tmpfiles/tmpfiles-0.ebuild
+++ b/virtual/tmpfiles/tmpfiles-0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual to select between different tmpfiles.d handlers"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~x86-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 65de682f040..d9400a781cf 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 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="|| (
media-fonts/liberation-fonts
diff --git a/virtual/udev/udev-215.ebuild b/virtual/udev/udev-215.ebuild
index ace9ffefe2d..0ee72a9fc16 100644
--- a/virtual/udev/udev-215.ebuild
+++ b/virtual/udev/udev-215.ebuild
@@ -5,7 +5,7 @@ EAPI=5
DESCRIPTION="Virtual to select between different udev daemon providers"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86"
IUSE="systemd"
RDEPEND="
diff --git a/virtual/udev/udev-217.ebuild b/virtual/udev/udev-217.ebuild
index eadf70a58a0..9f2037ac747 100644
--- a/virtual/udev/udev-217.ebuild
+++ b/virtual/udev/udev-217.ebuild
@@ -5,7 +5,7 @@ EAPI=5
DESCRIPTION="Virtual to select between different udev daemon providers"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
IUSE="systemd"
RDEPEND="
diff --git a/virtual/wireguard/wireguard-1.ebuild b/virtual/wireguard/wireguard-1.ebuild
index 4fa639117c9..d203b7a7428 100644
--- a/virtual/wireguard/wireguard-1.ebuild
+++ b/virtual/wireguard/wireguard-1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
DESCRIPTION="Simple yet fast and modern VPN that utilizes state-of-the-art cryptography."
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="+module +tools"
RDEPEND="
diff --git a/virtual/yacc/yacc-0.ebuild b/virtual/yacc/yacc-0.ebuild
index 2c7c24277c6..8854a2f0264 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="|| ( sys-devel/bison dev-util/byacc dev-util/yacc )"
diff --git a/www-client/links/links-2.20.2-r1.ebuild b/www-client/links/links-2.20.2-r1.ebuild
index 9481700830d..a36d03fe29a 100644
--- a/www-client/links/links-2.20.2-r1.ebuild
+++ b/www-client/links/links-2.20.2-r1.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 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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/links/links-2.20.2.ebuild b/www-client/links/links-2.20.2.ebuild
index b332d790337..d8a1e24533c 100644
--- a/www-client/links/links-2.20.2.ebuild
+++ b/www-client/links/links-2.20.2.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 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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.8.9_p1.ebuild b/www-client/lynx/lynx-2.8.9_p1.ebuild
index daaedfb5174..2641b15b618 100644
--- a/www-client/lynx/lynx-2.8.9_p1.ebuild
+++ b/www-client/lynx/lynx-2.8.9_p1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="http://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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 cjk gnutls idn ipv6 nls ssl unicode libressl"
RDEPEND="
diff --git a/www-client/lynx/lynx-2.9.0_pre1.ebuild b/www-client/lynx/lynx-2.9.0_pre1.ebuild
index 41065578d3d..6b46f2a2f32 100644
--- a/www-client/lynx/lynx-2.9.0_pre1.ebuild
+++ b/www-client/lynx/lynx-2.9.0_pre1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -21,7 +21,7 @@ SRC_URI="http://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 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 cjk gnutls idn ipv6 nls ssl unicode libressl"
RDEPEND="
diff --git a/www-client/lynx/lynx-2.9.0_pre4.ebuild b/www-client/lynx/lynx-2.9.0_pre4.ebuild
index 50822d5bdc9..52ea78289b9 100644
--- a/www-client/lynx/lynx-2.9.0_pre4.ebuild
+++ b/www-client/lynx/lynx-2.9.0_pre4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -21,7 +21,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 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 cjk gnutls idn ipv6 nls ssl unicode libressl"
RDEPEND="
diff --git a/www-servers/apache/apache-2.4.41.ebuild b/www-servers/apache/apache-2.4.41.ebuild
index d19670b4ff4..2d0f5110534 100644
--- a/www-servers/apache/apache-2.4.41.ebuild
+++ b/www-servers/apache/apache-2.4.41.ebuild
@@ -136,7 +136,7 @@ HOMEPAGE="https://httpd.apache.org/"
# some helper scripts are Apache-1.1, thus both are here
LICENSE="Apache-2.0 Apache-1.1"
SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
# Enable http2 by default (bug #563452)
# FIXME: Move to apache-2.eclass once this has reached stable.
diff --git a/www-servers/lighttpd/lighttpd-1.4.53.ebuild b/www-servers/lighttpd/lighttpd-1.4.53.ebuild
index 4999171183f..bc0f8469995 100644
--- a/www-servers/lighttpd/lighttpd-1.4.53.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.53.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz"
LICENSE="BSD GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE="bzip2 dbi doc fam gdbm geoip ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php postgres rrdtool sasl selinux ssl sqlite test webdav xattr zlib"
RESTRICT="!test? ( test )"
diff --git a/www-servers/lighttpd/lighttpd-1.4.54.ebuild b/www-servers/lighttpd/lighttpd-1.4.54.ebuild
index 4a53b7055f4..7da64c59821 100644
--- a/www-servers/lighttpd/lighttpd-1.4.54.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.54.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz"
LICENSE="BSD GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="bzip2 dbi doc fam gdbm geoip ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php postgres rrdtool sasl selinux ssl sqlite test webdav xattr zlib"
RESTRICT="!test? ( test )"
diff --git a/www-servers/lighttpd/lighttpd-1.4.55.ebuild b/www-servers/lighttpd/lighttpd-1.4.55.ebuild
index 4a53b7055f4..7da64c59821 100644
--- a/www-servers/lighttpd/lighttpd-1.4.55.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.55.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz"
LICENSE="BSD GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="bzip2 dbi doc fam gdbm geoip ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php postgres rrdtool sasl selinux ssl sqlite test webdav xattr zlib"
RESTRICT="!test? ( test )"
diff --git a/www-servers/spawn-fcgi/spawn-fcgi-1.6.4-r1.ebuild b/www-servers/spawn-fcgi/spawn-fcgi-1.6.4-r1.ebuild
index 5482479d06d..9c316828082 100644
--- a/www-servers/spawn-fcgi/spawn-fcgi-1.6.4-r1.ebuild
+++ b/www-servers/spawn-fcgi/spawn-fcgi-1.6.4-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.lighttpd.net/download/${P}.tar.xz"
LICENSE="BSD GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
IUSE="ipv6"
DEPEND=""
diff --git a/www-servers/tornado/tornado-4.5.3.ebuild b/www-servers/tornado/tornado-4.5.3.ebuild
index 2f8adca7e83..da08949d215 100644
--- a/www-servers/tornado/tornado-4.5.3.ebuild
+++ b/www-servers/tornado/tornado-4.5.3.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 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="examples test"
RESTRICT="!test? ( test )"
diff --git a/www-servers/tornado/tornado-5.1-r1.ebuild b/www-servers/tornado/tornado-5.1-r1.ebuild
index 9fe88cdfb05..4199fb33ff4 100644
--- a/www-servers/tornado/tornado-5.1-r1.ebuild
+++ b/www-servers/tornado/tornado-5.1-r1.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 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="examples test"
RESTRICT="!test? ( test )"
diff --git a/www-servers/tornado/tornado-6.0.3.ebuild b/www-servers/tornado/tornado-6.0.3.ebuild
index 154b14a5124..ae3b96b715a 100644
--- a/www-servers/tornado/tornado-6.0.3.ebuild
+++ b/www-servers/tornado/tornado-6.0.3.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 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="examples test"
RESTRICT="!test? ( test )"
diff --git a/x11-apps/appres/appres-1.0.4.ebuild b/x11-apps/appres/appres-1.0.4.ebuild
index ce6bdb87e90..a3baf441be9 100644
--- a/x11-apps/appres/appres-1.0.4.ebuild
+++ b/x11-apps/appres/appres-1.0.4.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
DESCRIPTION="list X application resource database"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND="x11-libs/libX11
x11-libs/libXt"
diff --git a/x11-apps/appres/appres-1.0.5.ebuild b/x11-apps/appres/appres-1.0.5.ebuild
index ce6bdb87e90..a3baf441be9 100644
--- a/x11-apps/appres/appres-1.0.5.ebuild
+++ b/x11-apps/appres/appres-1.0.5.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
DESCRIPTION="list X application resource database"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND="x11-libs/libX11
x11-libs/libXt"
diff --git a/x11-apps/bdftopcf/bdftopcf-1.1.ebuild b/x11-apps/bdftopcf/bdftopcf-1.1.ebuild
index 83a7b8ba50e..651342c973c 100644
--- a/x11-apps/bdftopcf/bdftopcf-1.1.ebuild
+++ b/x11-apps/bdftopcf/bdftopcf-1.1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
DESCRIPTION="X.Org bdftopcf application"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="
x11-base/xorg-proto"
diff --git a/x11-apps/beforelight/beforelight-1.0.5.ebuild b/x11-apps/beforelight/beforelight-1.0.5.ebuild
index e4ce3505fc3..f131ec93b6d 100644
--- a/x11-apps/beforelight/beforelight-1.0.5.ebuild
+++ b/x11-apps/beforelight/beforelight-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
inherit xorg-2
DESCRIPTION="Sample implementation of screen saver"
-KEYWORDS="amd64 arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="amd64 arm ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
IUSE=""
RDEPEND="x11-libs/libX11
x11-libs/libXScrnSaver
diff --git a/x11-apps/bitmap/bitmap-1.0.9.ebuild b/x11-apps/bitmap/bitmap-1.0.9.ebuild
index f4dbb209995..eb6201ff851 100644
--- a/x11-apps/bitmap/bitmap-1.0.9.ebuild
+++ b/x11-apps/bitmap/bitmap-1.0.9.ebuild
@@ -6,7 +6,7 @@ EAPI=5
inherit xorg-2
DESCRIPTION="X.Org bitmap application"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND="x11-libs/libX11
x11-libs/libXmu
diff --git a/x11-apps/editres/editres-1.0.6.ebuild b/x11-apps/editres/editres-1.0.6.ebuild
index d81fb1814cf..57d3582265a 100644
--- a/x11-apps/editres/editres-1.0.6.ebuild
+++ b/x11-apps/editres/editres-1.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -7,7 +7,7 @@ inherit xorg-2
DESCRIPTION="a dynamic resource editor for X Toolkit applications"
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND="x11-libs/libX11
diff --git a/x11-apps/editres/editres-1.0.7.ebuild b/x11-apps/editres/editres-1.0.7.ebuild
index 464eec9afe1..57d3582265a 100644
--- a/x11-apps/editres/editres-1.0.7.ebuild
+++ b/x11-apps/editres/editres-1.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -7,7 +7,7 @@ inherit xorg-2
DESCRIPTION="a dynamic resource editor for X Toolkit applications"
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND="x11-libs/libX11
diff --git a/x11-apps/fonttosfnt/fonttosfnt-1.1.0.ebuild b/x11-apps/fonttosfnt/fonttosfnt-1.1.0.ebuild
index 5c90fdfbefb..9b0d5a1a131 100644
--- a/x11-apps/fonttosfnt/fonttosfnt-1.1.0.ebuild
+++ b/x11-apps/fonttosfnt/fonttosfnt-1.1.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
inherit xorg-3
DESCRIPTION="X.Org fonttosfnt application"
-KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND="media-libs/freetype:2
x11-libs/libX11
diff --git a/x11-apps/fslsfonts/fslsfonts-1.0.5-r1.ebuild b/x11-apps/fslsfonts/fslsfonts-1.0.5-r1.ebuild
index e6deac2c8d2..32f8fbb3f0b 100644
--- a/x11-apps/fslsfonts/fslsfonts-1.0.5-r1.ebuild
+++ b/x11-apps/fslsfonts/fslsfonts-1.0.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
inherit xorg-2
DESCRIPTION="list fonts served by X font server"
-KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND="x11-libs/libFS"
diff --git a/x11-apps/fstobdf/fstobdf-1.0.6.ebuild b/x11-apps/fstobdf/fstobdf-1.0.6.ebuild
index db4fffaa7a9..fc375467eb9 100644
--- a/x11-apps/fstobdf/fstobdf-1.0.6.ebuild
+++ b/x11-apps/fstobdf/fstobdf-1.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
inherit xorg-2
DESCRIPTION="generate BDF font from X font server"
-KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND="x11-libs/libX11
diff --git a/x11-apps/iceauth/iceauth-1.0.8.ebuild b/x11-apps/iceauth/iceauth-1.0.8.ebuild
index c81bf8c1aec..832be1f833d 100644
--- a/x11-apps/iceauth/iceauth-1.0.8.ebuild
+++ b/x11-apps/iceauth/iceauth-1.0.8.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
DESCRIPTION="ICE authority file utility"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND="x11-libs/libICE"
diff --git a/x11-apps/ico/ico-1.0.4.ebuild b/x11-apps/ico/ico-1.0.4.ebuild
index beaa0842648..0c60e859472 100644
--- a/x11-apps/ico/ico-1.0.4.ebuild
+++ b/x11-apps/ico/ico-1.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
inherit xorg-2
DESCRIPTION="animate an icosahedron or other polyhedron"
-KEYWORDS="amd64 arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-linux"
+KEYWORDS="amd64 arm ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~x86-linux"
IUSE=""
RDEPEND="x11-libs/libX11"
diff --git a/x11-apps/ico/ico-1.0.5.ebuild b/x11-apps/ico/ico-1.0.5.ebuild
index 65ce2d36b02..0c60e859472 100644
--- a/x11-apps/ico/ico-1.0.5.ebuild
+++ b/x11-apps/ico/ico-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
inherit xorg-2
DESCRIPTION="animate an icosahedron or other polyhedron"
-KEYWORDS="amd64 arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-linux"
+KEYWORDS="amd64 arm ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~x86-linux"
IUSE=""
RDEPEND="x11-libs/libX11"
diff --git a/x11-apps/listres/listres-1.0.4.ebuild b/x11-apps/listres/listres-1.0.4.ebuild
index d06a8dcf280..9a5c4f39105 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-2019 Gentoo Authors
+# Copyright 1999-2020 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 sh 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/luit/luit-20190106.ebuild b/x11-apps/luit/luit-20190106.ebuild
index 257682f3cad..69d09ebd5f8 100644
--- a/x11-apps/luit/luit-20190106.ebuild
+++ b/x11-apps/luit/luit-20190106.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://invisible-mirror.net/archives/${PN}/${P}.tgz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="sys-libs/zlib
diff --git a/x11-apps/mesa-progs/mesa-progs-8.4.0.ebuild b/x11-apps/mesa-progs/mesa-progs-8.4.0.ebuild
index 47c7d51901b..5700904938b 100644
--- a/x11-apps/mesa-progs/mesa-progs-8.4.0.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-8.4.0.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} = 9999* ]]; then
else
SRC_URI="https://mesa.freedesktop.org/archive/demos/${MY_P}.tar.bz2
https://mesa.freedesktop.org/archive/demos/${PV}/${MY_P}.tar.bz2"
- KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
S="${WORKDIR}/${MY_P}"
fi
LICENSE="LGPL-2"
diff --git a/x11-apps/mesa-progs/mesa-progs-9999.ebuild b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
index 1f4f8498384..4220c4004cb 100644
--- a/x11-apps/mesa-progs/mesa-progs-9999.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -18,7 +18,7 @@ if [[ ${PV} = 9999* ]]; then
else
SRC_URI="https://mesa.freedesktop.org/archive/demos/${MY_P}.tar.bz2
https://mesa.freedesktop.org/archive/demos/${PV}/${MY_P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
S="${WORKDIR}/${MY_P}"
fi
LICENSE="LGPL-2"
diff --git a/x11-apps/mkfontdir/mkfontdir-1.2.0.ebuild b/x11-apps/mkfontdir/mkfontdir-1.2.0.ebuild
index 8e522ee26da..6a876ba280f 100644
--- a/x11-apps/mkfontdir/mkfontdir-1.2.0.ebuild
+++ b/x11-apps/mkfontdir/mkfontdir-1.2.0.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/mkfont
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=">=x11-apps/mkfontscale-1.2.0"
diff --git a/x11-apps/mkfontscale/mkfontscale-1.2.1.ebuild b/x11-apps/mkfontscale/mkfontscale-1.2.1.ebuild
index 6ab0eeb8899..bda8e858fb6 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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ec662219666..a9d5cb57275 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-2
DESCRIPTION="round X clock"
-KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="x11-libs/libX11
x11-libs/libXext
diff --git a/x11-apps/rgb/rgb-1.0.5.ebuild b/x11-apps/rgb/rgb-1.0.5.ebuild
index 81fb483e8bb..c4329613a74 100644
--- a/x11-apps/rgb/rgb-1.0.5.ebuild
+++ b/x11-apps/rgb/rgb-1.0.5.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
DESCRIPTION="uncompile an rgb color-name database"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND=""
DEPEND="${RDEPEND}
diff --git a/x11-apps/rgb/rgb-1.0.6.ebuild b/x11-apps/rgb/rgb-1.0.6.ebuild
index 6e7121089ba..473cda5c829 100644
--- a/x11-apps/rgb/rgb-1.0.6.ebuild
+++ b/x11-apps/rgb/rgb-1.0.6.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
DESCRIPTION="uncompile an rgb color-name database"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND=""
DEPEND="${RDEPEND}
diff --git a/x11-apps/rstart/rstart-1.0.5-r1.ebuild b/x11-apps/rstart/rstart-1.0.5-r1.ebuild
index 86908b7e7f1..327b30687d9 100644
--- a/x11-apps/rstart/rstart-1.0.5-r1.ebuild
+++ b/x11-apps/rstart/rstart-1.0.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
inherit xorg-2
DESCRIPTION="X.Org rstart application"
-KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 ~sparc x86"
IUSE=""
DEPEND="x11-base/xorg-proto"
diff --git a/x11-apps/scripts/scripts-1.0.1-r1.ebuild b/x11-apps/scripts/scripts-1.0.1-r1.ebuild
index 064806f4a2f..b17baaf949d 100644
--- a/x11-apps/scripts/scripts-1.0.1-r1.ebuild
+++ b/x11-apps/scripts/scripts-1.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -7,7 +7,7 @@ XORG_STATIC="no"
inherit xorg-2
DESCRIPTION="start an X program on a remote machine"
-KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="x11-libs/libX11"
diff --git a/x11-apps/sessreg/sessreg-1.1.2.ebuild b/x11-apps/sessreg/sessreg-1.1.2.ebuild
index b6c45b91d44..caec4627dc1 100644
--- a/x11-apps/sessreg/sessreg-1.1.2.ebuild
+++ b/x11-apps/sessreg/sessreg-1.1.2.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
DESCRIPTION="manage utmp/wtmp entries for non-init clients"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND=""
diff --git a/x11-apps/setxkbmap/setxkbmap-1.3.2.ebuild b/x11-apps/setxkbmap/setxkbmap-1.3.2.ebuild
index 695168e72fd..e6205ea3cd3 100644
--- a/x11-apps/setxkbmap/setxkbmap-1.3.2.ebuild
+++ b/x11-apps/setxkbmap/setxkbmap-1.3.2.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
DESCRIPTION="Controls the keyboard layout of a running X server"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
COMMON_DEPEND="
x11-libs/libxkbfile
diff --git a/x11-apps/showfont/showfont-1.0.4.ebuild b/x11-apps/showfont/showfont-1.0.4.ebuild
index f56371f798c..08e95071467 100644
--- a/x11-apps/showfont/showfont-1.0.4.ebuild
+++ b/x11-apps/showfont/showfont-1.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
inherit xorg-2
DESCRIPTION="font dumper for X font server"
-KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND="x11-libs/libFS"
diff --git a/x11-apps/showfont/showfont-1.0.5.ebuild b/x11-apps/showfont/showfont-1.0.5.ebuild
index 243b228fcca..08e95071467 100644
--- a/x11-apps/showfont/showfont-1.0.5.ebuild
+++ b/x11-apps/showfont/showfont-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
inherit xorg-2
DESCRIPTION="font dumper for X font server"
-KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND="x11-libs/libFS"
diff --git a/x11-apps/smproxy/smproxy-1.0.6.ebuild b/x11-apps/smproxy/smproxy-1.0.6.ebuild
index 48aaab490ad..be5990f6508 100644
--- a/x11-apps/smproxy/smproxy-1.0.6.ebuild
+++ b/x11-apps/smproxy/smproxy-1.0.6.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
DESCRIPTION="Session Manager Proxy"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND="x11-libs/libXt
diff --git a/x11-apps/viewres/viewres-1.0.6.ebuild b/x11-apps/viewres/viewres-1.0.6.ebuild
index 24c0ae2fd18..7d2094dfe9b 100644
--- a/x11-apps/viewres/viewres-1.0.6.ebuild
+++ b/x11-apps/viewres/viewres-1.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,7 +6,7 @@ inherit xorg-3
DESCRIPTION="graphical class browser for Xt"
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND="
diff --git a/x11-apps/x11perf/x11perf-1.6.1.ebuild b/x11-apps/x11perf/x11perf-1.6.1.ebuild
index 9e8eb497233..6d5954d08cc 100644
--- a/x11-apps/x11perf/x11perf-1.6.1.ebuild
+++ b/x11-apps/x11perf/x11perf-1.6.1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
DESCRIPTION="X rendering operation stress test utility"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xauth/xauth-1.1.ebuild b/x11-apps/xauth/xauth-1.1.ebuild
index 3aed6ad960a..0ed282e8957 100644
--- a/x11-apps/xauth/xauth-1.1.ebuild
+++ b/x11-apps/xauth/xauth-1.1.ebuild
@@ -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 s390 ~sh 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"
fi
DESCRIPTION="X authority file utility"
diff --git a/x11-apps/xauth/xauth-9999.ebuild b/x11-apps/xauth/xauth-9999.ebuild
index 17995a9945a..303aa1063e2 100644
--- a/x11-apps/xauth/xauth-9999.ebuild
+++ b/x11-apps/xauth/xauth-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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 ~s390 ~sh ~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"
fi
DESCRIPTION="X authority file utility"
diff --git a/x11-apps/xbacklight/xbacklight-1.2.3.ebuild b/x11-apps/xbacklight/xbacklight-1.2.3.ebuild
index a2e17e103c2..0a7152cc4e3 100644
--- a/x11-apps/xbacklight/xbacklight-1.2.3.ebuild
+++ b/x11-apps/xbacklight/xbacklight-1.2.3.ebuild
@@ -6,7 +6,7 @@ EAPI=7
inherit xorg-3
DESCRIPTION="Sets backlight level using the RandR 1.2 BACKLIGHT output property"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
RDEPEND="x11-libs/libxcb
diff --git a/x11-apps/xbiff/xbiff-1.0.4.ebuild b/x11-apps/xbiff/xbiff-1.0.4.ebuild
index 1af59d9a879..0b6a68e3cc4 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-2019 Gentoo Authors
+# Copyright 1999-2020 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 ~sh sparc x86"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 s390 sparc x86"
IUSE=""
RDEPEND="x11-libs/libXaw
diff --git a/x11-apps/xcalc/xcalc-1.1.0.ebuild b/x11-apps/xcalc/xcalc-1.1.0.ebuild
index 9a39ab1d1a5..dc5407baad1 100644
--- a/x11-apps/xcalc/xcalc-1.1.0.ebuild
+++ b/x11-apps/xcalc/xcalc-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -7,7 +7,7 @@ inherit xorg-3
DESCRIPTION="scientific calculator for X"
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
RDEPEND="x11-libs/libXaw
diff --git a/x11-apps/xclipboard/xclipboard-1.1.3.ebuild b/x11-apps/xclipboard/xclipboard-1.1.3.ebuild
index ea1227fbb32..cc1fab54564 100644
--- a/x11-apps/xclipboard/xclipboard-1.1.3.ebuild
+++ b/x11-apps/xclipboard/xclipboard-1.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
inherit xorg-2
DESCRIPTION="interchange between cut buffer and selection"
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND="x11-libs/libXaw
x11-libs/libxkbfile
diff --git a/x11-apps/xclock/xclock-1.0.9.ebuild b/x11-apps/xclock/xclock-1.0.9.ebuild
index cbb54bc4255..bf7c93ca054 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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
IUSE=""
RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xcmsdb/xcmsdb-1.0.5.ebuild b/x11-apps/xcmsdb/xcmsdb-1.0.5.ebuild
index db5e636725e..8573feb628c 100644
--- a/x11-apps/xcmsdb/xcmsdb-1.0.5.ebuild
+++ b/x11-apps/xcmsdb/xcmsdb-1.0.5.ebuild
@@ -6,7 +6,7 @@ EAPI=5
inherit xorg-2
DESCRIPTION="Device Color Characterization utility for X Color Management System"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND="x11-libs/libX11"
diff --git a/x11-apps/xconsole/xconsole-1.0.7.ebuild b/x11-apps/xconsole/xconsole-1.0.7.ebuild
index 405e37d4a9b..f95d3c6a377 100644
--- a/x11-apps/xconsole/xconsole-1.0.7.ebuild
+++ b/x11-apps/xconsole/xconsole-1.0.7.ebuild
@@ -6,7 +6,7 @@ EAPI=5
inherit xorg-2
DESCRIPTION="monitor system console messages with X"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND="x11-libs/libXaw
x11-libs/libXmu
diff --git a/x11-apps/xcursorgen/xcursorgen-1.0.7.ebuild b/x11-apps/xcursorgen/xcursorgen-1.0.7.ebuild
index bbceb121159..d3f58e64507 100644
--- a/x11-apps/xcursorgen/xcursorgen-1.0.7.ebuild
+++ b/x11-apps/xcursorgen/xcursorgen-1.0.7.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
DESCRIPTION="create an X cursor file from a collection of PNG images"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
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 8df4f1fe96f..8c5f6233c35 100644
--- a/x11-apps/xdbedizzy/xdbedizzy-1.1.0.ebuild
+++ b/x11-apps/xdbedizzy/xdbedizzy-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
inherit xorg-2
DESCRIPTION="X.Org xdbedizzy application"
-KEYWORDS="amd64 arm ~mips ppc ppc64 s390 sh ~sparc x86"
+KEYWORDS="amd64 arm ~mips ppc ppc64 s390 ~sparc x86"
IUSE=""
RDEPEND="
diff --git a/x11-apps/xditview/xditview-1.0.5.ebuild b/x11-apps/xditview/xditview-1.0.5.ebuild
index 8e1bf38f2a1..903af98add2 100644
--- a/x11-apps/xditview/xditview-1.0.5.ebuild
+++ b/x11-apps/xditview/xditview-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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="display ditroff output"
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND="x11-libs/libXaw
diff --git a/x11-apps/xdm/xdm-1.1.12.ebuild b/x11-apps/xdm/xdm-1.1.12.ebuild
index 395d907d0a4..1a6b0685cfe 100644
--- a/x11-apps/xdm/xdm-1.1.12.ebuild
+++ b/x11-apps/xdm/xdm-1.1.12.ebuild
@@ -11,7 +11,7 @@ DEFAULTVT=vt7
DESCRIPTION="X.Org xdm application"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="consolekit ipv6 pam systemd truetype xinerama xpm"
RDEPEND="
diff --git a/x11-apps/xdpyinfo/xdpyinfo-1.3.1.ebuild b/x11-apps/xdpyinfo/xdpyinfo-1.3.1.ebuild
index 9a61241b61e..f3f737d7bd2 100644
--- a/x11-apps/xdpyinfo/xdpyinfo-1.3.1.ebuild
+++ b/x11-apps/xdpyinfo/xdpyinfo-1.3.1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
inherit xorg-2
DESCRIPTION="Display information utility for X"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris ~x86-winnt"
IUSE="dga dmx xinerama"
RDEPEND="
diff --git a/x11-apps/xdpyinfo/xdpyinfo-1.3.2.ebuild b/x11-apps/xdpyinfo/xdpyinfo-1.3.2.ebuild
index 9a61241b61e..f3f737d7bd2 100644
--- a/x11-apps/xdpyinfo/xdpyinfo-1.3.2.ebuild
+++ b/x11-apps/xdpyinfo/xdpyinfo-1.3.2.ebuild
@@ -5,7 +5,7 @@ EAPI=5
inherit xorg-2
DESCRIPTION="Display information utility for X"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris ~x86-winnt"
IUSE="dga dmx xinerama"
RDEPEND="
diff --git a/x11-apps/xdriinfo/xdriinfo-1.0.5.ebuild b/x11-apps/xdriinfo/xdriinfo-1.0.5.ebuild
index 6592817ee95..c7c92387ec5 100644
--- a/x11-apps/xdriinfo/xdriinfo-1.0.5.ebuild
+++ b/x11-apps/xdriinfo/xdriinfo-1.0.5.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2 flag-o-matic multilib
DESCRIPTION="query configuration information of DRI drivers"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xdriinfo/xdriinfo-1.0.6.ebuild b/x11-apps/xdriinfo/xdriinfo-1.0.6.ebuild
index 6acef9e8a7e..eeaed55a5a6 100644
--- a/x11-apps/xdriinfo/xdriinfo-1.0.6.ebuild
+++ b/x11-apps/xdriinfo/xdriinfo-1.0.6.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2 flag-o-matic multilib
DESCRIPTION="query configuration information of DRI drivers"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xev/xev-1.2.3.ebuild b/x11-apps/xev/xev-1.2.3.ebuild
index 3fdc73bc737..5617123fecc 100644
--- a/x11-apps/xev/xev-1.2.3.ebuild
+++ b/x11-apps/xev/xev-1.2.3.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
DESCRIPTION="Print contents of X events"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-winnt"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-winnt"
IUSE=""
RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xeyes/xeyes-1.1.1.ebuild b/x11-apps/xeyes/xeyes-1.1.1.ebuild
index 0cc9337704f..78a1cd8b0f4 100644
--- a/x11-apps/xeyes/xeyes-1.1.1.ebuild
+++ b/x11-apps/xeyes/xeyes-1.1.1.ebuild
@@ -6,7 +6,7 @@ EAPI=5
inherit xorg-2
DESCRIPTION="X.Org xeyes application"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh 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"
IUSE=""
RDEPEND="x11-libs/libX11
x11-libs/libXt
diff --git a/x11-apps/xeyes/xeyes-1.1.2.ebuild b/x11-apps/xeyes/xeyes-1.1.2.ebuild
index ca365c20ef1..b3868d6f8fe 100644
--- a/x11-apps/xeyes/xeyes-1.1.2.ebuild
+++ b/x11-apps/xeyes/xeyes-1.1.2.ebuild
@@ -6,7 +6,7 @@ EAPI=5
inherit xorg-2
DESCRIPTION="X.Org xeyes application"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh 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"
IUSE=""
RDEPEND="x11-libs/libX11
x11-libs/libXt
diff --git a/x11-apps/xf86dga/xf86dga-1.0.3.ebuild b/x11-apps/xf86dga/xf86dga-1.0.3.ebuild
index 6b27b8eaf4c..add880951e1 100644
--- a/x11-apps/xf86dga/xf86dga-1.0.3.ebuild
+++ b/x11-apps/xf86dga/xf86dga-1.0.3.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
DESCRIPTION="Test program for the XFree86-DGA extension"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE=""
RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xfd/xfd-1.1.3.ebuild b/x11-apps/xfd/xfd-1.1.3.ebuild
index b46c4eb4ced..4939c1bde9d 100644
--- a/x11-apps/xfd/xfd-1.1.3.ebuild
+++ b/x11-apps/xfd/xfd-1.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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="X.Org xfd application"
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
DEPEND="media-libs/freetype:2
diff --git a/x11-apps/xfontsel/xfontsel-1.0.5.ebuild b/x11-apps/xfontsel/xfontsel-1.0.5.ebuild
index 5a56d5cdbe8..8b9d66d3c3b 100644
--- a/x11-apps/xfontsel/xfontsel-1.0.5.ebuild
+++ b/x11-apps/xfontsel/xfontsel-1.0.5.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
DESCRIPTION="point and click selection of X11 font names"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos"
IUSE=""
RDEPEND="x11-libs/libXaw
diff --git a/x11-apps/xfontsel/xfontsel-1.0.6.ebuild b/x11-apps/xfontsel/xfontsel-1.0.6.ebuild
index 5a56d5cdbe8..8b9d66d3c3b 100644
--- a/x11-apps/xfontsel/xfontsel-1.0.6.ebuild
+++ b/x11-apps/xfontsel/xfontsel-1.0.6.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
DESCRIPTION="point and click selection of X11 font names"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos"
IUSE=""
RDEPEND="x11-libs/libXaw
diff --git a/x11-apps/xgamma/xgamma-1.0.6.ebuild b/x11-apps/xgamma/xgamma-1.0.6.ebuild
index 2f0c9ce0590..a27b900f4d7 100644
--- a/x11-apps/xgamma/xgamma-1.0.6.ebuild
+++ b/x11-apps/xgamma/xgamma-1.0.6.ebuild
@@ -6,7 +6,7 @@ EAPI=5
inherit xorg-2
DESCRIPTION="Alter a monitor's gamma correction through the X server"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND="x11-libs/libXxf86vm
diff --git a/x11-apps/xgc/xgc-1.0.4.ebuild b/x11-apps/xgc/xgc-1.0.4.ebuild
index 7f9c2024f61..b9a84142818 100644
--- a/x11-apps/xgc/xgc-1.0.4.ebuild
+++ b/x11-apps/xgc/xgc-1.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
inherit xorg-2
DESCRIPTION="X graphics demo"
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND="x11-libs/libXaw
diff --git a/x11-apps/xgc/xgc-1.0.5.ebuild b/x11-apps/xgc/xgc-1.0.5.ebuild
index 917bf3f76a9..b9a84142818 100644
--- a/x11-apps/xgc/xgc-1.0.5.ebuild
+++ b/x11-apps/xgc/xgc-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
inherit xorg-2
DESCRIPTION="X graphics demo"
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND="x11-libs/libXaw
diff --git a/x11-apps/xhost/xhost-1.0.8.ebuild b/x11-apps/xhost/xhost-1.0.8.ebuild
index d74832908db..a5f6f0563e7 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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 ~x86-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 dc256942fd4..575e2ae0756 100644
--- a/x11-apps/xinit/xinit-1.4.1.ebuild
+++ b/x11-apps/xinit/xinit-1.4.1.ebuild
@@ -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 s390 ~sh sparc x86 ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~arm-linux ~x86-linux"
IUSE="twm"
RDEPEND="
diff --git a/x11-apps/xinput/xinput-1.6.3.ebuild b/x11-apps/xinput/xinput-1.6.3.ebuild
index 776829a7f0c..501c59fbebe 100644
--- a/x11-apps/xinput/xinput-1.6.3.ebuild
+++ b/x11-apps/xinput/xinput-1.6.3.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
DESCRIPTION="Utility to set XInput device parameters"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
RDEPEND=">=x11-libs/libX11-1.3
diff --git a/x11-apps/xkbcomp/xkbcomp-1.4.3.ebuild b/x11-apps/xkbcomp/xkbcomp-1.4.3.ebuild
index 9aed61dd9e7..311436edc57 100644
--- a/x11-apps/xkbcomp/xkbcomp-1.4.3.ebuild
+++ b/x11-apps/xkbcomp/xkbcomp-1.4.3.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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
DEPEND="
>=x11-libs/libX11-1.6.9
diff --git a/x11-apps/xkbevd/xkbevd-1.1.4.ebuild b/x11-apps/xkbevd/xkbevd-1.1.4.ebuild
index b3c15783415..7e8dc33ddac 100644
--- a/x11-apps/xkbevd/xkbevd-1.1.4.ebuild
+++ b/x11-apps/xkbevd/xkbevd-1.1.4.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
DESCRIPTION="XKB event daemon"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xkbprint/xkbprint-1.0.5.ebuild b/x11-apps/xkbprint/xkbprint-1.0.5.ebuild
index aaff770fb03..58b6df2baac 100644
--- a/x11-apps/xkbprint/xkbprint-1.0.5.ebuild
+++ b/x11-apps/xkbprint/xkbprint-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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="Print an XKB keyboard description"
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sparc x86"
IUSE=""
RDEPEND="x11-libs/libxkbfile
>=x11-libs/libX11-1.6.9"
diff --git a/x11-apps/xkbutils/xkbutils-1.0.4.ebuild b/x11-apps/xkbutils/xkbutils-1.0.4.ebuild
index 24c8a7a5e60..3667c478bf8 100644
--- a/x11-apps/xkbutils/xkbutils-1.0.4.ebuild
+++ b/x11-apps/xkbutils/xkbutils-1.0.4.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
DESCRIPTION="X.Org xkbutils application"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xkill/xkill-1.0.4.ebuild b/x11-apps/xkill/xkill-1.0.4.ebuild
index 829140652c7..305e59d5469 100644
--- a/x11-apps/xkill/xkill-1.0.4.ebuild
+++ b/x11-apps/xkill/xkill-1.0.4.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
DESCRIPTION="kill a client by its X resource"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-winnt"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-winnt"
IUSE=""
RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xkill/xkill-1.0.5.ebuild b/x11-apps/xkill/xkill-1.0.5.ebuild
index 829140652c7..305e59d5469 100644
--- a/x11-apps/xkill/xkill-1.0.5.ebuild
+++ b/x11-apps/xkill/xkill-1.0.5.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
DESCRIPTION="kill a client by its X resource"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-winnt"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-winnt"
IUSE=""
RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xload/xload-1.1.2.ebuild b/x11-apps/xload/xload-1.1.2.ebuild
index 56ed1250865..1a594ba3d49 100644
--- a/x11-apps/xload/xload-1.1.2.ebuild
+++ b/x11-apps/xload/xload-1.1.2.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
DESCRIPTION="system load average display for X"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND="x11-libs/libXaw
diff --git a/x11-apps/xload/xload-1.1.3.ebuild b/x11-apps/xload/xload-1.1.3.ebuild
index 56ed1250865..1a594ba3d49 100644
--- a/x11-apps/xload/xload-1.1.3.ebuild
+++ b/x11-apps/xload/xload-1.1.3.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
DESCRIPTION="system load average display for X"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND="x11-libs/libXaw
diff --git a/x11-apps/xlogo/xlogo-1.0.5.ebuild b/x11-apps/xlogo/xlogo-1.0.5.ebuild
index dad0af6a665..d04b4f1b6b2 100644
--- a/x11-apps/xlogo/xlogo-1.0.5.ebuild
+++ b/x11-apps/xlogo/xlogo-1.0.5.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
DESCRIPTION="X Window System logo"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE=""
RDEPEND="x11-libs/libXrender
diff --git a/x11-apps/xlsatoms/xlsatoms-1.1.3.ebuild b/x11-apps/xlsatoms/xlsatoms-1.1.3.ebuild
index df0207a3d8f..65cb3fbe13b 100644
--- a/x11-apps/xlsatoms/xlsatoms-1.1.3.ebuild
+++ b/x11-apps/xlsatoms/xlsatoms-1.1.3.ebuild
@@ -6,7 +6,7 @@ EAPI=7
inherit xorg-3
DESCRIPTION="list interned atoms defined on server"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND="x11-libs/libxcb:="
diff --git a/x11-apps/xlsclients/xlsclients-1.1.4.ebuild b/x11-apps/xlsclients/xlsclients-1.1.4.ebuild
index 0e09ffd5585..df912a9afe6 100644
--- a/x11-apps/xlsclients/xlsclients-1.1.4.ebuild
+++ b/x11-apps/xlsclients/xlsclients-1.1.4.ebuild
@@ -6,7 +6,7 @@ EAPI=5
inherit xorg-2
DESCRIPTION="X.Org xlsclients application"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND="
diff --git a/x11-apps/xlsfonts/xlsfonts-1.0.6.ebuild b/x11-apps/xlsfonts/xlsfonts-1.0.6.ebuild
index a5e00bea091..1778f237cf4 100644
--- a/x11-apps/xlsfonts/xlsfonts-1.0.6.ebuild
+++ b/x11-apps/xlsfonts/xlsfonts-1.0.6.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
DESCRIPTION="X.Org xlsfonts application"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
IUSE=""
RDEPEND="x11-libs/libX11"
DEPEND="${RDEPEND}"
diff --git a/x11-apps/xmag/xmag-1.0.6.ebuild b/x11-apps/xmag/xmag-1.0.6.ebuild
index b013f1b4ca7..7bb88d04f61 100644
--- a/x11-apps/xmag/xmag-1.0.6.ebuild
+++ b/x11-apps/xmag/xmag-1.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -7,7 +7,7 @@ inherit xorg-2
DESCRIPTION="X.Org xmag application"
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND="x11-libs/libXaw
diff --git a/x11-apps/xman/xman-1.1.5.ebuild b/x11-apps/xman/xman-1.1.5.ebuild
index d3a9b0c29ef..0d0830e3770 100644
--- a/x11-apps/xman/xman-1.1.5.ebuild
+++ b/x11-apps/xman/xman-1.1.5.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
DESCRIPTION="Manual page display program for the X Window System"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND="x11-libs/libXaw
diff --git a/x11-apps/xmessage/xmessage-1.0.4.ebuild b/x11-apps/xmessage/xmessage-1.0.4.ebuild
index 3dae2c83604..87a51d1b2f4 100644
--- a/x11-apps/xmessage/xmessage-1.0.4.ebuild
+++ b/x11-apps/xmessage/xmessage-1.0.4.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
DESCRIPTION="display a message or query in a window (X-based /bin/echo)"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="x11-libs/libXaw
diff --git a/x11-apps/xmessage/xmessage-1.0.5.ebuild b/x11-apps/xmessage/xmessage-1.0.5.ebuild
index f3552ab3e58..a736f48ebeb 100644
--- a/x11-apps/xmessage/xmessage-1.0.5.ebuild
+++ b/x11-apps/xmessage/xmessage-1.0.5.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
DESCRIPTION="display a message or query in a window (X-based /bin/echo)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="x11-libs/libXaw
diff --git a/x11-apps/xmodmap/xmodmap-1.0.10.ebuild b/x11-apps/xmodmap/xmodmap-1.0.10.ebuild
index db4af16c7d3..2bc74c242e5 100644
--- a/x11-apps/xmodmap/xmodmap-1.0.10.ebuild
+++ b/x11-apps/xmodmap/xmodmap-1.0.10.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
DESCRIPTION="utility for modifying keymaps and pointer button mappings in X"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh 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"
IUSE=""
RDEPEND="x11-libs/libX11"
diff --git a/x11-apps/xmore/xmore-1.0.3.ebuild b/x11-apps/xmore/xmore-1.0.3.ebuild
index 1e87cdf38ba..2bdc2c1ad61 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-2019 Gentoo Authors
+# Copyright 1999-2020 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 ~sh ~sparc x86"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 s390 ~sparc x86"
IUSE=""
RDEPEND="
diff --git a/x11-apps/xpr/xpr-1.0.5.ebuild b/x11-apps/xpr/xpr-1.0.5.ebuild
index 6bec1943f68..68d90c69f99 100644
--- a/x11-apps/xpr/xpr-1.0.5.ebuild
+++ b/x11-apps/xpr/xpr-1.0.5.ebuild
@@ -5,7 +5,7 @@ EAPI=5
inherit xorg-2
DESCRIPTION="X.Org xpr application"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE=""
RDEPEND="x11-libs/libXmu
x11-libs/libX11"
diff --git a/x11-apps/xprop/xprop-1.2.4.ebuild b/x11-apps/xprop/xprop-1.2.4.ebuild
index c9e9cf75df1..f06e95cfb4c 100644
--- a/x11-apps/xprop/xprop-1.2.4.ebuild
+++ b/x11-apps/xprop/xprop-1.2.4.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
DESCRIPTION="property displayer for X"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="x11-libs/libX11"
diff --git a/x11-apps/xrandr/xrandr-1.5.1.ebuild b/x11-apps/xrandr/xrandr-1.5.1.ebuild
index 4511edd4044..1b6b47c77a3 100644
--- a/x11-apps/xrandr/xrandr-1.5.1.ebuild
+++ b/x11-apps/xrandr/xrandr-1.5.1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
DESCRIPTION="primitive command line interface to RandR extension"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=">=x11-libs/libXrandr-1.5
diff --git a/x11-apps/xrdb/xrdb-1.2.0.ebuild b/x11-apps/xrdb/xrdb-1.2.0.ebuild
index d82c3f48594..aca1cdd497e 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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="x11-libs/libXmu
diff --git a/x11-apps/xrefresh/xrefresh-1.0.5.ebuild b/x11-apps/xrefresh/xrefresh-1.0.5.ebuild
index 04c0d14df91..11a71aa979b 100644
--- a/x11-apps/xrefresh/xrefresh-1.0.5.ebuild
+++ b/x11-apps/xrefresh/xrefresh-1.0.5.ebuild
@@ -6,7 +6,7 @@ EAPI=5
inherit xorg-2
DESCRIPTION="refresh all or part of an X screen"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND="x11-libs/libX11"
diff --git a/x11-apps/xrefresh/xrefresh-1.0.6.ebuild b/x11-apps/xrefresh/xrefresh-1.0.6.ebuild
index 04c0d14df91..11a71aa979b 100644
--- a/x11-apps/xrefresh/xrefresh-1.0.6.ebuild
+++ b/x11-apps/xrefresh/xrefresh-1.0.6.ebuild
@@ -6,7 +6,7 @@ EAPI=5
inherit xorg-2
DESCRIPTION="refresh all or part of an X screen"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND="x11-libs/libX11"
diff --git a/x11-apps/xset/xset-1.2.3.ebuild b/x11-apps/xset/xset-1.2.3.ebuild
index 9b5236ee783..d5eb7bc9f02 100644
--- a/x11-apps/xset/xset-1.2.3.ebuild
+++ b/x11-apps/xset/xset-1.2.3.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
DESCRIPTION="X.Org xset application"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="
diff --git a/x11-apps/xset/xset-1.2.4.ebuild b/x11-apps/xset/xset-1.2.4.ebuild
index 82a531f01cf..68805d4ee59 100644
--- a/x11-apps/xset/xset-1.2.4.ebuild
+++ b/x11-apps/xset/xset-1.2.4.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
DESCRIPTION="X.Org xset application"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="
diff --git a/x11-apps/xsetroot/xsetroot-1.1.1.ebuild b/x11-apps/xsetroot/xsetroot-1.1.1.ebuild
index 05c37c9499c..045791f2cc5 100644
--- a/x11-apps/xsetroot/xsetroot-1.1.1.ebuild
+++ b/x11-apps/xsetroot/xsetroot-1.1.1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
DESCRIPTION="X.Org xsetroot application"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="x11-libs/libXmu
x11-libs/libX11
diff --git a/x11-apps/xsetroot/xsetroot-1.1.2.ebuild b/x11-apps/xsetroot/xsetroot-1.1.2.ebuild
index 4d7b818760f..7cdcf616078 100644
--- a/x11-apps/xsetroot/xsetroot-1.1.2.ebuild
+++ b/x11-apps/xsetroot/xsetroot-1.1.2.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
DESCRIPTION="X.Org xsetroot application"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="x11-libs/libXmu
x11-libs/libX11
diff --git a/x11-apps/xsm/xsm-1.0.3.ebuild b/x11-apps/xsm/xsm-1.0.3.ebuild
index 7a615c51c74..c6c7d4cb520 100644
--- a/x11-apps/xsm/xsm-1.0.3.ebuild
+++ b/x11-apps/xsm/xsm-1.0.3.ebuild
@@ -6,7 +6,7 @@ EAPI=5
inherit xorg-2
DESCRIPTION="X Session Manager"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="rsh"
RDEPEND="x11-libs/libXaw
x11-libs/libX11
diff --git a/x11-apps/xsm/xsm-1.0.4.ebuild b/x11-apps/xsm/xsm-1.0.4.ebuild
index 65dfa19d412..53a6fa552c3 100644
--- a/x11-apps/xsm/xsm-1.0.4.ebuild
+++ b/x11-apps/xsm/xsm-1.0.4.ebuild
@@ -6,7 +6,7 @@ EAPI=5
inherit xorg-2
DESCRIPTION="X Session Manager"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="rsh"
RDEPEND="x11-libs/libXaw
x11-libs/libX11
diff --git a/x11-apps/xstdcmap/xstdcmap-1.0.4.ebuild b/x11-apps/xstdcmap/xstdcmap-1.0.4.ebuild
index b57b833cadf..f998ec1ba1b 100644
--- a/x11-apps/xstdcmap/xstdcmap-1.0.4.ebuild
+++ b/x11-apps/xstdcmap/xstdcmap-1.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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="X standard colormap utility"
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sparc x86"
IUSE=""
RDEPEND="x11-libs/libXmu
x11-libs/libX11"
diff --git a/x11-apps/xvidtune/xvidtune-1.0.3.ebuild b/x11-apps/xvidtune/xvidtune-1.0.3.ebuild
index 2f06f4dc1e3..77c7d67dd57 100644
--- a/x11-apps/xvidtune/xvidtune-1.0.3.ebuild
+++ b/x11-apps/xvidtune/xvidtune-1.0.3.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
DESCRIPTION="video mode tuner for Xorg"
-KEYWORDS="~alpha amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND="x11-libs/libXaw
diff --git a/x11-apps/xvinfo/xvinfo-1.1.4.ebuild b/x11-apps/xvinfo/xvinfo-1.1.4.ebuild
index a2cd9458e36..edbd5da10b0 100644
--- a/x11-apps/xvinfo/xvinfo-1.1.4.ebuild
+++ b/x11-apps/xvinfo/xvinfo-1.1.4.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
DESCRIPTION="Print out X-Video extension adaptor information"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND="x11-libs/libXv
diff --git a/x11-apps/xwd/xwd-1.0.6.ebuild b/x11-apps/xwd/xwd-1.0.6.ebuild
index bdc15d5400f..9557bc01914 100644
--- a/x11-apps/xwd/xwd-1.0.6.ebuild
+++ b/x11-apps/xwd/xwd-1.0.6.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
DESCRIPTION="dump an image of an X window"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
# libXt dependency is not in configure.ac, bug #408629, upstream #47462."
diff --git a/x11-apps/xwd/xwd-1.0.7.ebuild b/x11-apps/xwd/xwd-1.0.7.ebuild
index bdc15d5400f..9557bc01914 100644
--- a/x11-apps/xwd/xwd-1.0.7.ebuild
+++ b/x11-apps/xwd/xwd-1.0.7.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
DESCRIPTION="dump an image of an X window"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
# libXt dependency is not in configure.ac, bug #408629, upstream #47462."
diff --git a/x11-apps/xwininfo/xwininfo-1.1.5.ebuild b/x11-apps/xwininfo/xwininfo-1.1.5.ebuild
index 244764c0a93..7156191d840 100644
--- a/x11-apps/xwininfo/xwininfo-1.1.5.ebuild
+++ b/x11-apps/xwininfo/xwininfo-1.1.5.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
DESCRIPTION="window information utility for X"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND=">=x11-libs/libxcb-1.6"
diff --git a/x11-apps/xwud/xwud-1.0.5.ebuild b/x11-apps/xwud/xwud-1.0.5.ebuild
index 4a1e3c60b9f..49356baa345 100644
--- a/x11-apps/xwud/xwud-1.0.5.ebuild
+++ b/x11-apps/xwud/xwud-1.0.5.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
DESCRIPTION="image displayer for X"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE=""
RDEPEND="x11-libs/libX11"
diff --git a/x11-base/xcb-proto/xcb-proto-1.13.ebuild b/x11-base/xcb-proto/xcb-proto-1.13.ebuild
index 04f6f40a17f..ac8b3e4c59b 100644
--- a/x11-base/xcb-proto/xcb-proto-1.13.ebuild
+++ b/x11-base/xcb-proto/xcb-proto-1.13.ebuild
@@ -15,7 +15,7 @@ EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/xcbproto.git"
[[ ${PV} != 9999* ]] && \
SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="${PYTHON_DEPS}"
diff --git a/x11-base/xcb-proto/xcb-proto-1.14.ebuild b/x11-base/xcb-proto/xcb-proto-1.14.ebuild
index 1d2fe92f1d1..8d5daa5d6cc 100644
--- a/x11-base/xcb-proto/xcb-proto-1.14.ebuild
+++ b/x11-base/xcb-proto/xcb-proto-1.14.ebuild
@@ -15,7 +15,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 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=""
diff --git a/x11-base/xorg-drivers/xorg-drivers-1.20-r1.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.20-r1.ebuild
index 56bfdc3bdea..b4bf7fc3775 100644
--- a/x11-base/xorg-drivers/xorg-drivers-1.20-r1.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-1.20-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
LICENSE="metapackage"
SLOT="0"
if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
fi
IUSE_INPUT_DEVICES="
diff --git a/x11-base/xorg-drivers/xorg-drivers-9999.ebuild b/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
index 615936723c9..5bf741ecf02 100644
--- a/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
LICENSE="metapackage"
SLOT="0"
if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
fi
IUSE_INPUT_DEVICES="
diff --git a/x11-base/xorg-proto/xorg-proto-2019.2.ebuild b/x11-base/xorg-proto/xorg-proto-2019.2.ebuild
index 86f50955ca5..730e43f7c8a 100644
--- a/x11-base/xorg-proto/xorg-proto-2019.2.ebuild
+++ b/x11-base/xorg-proto/xorg-proto-2019.2.ebuild
@@ -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 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 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-base/xorg-proto/xorg-proto-9999.ebuild b/x11-base/xorg-proto/xorg-proto-9999.ebuild
index eefb01db7b2..1f96a954d93 100644
--- a/x11-base/xorg-proto/xorg-proto-9999.ebuild
+++ b/x11-base/xorg-proto/xorg-proto-9999.ebuild
@@ -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 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~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-base/xorg-server/xorg-server-1.20.7.ebuild b/x11-base/xorg-server/xorg-server-1.20.7.ebuild
index 33eb1762fd0..285ef61ecea 100644
--- a/x11-base/xorg-server/xorg-server-1.20.7.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.7.ebuild
@@ -10,7 +10,7 @@ EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
DESCRIPTION="X.Org X servers"
SLOT="0/${PV}"
if [[ ${PV} != 9999* ]]; then
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
fi
IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index b5c728873e8..252ce275e86 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
DESCRIPTION="X.Org X servers"
SLOT="0/${PV}"
if [[ ${PV} != 9999* ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
fi
IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
diff --git a/x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild b/x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild
index 8754c305f1a..e1889d17f2b 100644
--- a/x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.x.org/wiki/"
LICENSE="metapackage"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE="+fonts"
# Server
diff --git a/x11-drivers/xf86-input-elographics/xf86-input-elographics-1.4.2.ebuild b/x11-drivers/xf86-input-elographics/xf86-input-elographics-1.4.2.ebuild
index 8c906e4fc7b..32a28903e14 100644
--- a/x11-drivers/xf86-input-elographics/xf86-input-elographics-1.4.2.ebuild
+++ b/x11-drivers/xf86-input-elographics/xf86-input-elographics-1.4.2.ebuild
@@ -7,5 +7,5 @@ XORG_STATIC="no"
inherit xorg-3
DESCRIPTION="Elographics input driver"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
IUSE=""
diff --git a/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.6.ebuild b/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.6.ebuild
index 3a5435edf4a..d6549f3188a 100644
--- a/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.6.ebuild
+++ b/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.6.ebuild
@@ -5,7 +5,7 @@ EAPI=5
inherit linux-info xorg-2
DESCRIPTION="Generic Linux input driver"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
RDEPEND=">=x11-base/xorg-server-1.18[udev]
diff --git a/x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.3.ebuild b/x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.3.ebuild
index 04b4c8b69f9..15137497844 100644
--- a/x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.3.ebuild
+++ b/x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.3.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
DESCRIPTION="X.Org driver for joystick input devices"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
IUSE=""
RDEPEND=">=x11-base/xorg-server-1.10"
diff --git a/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.9.0.ebuild b/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.9.0.ebuild
index 4c2c2dfaa7a..48a9397521b 100644
--- a/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.9.0.ebuild
+++ b/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.9.0.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
DESCRIPTION="Keyboard input driver"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=">=x11-base/xorg-server-1.10"
diff --git a/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.9.3.ebuild b/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.9.3.ebuild
index 36b8f6d478a..80c2c0f3a31 100644
--- a/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.9.3.ebuild
+++ b/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.9.3.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
DESCRIPTION="X.Org driver for mouse input devices"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=">=x11-base/xorg-server-1.7"
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 9d418a35f39..8241b7076c9 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
@@ -6,7 +6,7 @@ inherit xorg-2
DESCRIPTION="null input driver"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=">=x11-base/xorg-server-1.9.99.1"
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 193c880e754..df2d5c2597f 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
@@ -6,7 +6,7 @@ inherit xorg-2
DESCRIPTION="X.Org driver for dummy cards"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh 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-1.0.99"
diff --git a/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.5.0.ebuild b/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.5.0.ebuild
index 60f9797ac74..6a33cf97bc9 100644
--- a/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.5.0.ebuild
+++ b/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.5.0.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
DESCRIPTION="video driver for framebuffer device"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
RDEPEND="x11-base/xorg-server"
diff --git a/x11-libs/cairo/cairo-1.16.0-r3.ebuild b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
index 498e3f4cf19..90f6ebb3dbb 100644
--- a/x11-libs/cairo/cairo-1.16.0-r3.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r3.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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index 5c02af000a6..453aa1b0d5e 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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.40.0.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.40.0.ebuild
index cb5330346ef..25857ef9272 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.40.0.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.40.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
LICENSE="LGPL-2+"
SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="X gtk-doc +introspection jpeg tiff"
# TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review
diff --git a/x11-libs/gnome-pty-helper/gnome-pty-helper-0.40.2.ebuild b/x11-libs/gnome-pty-helper/gnome-pty-helper-0.40.2.ebuild
index 734617aba40..97d87619284 100644
--- a/x11-libs/gnome-pty-helper/gnome-pty-helper-0.40.2.ebuild
+++ b/x11-libs/gnome-pty-helper/gnome-pty-helper-0.40.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
IUSE="+hardened"
# gnome-pty-helper was spit out with 0.27.90
diff --git a/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild b/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild
index 8b91e66833b..3fa86e0fe76 100644
--- a/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
xinerama? ( !aqua )
"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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.11.ebuild b/x11-libs/gtk+/gtk+-3.24.11.ebuild
index 6549eeb965b..a141a165cb8 100644
--- a/x11-libs/gtk+/gtk+-3.24.11.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.11.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
xinerama? ( X )
"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 ~x86-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/gtk+/gtk+-3.24.13.ebuild b/x11-libs/gtk+/gtk+-3.24.13.ebuild
index 9f99ac44d18..47b3e2a1ea0 100644
--- a/x11-libs/gtk+/gtk+-3.24.13.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.13.ebuild
@@ -19,7 +19,7 @@ REQUIRED_USE="
xinerama? ( X )
"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 ~x86-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/gtk+/gtk+-3.24.14.ebuild b/x11-libs/gtk+/gtk+-3.24.14.ebuild
index 29ca19b6baa..ddb924517c9 100644
--- a/x11-libs/gtk+/gtk+-3.24.14.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.14.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
xinerama? ( X )
"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 ~x86-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/gtkglarea/gtkglarea-2.0.1-r1.ebuild b/x11-libs/gtkglarea/gtkglarea-2.0.1-r1.ebuild
index c70462d862e..3174065c1d6 100644
--- a/x11-libs/gtkglarea/gtkglarea-2.0.1-r1.ebuild
+++ b/x11-libs/gtkglarea/gtkglarea-2.0.1-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.mono-project.com/archived/gtkglarea/"
LICENSE="LGPL-2+ GPL-2+" # examples are GPL-2+, library is LGPL-2+
SLOT="2"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
IUSE="examples"
RDEPEND=">=x11-libs/gtk+-2.0.3:2
diff --git a/x11-libs/gtkglarea/gtkglarea-2.1.0.ebuild b/x11-libs/gtkglarea/gtkglarea-2.1.0.ebuild
index a91c2801415..a6cc836a116 100644
--- a/x11-libs/gtkglarea/gtkglarea-2.1.0.ebuild
+++ b/x11-libs/gtkglarea/gtkglarea-2.1.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.mono-project.com/archived/gtkglarea/"
LICENSE="LGPL-2+ GPL-2+" # examples are GPL-2+, library is LGPL-2+
SLOT="2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
IUSE="examples"
RDEPEND="
diff --git a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
index a61ba76bc49..fe18f3773a3 100644
--- a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
+++ b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="
diff --git a/x11-libs/gtksourceview/gtksourceview-2.10.5-r3.ebuild b/x11-libs/gtksourceview/gtksourceview-2.10.5-r3.ebuild
index 9e055e27504..3f04044fd9d 100644
--- a/x11-libs/gtksourceview/gtksourceview-2.10.5-r3.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-2.10.5-r3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gnome.org/"
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="2.0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE=""
RDEPEND="
diff --git a/x11-libs/gtksourceview/gtksourceview-3.24.11.ebuild b/x11-libs/gtksourceview/gtksourceview-3.24.11.ebuild
index b1f7610499c..89c98cafa54 100644
--- a/x11-libs/gtksourceview/gtksourceview-3.24.11.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-3.24.11.ebuild
@@ -16,7 +16,7 @@ SLOT="3.0/3"
IUSE="glade +introspection +vala"
REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
RDEPEND="
>=dev-libs/glib-2.48:2
diff --git a/x11-libs/gtksourceview/gtksourceview-4.2.0.ebuild b/x11-libs/gtksourceview/gtksourceview-4.2.0.ebuild
index 3f3ddb9091e..b0a2c2c951b 100644
--- a/x11-libs/gtksourceview/gtksourceview-4.2.0.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-4.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -16,7 +16,7 @@ SLOT="4"
IUSE="glade +introspection +vala"
REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
RDEPEND="
>=dev-libs/glib-2.48:2
diff --git a/x11-libs/libFS/libFS-1.0.8.ebuild b/x11-libs/libFS/libFS-1.0.8.ebuild
index 33e58ea56a1..828e9b37771 100644
--- a/x11-libs/libFS/libFS-1.0.8.ebuild
+++ b/x11-libs/libFS/libFS-1.0.8.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
DESCRIPTION="X.Org FS library"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="ipv6"
DEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libICE/libICE-1.0.10.ebuild b/x11-libs/libICE/libICE-1.0.10.ebuild
index 670aae15629..9084a4be11d 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 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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.ebuild b/x11-libs/libSM/libSM-1.2.3.ebuild
index 8c292e6c745..20bb772f027 100644
--- a/x11-libs/libSM/libSM-1.2.3.ebuild
+++ b/x11-libs/libSM/libSM-1.2.3.ebuild
@@ -9,7 +9,7 @@ inherit xorg-2
DESCRIPTION="X.Org Session Management library"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="doc ipv6 +uuid"
RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libX11/libX11-1.6.9.ebuild b/x11-libs/libX11/libX11-1.6.9.ebuild
index 598bf6c36a5..4be795a076a 100644
--- a/x11-libs/libX11/libX11-1.6.9.ebuild
+++ b/x11-libs/libX11/libX11-1.6.9.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
DESCRIPTION="X.Org X11 library"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 522087547a7..8a7a6a2cc8d 100644
--- a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild
+++ b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild
@@ -7,7 +7,7 @@ XORG_MULTILIB=yes
inherit xorg-2
DESCRIPTION="X.Org XScrnSaver library"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXau/libXau-1.0.9.ebuild b/x11-libs/libXau/libXau-1.0.9.ebuild
index d7142517be6..06924f391b6 100644
--- a/x11-libs/libXau/libXau-1.0.9.ebuild
+++ b/x11-libs/libXau/libXau-1.0.9.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
DESCRIPTION="X.Org X authorization library"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND="x11-base/xorg-proto"
diff --git a/x11-libs/libXaw/libXaw-1.0.13-r1.ebuild b/x11-libs/libXaw/libXaw-1.0.13-r1.ebuild
index 11cfd225154..6445700a8fa 100644
--- a/x11-libs/libXaw/libXaw-1.0.13-r1.ebuild
+++ b/x11-libs/libXaw/libXaw-1.0.13-r1.ebuild
@@ -9,7 +9,7 @@ inherit xorg-2
DESCRIPTION="X.Org Xaw library"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="deprecated"
RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXaw3d/libXaw3d-1.6.3.ebuild b/x11-libs/libXaw3d/libXaw3d-1.6.3.ebuild
index ea8531d6b89..2b0e603a462 100644
--- a/x11-libs/libXaw3d/libXaw3d-1.6.3.ebuild
+++ b/x11-libs/libXaw3d/libXaw3d-1.6.3.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
DESCRIPTION="X.Org Xaw3d library"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="unicode xpm"
RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild b/x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild
index a8547d76311..3d7dfc868d1 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 ~x86-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 fcededdd59c..26fc4806846 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 16df1fc3632..08a958eb0ba 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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-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 ~x86-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 a3ea890a545..5cf561cec2a 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 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 0e12bb3dc34..8d9e5db13ab 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 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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-r1.ebuild b/x11-libs/libXfixes/libXfixes-5.0.3-r1.ebuild
index 7339679b651..e0d2458dc53 100644
--- a/x11-libs/libXfixes/libXfixes-5.0.3-r1.ebuild
+++ b/x11-libs/libXfixes/libXfixes-5.0.3-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
DESCRIPTION="X.Org Xfixes library"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXfont2/libXfont2-2.0.4.ebuild b/x11-libs/libXfont2/libXfont2-2.0.4.ebuild
index 7c6ba55c505..a9a9d3e6c36 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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 7cacab3366d..f01619e8c46 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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x86-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 d07c26c8f67..4567761599b 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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND="
diff --git a/x11-libs/libXinerama/libXinerama-1.1.4.ebuild b/x11-libs/libXinerama/libXinerama-1.1.4.ebuild
index dfcd75669e2..5185866ba24 100644
--- a/x11-libs/libXinerama/libXinerama-1.1.4.ebuild
+++ b/x11-libs/libXinerama/libXinerama-1.1.4.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
DESCRIPTION="X.Org Xinerama library"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXmu/libXmu-1.1.3.ebuild b/x11-libs/libXmu/libXmu-1.1.3.ebuild
index 9c5b7c8309c..697eb30cdf7 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 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="ipv6"
RDEPEND="
diff --git a/x11-libs/libXpm/libXpm-3.5.13.ebuild b/x11-libs/libXpm/libXpm-3.5.13.ebuild
index c8c5a92e65f..a3f39973b89 100644
--- a/x11-libs/libXpm/libXpm-3.5.13.ebuild
+++ b/x11-libs/libXpm/libXpm-3.5.13.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
DESCRIPTION="X.Org Xpm library"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXrandr/libXrandr-1.5.2.ebuild b/x11-libs/libXrandr/libXrandr-1.5.2.ebuild
index bd12f8098fd..4422cc48bee 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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="doc"
RDEPEND="
diff --git a/x11-libs/libXrender/libXrender-0.9.10-r1.ebuild b/x11-libs/libXrender/libXrender-0.9.10-r1.ebuild
index 00fdf17bd48..baaa4bf4567 100644
--- a/x11-libs/libXrender/libXrender-0.9.10-r1.ebuild
+++ b/x11-libs/libXrender/libXrender-0.9.10-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
DESCRIPTION="X.Org Xrender library"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXres/libXres-1.2.0-r1.ebuild b/x11-libs/libXres/libXres-1.2.0-r1.ebuild
index 0cd2f36ff57..d5c26bc2f0e 100644
--- a/x11-libs/libXres/libXres-1.2.0-r1.ebuild
+++ b/x11-libs/libXres/libXres-1.2.0-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
DESCRIPTION="X.Org XRes library"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXt/libXt-1.2.0.ebuild b/x11-libs/libXt/libXt-1.2.0.ebuild
index f5250c95200..82bd7159944 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 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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-r1.ebuild b/x11-libs/libXtst/libXtst-1.2.3-r1.ebuild
index 05191b0a1d7..7828806d5d8 100644
--- a/x11-libs/libXtst/libXtst-1.2.3-r1.ebuild
+++ b/x11-libs/libXtst/libXtst-1.2.3-r1.ebuild
@@ -9,7 +9,7 @@ inherit xorg-2
DESCRIPTION="X.Org Xlib-based client API for the XTEST & RECORD extensions library"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXv/libXv-1.0.11-r1.ebuild b/x11-libs/libXv/libXv-1.0.11-r1.ebuild
index e94afd5c197..d31e2ab2b3f 100644
--- a/x11-libs/libXv/libXv-1.0.11-r1.ebuild
+++ b/x11-libs/libXv/libXv-1.0.11-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
DESCRIPTION="X.Org Xv library"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXvMC/libXvMC-1.0.12.ebuild b/x11-libs/libXvMC/libXvMC-1.0.12.ebuild
index 481e501cdde..9dd1d04598e 100644
--- a/x11-libs/libXvMC/libXvMC-1.0.12.ebuild
+++ b/x11-libs/libXvMC/libXvMC-1.0.12.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
DESCRIPTION="X.Org XvMC library"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh 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=""
RDEPEND="
diff --git a/x11-libs/libXxf86dga/libXxf86dga-1.1.5.ebuild b/x11-libs/libXxf86dga/libXxf86dga-1.1.5.ebuild
index 858d77ca350..ef17f2308a5 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
IUSE="doc"
RDEPEND="
diff --git a/x11-libs/libXxf86misc/libXxf86misc-1.0.4.ebuild b/x11-libs/libXxf86misc/libXxf86misc-1.0.4.ebuild
index dc1e5bb0107..294ad70951f 100644
--- a/x11-libs/libXxf86misc/libXxf86misc-1.0.4.ebuild
+++ b/x11-libs/libXxf86misc/libXxf86misc-1.0.4.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
DESCRIPTION="X.Org Xxf86misc library"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r1.ebuild b/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r1.ebuild
index 124eeec5609..2a8c293442f 100644
--- a/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r1.ebuild
+++ b/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
DESCRIPTION="X.Org Xxf86vm library"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libast/libast-0.7-r2.ebuild b/x11-libs/libast/libast-0.7-r2.ebuild
index 105b818030a..b0507249877 100644
--- a/x11-libs/libast/libast-0.7-r2.ebuild
+++ b/x11-libs/libast/libast-0.7-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.eterm.org/download/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="imlib cpu_flags_x86_mmx pcre"
RDEPEND="
diff --git a/x11-libs/libdmx/libdmx-1.1.4.ebuild b/x11-libs/libdmx/libdmx-1.1.4.ebuild
index bff53db653e..c9b13888129 100644
--- a/x11-libs/libdmx/libdmx-1.1.4.ebuild
+++ b/x11-libs/libdmx/libdmx-1.1.4.ebuild
@@ -5,7 +5,7 @@ EAPI=5
inherit xorg-2
DESCRIPTION="X.Org dmx library"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE=""
RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libdrm/libdrm-2.4.100.ebuild b/x11-libs/libdrm/libdrm-2.4.100.ebuild
index aae3267d666..bcca2ca94f1 100644
--- a/x11-libs/libdrm/libdrm-2.4.100.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.100.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = 9999* ]]; then
SRC_URI=""
else
SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
- KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
fi
VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
diff --git a/x11-libs/libdrm/libdrm-9999.ebuild b/x11-libs/libdrm/libdrm-9999.ebuild
index 7178075e743..68621069925 100644
--- a/x11-libs/libdrm/libdrm-9999.ebuild
+++ b/x11-libs/libdrm/libdrm-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -17,7 +17,7 @@ if [[ ${PV} = 9999* ]]; then
SRC_URI=""
else
SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
fi
VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
diff --git a/x11-libs/libfontenc/libfontenc-1.1.4.ebuild b/x11-libs/libfontenc/libfontenc-1.1.4.ebuild
index 4c737320772..97bc98d3de2 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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND="sys-libs/zlib"
diff --git a/x11-libs/libnotify/libnotify-0.7.8.ebuild b/x11-libs/libnotify/libnotify-0.7.8.ebuild
index f518209a833..7ce6b1906a3 100644
--- a/x11-libs/libnotify/libnotify-0.7.8.ebuild
+++ b/x11-libs/libnotify/libnotify-0.7.8.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libnotify"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="gtk-doc +introspection test"
RESTRICT="!test? ( test )"
diff --git a/x11-libs/libpciaccess/libpciaccess-0.16.ebuild b/x11-libs/libpciaccess/libpciaccess-0.16.ebuild
index 3fe96080369..0b6dcfea1e1 100644
--- a/x11-libs/libpciaccess/libpciaccess-0.16.ebuild
+++ b/x11-libs/libpciaccess/libpciaccess-0.16.ebuild
@@ -7,7 +7,7 @@ XORG_MULTILIB=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 s390 ~sh 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"
IUSE="zlib"
DEPEND="
diff --git a/x11-libs/libwnck/libwnck-2.31.0.ebuild b/x11-libs/libwnck/libwnck-2.31.0.ebuild
index c1e5436bd2d..175d7eccadf 100644
--- a/x11-libs/libwnck/libwnck-2.31.0.ebuild
+++ b/x11-libs/libwnck/libwnck-2.31.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.gnome.org/"
LICENSE="LGPL-2+"
SLOT="1"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="+introspection startup-notification"
diff --git a/x11-libs/libwnck/libwnck-3.30.0.ebuild b/x11-libs/libwnck/libwnck-3.30.0.ebuild
index 1eb3247c2db..b6ea3ecf728 100644
--- a/x11-libs/libwnck/libwnck-3.30.0.ebuild
+++ b/x11-libs/libwnck/libwnck-3.30.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://developer.gnome.org/libwnck/stable/"
LICENSE="LGPL-2+"
SLOT="3"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="+introspection startup-notification tools"
diff --git a/x11-libs/libxcb/libxcb-1.13.1.ebuild b/x11-libs/libxcb/libxcb-1.13.1.ebuild
index 6c971b7ee8f..6e8f7ae36d3 100644
--- a/x11-libs/libxcb/libxcb-1.13.1.ebuild
+++ b/x11-libs/libxcb/libxcb-1.13.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/l
[[ ${PV} != 9999* ]] && \
SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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/libxcb/libxcb-1.14.ebuild b/x11-libs/libxcb/libxcb-1.14.ebuild
index baab92359da..0539656222e 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 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 34f01de543c..d43a2b7b73f 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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/libxklavier/libxklavier-5.4.ebuild b/x11-libs/libxklavier/libxklavier-5.4.ebuild
index 245b23451c1..df70bc665a7 100644
--- a/x11-libs/libxklavier/libxklavier-5.4.ebuild
+++ b/x11-libs/libxklavier/libxklavier-5.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://people.freedesktop.org/~svu/${P}.tar.bz2"
LICENSE="LGPL-2"
SLOT="0/16"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="+introspection vala"
REQUIRED_USE="vala? ( introspection )"
diff --git a/x11-libs/libxshmfence/libxshmfence-1.3-r1.ebuild b/x11-libs/libxshmfence/libxshmfence-1.3-r1.ebuild
index 0dbaa703c0a..0442f2b2218 100644
--- a/x11-libs/libxshmfence/libxshmfence-1.3-r1.ebuild
+++ b/x11-libs/libxshmfence/libxshmfence-1.3-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
DESCRIPTION="Shared memory fences using futexes"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh 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"
IUSE=""
RDEPEND=""
diff --git a/x11-libs/motif/motif-2.3.8-r1.ebuild b/x11-libs/motif/motif-2.3.8-r1.ebuild
index 6fbf54519aa..4529f15c916 100644
--- a/x11-libs/motif/motif-2.3.8-r1.ebuild
+++ b/x11-libs/motif/motif-2.3.8-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/project/motif/Motif%20${PV}%20Source%20Code/${P}.t
LICENSE="LGPL-2.1+ MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="examples jpeg +motif22-compatibility png static-libs unicode xft"
RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild b/x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild
index 1cd5cd178c3..59cc724c32b 100644
--- a/x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild
+++ b/x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://siag.nu/pub/neXtaw/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
IUSE=""
RDEPEND="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 81db75e2506..95bef6f407e 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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="X +introspection test"
RESTRICT="!test? ( test )"
diff --git a/x11-libs/pango/pango-1.44.7.ebuild b/x11-libs/pango/pango-1.44.7.ebuild
index 18e01824352..7100e6c4679 100644
--- a/x11-libs/pango/pango-1.44.7.ebuild
+++ b/x11-libs/pango/pango-1.44.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/$(ver_cut 1-2)/${P}.tar.xz
LICENSE="LGPL-2+ FTL"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# X USE flag is simply a stub until all revdeps have been adjusted to use X(+)
IUSE="gtk-doc +introspection test +X"
diff --git a/x11-libs/pangox-compat/pangox-compat-0.0.2-r1.ebuild b/x11-libs/pangox-compat/pangox-compat-0.0.2-r1.ebuild
index 0a1ea07640a..c6ef9160764 100644
--- a/x11-libs/pangox-compat/pangox-compat-0.0.2-r1.ebuild
+++ b/x11-libs/pangox-compat/pangox-compat-0.0.2-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.pango.org/"
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
>=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}]
diff --git a/x11-libs/pangox-compat/pangox-compat-0.0.2.ebuild b/x11-libs/pangox-compat/pangox-compat-0.0.2.ebuild
index 0bfedba4661..422c013dd68 100644
--- a/x11-libs/pangox-compat/pangox-compat-0.0.2.ebuild
+++ b/x11-libs/pangox-compat/pangox-compat-0.0.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.pango.org/"
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
RDEPEND=">=dev-libs/glib-2.31:2
>=x11-libs/pango-1.32
diff --git a/x11-libs/pixman/pixman-0.38.4.ebuild b/x11-libs/pixman/pixman-0.38.4.ebuild
index 5e5a9e4f7a7..4ac6f95df23 100644
--- a/x11-libs/pixman/pixman-0.38.4.ebuild
+++ b/x11-libs/pixman/pixman-0.38.4.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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.gz"
fi
diff --git a/x11-libs/pixman/pixman-9999.ebuild b/x11-libs/pixman/pixman-9999.ebuild
index b8c477a351e..ee4a7b6b0de 100644
--- a/x11-libs/pixman/pixman-9999.ebuild
+++ b/x11-libs/pixman/pixman-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.gz"
fi
diff --git a/x11-libs/startup-notification/startup-notification-0.12-r1.ebuild b/x11-libs/startup-notification/startup-notification-0.12-r1.ebuild
index c3d69b7d0af..1e37d8a45ea 100644
--- a/x11-libs/startup-notification/startup-notification-0.12-r1.ebuild
+++ b/x11-libs/startup-notification/startup-notification-0.12-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
LICENSE="LGPL-2 MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=">=x11-libs/libX11-1.4.3
diff --git a/x11-libs/tslib/tslib-1.21.ebuild b/x11-libs/tslib/tslib-1.21.ebuild
index ca94dcb2ca8..03a0da70b52 100644
--- a/x11-libs/tslib/tslib-1.21.ebuild
+++ b/x11-libs/tslib/tslib-1.21.ebuild
@@ -11,7 +11,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 ~sh 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/vte/vte-0.28.2-r208.ebuild b/x11-libs/vte/vte-0.28.2-r208.ebuild
index d4ddb9c31aa..07f3949e06d 100644
--- a/x11-libs/vte/vte-0.28.2-r208.ebuild
+++ b/x11-libs/vte/vte-0.28.2-r208.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE="debug +introspection python"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/x11-libs/vte/vte-0.56.4.ebuild b/x11-libs/vte/vte-0.56.4.ebuild
index 3540e289448..0f215382634 100644
--- a/x11-libs/vte/vte-0.56.4.ebuild
+++ b/x11-libs/vte/vte-0.56.4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
LICENSE="LGPL-2+"
SLOT="2.91"
IUSE="+crypt debug glade +introspection +vala vanilla"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
REQUIRED_USE="vala? ( introspection )"
SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~leio/distfiles/${PN}-0.54.1-command-notify.patch.xz )"
diff --git a/x11-libs/vte/vte-0.58.3.ebuild b/x11-libs/vte/vte-0.58.3.ebuild
index d35818a2572..386611ee38a 100644
--- a/x11-libs/vte/vte-0.58.3.ebuild
+++ b/x11-libs/vte/vte-0.58.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
LICENSE="LGPL-3+ GPL-3+"
SLOT="2.91"
IUSE="+crypt debug gtk-doc +introspection +vala vanilla"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
REQUIRED_USE="vala? ( introspection )"
SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~leio/distfiles/${PN}-0.58.3-command-notify.patch.xz )"
diff --git a/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild
index 124c5e3d880..7a130300080 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidge
https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20190713.tar.xz
doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2 )"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff"
SLOT="3.0"
diff --git a/x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild
index 0b9aa87a724..e081aaad649 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidge
https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20190713.tar.xz
doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2 )"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit"
WXSUBVERSION=${PV}.0-gtk3 # 3.0.3.0-gtk3
diff --git a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r2.ebuild b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r2.ebuild
index 1a6a22763cf..27f3de160f1 100644
--- a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r2.ebuild
+++ b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r2.ebuild
@@ -15,7 +15,7 @@ EGIT_HAS_SUBMODULES=yes
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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r1.ebuild b/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r1.ebuild
index d1f63d1e450..1c2967810f7 100644
--- a/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r1.ebuild
+++ b/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r1.ebuild
@@ -14,7 +14,7 @@ EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/lib/libxcb-image.git"
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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r1.ebuild b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r1.ebuild
index c63743579e5..be58ec08f0d 100644
--- a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r1.ebuild
+++ b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r1.ebuild
@@ -14,7 +14,7 @@ EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/lib/libxcb-keysyms.git"
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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r2.ebuild b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r2.ebuild
index 1e585b806c3..f90817a0a40 100644
--- a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r2.ebuild
+++ b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r2.ebuild
@@ -15,7 +15,7 @@ EGIT_HAS_SUBMODULES=yes
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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r2.ebuild b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r2.ebuild
index b506228ab15..39ac8e324e3 100644
--- a/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r2.ebuild
+++ b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r2.ebuild
@@ -15,7 +15,7 @@ EGIT_HAS_SUBMODULES=yes
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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/x11-libs/xcb-util/xcb-util-0.4.0-r1.ebuild b/x11-libs/xcb-util/xcb-util-0.4.0-r1.ebuild
index 80013a1a01b..5fbdb8f2394 100644
--- a/x11-libs/xcb-util/xcb-util-0.4.0-r1.ebuild
+++ b/x11-libs/xcb-util/xcb-util-0.4.0-r1.ebuild
@@ -14,7 +14,7 @@ EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/lib/libxcb-util.git"
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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/x11-libs/xforms/xforms-1.2.4.ebuild b/x11-libs/xforms/xforms-1.2.4.ebuild
index 30c185fca72..cf658a52cc1 100644
--- a/x11-libs/xforms/xforms-1.2.4.ebuild
+++ b/x11-libs/xforms/xforms-1.2.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="amd64 arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
IUSE="doc opengl static-libs"
RDEPEND="
diff --git a/x11-libs/xtrans/xtrans-1.4.0.ebuild b/x11-libs/xtrans/xtrans-1.4.0.ebuild
index 4987eebb29f..c9f6789a91e 100644
--- a/x11-libs/xtrans/xtrans-1.4.0.ebuild
+++ b/x11-libs/xtrans/xtrans-1.4.0.ebuild
@@ -10,7 +10,7 @@ XORG_DOC=doc
inherit xorg-3
DESCRIPTION="X.Org xtrans library"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=""
diff --git a/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild b/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild
index 06f2a1ca64d..24ed2197e2e 100644
--- a/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild
+++ b/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
LIVE_DEPEND=">=x11-misc/util-macros-1.18"
else
SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2"
- KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="MIT"
diff --git a/x11-misc/gccmakedep/gccmakedep-9999.ebuild b/x11-misc/gccmakedep/gccmakedep-9999.ebuild
index f973a69d155..667579e1177 100644
--- a/x11-misc/gccmakedep/gccmakedep-9999.ebuild
+++ b/x11-misc/gccmakedep/gccmakedep-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
LIVE_DEPEND=">=x11-misc/util-macros-1.18"
else
SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="MIT"
diff --git a/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r1.ebuild b/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r1.ebuild
index cd71a8e3af4..7a9c645fffe 100644
--- a/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r1.ebuild
+++ b/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://tango.freedesktop.org/releases/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=">=dev-perl/XML-Simple-2
diff --git a/x11-misc/imake/imake-1.0.8.ebuild b/x11-misc/imake/imake-1.0.8.ebuild
index a6eb41877f6..2c1b84a70ba 100644
--- a/x11-misc/imake/imake-1.0.8.ebuild
+++ b/x11-misc/imake/imake-1.0.8.ebuild
@@ -7,7 +7,7 @@ XORG_STATIC=no
inherit xorg-3
DESCRIPTION="C preprocessor interface to the make utility"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 0fdf7132834..0786d8108c0 100644
--- a/x11-misc/makedepend/makedepend-1.0.6.ebuild
+++ b/x11-misc/makedepend/makedepend-1.0.6.ebuild
@@ -6,7 +6,7 @@ XORG_STATIC=no
inherit xorg-3
DESCRIPTION="create dependencies in makefiles"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=""
diff --git a/x11-misc/notification-daemon/notification-daemon-0.5.0.ebuild b/x11-misc/notification-daemon/notification-daemon-0.5.0.ebuild
index fc507b77620..807ee0da169 100644
--- a/x11-misc/notification-daemon/notification-daemon-0.5.0.ebuild
+++ b/x11-misc/notification-daemon/notification-daemon-0.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -13,7 +13,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/notification-daemon/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="sh"
+KEYWORDS=""
IUSE=""
RDEPEND=">=dev-libs/glib-2
diff --git a/x11-misc/notification-daemon/notification-daemon-3.14.1.ebuild b/x11-misc/notification-daemon/notification-daemon-3.14.1.ebuild
index 590080c8318..6bdd97f5b25 100644
--- a/x11-misc/notification-daemon/notification-daemon-3.14.1.ebuild
+++ b/x11-misc/notification-daemon/notification-daemon-3.14.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/notification-daemon/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE=""
RDEPEND="
diff --git a/x11-misc/notification-daemon/notification-daemon-3.18.2.ebuild b/x11-misc/notification-daemon/notification-daemon-3.18.2.ebuild
index d39b268759d..15fde45bfb7 100644
--- a/x11-misc/notification-daemon/notification-daemon-3.18.2.ebuild
+++ b/x11-misc/notification-daemon/notification-daemon-3.18.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/notification-daemon/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE=""
RDEPEND="
diff --git a/x11-misc/notification-daemon/notification-daemon-3.20.0.ebuild b/x11-misc/notification-daemon/notification-daemon-3.20.0.ebuild
index c350de33fe2..0dcedda4944 100644
--- a/x11-misc/notification-daemon/notification-daemon-3.20.0.ebuild
+++ b/x11-misc/notification-daemon/notification-daemon-3.20.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/notification-daemon/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~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 86f04c4e23a..f14ac35b0d6 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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.10.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.10.ebuild
index 5a713751642..fde1f161f06 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-1.10.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-1.10.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 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/x11-misc/util-macros/util-macros-1.19.2-r1.ebuild b/x11-misc/util-macros/util-macros-1.19.2-r1.ebuild
index 7e989da50a1..56a444986d5 100644
--- a/x11-misc/util-macros/util-macros-1.19.2-r1.ebuild
+++ b/x11-misc/util-macros/util-macros-1.19.2-r1.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 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
# there is nothing to compile for this package, all its contents are produced by
diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild
index d94fc7b87fe..147483f3fa5 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/LibVNC/x11vnc/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh 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"
IUSE="crypt fbcon libressl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf"
COMMON_DEPEND="
diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r3.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r3.ebuild
index f01cd79f6ba..e25329e5f47 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.16-r3.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.16-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/LibVNC/x11vnc/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2+-with-openssl-exception"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~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"
IUSE="crypt fbcon libressl ssl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf"
COMMON_DEPEND="
diff --git a/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild b/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild
index 7be9137d7fd..b9e77b30a1c 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 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 fa3f1ac89cc..80ad71a04fd 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
@@ -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 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris"
IUSE="doc"
RDEPEND="
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.29.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.29.ebuild
index 229155d2470..a281d144e56 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.29.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.29.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
LIVE_DEPEND=">=x11-misc/util-macros-1.18"
else
SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.bz2"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
fi
LICENSE="MIT"
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
index 4cc1688ced6..66e3276b4ab 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
LIVE_DEPEND=">=x11-misc/util-macros-1.18"
else
SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
fi
LICENSE="MIT"
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 53d2699aa97..e2fb38e10d9 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
BDEPEND="
diff --git a/x11-misc/xscreensaver/xscreensaver-5.38.ebuild b/x11-misc/xscreensaver/xscreensaver-5.38.ebuild
index 6ebfe87bb88..8d6540f0313 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.38.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.38.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE="gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
COMMON_DEPEND="
diff --git a/x11-misc/xscreensaver/xscreensaver-5.43-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-5.43-r2.ebuild
index d95ba78bc02..3f0ba54893e 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.43-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.43-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE="caps gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
COMMON_DEPEND="
diff --git a/x11-misc/xscreensaver/xscreensaver-5.44-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-5.44-r1.ebuild
index 8fd4a1daa6e..94909200656 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.44-r1.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.44-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE="caps gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
COMMON_DEPEND="
diff --git a/x11-misc/xtrace/xtrace-1.4.0.ebuild b/x11-misc/xtrace/xtrace-1.4.0.ebuild
index 21fc2c1feec..e869ff64816 100644
--- a/x11-misc/xtrace/xtrace-1.4.0.ebuild
+++ b/x11-misc/xtrace/xtrace-1.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://salsa.debian.org/debian/${PN}/-/archive/${P}/${PN}-${P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~sh ~x86"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~x86"
DEPEND="x11-base/xorg-proto
x11-libs/libXext
diff --git a/x11-terms/eterm/eterm-0.9.6-r2.ebuild b/x11-terms/eterm/eterm-0.9.6-r2.ebuild
index b102f424100..c284c4a5f4c 100644
--- a/x11-terms/eterm/eterm-0.9.6-r2.ebuild
+++ b/x11-terms/eterm/eterm-0.9.6-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x86-macos"
IUSE="escreen minimal cpu_flags_x86_mmx cpu_flags_x86_sse2 unicode +utempter"
RDEPEND="
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.32.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.32.2.ebuild
index 2bd5bd75727..8e7f3ec1336 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-3.32.2.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.32.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -14,7 +14,7 @@ SLOT="0"
IUSE="debug +gnome-shell +nautilus vanilla"
SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~leio/distfiles/${P}-cntr-ntfy-ttl-ts.patch.xz )"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
# FIXME: automagic dependency on gtk+[X], just transitive but needs proper control, bug 624960
RDEPEND="
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.34.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.34.2.ebuild
index c32e97d0f54..64c25ff4358 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-3.34.2.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.34.2.ebuild
@@ -15,7 +15,7 @@ IUSE="debug +gnome-shell +nautilus vanilla"
SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz
!vanilla? ( https://dev.gentoo.org/~leio/distfiles/${P}-cntr-ntfy-autottl-ts.patch.xz )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
# FIXME: automagic dependency on gtk+[X], just transitive but needs proper control, bug 624960
RDEPEND="
diff --git a/x11-terms/xterm/xterm-337.ebuild b/x11-terms/xterm/xterm-337.ebuild
index dad3c2a4732..ec1b3d63e25 100644
--- a/x11-terms/xterm/xterm-337.ebuild
+++ b/x11-terms/xterm/xterm-337.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.invisible-island.net/${PN}/${P}.tgz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+openpty toolbar truetype unicode Xaw3d xinerama"
BDEPEND="virtual/pkgconfig
diff --git a/x11-terms/xterm/xterm-351.ebuild b/x11-terms/xterm/xterm-351.ebuild
index defcdde1c37..94feb71c879 100644
--- a/x11-terms/xterm/xterm-351.ebuild
+++ b/x11-terms/xterm/xterm-351.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.invisible-island.net/${PN}/${P}.tgz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama"
BDEPEND="virtual/pkgconfig
diff --git a/x11-terms/xterm/xterm-353.ebuild b/x11-terms/xterm/xterm-353.ebuild
index e29b43efd77..ace98c8c3af 100644
--- a/x11-terms/xterm/xterm-353.ebuild
+++ b/x11-terms/xterm/xterm-353.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.invisible-island.net/${PN}/${P}.tgz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama"
BDEPEND="virtual/pkgconfig
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 3ae536ce48e..8e14d753315 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
@@ -17,7 +17,7 @@ LICENSE="
"
SLOT="0"
IUSE="branding"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh 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/arc-icon-theme/arc-icon-theme-20161122.ebuild b/x11-themes/arc-icon-theme/arc-icon-theme-20161122.ebuild
index a0542371a0a..e2090d55a9f 100644
--- a/x11-themes/arc-icon-theme/arc-icon-theme-20161122.ebuild
+++ b/x11-themes/arc-icon-theme/arc-icon-theme-20161122.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/horst3180/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
# Require adwaita until moka is packaged
RDEPEND="
diff --git a/x11-themes/gentoo-xcursors/gentoo-xcursors-0.3.1.ebuild b/x11-themes/gentoo-xcursors/gentoo-xcursors-0.3.1.ebuild
index 56772c013ea..04931974373 100644
--- a/x11-themes/gentoo-xcursors/gentoo-xcursors-0.3.1.ebuild
+++ b/x11-themes/gentoo-xcursors/gentoo-xcursors-0.3.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${PN/xcursors/cursors}-tad-${PV}.tar.bz2"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
RDEPEND=""
diff --git a/x11-themes/gnome-backgrounds/gnome-backgrounds-3.32.0.ebuild b/x11-themes/gnome-backgrounds/gnome-backgrounds-3.32.0.ebuild
index c10e0df540d..b0437ec9185 100644
--- a/x11-themes/gnome-backgrounds/gnome-backgrounds-3.32.0.ebuild
+++ b/x11-themes/gnome-backgrounds/gnome-backgrounds-3.32.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-backgrounds"
LICENSE="CC-BY-SA-2.0 CC-BY-SA-3.0 CC-BY-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE=""
RDEPEND="!<x11-themes/gnome-themes-standard-3.14"
diff --git a/x11-themes/gnome-backgrounds/gnome-backgrounds-3.34.0.ebuild b/x11-themes/gnome-backgrounds/gnome-backgrounds-3.34.0.ebuild
index d7c4ad3f369..54df8bd976f 100644
--- a/x11-themes/gnome-backgrounds/gnome-backgrounds-3.34.0.ebuild
+++ b/x11-themes/gnome-backgrounds/gnome-backgrounds-3.34.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-backgrounds"
LICENSE="CC-BY-SA-2.0 CC-BY-SA-3.0 CC-BY-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
RDEPEND="!<x11-themes/gnome-themes-standard-3.14"
diff --git a/x11-themes/gnome-icon-theme-symbolic/gnome-icon-theme-symbolic-3.10.1.ebuild b/x11-themes/gnome-icon-theme-symbolic/gnome-icon-theme-symbolic-3.10.1.ebuild
index 6fac6d84e68..b5a5e8f4d28 100644
--- a/x11-themes/gnome-icon-theme-symbolic/gnome-icon-theme-symbolic-3.10.1.ebuild
+++ b/x11-themes/gnome-icon-theme-symbolic/gnome-icon-theme-symbolic-3.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-icon-theme-symbolic/"
LICENSE="CC-BY-SA-3.0"
SLOT="0"
IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND=">=x11-themes/hicolor-icon-theme-0.10"
diff --git a/x11-themes/gnome-icon-theme-symbolic/gnome-icon-theme-symbolic-3.12.0.ebuild b/x11-themes/gnome-icon-theme-symbolic/gnome-icon-theme-symbolic-3.12.0.ebuild
index 6fac6d84e68..b5a5e8f4d28 100644
--- a/x11-themes/gnome-icon-theme-symbolic/gnome-icon-theme-symbolic-3.12.0.ebuild
+++ b/x11-themes/gnome-icon-theme-symbolic/gnome-icon-theme-symbolic-3.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-icon-theme-symbolic/"
LICENSE="CC-BY-SA-3.0"
SLOT="0"
IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND=">=x11-themes/hicolor-icon-theme-0.10"
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 e5d969ad6e0..f8ba448b42d 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
@@ -12,7 +12,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-themes-extra"
LICENSE="LGPL-2.1+"
SLOT="0"
IUSE=""
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh 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 4263aba9d33..31ed056bc39 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
@@ -12,7 +12,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-themes-extra/"
LICENSE="LGPL-2.1+"
SLOT="0"
IUSE=""
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh 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"
COMMON_DEPEND="
>=x11-libs/gtk+-2.24.15:2[${MULTILIB_USEDEP}]
diff --git a/x11-themes/gtk-engines/gtk-engines-2.20.2-r2.ebuild b/x11-themes/gtk-engines/gtk-engines-2.20.2-r2.ebuild
index de076094109..34b99272bf4 100644
--- a/x11-themes/gtk-engines/gtk-engines-2.20.2-r2.ebuild
+++ b/x11-themes/gtk-engines/gtk-engines-2.20.2-r2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gtk.org/"
LICENSE="LGPL-2.1"
SLOT="2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="accessibility lua"
RDEPEND="
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 d7823da9e11..c6076c58811 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=""
diff --git a/x11-themes/sound-theme-freedesktop/sound-theme-freedesktop-0.8.ebuild b/x11-themes/sound-theme-freedesktop/sound-theme-freedesktop-0.8.ebuild
index 3126ec313aa..f085ad0a94d 100644
--- a/x11-themes/sound-theme-freedesktop/sound-theme-freedesktop-0.8.ebuild
+++ b/x11-themes/sound-theme-freedesktop/sound-theme-freedesktop-0.8.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://people.freedesktop.org/~mccann/dist/${P}.tar.bz2"
LICENSE="GPL-2 LGPL-2 CC-BY-3.0 CC-BY-SA-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE=""
RDEPEND=""
diff --git a/x11-themes/vertex-icon-theme/vertex-icon-theme-20150506.ebuild b/x11-themes/vertex-icon-theme/vertex-icon-theme-20150506.ebuild
index 0a26098712f..79ed9e68878 100644
--- a/x11-themes/vertex-icon-theme/vertex-icon-theme-20150506.ebuild
+++ b/x11-themes/vertex-icon-theme/vertex-icon-theme-20150506.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
else
EGIT_COMMIT="f27e47edf392596b7967b7d134d3c62ac3fda0c9"
SRC_URI="https://github.com/horst3180/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
S="${WORKDIR}/${MY_PN}-${EGIT_COMMIT}"
fi
diff --git a/x11-themes/xcursor-themes/xcursor-themes-1.0.6.ebuild b/x11-themes/xcursor-themes/xcursor-themes-1.0.6.ebuild
index 1e66116eb1c..2eb325b2307 100644
--- a/x11-themes/xcursor-themes/xcursor-themes-1.0.6.ebuild
+++ b/x11-themes/xcursor-themes/xcursor-themes-1.0.6.ebuild
@@ -8,7 +8,7 @@ XORG_MODULE=data/
inherit xorg-2
DESCRIPTION="X.Org cursor themes: whiteglass, redglass and handhelds"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
RDEPEND="
diff --git a/x11-wm/sawfish/sawfish-1.12.0-r1.ebuild b/x11-wm/sawfish/sawfish-1.12.0-r1.ebuild
index 06915f975f0..67adf7d892a 100644
--- a/x11-wm/sawfish/sawfish-1.12.0-r1.ebuild
+++ b/x11-wm/sawfish/sawfish-1.12.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://download.tuxfamily.org/sawfish/${MY_P}.tar.xz"
LICENSE="GPL-2 Artistic-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ia64 ppc ~ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 ia64 ppc ~ppc64 sparc x86"
IUSE="emacs kde nls xinerama"
RDEPEND="
diff --git a/x11-wm/twm/twm-1.0.10.ebuild b/x11-wm/twm/twm-1.0.10.ebuild
index 47dee148edb..dab7fbc4ac2 100644
--- a/x11-wm/twm/twm-1.0.10.ebuild
+++ b/x11-wm/twm/twm-1.0.10.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
DESCRIPTION="X.Org Tab Window Manager"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="x11-libs/libX11
diff --git a/xfce-base/garcon/garcon-0.6.4-r2.ebuild b/xfce-base/garcon/garcon-0.6.4-r2.ebuild
index 8e1a4c79814..79394ad32fe 100644
--- a/xfce-base/garcon/garcon-0.6.4-r2.ebuild
+++ b/xfce-base/garcon/garcon-0.6.4-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="LGPL-2+ FDL-1.1+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="-gtk2"
RDEPEND=">=dev-libs/glib-2.30:=
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.14.1.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.14.1.ebuild
index 46a3f9d709f..7c23bdfb39e 100644
--- a/xfce-base/libxfce4ui/libxfce4ui-4.14.1.ebuild
+++ b/xfce-base/libxfce4ui/libxfce4ui-4.14.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="LGPL-2+ GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="debug glade +gtk2 introspection startup-notification vala"
REQUIRED_USE="vala? ( introspection )"
RESTRICT="!gtk2? ( test )"
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.15.1.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.15.1.ebuild
index d7598a86b7a..cddd13c8d5e 100644
--- a/xfce-base/libxfce4ui/libxfce4ui-4.15.1.ebuild
+++ b/xfce-base/libxfce4ui/libxfce4ui-4.15.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="LGPL-2+ GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="debug glade introspection libgtop startup-notification vala"
REQUIRED_USE="vala? ( introspection )"
diff --git a/xfce-base/libxfce4util/libxfce4util-4.14.0.ebuild b/xfce-base/libxfce4util/libxfce4util-4.14.0.ebuild
index 4fb2cf7d693..893d33faa51 100644
--- a/xfce-base/libxfce4util/libxfce4util-4.14.0.ebuild
+++ b/xfce-base/libxfce4util/libxfce4util-4.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="LGPL-2+ GPL-2+"
SLOT="0/7"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE="introspection vala"
REQUIRED_USE="vala? ( introspection )"
diff --git a/xfce-base/libxfce4util/libxfce4util-4.15.0.ebuild b/xfce-base/libxfce4util/libxfce4util-4.15.0.ebuild
index 0e8c6a84310..dd5b8e34dae 100644
--- a/xfce-base/libxfce4util/libxfce4util-4.15.0.ebuild
+++ b/xfce-base/libxfce4util/libxfce4util-4.15.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="LGPL-2+ GPL-2+"
SLOT="0/7"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE="introspection vala"
REQUIRED_USE="vala? ( introspection )"
diff --git a/xfce-base/xfconf/xfconf-4.14.1.ebuild b/xfce-base/xfconf/xfconf-4.14.1.ebuild
index 2ffd6d07999..ea2548f8645 100644
--- a/xfce-base/xfconf/xfconf-4.14.1.ebuild
+++ b/xfce-base/xfconf/xfconf-4.14.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2+"
SLOT="0/3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
IUSE="debug introspection perl vala"
REQUIRED_USE="vala? ( introspection )"
--git a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.7.ebuild b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.7.ebuild
index 1b50b412ea1..d1dd296ed8c 100644
--- a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.7.ebuild
+++ b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=">=dev-libs/glib-2.16:=
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2020-03-26 15:26 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-03-26 15:26 [gentoo-commits] repo/gentoo:master commit in: gnome-base/gconf/, app-dicts/myspell-ca/, x11-themes/gnome-icon-theme-symbolic/, Mikle Kolyada
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox