Merge updates from master

26 files changed, 27 insertions, 26 deletions

diff --git a/dev-lang/python/python-3.8.6.ebuild b/dev-lang/python/python-3.8.6.ebuild
index 67bec8f17735..df05aaedef1f 100644
--- a/dev-lang/python/python-3.8.6.ebuild
+++ b/dev-lang/python/python-3.8.6.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 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.ebuild b/dev-lang/python/python-3.9.0.ebuild
index 9f8512e17745..b47689f99a6e 100644
--- a/dev-lang/python/python-3.9.0.ebuild
+++ b/dev-lang/python/python-3.9.0.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 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-python/aiohttp-cors/aiohttp-cors-0.7.0-r1.ebuild b/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r1.ebuild
index 512cc4594ed9..2c9bec56f9df 100644
--- a/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r1.ebuild
+++ b/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86"
 
 RDEPEND=">=dev-python/aiohttp-1.1.1[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/aiohttp/aiohttp-3.6.2.ebuild b/dev-python/aiohttp/aiohttp-3.6.2.ebuild
index 60d447f6f833..3221c80393a9 100644
--- a/dev-python/aiohttp/aiohttp-3.6.2.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.6.2.ebuild
@@ -13,7 +13,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 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/async_timeout/async_timeout-3.0.1.ebuild b/dev-python/async_timeout/async_timeout-3.0.1.ebuild
index 21194c01f37d..be6dbf2b4bcb 100644
--- a/dev-python/async_timeout/async_timeout-3.0.1.ebuild
+++ b/dev-python/async_timeout/async_timeout-3.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 S=${WORKDIR}/${MY_P}
diff --git a/dev-python/black/black-20.8_beta1.ebuild b/dev-python/black/black-20.8_beta1.ebuild
index 92ca0c56f974..d465ff652c1c 100644
--- a/dev-python/black/black-20.8_beta1.ebuild
+++ b/dev-python/black/black-20.8_beta1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/deprecation/deprecation-2.1.0.ebuild b/dev-python/deprecation/deprecation-2.1.0.ebuild
index 6ab07e7c28ba..634ee7f7c47e 100644
--- a/dev-python/deprecation/deprecation-2.1.0.ebuild
+++ b/dev-python/deprecation/deprecation-2.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
 
 RDEPEND="dev-python/packaging[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/filetype/filetype-1.0.7.ebuild b/dev-python/filetype/filetype-1.0.7.ebuild
index 3d833335e8a6..43798d810c36 100644
--- a/dev-python/filetype/filetype-1.0.7.ebuild
+++ b/dev-python/filetype/filetype-1.0.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
 
 PATCHES=( "${FILESDIR}/${P}-examples.patch" )
 
diff --git a/dev-python/hypothesis/hypothesis-5.35.4.ebuild b/dev-python/hypothesis/hypothesis-5.35.4.ebuild
index 6cacdb088ae4..50aca5993567 100644
--- a/dev-python/hypothesis/hypothesis-5.35.4.ebuild
+++ b/dev-python/hypothesis/hypothesis-5.35.4.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86"
 IUSE="cli test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/idna-ssl/idna-ssl-1.1.0.ebuild b/dev-python/idna-ssl/idna-ssl-1.1.0.ebuild
index 43d61f768e56..d89d7ad2cf19 100644
--- a/dev-python/idna-ssl/idna-ssl-1.1.0.ebuild
+++ b/dev-python/idna-ssl/idna-ssl-1.1.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86"
 IUSE=""
 
 RDEPEND="dev-python/idna[${PYTHON_USEDEP}]"
diff --git a/dev-python/pylast/pylast-4.0.0.ebuild b/dev-python/pylast/pylast-4.0.0.ebuild
index 1e4b885f9d02..7cc2c9192cdc 100644
--- a/dev-python/pylast/pylast-4.0.0.ebuild
+++ b/dev-python/pylast/pylast-4.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm hppa ~ia64 ~ppc ~ppc64 sparc x86"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild b/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild
index ea108d150dc7..b0e12aef3b74 100644
--- a/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild
+++ b/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild
@@ -13,7 +13,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 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/redis-py/redis-py-3.3.11.ebuild b/dev-python/redis-py/redis-py-3.3.11.ebuild
index 2179b1db068c..ef36d2f03060 100644
--- a/dev-python/redis-py/redis-py-3.3.11.ebuild
+++ b/dev-python/redis-py/redis-py-3.3.11.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.2-r1.ebuild b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.2-r1.ebuild
index 5e4eec45be71..3c80bcab45d0 100644
--- a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.2-r1.ebuild
+++ b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.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="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
 
 RDEPEND="!<dev-python/ruamel-yaml-0.16.0"
 
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.16.12-r1.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.16.12-r1.ebuild
index 0be5c87c224a..cab8a4882127 100644
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.16.12-r1.ebuild
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.16.12-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="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
 
 RDEPEND="dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.4.0.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.4.0.ebuild
index c15ec8741050..781f7fceb3be 100644
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.4.0.ebuild
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.4.0.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 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/mail-filter/pyzor/pyzor-1.0.0-r1.ebuild b/mail-filter/pyzor/pyzor-1.0.0-r1.ebuild
index 1cf021784362..af40ded0281c 100644
--- a/mail-filter/pyzor/pyzor-1.0.0-r1.ebuild
+++ b/mail-filter/pyzor/pyzor-1.0.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/SpamExperts/pyzor/archive/release-${MY_PV}.tar.gz ->
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="doc gdbm gevent pyzord redis test"
 # The test suite is py2-only
diff --git a/mail-filter/pyzor/pyzor-1.0.0_p20200523.ebuild b/mail-filter/pyzor/pyzor-1.0.0_p20200523.ebuild
index b1871754c311..3bf6bdff2901 100644
--- a/mail-filter/pyzor/pyzor-1.0.0_p20200523.ebuild
+++ b/mail-filter/pyzor/pyzor-1.0.0_p20200523.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/SpamExperts/pyzor/archive/${COMMIT}.tar.gz -> ${P}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="doc gdbm gevent mysql pyzord redis 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 21572ce7f808..ce3d563a4d0e 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 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/media-libs/mutagen/mutagen-1.43.0-r1.ebuild b/media-libs/mutagen/mutagen-1.43.0-r1.ebuild
index 9bf25d7b1334..7a24a1f153d0 100644
--- a/media-libs/mutagen/mutagen-1.43.0-r1.ebuild
+++ b/media-libs/mutagen/mutagen-1.43.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/quodlibet/mutagen/releases/download/release-${PV}/${
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 # TODO: Missing support for >=dev-python/eyeD3-0.7 API
diff --git a/net-libs/courier-authlib/courier-authlib-0.71.0.ebuild b/net-libs/courier-authlib/courier-authlib-0.71.0.ebuild
index 5998feeec73d..be6b3354a070 100644
--- a/net-libs/courier-authlib/courier-authlib-0.71.0.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.71.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 inherit flag-o-matic
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 
 DESCRIPTION="Courier authentication library"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
diff --git a/net-libs/courier-unicode/courier-unicode-2.1-r1.ebuild b/net-libs/courier-unicode/courier-unicode-2.1-r1.ebuild
index 357f737a2c93..bab50bd7818f 100644
--- a/net-libs/courier-unicode/courier-unicode-2.1-r1.ebuild
+++ b/net-libs/courier-unicode/courier-unicode-2.1-r1.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 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 src_configure() {
diff --git a/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.mask b/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.mask
index f86a094ace0e..e1ce7a0144a6 100644
--- a/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.mask
+++ b/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.mask
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 # unmask ld symlink package, due to missing blocks support we are not
-# able to compile this
+# able to compile binutils-apple
+sys-devel/binutils-apple
 -sys-devel/native-cctools
 # and unmask FSF GCC itself of course
 -sys-devel/gcc
diff --git a/sys-apps/acl/acl-2.2.53-r1.ebuild b/sys-apps/acl/acl-2.2.53-r1.ebuild
index 739c38023023..261639dbb408 100644
--- a/sys-apps/acl/acl-2.2.53-r1.ebuild
+++ b/sys-apps/acl/acl-2.2.53-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="nls static-libs"
 
 RDEPEND="
diff --git a/sys-apps/attr/attr-2.4.48-r4.ebuild b/sys-apps/attr/attr-2.4.48-r4.ebuild
index 45f3412feefc..4ed1fc5d9cc0 100644
--- a/sys-apps/attr/attr-2.4.48-r4.ebuild
+++ b/sys-apps/attr/attr-2.4.48-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug nls static-libs"
 
 BDEPEND="nls? ( sys-devel/gettext )"
diff --git a/sys-cluster/corosync/corosync-2.3.5.ebuild b/sys-cluster/corosync/corosync-2.3.5.ebuild
index 3485dedb6bb1..e40a5ddb5edb 100644
--- a/sys-cluster/corosync/corosync-2.3.5.ebuild
+++ b/sys-cluster/corosync/corosync-2.3.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://build.clusterlabs.org/corosync/releases/${P}.tar.gz"
 
 LICENSE="BSD-2 public-domain"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
 IUSE="doc infiniband static-libs systemd xml"
 
 # TODO: support those new configure flags