gentoo resync : 08.01.2021

18 files changed, 24 insertions, 165 deletions

diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index c6c1c01a19ad..a4f4b11d28cd 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/alpine/Manifest b/mail-client/alpine/Manifest
index 9e99bddd7e01..bab24066241b 100644
--- a/mail-client/alpine/Manifest
+++ b/mail-client/alpine/Manifest
@@ -3,5 +3,5 @@ DIST alpine-2.23.tar.xz 6330784 BLAKE2B e7be73dc0ccf04cfbd8712e70f8b114063983b97
 DIST alpine-2.24-chappa.patch.gz 172010 BLAKE2B 39f5336ead355a4b78bcdd5b44dc398888bf93f3c3efa95b3ad8a86f3a0dda13f03164a03fbed898150864130648a204a6b5d9e32c3437138878516d014c8bbe SHA512 7152a8e4a79a530345448267204a96bc2585b4fccb23f011fd4dc97bc713696b8eb7ca9563655d8da33570ef14bf29577f82fe0f104c80590a43b0e74ec89e81
 DIST alpine-2.24.tar.xz 7341676 BLAKE2B 63e2d9387f1a369f9a4623625524f25eec64c600672092608256fd2827c094fae1384b35da84ec5f5865295744982ede533551dc47b6f0c80f2405ed16cad546 SHA512 642a51f73732ebdf7c40e2b66370aa2f48fb13b349b477871b26295c3e8b860a0cc78dec9f80efc6ea74c548a080ceff04181eb18c35a9c8cae8d8ef831178c5
 EBUILD alpine-2.23.ebuild 2227 BLAKE2B 0dc55e814c736e2381e1ccc05b3b67e5b7f1ed065d8b854569bc4ec8e5db4028cf427fe1e24aa6ec8d07b792790402ee3a946811f2722b79e1cc498aff356dfe SHA512 b1ab7041333db6b69b4378a4f4f76e6309f460a2507bad2d5b2b2e509b2df2f8dd56a9e4020687f3bb5614796e676ea94bc28b3b749e97d838451a995990554e
-EBUILD alpine-2.24.ebuild 2221 BLAKE2B 2ccc64b6695ab2549afd5b52bde33766c4a7a8a4499d456886da6aee0b1b81875ad395bdd198c4695e812802a0c9674fe0d8075c520c460350acdf4f09881c43 SHA512 75502c03343afa0c134a8ce8584aa6f479b8c3cb2ee1e9c38b2478e2d214619a1156c7d7ec6e8a56217ce6df48e33c8a299eaa2ceb9503420902d1cf40d5ccba
+EBUILD alpine-2.24.ebuild 2219 BLAKE2B d9519cd31b87eccc98cf32730ec58b62288ff098dc51358945d0914f7f89828a32c5c0db571e6c2d00ec4b886bd5ac7356f2e55f8d082e71d5f62ab032d2cda7 SHA512 085a6c972d695aa1850d9e364fdef423d353a0b000328aa66f51474092a7d0847a31c04010e15ea9788c8409aebec43f2f71904b84ed58a17628dd1541d877b5
 MISC metadata.xml 731 BLAKE2B 299d44541ef09d51036feeb36ca1d720fba218c526cbb34d7d7358f8baa8d227ee96f823a1960a3fe16313da57f3ea2cd83424d5228839d722a94f780680949e SHA512 fb53b04da391da15373da8dff24b64abd9bee04a24eea999f1331d175c2084d9267c056426b5a9d7cebec808002715782bc1d414a70c310ddbbad72c0540dbae
diff --git a/mail-client/alpine/alpine-2.24.ebuild b/mail-client/alpine/alpine-2.24.ebuild
index 7b23e69e396c..87ccc42fe858 100644
--- a/mail-client/alpine/alpine-2.24.ebuild
+++ b/mail-client/alpine/alpine-2.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="http://alpine.x10host.com/alpine/release/src/${P}.tar.xz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 ~sparc ~x86"
 IUSE="+chappa doc ipv6 kerberos ldap libressl nls onlyalpine passfile smime spell ssl threads"
 
 DEPEND="sys-libs/ncurses
diff --git a/mail-client/bower/Manifest b/mail-client/bower/Manifest
index 65c84604c562..bf178315b599 100644
--- a/mail-client/bower/Manifest
+++ b/mail-client/bower/Manifest
@@ -1,7 +1,3 @@
-DIST bower-0.10.tar.gz 261487 BLAKE2B 861ee1e17787586f12795fb507cb32fd2d63b8831083354aed9f710c06cc8714ede7421d64c7aa6f2a52aec954be89fe15f1a4a2292d044c9b6a754c754d9667 SHA512 54ba7492008f1f6f1495b0d8a7585965ecf6ba16701bd19234dc761190db701d7cdc9a4e0e5995846f2feb08018a217a0e405dea0dacb3fbfb5681ed66529b9a
-DIST bower-0.11.tar.gz 266063 BLAKE2B 04fbf8febf472f39a6b2a39e5ea36311fa9b2fd931264315053bccd655ba94ea0c163c54cdf80c1d614df91b77c04543e8fdc34ff8cd42f2795dabae91cde95c SHA512 67d803a393b72e7140c1f252d86c693d31c2e570506aa22e64c6417a0bc51d14f7b6f4bdb89d5098dd32bcf0ac82b1a7b1a801325c856e9f6c58750d2cfa20e8
 DIST bower-0.12.tar.gz 275436 BLAKE2B 66ea4d0a502f9948bd7af29c6d63bd7c0c382d91a875dbcea4db8a55f457202cb70351fee151a7bc03a7ba1b0a2877cb4db76b0f6b8c38bf30c6072e3a74c9b7 SHA512 efa0ced9ddc13b2df43874acfa90843eef46ae527e2796d1368c234b7cc8c7c0a9b173398a0180b0eee52d94ba339f2b3bc65a91d07a563c320dbc86ae1521c3
-EBUILD bower-0.10.ebuild 863 BLAKE2B 00dc12562b8f20578ebc31d666ead3bb9fd05f3e056244ecbb46bcab8b59065c2fdc5159de7e4b0679b507e7ecdd716b2efbb28dfd9605eaf07a107088597e28 SHA512 742e0dd2a351067e1b04fb23275ad8c61b5bbea25b4a31f0c3071095bfc207182db6c8889e3515dd9dbd6cc44d7806d376930147d714ae59757996fda1ed4cc2
-EBUILD bower-0.11.ebuild 862 BLAKE2B 50f5228a48a7972dc641444f5ae6cfd60e18f9d299666dd53bb3159136a44b4bc6b034e9bcf8572c20903b703e30b17c7d8119a621b9e23d278da5f8f5e10d85 SHA512 f707009b28174392b266179ff9b5c87ca5db53ab727c043602001fcdfd45577bfdf533f39947b4278fdbc0a056e00231fd02a6f00545aa108eda9907bdd540b2
-EBUILD bower-0.12.ebuild 854 BLAKE2B 56914a8e6dd86584e8fbae1acd7c994af4f161bb194badd33432c6ee99afd3dfc67e0d600e8ebb711cc353c9691dc8da93a1ef5c471baa8161761a4a94c3402d SHA512 29c7ace36133c804de56f055e80a95e3d9e1b3d69a199308804573be5cd66db60bc29130395fdad085fa959ed7ce4f4c2f2a36e5be65cb0eb8800adbb49dfe18
+EBUILD bower-0.12.ebuild 853 BLAKE2B 5a7450c0cce650b0b0635fbd97f3d9c8d288bdcab038e10f0b5b06e1794da59089c886bdbef498fd128c519ab4cf34de540c240530efd678637e2aa28f47d998 SHA512 f8a3e69cde662c2572034cb29601563498fa9a81278e8ab3f76063ef4e88e943d6e368078fd4a048cfbce95082d78b8273fab1f2243c9b09c50a676276638422
 MISC metadata.xml 389 BLAKE2B a09020cbce6ed8e4d346c5373ae818b8741efcad65d894709a5760968361d731fdaff1ff5458601817d311d76ba81e5f18ee40aae7c623b65e39ce72bfa8afdc SHA512 3c6a3d5a83e56530370ae4ff0ec1c67d3ced1e0c21c6b6cd9868066ba6f43b15768063c79e8a2948aeca16e19c44dd746f824620a6a9437734707282b5cf4910
diff --git a/mail-client/bower/bower-0.10.ebuild b/mail-client/bower/bower-0.10.ebuild
deleted file mode 100644
index a8d841c2f962..000000000000
--- a/mail-client/bower/bower-0.10.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multiprocessing
-
-DESCRIPTION="A curses terminal client for the Notmuch email system"
-HOMEPAGE="https://github.com/wangp/bower"
-SRC_URI="https://github.com/wangp/bower/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-COMMON_DEPEND="app-crypt/gpgme:=
-	sys-libs/ncurses:0="
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/mercury-11.07"
-RDEPEND="${COMMON_DEPEND}
-	net-mail/notmuch
-	sys-apps/coreutils"
-
-src_prepare() {
-	default
-	if has_version "sys-libs/ncurses:0[tinfo]" ; then
-		echo "MLLIBS-bower += -ltinfow" >> src/Mercury.params || die
-	fi
-}
-
-src_compile() {
-	emake PARALLEL="--jobs $(makeopts_jobs) --no-strip --very-verbose"
-}
-
-src_install() {
-	dobin bower
-	dodoc AUTHORS NEWS README.md bower.conf.sample
-}
diff --git a/mail-client/bower/bower-0.11.ebuild b/mail-client/bower/bower-0.11.ebuild
deleted file mode 100644
index 04657e9647ac..000000000000
--- a/mail-client/bower/bower-0.11.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multiprocessing
-
-DESCRIPTION="Curses terminal client for the Notmuch email system"
-HOMEPAGE="https://github.com/wangp/bower"
-SRC_URI="https://github.com/wangp/bower/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-COMMON_DEPEND="app-crypt/gpgme:=
-	sys-libs/ncurses:0="
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/mercury-11.07"
-RDEPEND="${COMMON_DEPEND}
-	net-mail/notmuch
-	sys-apps/coreutils"
-
-src_prepare() {
-	default
-	if has_version "sys-libs/ncurses:0[tinfo]" ; then
-		echo "MLLIBS-bower += -ltinfow" >> src/Mercury.params || die
-	fi
-}
-
-src_compile() {
-	emake PARALLEL="--jobs $(makeopts_jobs) --no-strip --very-verbose"
-}
-
-src_install() {
-	dobin bower
-	dodoc AUTHORS NEWS README.md bower.conf.sample
-}
diff --git a/mail-client/bower/bower-0.12.ebuild b/mail-client/bower/bower-0.12.ebuild
index d76953ce7610..ebd82dbd7edf 100644
--- a/mail-client/bower/bower-0.12.ebuild
+++ b/mail-client/bower/bower-0.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wangp/bower/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 COMMON_DEPEND="app-crypt/gpgme:=
diff --git a/mail-client/mailx-support/Manifest b/mail-client/mailx-support/Manifest
index 0b11d3c7b6cf..1d8a7acab989 100644
--- a/mail-client/mailx-support/Manifest
+++ b/mail-client/mailx-support/Manifest
@@ -1,5 +1,5 @@
 AUX mailx-support-20060102-add-sys_file_h.patch 397 BLAKE2B c560eb7a53f2c318873f17c2a3543bd02912c7f635a864e987ac333eca8f4fbe33e5c39ae5bc6122607fdf4c1f73ac40618b6a050eec2d520a0fce32da626c46 SHA512 d2906ca15610090ab93d0f839a0687b67556dccc0cd8dcfe1c5ae52d23c45e74d008376d57d84eaa4272a56f209628819a60108eebaf645cc1c3106ae5a954d6
 AUX mailx-support-20060102-respect-ldflags.patch 537 BLAKE2B 34dbdd5f8a9b3537657f98f8ea274349e043618dfba3d20f004be3cb0fe58438b6c3dd9af91e921f776ee8b38bfe296718add6da217893dae001c904bcebf225 SHA512 cec6b2cf6a3f8b85ebdfcd3bdbbeac9ded468b7f34053ef6473aefd413292d9d7dc350782488481a3ae2db273ad9a7005193acc0e601c5556a2fdd49640dfe1f
 DIST mailx-support-20060102.tar.bz2 8822 BLAKE2B aee5141916f3d59f730e52f5e80fc465e7a3d961ff38e5e3d3feead4b772682c999925b7d900e2d3f87d178a6730994c2e0ec3d1625b5794bed5945a219aef81 SHA512 a4bd84253fcb5a97119e75290dfda01004115c3eb5898bb792c75f7b01c7e48fa1189b9ec4ed195c404196893af8b9390062f2f258da68889b464b53aa0ecbc2
-EBUILD mailx-support-20060102-r2.ebuild 844 BLAKE2B dd167af630184fe18761489c20c405147fb94a43d8719963943d682aa272717639452c8b46032ebe233449a4a6af38217fbe9736ae4d1b2cc51fc19d24532579 SHA512 60f2d4c1d9d680efad218bcb313d2dcafed1f66aec9d1e4c8cfc0a62a313c3e20666b2c16761cb2d2b8ef554c676edfb19dcde13182b2c7496cc3e07daf258f9
+EBUILD mailx-support-20060102-r2.ebuild 833 BLAKE2B 67fa5225f07eb8954cdc842d56fd10f291396bbd3b72365007d3b9b25428dc63325ad51e3b89190f66889a9d3135c424876dab0a414f917a9a8789133bb3e76f SHA512 c3f08d6578d1b652be01b07993adc8788b9d907bd599c9604cb5b1a562157ebef2b8d2331f3957615f46748103a3e43d7a0feceede4e2935bdc4a07946369f20
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/mail-client/mailx-support/mailx-support-20060102-r2.ebuild b/mail-client/mailx-support/mailx-support-20060102-r2.ebuild
index d6d3aa3a39af..7b7e1dbbb233 100644
--- a/mail-client/mailx-support/mailx-support-20060102-r2.ebuild
+++ b/mail-client/mailx-support/mailx-support-20060102-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 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"
 IUSE=""
 
 RDEPEND=""
diff --git a/mail-client/mailx/Manifest b/mail-client/mailx/Manifest
index 39dcb2da39a4..777e327a8c67 100644
--- a/mail-client/mailx/Manifest
+++ b/mail-client/mailx/Manifest
@@ -1,9 +1,6 @@
 AUX mailx-8.1.2.20050715-offsetof.patch 1566 BLAKE2B 0878d9f3b639e292e1cfc69676c3e8b3ef68627764828f89fb252c72ac8133162fc4bda234ed1a82487a39306efbead9406b2dc750548deea3fb4c767ddc26c1 SHA512 f6c865cfe32d75d2ce2cf3538822db3c22edc09038ba72f7e25001bfda9b4b2c320e03f91622b316a268cfbdc1f57780ffe199dd8da8c78fbcfe93daf9972aea
 AUX mailx-8.1.2.20180807-fno-common.patch 7481 BLAKE2B e847c7865c2346bfaeae2a32539aae3e5a73452073253af52615f3791285e822bbb96174dfabc97daec576a36d7d9ec7a2e9fc94b7372aea8efa08c363095f5f SHA512 37a5ed4b1b31eecd05d8a05b59aec9f8cba78cda838bd2ce06ed3f6c7a4f1e586223207e9ebdbd2cf952bab1dcbf06466aa61c61bcf0527fd57bc0b018acfe85
-DIST bsd-mailx_8.1.2-0.20160123cvs-4.debian.tar.xz 45768 BLAKE2B 7e5ae62dee742502ea86c55803615f67b2be082b0fe3e6dbf5f64ca7b63fa79014195f4c2262ffaba23624677227df4a94d3966611e9de4bf491f52e050c88b9 SHA512 79d822b4e0e9796970e96f656814cf835fe522d2e33b79484257af50e631a264f6fae99e225d96fa37f50d7ce9f3b9e9577ddb361a27c6e59af8db4736250c19
-DIST bsd-mailx_8.1.2-0.20160123cvs.orig.tar.bz2 76715 BLAKE2B c6491cd88e99b62184da60cc6f8a42aac5f7f5a828c80c05d3dc4493c77727e553b916cb646dade38214d3a6738c084559764abb812a1dfe1fcce2e4d6a04960 SHA512 b66dd0fc5a150c0e1068b9aedda8425c73be7ac7e22d91f2c52de3f2d416016886f46dd54ec5024c0cd4c7e736aee7bdb68d9117f9b2b455fc42d05e1a677373
 DIST bsd-mailx_8.1.2-0.20180807cvs-1.debian.tar.xz 47916 BLAKE2B 6776dc1705383438e4249269f38a0db963731580ce4df3a2f6fddb112495db3225608b97718cd3916e7bb40b71d0338e6d262416a42b60ba19a6f4a8e1c8627e SHA512 3c99c5be121ecb37f2495b885e2a00290173b16578da100bb7955f86c7e76b8a8cd6bf8f936c1f00b906611e8649c0a6a25089b647d7f5ebcea8c8df3f334e28
 DIST bsd-mailx_8.1.2-0.20180807cvs.orig.tar.xz 79684 BLAKE2B 2846cd752472a193f89f7672d6a61de9759beea5530484c75ae4703335afc22a833226a87141853e4fbb2c951f9818ff35c8b79349b8a7a9a77f7788c6569bab SHA512 7a33d35934b0a98660732259d3132235ed14cd6843e79edd5683b668c3a550b45f0664021af35c219043640c20ce5aa34eaaf6dc275dc7e83aaed44853d008c9
-EBUILD mailx-8.1.2.20160123.ebuild 1252 BLAKE2B c0dbe3c57cbe7c344f7516b84f9195534456269078403ffa7d7394b817bf0011f312ff4c198244f43af815d81a8486287358b430f606759442d6b3e9903e56f8 SHA512 00e923afa6639b52ba0e46c35a2e41d58f176718f7bd4bd0e24248758ebd8f85f42f8c8a7e5fe9b5ca75ddd162c86ac183d6a5882d1625203fde91150149719a
-EBUILD mailx-8.1.2.20180807.ebuild 1310 BLAKE2B ee892448256470594bf5a733e7d6ca372673684361e40a0d0060759343f7ced04102a5855c2e3dab270fd859ea0fb38c2bdb6a3b3bb9f7efc6c7f94e020f3b1c SHA512 0711668fe718bafa181270f143dee3c3845f96e9aa57f220ddfc86dc1b603b8eb63162a9d5a2296fb9049515a9de9d68ac6a48a10924a3ca4ca2a48bfbd683b4
+EBUILD mailx-8.1.2.20180807.ebuild 1292 BLAKE2B f558391789ed0468b4e5481668c359e10d2846cba9d7df4dba352c9ff57e21234e1d3f9809cce195ea2d86511dbb7d2f669c0db65ca8f837a944ff8c07508222 SHA512 8f3c58bd37f2bf33b6e8451397f33ce426fb53593b82362210a2977edcfd377ec4f035de3837b30f30f5a851477102edb496fa2af018f1ab0ed971526032cba1
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/mail-client/mailx/mailx-8.1.2.20160123.ebuild b/mail-client/mailx/mailx-8.1.2.20160123.ebuild
deleted file mode 100644
index d8196d2ee513..000000000000
--- a/mail-client/mailx/mailx-8.1.2.20160123.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs
-
-DP="bsd-${PN}_${PV%.*}-0.${PV##*.}cvs"
-DPT="${DP}.orig.tar.bz2"
-DPP="${DP}-4.debian.tar.xz"
-
-DESCRIPTION="The $ mail program, which is used to send mail via shell scripts"
-HOMEPAGE="https://www.debian.org/"
-SRC_URI="http://http.debian.net/debian/pool/main/b/bsd-${PN}/${DPT}
-	http://http.debian.net/debian/pool/main/b/bsd-${PN}/${DPP}"
-
-S="${WORKDIR}/${DP/_/-}.orig"
-
-LICENSE="BSD"
-SLOT="0"
-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
-	dev-libs/libbsd
-	virtual/mta
-	mail-client/mailx-support"
-
-RDEPEND="${DEPEND}
-	!mail-client/nail
-	!net-mail/mailutils"
-
-src_prepare() {
-	eapply "${WORKDIR}/debian/patches"
-	eapply "${FILESDIR}/${PN}-8.1.2.20050715-offsetof.patch"
-	eapply_user
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) EXTRAFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dobin mail
-
-	doman mail.1
-
-	dosym mail /usr/bin/Mail
-	dosym mail /usr/bin/mailx
-	dosym mail.1 /usr/share/man/man1/Mail.1
-
-	insinto /usr/share/mailx/
-	doins misc/mail.help misc/mail.tildehelp
-	insinto /etc
-	doins misc/mail.rc
-}
diff --git a/mail-client/mailx/mailx-8.1.2.20180807.ebuild b/mail-client/mailx/mailx-8.1.2.20180807.ebuild
index ec21b85da17b..0dc175ca042d 100644
--- a/mail-client/mailx/mailx-8.1.2.20180807.ebuild
+++ b/mail-client/mailx/mailx-8.1.2.20180807.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ S="${WORKDIR}/${DP/_/-}.orig"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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"
 
 DEPEND=">=net-libs/liblockfile-1.03
 	dev-libs/libbsd
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 8fc04a12b536..21c0d15ccd29 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -6,7 +6,7 @@ DIST mutt-2.0.4.tar.gz 5293913 BLAKE2B 9c5d2d17fae9653868cca08eb7d92f9c6e1227025
 DIST mutt-gentoo-2.0.2-patches-r0.tar.xz 26380 BLAKE2B 3ce2dbe07f9340adbaeb0489fe88564b6cc44ef330d298915d42617357799a26f277cc0dcab2b78a5620f20a2533f2fe43287bab76eeb9529013e9f9c7659ffb SHA512 79fb00ccf6084da805c75eedbdb1631b12e616318e91a4c246d0194a478b803e3dc5d2815f757fecc91316c010058c2d0e9ecaf3fe40d5664ac25af63a0d7e13
 DIST mutt-gentoo-2.0.3-patches-r0.tar.xz 26396 BLAKE2B 1ee41baedb2ade72437ec4ffbd617e7e8a07c432ae2c025001df7fc19b2e6181e54f25dd16f02027f03f0f9df0032b35088354ae8c2c238a57fea2c3407dee4e SHA512 290416aa72d6938c9f52f60702ae1a9306704a3c63ca35c8fb35902c8e2307da42b478718521ebe0d6b857089b778bc172cd9cf5f061fab56fe5dea47c01f792
 DIST mutt-gentoo-2.0.4-patches-r0.tar.xz 26448 BLAKE2B 7f2e2730e18def7281cf59bc783ebc4047e459ebb8796810507ff11f5e99b78c2d6914be154251f1a279b4963156825931e22cd727e86eb40c15637736be457e SHA512 16025a790fba20ba1e693b1b826bf86bd2697d0d3ab5ceaf08b1692902235ef40866daec80862c7082a82a58fa4f9631889688f1d06b864cb29c613725fe5024
-EBUILD mutt-2.0.2.ebuild 8041 BLAKE2B 0722cd74cc8b016f889b685dd200bbdbdfb8c3d44d0ebd2942fcfa9dd4a5148b5a5bf97bd56c9fb457d1aad39753084ffb3bfa58f9fc3dcd6c590169b38304e5 SHA512 264b09dcd7947c3dd16e32ccace1031b5d2c0ac5b4126046cff458a74879bd55d4d1a6ccff09877d9196d275f3b341fd58a63287723e4bcc3a62daff988c773c
-EBUILD mutt-2.0.3.ebuild 8047 BLAKE2B 686ed4ca740e3f3f71bbbbf2529cfde6c0af4ddc4ff78462204c6717fad6d75607d185803c957a58433317f7244a0bdee2ce791132b13e8516c4301e925be6db SHA512 3ac34bc6f403122b8b303b0a9dc8a8dbfdf5fab5ff814afbb141c6367c5d637122ad6494085b8782fa0450cf45bee90ed160f332c6a268fb53de5ab5d4004145
-EBUILD mutt-2.0.4.ebuild 8047 BLAKE2B 686ed4ca740e3f3f71bbbbf2529cfde6c0af4ddc4ff78462204c6717fad6d75607d185803c957a58433317f7244a0bdee2ce791132b13e8516c4301e925be6db SHA512 3ac34bc6f403122b8b303b0a9dc8a8dbfdf5fab5ff814afbb141c6367c5d637122ad6494085b8782fa0450cf45bee90ed160f332c6a268fb53de5ab5d4004145
+EBUILD mutt-2.0.2.ebuild 8030 BLAKE2B c4c0be2976d82764751382bb3ee8f752eb0a4e7dc1a8a08c7628baff56c35609f6cc38c0fc680856c4fd8b08c36dd0c349c5f8259f399911f981d3354e8f9570 SHA512 943d41ce9e79a04a8e01cffd3e09c0ec22302f580c5a33e2a3568597e8973f1bb7ec967d598729221ddb570bb45d3b17aeb4732a416892edc1adc0d7a681b034
+EBUILD mutt-2.0.3.ebuild 8036 BLAKE2B 384d6e067fe5a25665e73774e77e672ed95a76979387fadd48162ccb93b4ecb3ef8fd70bdb3da2d032d29b9637bc53d6e76cc0db897e36a4d3d7b85b0d2744b1 SHA512 8ea51487a1de28822309c919fe327393d7b89f6f86174ff68f17d30838576709ca749b8e9482fe0a03200293b333481988ac427bf190bf2d18b8ebba5a9d22ee
+EBUILD mutt-2.0.4.ebuild 8036 BLAKE2B 384d6e067fe5a25665e73774e77e672ed95a76979387fadd48162ccb93b4ecb3ef8fd70bdb3da2d032d29b9637bc53d6e76cc0db897e36a4d3d7b85b0d2744b1 SHA512 8ea51487a1de28822309c919fe327393d7b89f6f86174ff68f17d30838576709ca749b8e9482fe0a03200293b333481988ac427bf190bf2d18b8ebba5a9d22ee
 MISC metadata.xml 1297 BLAKE2B 67419e66fa917ae69f015d9af534edeb809c4371b2c004c6687a942f331c70ad0513fedb8b6f45a2cb7fc5bfd9ca80c91f888e58293dee00c198d2bca7b8cb12 SHA512 9d9c30b14ce952f8099fb60eac3e8dc25e1c5ef05b88b71c1207950766cb367b56cf7c60168c6f3e431e1aa823c0a345ce851414705e9f0af015cfa51e241350
diff --git a/mail-client/mutt/mutt-2.0.2.ebuild b/mail-client/mutt/mutt-2.0.2.ebuild
index 6ea867b6524b..b5c1a188f270 100644
--- a/mail-client/mutt/mutt-2.0.2.ebuild
+++ b/mail-client/mutt/mutt-2.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -27,7 +27,7 @@ REQUIRED_USE="
 	autocrypt?        ( gpgme )"
 SLOT="0"
 LICENSE="GPL-2"
-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"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # yes, we overdepend on the backend impls here, hopefully one day we can
 # have REQUIRED_USE do what it is made for again. bug #607360
 CDEPEND="
diff --git a/mail-client/mutt/mutt-2.0.3.ebuild b/mail-client/mutt/mutt-2.0.3.ebuild
index 098178a82427..c9a2e340a3c6 100644
--- a/mail-client/mutt/mutt-2.0.3.ebuild
+++ b/mail-client/mutt/mutt-2.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -27,7 +27,7 @@ REQUIRED_USE="
 	autocrypt?        ( gpgme )"
 SLOT="0"
 LICENSE="GPL-2"
-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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # yes, we overdepend on the backend impls here, hopefully one day we can
 # have REQUIRED_USE do what it is made for again. bug #607360
 CDEPEND="
diff --git a/mail-client/mutt/mutt-2.0.4.ebuild b/mail-client/mutt/mutt-2.0.4.ebuild
index 098178a82427..c9a2e340a3c6 100644
--- a/mail-client/mutt/mutt-2.0.4.ebuild
+++ b/mail-client/mutt/mutt-2.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -27,7 +27,7 @@ REQUIRED_USE="
 	autocrypt?        ( gpgme )"
 SLOT="0"
 LICENSE="GPL-2"
-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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # yes, we overdepend on the backend impls here, hopefully one day we can
 # have REQUIRED_USE do what it is made for again. bug #607360
 CDEPEND="
diff --git a/mail-client/roundcube/Manifest b/mail-client/roundcube/Manifest
index 9e5460ff6775..9c31437d891d 100644
--- a/mail-client/roundcube/Manifest
+++ b/mail-client/roundcube/Manifest
@@ -1,7 +1,7 @@
 AUX POST-UPGRADE_complete.txt 854 BLAKE2B e99a1ec9a316c90ee4adc112dd87f394d0e2ce37ca5d1195e3f812683a2da59bedf45688cd448cc3ca544a02ee1c0e125f3960e81a062b0f7949e2cde581563d SHA512 0328842265ca859e78fa7d5babeac7b6baa16fb25962f50d431bbca133d042694d98942f77ba3387832d66645cc4df8fb9f3c4591ca7ed4eade6782a92a3d445
 DIST roundcubemail-1.4.10-complete.tar.gz 7043181 BLAKE2B aa442c9e4fb4d31bc9ddd77d888637d9d7afb8ac6c264ca5d378bd7bfc160f2f31379fae208638b2f79e6127add83f0254d1526e22c2ca24656b31ee75dc695e SHA512 e0a661ae5b928ce2c93129775d32a679ad2512ca4af21e8dd1711d38a62818ff9ee1e1fc922aae68e0a8bca034ca780fc3e3e988731a2ce9b2190b2c1d8e08a6
 DIST roundcubemail-1.4.8-complete.tar.gz 7032822 BLAKE2B 61c5329d9abe65baba3274d3cb9a6a435f886a0196c2881153da473eb415ad4c63dfdab49c67c75a2fd92ff55f9e6da7bdfcece7041ce408b2be628da47045d4 SHA512 8b7734cdec95954b7e18a0e44957da6ef74b5b0c3d28a1449e8634faa230844f5e0c28954245641758f8b2d9102aa32f279765ed3dfa20fa7b00dee4e5347362
-EBUILD roundcube-1.4.10.ebuild 2280 BLAKE2B 58c1e1ae779e5df8a48263227ea5e675809653f7070ecd12250fb4224089d9689a7096b73682fe89e70a87190b2bbfaf3729d8ce5d49c0bd7464efa24b91e8d3 SHA512 06035fda968d1e94d19207e9d040805e7fbd61edf93bc36e3a72895c0a3c5e41ae1ef463dd97847554dcb26239ddff362efc370c28ce34cbce1f87b03279b73a
+EBUILD roundcube-1.4.10.ebuild 2274 BLAKE2B 19056b64fd44f1dc2bbe30105b022ee28852dc0413b5aa2c759c5563446a2838b46aa0ecd039621b07f43f425529edd6896b3e4193cc9d2c9777216cb05b05b2 SHA512 4a59ffc29e7ab69dec776ccca749dab9ac839b9cfbad63aa2a5d986c9f30e59a1d618d1f44cbbacc6572b143544835af55e0ba11a9295aecea75c0d3ba5b4592
 EBUILD roundcube-1.4.8.ebuild 1792 BLAKE2B 6ee68871faba7e25719ea805518faf117e5619cc265235e7df8189d557af0fbc48b4c1ee14f1241854e64bae810f05679d6a154a209795c2738fcd8e5f7b3626 SHA512 60ecc662e19e21ba510947dcb07db3dd62912f675ca9b5c1a4502df456d6be8109c7803b8e4322b307ca9daa28cc70ab39f037b7f290e14e96fa1c2539cb1862
 EBUILD roundcube-9999.ebuild 2280 BLAKE2B 58c1e1ae779e5df8a48263227ea5e675809653f7070ecd12250fb4224089d9689a7096b73682fe89e70a87190b2bbfaf3729d8ce5d49c0bd7464efa24b91e8d3 SHA512 06035fda968d1e94d19207e9d040805e7fbd61edf93bc36e3a72895c0a3c5e41ae1ef463dd97847554dcb26239ddff362efc370c28ce34cbce1f87b03279b73a
 MISC metadata.xml 997 BLAKE2B 60bf23d71ef0014f432b1f09779263618f12eb2de5adb51e14b6c491d69c7a6b15d92f050d145d83d6ba0a6fc04b67906477ff1b6ce34d69c0ccf90cc2aaff1f SHA512 ed338883744882344de018e49854eaf1e6fdaf4af5a15cde8baabea5f315ff2904c1d161499ba68ba988e355336b962c1d6dcc64b550f2ef8875ece77f97ae83
diff --git a/mail-client/roundcube/roundcube-1.4.10.ebuild b/mail-client/roundcube/roundcube-1.4.10.ebuild
index 54ae74d1e868..2b983aea987c 100644
--- a/mail-client/roundcube/roundcube-1.4.10.ebuild
+++ b/mail-client/roundcube/roundcube-1.4.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -52,7 +52,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	SRC_URI="https://github.com/${PN}/${MY_PN}/releases/download/${MY_PV}/${MY_P}-complete.tar.gz"
 	S="${WORKDIR}/${MY_P}"
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 arm ~hppa ppc ppc64 sparc x86"
 fi
 
 src_unpack() {