Merge updates from master

11 files changed, 11 insertions, 11 deletions

diff --git a/app-arch/xarchiver/xarchiver-0.5.4.18.ebuild b/app-arch/xarchiver/xarchiver-0.5.4.18.ebuild
index e97eba4af6fc..029e7abb5e25 100644
--- a/app-arch/xarchiver/xarchiver-0.5.4.18.ebuild
+++ b/app-arch/xarchiver/xarchiver-0.5.4.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ib/xarchiver/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 # older pigz versions have incompatible command-line processing
diff --git a/app-cdr/xcdroast/xcdroast-1.19-r1.ebuild b/app-cdr/xcdroast/xcdroast-1.19-r1.ebuild
index 17994dcb4dfb..63b715197b22 100644
--- a/app-cdr/xcdroast/xcdroast-1.19-r1.ebuild
+++ b/app-cdr/xcdroast/xcdroast-1.19-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${P/_/}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc ~sparc x86"
 IUSE="nls suid"
 
 RDEPEND=">=app-cdr/cdrtools-3.02_alpha09
diff --git a/app-eselect/eselect-rust/eselect-rust-20210703.ebuild b/app-eselect/eselect-rust/eselect-rust-20210703.ebuild
index 18b15d4d3866..0083ce57617b 100644
--- a/app-eselect/eselect-rust/eselect-rust-20210703.ebuild
+++ b/app-eselect/eselect-rust/eselect-rust-20210703.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "99999999" ]] ; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="Eselect module for management of multiple Rust versions"
diff --git a/dev-lang/rust-bin/rust-bin-1.62.1.ebuild b/dev-lang/rust-bin/rust-bin-1.62.1.ebuild
index 1cfc67bc9fb7..a65fe74123e5 100644
--- a/dev-lang/rust-bin/rust-bin-1.62.1.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.62.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="$(rust_all_arch_uris ${MY_P})
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
 SLOT="stable"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ppc64 ~riscv ~s390 sparc ~x86"
 IUSE="clippy cpu_flags_x86_sse2 doc prefix rls rust-src rustfmt"
 
 DEPEND=""
diff --git a/dev-lang/rust/rust-1.62.1.ebuild b/dev-lang/rust/rust-1.62.1.ebuild
index 4b8fdf357c6e..7f906c9e0b2b 100644
--- a/dev-lang/rust/rust-1.62.1.ebuild
+++ b/dev-lang/rust/rust-1.62.1.ebuild
@@ -19,7 +19,7 @@ else
 	SLOT="stable/${ABI_VER}"
 	MY_P="rustc-${PV}"
 	SRC="${MY_P}-src.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~riscv sparc ~x86"
 fi
 
 RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0"
diff --git a/dev-python/gpep517/gpep517-8.ebuild b/dev-python/gpep517/gpep517-8.ebuild
index ee64cb1d660f..899810bac85d 100644
--- a/dev-python/gpep517/gpep517-8.ebuild
+++ b/dev-python/gpep517/gpep517-8.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-python/installer-0.5.0[${PYTHON_USEDEP}]
diff --git a/dev-scheme/racket/racket-8.5.ebuild b/dev-scheme/racket/racket-8.5.ebuild
index f501621d6d0e..3f624b63833c 100644
--- a/dev-scheme/racket/racket-8.5.ebuild
+++ b/dev-scheme/racket/racket-8.5.ebuild
@@ -24,7 +24,7 @@ LICENSE="
 # PV == SLOT but this has to be checked carefully and in cases
 # where we use _p, _pre, etc it will have to be set manually.
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE="+chez +doc +futures +jit minimal ncurses +places +threads"
 # See bug #809785 re chez/threads
 REQUIRED_USE="chez? ( futures places ) futures? ( jit threads ) places? ( threads )"
diff --git a/sec-keys/openpgp-keys-rust/openpgp-keys-rust-20210504.ebuild b/sec-keys/openpgp-keys-rust/openpgp-keys-rust-20210504.ebuild
index a950c2ef8515..ad00a7bfa0a7 100644
--- a/sec-keys/openpgp-keys-rust/openpgp-keys-rust-20210504.ebuild
+++ b/sec-keys/openpgp-keys-rust/openpgp-keys-rust-20210504.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://static.rust-lang.org/rust-key.gpg.ascii"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 S="${WORKDIR}"
 
diff --git a/virtual/rust/rust-1.62.1.ebuild b/virtual/rust/rust-1.62.1.ebuild
index b7da1d054aa3..bb463a3f7c47 100644
--- a/virtual/rust/rust-1.62.1.ebuild
+++ b/virtual/rust/rust-1.62.1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Virtual for Rust language compiler"
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ppc64 ~riscv ~s390 sparc ~x86"
 IUSE="rustfmt"
 
 BDEPEND=""
diff --git a/x11-terms/xfce4-terminal/xfce4-terminal-1.0.4.ebuild b/x11-terms/xfce4-terminal/xfce4-terminal-1.0.4.ebuild
index 1d7716acb32e..8faf23b0abf0 100644
--- a/x11-terms/xfce4-terminal/xfce4-terminal-1.0.4.ebuild
+++ b/x11-terms/xfce4-terminal/xfce4-terminal-1.0.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/$(ver_cut 1-2)/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="utempter"
 
 RDEPEND="
diff --git a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.5.4.ebuild b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.5.4.ebuild
index b61d14068ef3..222d056a1ada 100644
--- a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.5.4.ebuild
+++ b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.5.4.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 ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	x11-libs/cairo