gentoo resync : 25.08.2018

18 files changed, 15 insertions, 120 deletions

diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 5ea920f49b1c..94e6ad526140 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/radeontop/Manifest b/x11-apps/radeontop/Manifest
deleted file mode 100644
index 2ad4c2a47d9e..000000000000
--- a/x11-apps/radeontop/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST radeontop-1.0.tar.gz 32677 BLAKE2B e3445c400dff0f8afaa743d349477b67ccc4da187cbf979fe42c63b9e60f246f54e5fa2076ef6af789fea093c175d0ec66fa9f0f30bfb926a28f1aa12f2b10cf SHA512 bd7e8ecff962d8ac3072f3f1fa7a5d9981e2da28b38a1f234f6fe550511c3fbda2c1c6e9a6d1120bf99ef3ae621a91ff67c451eaf98dfa1264e9e6a59ae55e08
-EBUILD radeontop-1.0-r1.ebuild 946 BLAKE2B 6dcfb167e77aefa263764053f0684befc113d832bc81c4ba9d81e352ed0c8b87c2090c2e4982dc67fd2d5d0b538ec549aba84871268f41115c569911e2512545 SHA512 2d129777b521aee7510afb4dd4768e289e85358cf459113b0fbdee379f0075fdb1b5000ded11ed50330564e91863d1fa60ee4e856bb0796135f31e1464cac611
-EBUILD radeontop-9999.ebuild 739 BLAKE2B 7afd099c314bfd0399802a2f0dc5282d8a185719f9a5047120dcfacaccf247ec004447a25854e2f8579ff6e9049a858398c5d30fb52969678bf979530d96f70f SHA512 2d9ad6242ac7e7e4cb53db8a041b4494009163e7b6b9d299bbebd20aaccbcda4978b31227f44842904a4e65ac499d2ab2ff8fc58325b185d7ab156d8d6875202
-MISC metadata.xml 245 BLAKE2B 12440cccfbe49281faa7de1bf6579a53bf4e3ed4e07d40cff3f0e218ddda90e3b2fe45cf75d0e10c25f9ced1eee436aaa93dd2a859d34a5d278b47cd4c718b95 SHA512 49b8c90c9dde8331133ea5d9c026880dd1915a514d04f516d79c73b4c270e0b90f4fc36e654e0f9b508dcee5fc58c49c3dd060989f4ca0e3187b5f6800d2504a
diff --git a/x11-apps/radeontop/metadata.xml b/x11-apps/radeontop/metadata.xml
deleted file mode 100644
index 0fad074d0738..000000000000
--- a/x11-apps/radeontop/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">clbr/radeontop</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/x11-apps/radeontop/radeontop-1.0-r1.ebuild b/x11-apps/radeontop/radeontop-1.0-r1.ebuild
deleted file mode 100644
index dbe582980fc9..000000000000
--- a/x11-apps/radeontop/radeontop-1.0-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="Utility to view Radeon GPU utilization"
-HOMEPAGE="https://github.com/clbr/radeontop"
-SRC_URI="https://github.com/clbr/radeontop/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="
-	sys-libs/ncurses:0=
-	x11-libs/libdrm
-	x11-libs/libpciaccess
-	x11-libs/libxcb
-	nls? (
-		sys-libs/ncurses:0=[unicode]
-		virtual/libintl
-	)
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-src_prepare() {
-	default
-
-	cat > include/version.h <<-EOF || die
-	#ifndef VER_H
-	#define VER_H
-
-	#define VERSION "${PV}"
-
-	#endif
-	EOF
-	>getver.sh || die
-	touch .git || die
-}
-
-src_configure() {
-	tc-export CC
-	export LIBDIR=$(get_libdir)
-	export nls=$(usex nls 1 0)
-	export amdgpu=1
-	export xcb=1
-	# Do not add -g or -s to CFLAGS
-	export plain=1
-}
diff --git a/x11-apps/radeontop/radeontop-9999.ebuild b/x11-apps/radeontop/radeontop-9999.ebuild
deleted file mode 100644
index 4c1bafa1eb80..000000000000
--- a/x11-apps/radeontop/radeontop-9999.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs git-r3
-
-DESCRIPTION="Utility to view Radeon GPU utilization"
-HOMEPAGE="https://github.com/clbr/radeontop"
-EGIT_REPO_URI="https://github.com/clbr/radeontop.git"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE="nls"
-
-RDEPEND="
-	sys-libs/ncurses:0=
-	x11-libs/libdrm
-	x11-libs/libpciaccess
-	x11-libs/libxcb
-	nls? (
-		sys-libs/ncurses:0=[unicode]
-		virtual/libintl
-	)
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-src_configure() {
-	tc-export CC
-	export LIBDIR=$(get_libdir)
-	export nls=$(usex nls 1 0)
-	export amdgpu=1
-	export xcb=1
-	# Do not add -g or -s to CFLAGS
-	export plain=1
-}
diff --git a/x11-apps/rgb/Manifest b/x11-apps/rgb/Manifest
index 73ced3e687fd..1256933d3f46 100644
--- a/x11-apps/rgb/Manifest
+++ b/x11-apps/rgb/Manifest
@@ -1,5 +1,5 @@
 DIST rgb-1.0.5.tar.bz2 130900 BLAKE2B 40675dfd862757d62cc636fe2cc3cfac25a87d863ada67e76dd9516a1607e356530b2578082b9e5cdf84d97b766c558b80f8fa919c515a5eb3da2731ac07391f SHA512 2e4ad2b0f5539375986d455b47cb5f10e50841198ee242ee430e021e9ddbffec1304259c259c7a6b7e0cd4b244ecedcb5818baac35deb4447da53c2ddba3ad43
 DIST rgb-1.0.6.tar.bz2 139225 BLAKE2B 25e20d0be23a46d869869e47169d86dd50a99bc65551bf83800119c7f9cd242f41d5ecdb611467eaf9aeba909cebbfab8f578e0a5dc63380482f324124064bb4 SHA512 92c8885a0e1482065a8b86f7be890859a5eab6b9d57ff219e916cbbd10cd185deec1c5db25dae8c405a343ab0e2ddaba3ddfe0b567d06534405f102e1845654e
 EBUILD rgb-1.0.5.ebuild 459 BLAKE2B 14afcfdaf45273d0a2a2b91e0e6eeaa5ec92fb9088e98ab6a65bc3c742ca5b008a86244dd953dea391b4124cfb36c3ddd50d0d621c5832b66001f29148f36df9 SHA512 8d3a38f6579645815f57bfcf08ccb7c99acca49b238a38b3ecebbfd3940133396f4e0350b0818f6114d4239ec389d2f91333d519c04cd5e2905dd0e9036dba5f
-EBUILD rgb-1.0.6.ebuild 488 BLAKE2B b54492cf1dc1dfed814a9be8722e680333b2e126ab5f95b7b14271e7c0d9325234fc9b3471c059a67df2017874414deb187a3f79ca018b3ff43df1531c70ce49 SHA512 d288e88f9a0cd7cfcf49696f0a6afefeae53b4499462b5aabdf860545b5c50d9b369a87a55c76070af717e93d59ff67aaafdc28141e600d27d194820454278ec
+EBUILD rgb-1.0.6.ebuild 487 BLAKE2B fdb5713ccc92c3964fd1d4953d8b922708fdadb5fd24abe9f1b802a09215a935896799f13fcbb241500b63c36868a1880d157a13f750a744eb722bfe05ee8da6 SHA512 c38ac6bf27bc8f3314cc892afb1631dcdede643fb6ab924c41d02db348a507c56ca98056b6eb11b029adc49bc97d35faa3b2669406a7cc879a7590e9205740d9
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/rgb/rgb-1.0.6.ebuild b/x11-apps/rgb/rgb-1.0.6.ebuild
index 16d1e459c1ca..fc73916f327e 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-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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/xclock/Manifest b/x11-apps/xclock/Manifest
index e41914bcf448..8a59fdb6d2bf 100644
--- a/x11-apps/xclock/Manifest
+++ b/x11-apps/xclock/Manifest
@@ -1,3 +1,3 @@
 DIST xclock-1.0.7.tar.bz2 164035 BLAKE2B d52db001d577b8eb9208ada8e77784ab2a5916551216dae7e71a51381105915778c90124f35dcc83553e332cb6c6435c00041ae8dd0d2033fd70b69435ee677f SHA512 56689bdae6c83e9e1da5c4c48cf1136ca8b4f45b177f27bc1deeb24758e2c180035b639e8df72e3ebf32dc301bceb59118309fcce2ffab54e5abe9bfa645e607
-EBUILD xclock-1.0.7.ebuild 487 BLAKE2B 725cf6a4fc496c15215fdb0b980fc9dcd2b471c86096f539b53ff8974ae82d059f61e702c2f44d035fdf79ec69648c882d79149967febe078d90c9ec620d9028 SHA512 4ad0e705bc67bb3d0951ef6bcd93ec008d1799f31fd7c5b5795c14f483e4c79a79440d955ff2fe9a44d4adad2e51dfec9a6d56a92be9e25c9467c36276f4d0a7
+EBUILD xclock-1.0.7.ebuild 486 BLAKE2B d6a22848ac5d2d3f83c1b76dc5a3821d2e39bba870d21d30761b37543ce7eaa6804009218e9a7e7257d5e90763b7323864667a6384c438c24687b1001fba8b6d SHA512 e40d10b54a396a80369653de9e7dd3196849324389425edfc4096791f028a0af8daac6c299526ead7326da51226c6cdb79a4b0422d2cba99c316e3de4bf47566
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xclock/xclock-1.0.7.ebuild b/x11-apps/xclock/xclock-1.0.7.ebuild
index 420604425ebe..d1419a57d469 100644
--- a/x11-apps/xclock/xclock-1.0.7.ebuild
+++ b/x11-apps/xclock/xclock-1.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="analog / digital clock for X"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index 2772ad3be0f9..d47392d5a514 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -7,5 +7,5 @@ AUX xinit-1.3.3-gentoo-customizations.patch 1494 BLAKE2B 1a67f486324e07aee070786
 AUX xinit-1.4.0-startx-current-vt.patch 740 BLAKE2B f5ac87b96f76bd4c845cde4844f935afbb757908d0c94f6f5b9c7e6b8055841fcdf4de44af964fe3703d2599b9097fca300551bb4a3dce003e20c266d619eb49 SHA512 97e0ac72c49a9a5ac29a09f169076f0bcec48978f645be01f3b40b6c32b4af4d188f96662c0cf62bab0a6b356ae80c25e0614c0b87a368d7a01a11e603ecdd15
 AUX xserverrc.1 132 BLAKE2B f914e41cf124fb4777cb6eef3cee5e7137336961ef5cc010288b5949fff59fcdab3d2f264c91fe05ae165b6bacd63ae8b13e58b51a149b637996db346790aca2 SHA512 3cc3b18cfc8076badcae62d098a0c3cc0b654ab691b9e7a64f456f5428f1afe1130c9c033b106cfa2e566de22cb75756d71368e3c0a7474b8a76f63c1f91a918
 DIST xinit-1.4.0.tar.bz2 174491 BLAKE2B 5a613a244a22f3bb4de43ae23b8f590b41a6af2c3adb282d2a089f4b94117220d86654c16cbb20ad0a50b6aab1be65512a7a42850e9047cfca96f25af964d081 SHA512 53a29081130c1e195eb441ee77ccaa044b18b4cca3d2d5da3a6d67aa421dfd9718fa18b6be6232a41e40cf260c8190064c4d8d9ab771177bd5cd12e77a8fa79e
-EBUILD xinit-1.4.0.ebuild 1761 BLAKE2B 2cbae077fd7323d05f5a812a0c273d4d856aa6d3099a55dfcf5cb0ff8300132694962a367ee4db1dc4efdc94f10e7b4ef59bfd6e702772ec9d9cda7535367da9 SHA512 e650c6724eed6b984cd4c1581325bdfd65fe5785cf33d2b6c10a7dbbd240a16ad1240b503d78842be66de1f7d3875be25aa5469cb9069689225da936aa8e59b9
+EBUILD xinit-1.4.0.ebuild 1760 BLAKE2B 85c973d7c0aa292a9cfb89adf65b57069e3d2a45b52d6d16b1a75ee07b81be9ff4306d641bd34b161535f0af15f01a32c5ebb1882f60d3e5272ae75f9ad35f0a SHA512 cfecaf690fe6735d20b0f02495a435afad6e81d8fe259d121f5b1883fa83bbae48d02b2ca49bc4acabeca1c1ec00b17f3a804a7ce0eb950680b9a69328618a57
 MISC metadata.xml 480 BLAKE2B 190a0b3a84e4d0d85e0928b964cb820599510c6c09a1a7c385b2f9b402a44478e08b48fce2d88216fe2fd52a3f35ec02d99cb7d738caf8a2d8dd6418e36f6125 SHA512 5dcfabd3eff26ffb33bd8ae8248cc3214c67a0fb10d5c214b2432fea7625b2555b29bb654d9712e8d55a081b25912da65ac367203fe529a860febc59fb91de55
diff --git a/x11-apps/xinit/xinit-1.4.0.ebuild b/x11-apps/xinit/xinit-1.4.0.ebuild
index 67abbac0edf9..11869af32fe1 100644
--- a/x11-apps/xinit/xinit-1.4.0.ebuild
+++ b/x11-apps/xinit/xinit-1.4.0.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 DESCRIPTION="X Window System initializer"
 
 LICENSE="${LICENSE} GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="+minimal"
 
 RDEPEND="
diff --git a/x11-apps/xkbcomp/Manifest b/x11-apps/xkbcomp/Manifest
index c19ea609c231..2793b13963b4 100644
--- a/x11-apps/xkbcomp/Manifest
+++ b/x11-apps/xkbcomp/Manifest
@@ -1,5 +1,5 @@
 DIST xkbcomp-1.4.1.tar.bz2 251069 BLAKE2B dd485d2a5c985bace74fb5cc8da64d6b33dc9450c2e98f42e7e82f989faaa724da068799c40d2703da7172d758e67ece633ca47d2fc97342ec7a9aaedd71d201 SHA512 443397e112f67e2ebc5150ec0dbf0f4a072ea39585d964d2c7cbd0569b7e0ce7d8bed0bc2c2d886343fdb060c941e65b42aac16adf189c66e90849029e278f23
 DIST xkbcomp-1.4.2.tar.bz2 248399 BLAKE2B dcc09823fdf8a62451a1daf8dc56adbd1713b56ac7343b9edb8b3aef8b527ab8443a056ae6b4f8c21051ce5aa4764c9b198c9a5cd0e929f52e9a3e191b950334 SHA512 b00d1eb08c19be86044418c8ea3bfc3c3973406c481878270138a70ed9dab348acb8e4d0af8678879598ffbd7df1c640a63d0abad3d7481758be99af8dd7734e
-EBUILD xkbcomp-1.4.1.ebuild 458 BLAKE2B 494541c3f941fedd25b488a4094bc0f92598948b454eb1bf32c5abac18dbdae01af939d4e259928b450cc7976d9f93fb49cd207e239e99c6bb6999f37152586e SHA512 899bc4a357b2a9feca67fe97e9b3a2b7bdfef6d180331493cfe3b4dec67e1b669f5f956a7f244973acf8bb8c0d96d961d399644487279d07b55be63f4341de33
-EBUILD xkbcomp-1.4.2.ebuild 467 BLAKE2B fc6d49d4634e6df995e77f1977beb6ba041e42ed42cdf9a7d43052ae5e4fb49970489661a6034875acaa7d513809ae503f093479e8b20d399c6bf91cbcabf069 SHA512 e027043637b117df23b3d7d1551a10fbf5693cad3130ce010e280edde5a9724571ed5ef803283acfc31bcc229f1e1b3d35d1e082d904357ba93b45fab12e92cb
+EBUILD xkbcomp-1.4.1.ebuild 457 BLAKE2B 75a7be570b14d6740e0c5b07c34599d22de906d6dfb2acbbfb2e9df124a88c678ff4e28a591b8d650dc0e5ebe67fa9bad80b15d3431d0f831f020e6464ade355 SHA512 86ad249f1279bc6f47c798bda1a172c7212b0157c152548e879c3453bc7d4f3179d49e7a0cbf23a16227afbea148a190f066ee939dc2e2480becc4a75afd2411
+EBUILD xkbcomp-1.4.2.ebuild 461 BLAKE2B 1c8f2cd3ad62b5d04777b99b5666afa96596d47f105d741ea559958cc39ff57f8f578281a76c4f854a47c37bdcf1573ebdabdf5256defa9113f9ab62b9a78e49 SHA512 0d726713eb7278aad60d759346fbbd42255689724d9aef2957602bc0aa5cb04890bf711cb5acd1c642bb5ed7eb836492c698be298ab20fb313239ac4a442eee0
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xkbcomp/xkbcomp-1.4.1.ebuild b/x11-apps/xkbcomp/xkbcomp-1.4.1.ebuild
index be2694f8fedf..56ddf8af349d 100644
--- a/x11-apps/xkbcomp/xkbcomp-1.4.1.ebuild
+++ b/x11-apps/xkbcomp/xkbcomp-1.4.1.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="compile XKB keyboard description"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 RDEPEND="x11-libs/libX11
 	x11-libs/libxkbfile"
diff --git a/x11-apps/xkbcomp/xkbcomp-1.4.2.ebuild b/x11-apps/xkbcomp/xkbcomp-1.4.2.ebuild
index c3f0fc686a56..76fc46735089 100644
--- a/x11-apps/xkbcomp/xkbcomp-1.4.2.ebuild
+++ b/x11-apps/xkbcomp/xkbcomp-1.4.2.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="compile XKB keyboard description"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 RDEPEND="x11-libs/libX11
 	x11-libs/libxkbfile"
diff --git a/x11-apps/xrdb/Manifest b/x11-apps/xrdb/Manifest
index 9f24fd1ff2d0..d415d6e567a6 100644
--- a/x11-apps/xrdb/Manifest
+++ b/x11-apps/xrdb/Manifest
@@ -1,5 +1,5 @@
 DIST xrdb-1.1.0.tar.bz2 138035 BLAKE2B 62cea13d943692cf8be654b53c89751925c0e1b07c84cbe954070c109a5792908bb3642b208ac2da151f8416ab645c05d3d54084424d9fc9d5aba4efc99604e6 SHA512 8e2a177653d5aa895c71ed3640e0f1dd9fe8bf5cd6f0c6ff7e372394a2a41c3aa2286905fd9c69e3d140024d235b81a1f32b5d4012b1ac5ac1ed945599dee407
 DIST xrdb-1.1.1.tar.bz2 141950 BLAKE2B bfd0e384e4bdbae3209caf4e729a8151ec174ca1a461d3dd5a357b8a383fcf7da072741e539a8830434b416c894684e20cde8bde11fb211420d5796c2c08298b SHA512 20c342004ef911fc4d3ef4ac3ac15d1c30bb946b8156f3a6916c242e470be0cb63261563462fd1e2e07b1a7cc527b8cacf5f913e31b02196629a95043cf8d13f
 EBUILD xrdb-1.1.0.ebuild 453 BLAKE2B daf0a433a3db3d0806652b2d74763c6463f33cfc6852f18fa09fedb5ee4cd053112bbdf090560ec99bf0d44521ee592d8db568caff4e25120484772cb6077105 SHA512 c04e14cef41a0c133f403b3c4ea3a9c04ac2d49d27541ef558b1cde2a8a5951cf138a411a15712d69fb06006d02f77572bc9d0135974f0051f00f45f216c1c9a
-EBUILD xrdb-1.1.1.ebuild 453 BLAKE2B b19c1f8c0e950c054c23c813b58a8c957193e2c675777617c5aacf9320f924268310c193418dba12e7b9b9cd296f15a2cefe3aabb9a1ede5341a731c0ab0d6b9 SHA512 e8bcb71e092f8d268975bae6de05bec539251843b9bf914df4968449c045adf60309c3327b29a41b2e5873534651aab68e54acb4ebb93fec73c19983a4aeafe8
+EBUILD xrdb-1.1.1.ebuild 452 BLAKE2B c681cae1c639984ec1eed77b19390d7443dc8efe556002ac1947df760d6edeae2299654e6bbebc84c6adf470ab744b8ad872f34dd438aad41bfc4e73f4837bfa SHA512 1c9a306c38bffb2acb9e7cd86009b388c2cd2663f013f8c376e9e8b2142ca492e816b9553831fd70ed6a0be25ec996e03eaf9e307edad8017ed92686e4a8508a
 MISC metadata.xml 317 BLAKE2B 02ff19551010134a361010ad2647deb4949c46241c2f3ff388fc8fb7aad6194a822c795f8505cb72896229f9702857b29235197675a227a1da9755d051e5930e SHA512 460dc7431825b65cf43260ca92bad810e99a9cdcc0602da758d5f23ec6faf69a3c056d2db6df266055aed47fe3a1c7063cdd2cb942e09a9b08f60ea81597bc96
diff --git a/x11-apps/xrdb/xrdb-1.1.1.ebuild b/x11-apps/xrdb/xrdb-1.1.1.ebuild
index 0432cd1c5911..c0473d72505e 100644
--- a/x11-apps/xrdb/xrdb-1.1.1.ebuild
+++ b/x11-apps/xrdb/xrdb-1.1.1.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="X server resource database utility"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libXmu
diff --git a/x11-apps/xsm/Manifest b/x11-apps/xsm/Manifest
index d2187e5a4245..01f308498111 100644
--- a/x11-apps/xsm/Manifest
+++ b/x11-apps/xsm/Manifest
@@ -1,5 +1,5 @@
 DIST xsm-1.0.3.tar.bz2 161012 BLAKE2B 2628e4234b5fed58ebefb35f454c36e268c75cafa784ed709833d5979ee4484ada8f315d75b6204e64a0efd0f1fd7a14662afb430c0e84bc81a40eefda9380cf SHA512 930a12272011ddd7c60e62b32b485c383292163f8aed6086c756f71cece62d0c316d89a6056751818b3b0ee26f68cca6e0fc914cd58d9b20da0a3b7ccf2145f0
 DIST xsm-1.0.4.tar.bz2 170933 BLAKE2B 05cf4614440f36da6ed1e8e0949ef6955da03d1fe0cc2d0323150b34ea01c293301aa49006a93fe7c44c842db41fb6b66a2f4a4051ddf2258143e54a6e99b390 SHA512 d4e4da7c309a4eae126d2b58a13684f4dbc06b09f76dde9c89c707375df2843614f3d83bc44f9cd02f239200db3397abd86796dca0dbafc69f60482b0af5a176
 EBUILD xsm-1.0.3.ebuild 848 BLAKE2B c6834e4bae18e6c7171eb41052853f6d7d0ecb0e17ead1c4d3474c7c3a83d9ca6b2519f58dc72514d73bc258c4224a90bf0ca0721ba5db20bd9e860ad7f4c71e SHA512 fda19eab58e2a49338dbe029e492e4379016a3f165c18eb7032d5e47e24b560f913b69f9e333d58f1880d23b282ff7d4d81b7b9a6b270a3cb2dac0c4657e896c
-EBUILD xsm-1.0.4.ebuild 848 BLAKE2B 3872f28c4e3fcbe68d8b6303d3bae8a85c53f2ec821a2ee9eb5360f884dbaac57f5ca9e481c2ad43782b146f82a43a8d0b0489a19dff638899ee758493c6d6a8 SHA512 2f2eb28d44aa335207732670196e1b9bd3d247c5616ef9e721bcfc66215db3487188154687472af1e8917cb7d2182465330326dc7dd5f3b3c46b7277fe8e4386
+EBUILD xsm-1.0.4.ebuild 847 BLAKE2B 7f456387c59b668cd2bac3b4f09872e142a8adc1d9253f7c0de80c4be91a4816331b8c7598c2b13ecfdf61e11f54491258bbdc179de5d529e0b241ca62fcbae3 SHA512 ab08fcd5d5c72e389e38641c89f103281b8308e9e83b7c4e8963a0afdea46e585cfec0cd37a7eefb750c1aa3ce5cb5d31d9cc84f64c3f3686f5db2ce9e317331
 MISC metadata.xml 333 BLAKE2B 0b142d7cf4b255c50a9e616434af7ff1db6a2aa0d3467f43d3e22ce6ce55a1bae7ab18eaf092bd5ca002464dc046bc2de62b3738425cdecf4ad15727b20f2d18 SHA512 5496dab87579d1d5c218ddd1ef1e8b63e73ed8d0e695d3be9577d862fc03a775b9cd3dc82abd356c1ef124522f4ed07a5f289e5e3355bb76c2d8746e6cf5a7c2
diff --git a/x11-apps/xsm/xsm-1.0.4.ebuild b/x11-apps/xsm/xsm-1.0.4.ebuild
index cc08af1187c3..94bb03844bee 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="rsh"
 RDEPEND="x11-libs/libXaw
 	x11-libs/libX11