gentoo resync : 08.01.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-01-08 11:28:34 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-01-08 11:28:34 +0000
commit: 24fd814c326e282c4321965c31f341dad77e270d (patch)
tree: 033d63b33c21a3209964ab56005bb9bdd523630d /x11-misc
parent: 129160ec854dca4c3fedb5bcfbcb56930371da0f (diff)
72 files changed, 243 insertions, 274 deletions
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 3346960762c4..7f25d41bef53 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/clipnotify/Manifest b/x11-misc/clipnotify/Manifest
index 3d6e95db9b31..6ad226269a6a 100644
--- a/x11-misc/clipnotify/Manifest
+++ b/x11-misc/clipnotify/Manifest
@@ -1,3 +1,3 @@
 DIST clipnotify-1.0.2.tar.gz 1318 BLAKE2B a418a1a25f43c033fd6457eabe926b0ebf911b233f9dd1cf6ff7a8399ab2660083bec969aef1f44edd583ee2cd1d097b71e7014b620efcdcb8c544a63612a17b SHA512 52277099d9543e0f550de63ff2e15e3e7ba63ea38f3928006e2b570bb1bcdd3f2f09892bd4efecc1f36fb5131e0567c28c2b0597123c90b9f78ab6fbd02dfc49
-EBUILD clipnotify-1.0.2.ebuild 446 BLAKE2B 029e27bb68a337cbf45e9af2e9e80d49566bdf67a1dc8084259d997c1068fc07d4823c5c864971e83c67ef16f1b2216c085b90ad6545d12f8e5f8c62a866aca2 SHA512 65a5a57b147ca498ba3e2e54a8f07800b231f67150eae7d6d9b0473d6e539a7853343d676425af86a8a65b99be882421658c09130c4358c55eb5af434da5dde7
+EBUILD clipnotify-1.0.2.ebuild 449 BLAKE2B efb981b756d179a92db594d2e863fa750a69ba7e877f8a86d7ddb361ae0594cf8d43b3b70d1d31401edf48d1108417ba435c3e12ea0f87805a714d5e8e611464 SHA512 9c76a4dd4426af219705ada77c76ed33b1386410c1add63096a6d5beaac16482c3832be1aa39ab0d050d9a63f481526bae8cdec410aba74cb7748c07cef511bf
 MISC metadata.xml 364 BLAKE2B 4f0c3d96c42f1ae903968e3cb3b0a28b5d0a3881c74eab0347abf13262547aa218a83bd907ec9a5c0d906948f5cb57c97372f07630368637326277fcb75c4db5 SHA512 478344a69216a5d9aa8b69a0252c171c23ae8719529fbecf912d8f298cb28bb85fd9506af2a5a4b77ddd3048c60d479dee0e5ba7909d661886d35c20107527fe
diff --git a/x11-misc/clipnotify/clipnotify-1.0.2.ebuild b/x11-misc/clipnotify/clipnotify-1.0.2.ebuild
index f3047ebe20ed..4a8c1f9e890c 100644
--- a/x11-misc/clipnotify/clipnotify-1.0.2.ebuild
+++ b/x11-misc/clipnotify/clipnotify-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/cdown/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/x11-misc/compose-tables/Manifest b/x11-misc/compose-tables/Manifest
index abc7b78a961b..9476b9178245 100644
--- a/x11-misc/compose-tables/Manifest
+++ b/x11-misc/compose-tables/Manifest
@@ -1,3 +1,3 @@
 DIST libX11-1.7.0.tar.bz2 2409144 BLAKE2B 1eb6aa8f2fe50ddb2f6d324429b3d9cecfb48833c3f52f22ae8e32846be614c8db63c57d25e2b1c46612b6b333ff61ceab8ac0b605b117bcea1224f918af8e6d SHA512 f661ca90350fd8a94f054b00f12f5122cea068ebff706acfd399462236c189a296a2358d17d16166635101cf56cc19303dd407873a159932d093c9f33556f9fb
-EBUILD compose-tables-1.7.0.ebuild 895 BLAKE2B 72fe08a0b8a07ef311c2c7e3d00f0efe2922ace618c929428e98e260b0858890b0f3cee81c4064c5383ea7e6beb65acd87b1af9d4c1326878ea36d99cde69c6c SHA512 473b96a045bd9f4ce9c9d504a3241940ae3dd083c820a91692361d3bac7bf36013923aabe817c8e062c928ca7badae706b48e9b1cc8834829db1b1db51005274
+EBUILD compose-tables-1.7.0.ebuild 889 BLAKE2B 7412ea439ac43b94a90de8391f79f039c36353f7f9ac94819dadd5787bf9d02b3ed0028f0788deea4c83951e9201cdf75323e6bf3c40d15533202374a4c2c390 SHA512 54dba5d4e1294ac5f35e11825cd20ede8a1ca2d4a8f162eee0f61a5ac63ea5cf5847c2b438c0eb2c3ecb95293205cf95acaca205778f8ecb9e2861abee54d0be
 MISC metadata.xml 311 BLAKE2B 1e5deaa311245a5794e72574f94028f60c1c712a06820551cae811b113d633816a60fd3920ff5f2ca287558dbcff28e57537d5c0d3ee3a325c7540bc0b98da13 SHA512 760d09a1ed93bf16d8e26a70fa1178c02c6b336dff9aa29f900d5eff305686b9c3fae4bc93bcce58c0427f567d3759dd3a8adcd8707d07fdd90c6db79d4e13f2
diff --git a/x11-misc/compose-tables/compose-tables-1.7.0.ebuild b/x11-misc/compose-tables/compose-tables-1.7.0.ebuild
index 8d2cd5fa5f97..448e65eba222 100644
--- a/x11-misc/compose-tables/compose-tables-1.7.0.ebuild
+++ b/x11-misc/compose-tables/compose-tables-1.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/lib/libX11-${PV}.tar.${XORG_TARBALL_SUFFIX}
 S="${WORKDIR}/libX11-${PV}/"
 
 DESCRIPTION="X.Org Compose Key tables from libX11"
-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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 # Only needed by configure
 DEPEND="
diff --git a/x11-misc/gccmakedep/Manifest b/x11-misc/gccmakedep/Manifest
index 485b33ecb95e..054451542eff 100644
--- a/x11-misc/gccmakedep/Manifest
+++ b/x11-misc/gccmakedep/Manifest
@@ -1,4 +1,4 @@
 DIST gccmakedep-1.0.3.tar.bz2 104766 BLAKE2B 4da8c3d4423f55fa110b1be748e9488b713a36b575f065f58d68c24eb4fdfc337aa9c715b82dfaac6eaaf8cb2037ab4d0355297a61c39f7e7672f136bb1395d8 SHA512 563b2897770a4df2792ea3eae8183a1f9e78192b7efc9c8296ee68d1cba6e72fa962a88e3251bb780df776e2aa7e80d74d5096675c61526c232aefa4f9e6a5fc
-EBUILD gccmakedep-1.0.3-r1.ebuild 972 BLAKE2B db55e9160eabe9608d1b7a2aac70e0e3e03a1078f5e6ec531d77b15742a3aa168e4e19596474e6b3f5def7608438d8c6ef9e4fd1c3da5e04821f4cec4e862b2c SHA512 5e8aead234bd08205275164ab3b7e00decf340ef48d3894aeae4cf748002cc586ccf2234d52f2cc58a57f6720b08e2f606cc96e536c77aea1c36682273b0a534
-EBUILD gccmakedep-9999.ebuild 979 BLAKE2B 74df3fa9178b636374be308904d13dad561253bf205b38537d00ece1a41411fe3672bfe68dde4b806195effb37f1bef4f3fa249993633bdc3413cee28a661de2 SHA512 06efe886a9c966418df5a2d93dba7479158c1e59b8c33f88716588ce8ac2a6ebfac7a1087f060aef999895e04edc730773c9a3cbff90276ba7f5f838606fb6b7
+EBUILD gccmakedep-1.0.3-r1.ebuild 961 BLAKE2B b4cef4491d298bae82cc6af865897f8f22c124c021e19471e860afb40ff27ed9cb18e2896e1c7a5476c6765fb2193fae42f931b03b53926521171efb5f1db696 SHA512 7f8c4ad03bf10bcc5a303a98d0aad54f6cb1821f59d20fc5773840ad46da149e3928b73729e5fe33a7fe123fb5bb7cf64808f78503c9adda6e35200138a33d66
+EBUILD gccmakedep-9999.ebuild 968 BLAKE2B 99c6cd961be7e637f5e673c307eaa5ca2dd0757db96316a955620abee0296b40501af347d4a8f941446e286542ab3f47572e1e7761d9d84ffee8ca3d9b65aebe SHA512 1c728ac1711a0e23a25f0f4467ba086a0edabbc25b70eb739cef63c336d5b160de71c2319f9e7c1153794c6c7c911b2b89cab8bdabdb849da81ab37a767357b1
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild b/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild
index 5e29f26efdfe..5f4e582a9046 100644
--- a/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild
+++ b/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.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 @@ 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 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 ~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 667579e11771..1c0ddf97584c 100644
--- a/x11-misc/gccmakedep/gccmakedep-9999.ebuild
+++ b/x11-misc/gccmakedep/gccmakedep-9999.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 @@ 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 ~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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/x11-misc/habak/Manifest b/x11-misc/habak/Manifest
index 4d1df19d4085..f0bda800668b 100644
--- a/x11-misc/habak/Manifest
+++ b/x11-misc/habak/Manifest
@@ -4,5 +4,5 @@ AUX habak-0.2.5-gentoo.patch 796 BLAKE2B 901f4673a8509029fde736c4dea5f809c268682
 DIST habak-0.2.5-sourceforge.tar.gz 28747 BLAKE2B 60c6f60e0a16dca2091f41c9e4f419e5fb4be88a3ce44de98d91740f94e468fb7bd64bbf0b399b64035c21547b50fccf2e40954e0ff59ab1f1c0ce8dc6e56670 SHA512 4b1ff1484c65f74441b297e558360a8f2ea8f12ac63c4b74f846e41328dd84a1d619bde55e81224c3bd527897625e17bc07a6bb0d4cc3bd0eec6f4e787201277
 DIST habak-0.2.5.tar.bz2 22657 BLAKE2B 10b3c4808251b255bcf26935974514a2df5946520bd4bc080b9bdc551c727925c8b9a7485124013303654769b9daacff42d54fc0e5d567b26d99c5a75a0a50c2 SHA512 256ac24a3b322397b6cdbd2ca8add5938c77d166092a783234baa6186c3b4e01aeffd0b890749c7ac14aa39961e5fc6326f614ceb04eadfc5e4af282d04b7188
 EBUILD habak-0.2.5-r2.ebuild 953 BLAKE2B f3f8edebe88381e5677bc3ca658fc6280cc7dc1c1195f05b24cf70c7c9088d6eeadf1867d551e9fd8940a8b862a4addb2d63dee0d9c35d4e9b3fb8c9708c1e9a SHA512 d50d1b74cbc385494b872d5b8a685e0729d2a4b5f0ec29a0fa101c164df5dda3a1cd1c1329fd7613eea9ceb898660c1c4f099c8f995fe3320b326a92072da03c
-EBUILD habak-0.2.5-r3.ebuild 824 BLAKE2B 082076f0220dc405bf34ca692b4fb20d919b467a1c2f1aeb9fea58dd855059a11f11fbb48a22609d0b56c7520cecc4bac9f1be76aa1f53650be6ff6749ae4da0 SHA512 2aa8fde84208f8c979690386d2ffa4294b9f568ae3206a03587841265d3db821d67500b57a401ff60e39867a2ab7e92f42388362d4c9d2cadef3bf794879a475
+EBUILD habak-0.2.5-r3.ebuild 819 BLAKE2B b856bac330050b0cf52db34f7f39f9f625d6e5de0ab5a9fbd17abd6454be206ac3538fb3232c3e590f5f66d4c7ab3a531801bde8728d1093c98d76e20bb5bad1 SHA512 4f1b4461d71d5d2305004c2edb93c0992818905c770e24c1448901463c51188589978e9ed9056684eee4e265b5aa4cc931021dc046c6feba9805adf400f927ed
 MISC metadata.xml 272 BLAKE2B 4dbd2b5ae92564a97b2a06ab0ec6562e8dce2dd636aaf0788ee09f8688ca5d5b6483084a65366dfbe6d144d30170e5558bc5759adecb96abb405ea96a5147285 SHA512 ebe67da08587903b5b82fc194aa3c8f1ab65371f60d2c134928362e089550d9e9fd9531bffe8b676a345b5bf0ab209ce7f50d37d98201a88176f002e17582493
diff --git a/x11-misc/habak/habak-0.2.5-r3.ebuild b/x11-misc/habak/habak-0.2.5-r3.ebuild
index 4279398d92db..4f033af7e179 100644
--- a/x11-misc/habak/habak-0.2.5-r3.ebuild
+++ b/x11-misc/habak/habak-0.2.5-r3.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
@@ -10,7 +10,7 @@ SRC_URI="https://sourceforge.net/projects/fvwm-crystal/files/${PN}/${PV}/${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
 
 RDEPEND="
 	media-libs/imlib2[X]
diff --git a/x11-misc/i3lock/Manifest b/x11-misc/i3lock/Manifest
index 49ff2c798b25..5e4e9d04dc20 100644
--- a/x11-misc/i3lock/Manifest
+++ b/x11-misc/i3lock/Manifest
@@ -1,5 +1,3 @@
-DIST i3lock-2.10.tar.bz2 23171 BLAKE2B 1c1d0f8e3a85dcebe4a9ee181e399a4ff447ececfbdf5f9488df849316e47233118b7436c269a986fed4e907e6162f3758c8bdad2d20ac156e95a8be185a744c SHA512 ea865b202668212b58d0b97d0263171847e1bd0c529e2fd3d26c15ef253861b9a8357ff2efaa6a4f342c4d0d1ab03bc00f95f4d4008760ec8e0767ac29195517
 DIST i3lock-2.13.tar.bz2 149332 BLAKE2B 4b285fb3a27463f0d538d291134942a19933394c4c2d0acf27dfe5624a854cef0f29c5fc2e4ce4398c85ac0e6b774521c7daa65abedc0d38b0fd4897b2e6db88 SHA512 3a9bed3d14a2d59e641b3603448bb46d769104995b1c0239eca87d582e80e64dd8905b8e455bd5b0e635d4b37d7a87208d8de37253e9af799c65f4f8d396789d
-EBUILD i3lock-2.10-r1.ebuild 673 BLAKE2B 812f0149566d91f2ace6ee875e6531e88d848971117a39101574f6edb98db41fe1cdc74eee6979ce9a1b810d9489ab4e48d7dc9c9b65c84ee6883b81b8b28ea4 SHA512 4c1f403cb6bf8bf5351336e99ae0a1c909d6b1ee7b4d27d0338808a59db1443d82aedcc4030a00a5a19cc62abca711200ea2d6a41c59f517c4e8cbeab645c17e
-EBUILD i3lock-2.13.ebuild 695 BLAKE2B 4a141ecca3734c76266b899c85928c9f1c315fc3cb47b6c637f8f9b7b774fc64dd29ee6f1888b7e8874d0f7b1b340e4e5e2d475f22d07028e8085791076a1260 SHA512 dd2593dffa96e736ff2a466402848da05764d4cb27bf768a4ed9a344ca7af35f72a8b09848d15e452521014b7bac421c9ff0146e680479018d3ec625913f98ec
+EBUILD i3lock-2.13.ebuild 693 BLAKE2B d52e903c7bdc80e8add5d608392da3ec29964c70edaee54fcd225f68884156482d0094586e57f4a9cbd6b4057fca9993c559579bad4e6cb52c49926972e1e44a SHA512 ad8a941ef22b74bb307ffc4347ce8a72be740104ad83eee449a252b4306491d6435f92fe4be8b46460fcd4cec47f47da944a3f1cc4982d9bef81362cdfa48c39
 MISC metadata.xml 357 BLAKE2B 40dcfc882fb8c7149a23b006e6348eafebeb9da6895bc1f55b17c4a19c165cf336a28cb4695db0b7a794023a8b5758a59aeeb67e9e92998b83844f5bb1db895a SHA512 565f596c3057c2fde857dab1bc064bc6c040372f8898f021079a5f52264de6958ab4604a0dec7392de2e53c3a7142d922e80dc6ae52ad5c68fef99700678b1cb
diff --git a/x11-misc/i3lock/i3lock-2.10-r1.ebuild b/x11-misc/i3lock/i3lock-2.10-r1.ebuild
deleted file mode 100644
index e3f2050116b9..000000000000
--- a/x11-misc/i3lock/i3lock-2.10-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Simple screen locker"
-HOMEPAGE="https://i3wm.org/i3lock/"
-SRC_URI="https://i3wm.org/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	>=x11-libs/libxkbcommon-0.5.0[X]
-	dev-libs/libev
-	sys-libs/pam
-	x11-libs/cairo[X,xcb(+)]
-	x11-libs/libxcb[xkb]
-	x11-libs/xcb-util
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-DOCS=( CHANGELOG README.md )
-
-src_prepare() {
-	default
-
-	sed -i -e 's:login:system-auth:' ${PN}.pam || die
-
-	tc-export CC
-}
-
-src_install() {
-	default
-	doman ${PN}.1
-}
diff --git a/x11-misc/i3lock/i3lock-2.13.ebuild b/x11-misc/i3lock/i3lock-2.13.ebuild
index 2ece4ee1a049..8770aa432d5d 100644
--- a/x11-misc/i3lock/i3lock-2.13.ebuild
+++ b/x11-misc/i3lock/i3lock-2.13.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://i3wm.org/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 RDEPEND="
 	dev-libs/libev
diff --git a/x11-misc/icon-naming-utils/Manifest b/x11-misc/icon-naming-utils/Manifest
index 4e1830564020..9b3938233343 100644
--- a/x11-misc/icon-naming-utils/Manifest
+++ b/x11-misc/icon-naming-utils/Manifest
@@ -1,3 +1,3 @@
 DIST icon-naming-utils-0.8.90.tar.gz 70321 BLAKE2B e4944c6a279ffe38c8966783c799b1a84ba626a0611c3c29a7bccc982dfd45c7ae9d38d8b99f2e796466812a98a9216a440e871058b73aad537a0f2f4339d5ec SHA512 6c23f6138e053f9fc6de9d56f94b80849f29f9fde46cdf54b705720cb48b0c660f315484fb36fb9936d4ceade7768aad2d17280545a4b392aa56185c9452999d
-EBUILD icon-naming-utils-0.8.90-r1.ebuild 560 BLAKE2B fc55e7fa14494fff6a6f94f411fae83ddae57729cb9a995d528ec67cc3e42e113d4efbdadf644e3f86b39aa59f421a8b6db2cc4cd3eb5dbd7aa62bb54dae06d1 SHA512 905ed830f64c84f0ce203a7302041a78f8d502707490fbf29d1299176dec5890ef94cc3e00d7bb8296b8dff214c393fac51fbb378096bd0f735045b6587845bf
+EBUILD icon-naming-utils-0.8.90-r1.ebuild 549 BLAKE2B 64b16760cb6fd337bd2b9d601ab0b84635b0615fb5d0a9e2dc580c3b8ddb5deed239a42775ecd27948124fd5cb8d78236f7437101ad5d1fd4e88e10a47584fad SHA512 705cc7887c88b3d87a110773a70236b0b33e34a70acf8ddd15f6fe6233c5ee213ce0fe83aa27ca1d0e566f965a63fe8f8f8d72181495aea2c07159fef4f1b3f6
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
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 c52cc6c84f63..6d69b281aff9 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
@@ -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
@@ -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 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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-perl/XML-Simple-2
diff --git a/x11-misc/imake/Manifest b/x11-misc/imake/Manifest
index c9ec90b04c3e..a3b1ecbf0732 100644
--- a/x11-misc/imake/Manifest
+++ b/x11-misc/imake/Manifest
@@ -1,3 +1,3 @@
 DIST imake-1.0.8.tar.bz2 159398 BLAKE2B 2ea03a06daab883a35ac4ef5c5598db89c84b2bbc41105902f64ffaf66a2e5cebaa28bef0ee7d258eb7279eaa95671b8798701423cafffe87d8feced5bc1b63d SHA512 5352b0148664506c8eb7ba80f95fced146d150398673547ba0b2c7c966a382bc21de43dfb8e0d74e38a0a563f16ddbec48bf8c8e6daa1a0899a95403579d7728
-EBUILD imake-1.0.8.ebuild 533 BLAKE2B 60af8415f7b46e7019e371cb2855e78622c2ea38b9486585addb187fc82fe31fb139329a10ab13093ba7c648ad38a13de4909c2b5ff8fd4936e49903866d2d2e SHA512 21176e630ea7b007a841a1ae7d318ce917645fd0623c3b67f7435f6487443bfcfcb6e9c7c11e05feb0202f763128dde62c3c0566a0e6dfbf52a7730bd2c4a85b
+EBUILD imake-1.0.8.ebuild 522 BLAKE2B 77128b5558cdb78e00b422c04f844ba90b6ba66e23fc8be87d656803553e7b523dbc2c77fa4fef0f34c14c51dad2c198e35ed563ba0c4ca6c4c767d9c41888a2 SHA512 b0a62ca4ef660d97c6dc7f54775228aa478521b45b258793391c6dea171b79bfe27e637d39ba63effb9b4ce14e773ad59890ad798e1420452b7433a855c6e695
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/imake/imake-1.0.8.ebuild b/x11-misc/imake/imake-1.0.8.ebuild
index 034534999ddd..3bc41c5b6d95 100644
--- a/x11-misc/imake/imake-1.0.8.ebuild
+++ b/x11-misc/imake/imake-1.0.8.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
@@ -7,7 +7,7 @@ XORG_STATIC=no
 inherit toolchain-funcs xorg-3
 
 DESCRIPTION="C preprocessor interface to the make utility"
-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"
+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=""
 
 RDEPEND="x11-misc/xorg-cf-files"
diff --git a/x11-misc/makedepend/Manifest b/x11-misc/makedepend/Manifest
index af06f43a9daf..7ce820571fbf 100644
--- a/x11-misc/makedepend/Manifest
+++ b/x11-misc/makedepend/Manifest
@@ -1,3 +1,3 @@
 DIST makedepend-1.0.6.tar.bz2 147616 BLAKE2B 6e9538e435d602ab3bcfb35a5398d6f11a23e4c9fa19bb2e3f651967d3fb1945557af2a5d84fae3e46112aae9ec411894cf8605e4856a46b120b660ff4b95ea4 SHA512 eb0e8ee8ab7515806d7d98a060cdcd392ec38e4225e5e05db26daa6651f185d0b764aab403edeea904d4d23211b1f7db20daeee6eafce8abe65225784ed0aa42
-EBUILD makedepend-1.0.6.ebuild 415 BLAKE2B 21549c312f5f64c11e048f19c67a8b415e76537dfe2e74662b700c9fed47ad4bf2089261628e7dd6b320c42b30bc732f261bc47ef34c2933f31d27b6e97fbb65 SHA512 58781f447bf967adbe250cfaff94ae81ef61f55fdcb7cfe8d42632a5c57318af77d1931eaaa577de223835927c9ea808faec48a675f5429f8941068650d4f60b
+EBUILD makedepend-1.0.6.ebuild 404 BLAKE2B 5f109590338924aff5cdd10d786b69474dba44d797c93be089dd2f7af4f3a51b090aecf57d038163b4f67ac3cc51ceedc3fd694d02093e7060c9e2f62297f129 SHA512 2ca0b70020a513dac77dbcd8e874e6b8193ce0d5658446bba737afa1f099420a40abe5762994ce6c685dd733cfcd8a934ee3867f3540fee4c81115bf3bb66e93
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/makedepend/makedepend-1.0.6.ebuild b/x11-misc/makedepend/makedepend-1.0.6.ebuild
index 7c7927404ae4..43f22b11557b 100644
--- a/x11-misc/makedepend/makedepend-1.0.6.ebuild
+++ b/x11-misc/makedepend/makedepend-1.0.6.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
@@ -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 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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-misc/mugshot/Manifest b/x11-misc/mugshot/Manifest
index 6a065482eb4d..808e421fbac1 100644
--- a/x11-misc/mugshot/Manifest
+++ b/x11-misc/mugshot/Manifest
@@ -1,4 +1,6 @@
 AUX mugshot-0.4.2-python39.patch 1369 BLAKE2B e006525dae248e4e8d04a01932f74371846c2757c085f5a0afc634f2c163c81918e6130ca796bcf122645bb7bd4e33348eea3ed0d926ff867028ab84641bf67a SHA512 c3868bec2772e7834bae8de87c2407986aacca1d32125631da92788ac9ae03e5a688b36ff6090792990f6c3163ecae1623eccd84349dc0099b4809258f14793b
 DIST mugshot-0.4.2.tar.gz 121020 BLAKE2B c092e25273dbd8ef9cbfbc001fb5f86b134ed8f9bf5d84993d5f46664f17eb74eda5c121ee70b5f0c4b0adb5aa1fc4d21d8c59d3f0cf4a4f67991d06690f5aa5 SHA512 721629cf4a7e4d84fd8505279cf88c88ac88c7b6c995ac84a2fd6a9b978c92716bbe20d7b0301ca70e99c007698e4cddf41b6cf1111bf496eec4d39591cd9ed1
+DIST mugshot-0.4.3.tar.gz 128500 BLAKE2B 88ed4a9a0efa70a14d90b831d00ad8c98d7c6dc4eff0e319e5ad08e904b0c0cf2c15bb26198f4ae1248e85959c08af165c9b6dc917dce35d986fdd73ff67eed8 SHA512 b5e91288b4de30124bd84c44b8f2a70e043af12e1f9580d07b13344b6c0343399037aadf153ea216d61cd12e4891ebb15557f1ad62c3b4d7c49584fa004ae65c
 EBUILD mugshot-0.4.2-r1.ebuild 1587 BLAKE2B 4c48a5849b55e9d6a21974bcb7c102ed6d6cc1b29685066e2aef2776931bcd3488b7c6a351b3a7dcec9bceb582e1fc688c5b919ae6db0f5f863d9fa832514fb1 SHA512 0b02356145d66c3d0e00a13db08756f1547050e98fa864b34e3c73ec2bbef7fd239a4f72d34864c4540970fb0ebd6fa8f0c774c6379268b3d7de4f370c704e69
+EBUILD mugshot-0.4.3.ebuild 1535 BLAKE2B c551eda62f7f5ff5e955c2418626eb66c19b29b1e299b0b13ed564c4cfb3fc3d0bee65aa206258b2c14806794828a99d21c86b15bf51d27f270f9ff313bc926f SHA512 3506c7a52fc30815943684a3225ea2e65557b7f7cdd679ea4d13892234d8af5c065b5fcf4dda49e6c0b0400dd7a65c64287f2c26f98bb8e306270d1c9df7275d
 MISC metadata.xml 943 BLAKE2B b39c09aa84b6a1f25d001e073b2c369af9ebebb7448fff5b3abc83898516963e117c33d1c03fb6db72422e4b20c065ed78e711326f28912e1ed5321b232bbee1 SHA512 3b4e66543245b2db7d1c255adf30112834935ab552a7d6773921838510417e000fd41c63fcab7e6be8df043f3daeab1cfcbebccaebf44f6185abfcb47898a3f2
diff --git a/x11-misc/mugshot/mugshot-0.4.3.ebuild b/x11-misc/mugshot/mugshot-0.4.3.ebuild
new file mode 100644
index 000000000000..e739d980480c
--- /dev/null
+++ b/x11-misc/mugshot/mugshot-0.4.3.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS="no"
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1 gnome2-utils xdg-utils
+
+DESCRIPTION="A lightweight user-configuration application"
+HOMEPAGE="https://github.com/bluesabre/mugshot"
+SRC_URI="https://github.com/bluesabre/${PN}/archive/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnome libreoffice webcam"
+
+COMMON_DEPEND="
+	dev-libs/gobject-introspection
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	sys-apps/accountsservice
+	sys-apps/shadow
+	gnome? ( gnome-base/gnome-control-center )
+	libreoffice? (
+		|| (
+			app-office/libreoffice-bin
+			app-office/libreoffice
+		)
+	)
+	webcam? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-good:1.0
+		gnome? (
+			media-libs/clutter-gtk[introspection]
+			media-video/cheese[introspection]
+		)
+	)
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	x11-libs/gtk+:3[introspection]
+"
+
+BDEPEND="
+	dev-python/python-distutils-extra[${PYTHON_USEDEP}]
+	dev-util/intltool
+"
+
+S="${WORKDIR}/${PN}-${P}"
+
+python_install() {
+	distutils-r1_python_install
+
+	python_optimize
+
+	# Since DOCS are installed twice, remove the wrong path
+	rm -r "${ED}"/usr/share/doc/mugshot || die
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
diff --git a/x11-misc/notification-daemon/Manifest b/x11-misc/notification-daemon/Manifest
index cca7ea45eea2..62728a11939a 100644
--- a/x11-misc/notification-daemon/Manifest
+++ b/x11-misc/notification-daemon/Manifest
@@ -1,6 +1,6 @@
 AUX notification-daemon-0.5.0-libnotify-0.7.patch 948 BLAKE2B 9da54db70a628988b5f5b3e34dd71a7bbf8357a58be1e7c9de863d719619b6376ca311c4963e0974f77c08671f03efd28693d90f97a852ee68393e3b11b550fc SHA512 e828d89197c29c3b8e2b6b2e616d6fd63952f8b8ac23f4a0b7a8f6a75722e011d1684302b711ee530506e4e17aae6c7949f12f58a113ca6bb254a29d146d5870
 AUX notification-daemon-0.5.0-underlinking.patch 277 BLAKE2B ef30fae7ca0d8a26c18acc5f98e5a2bd4db53293f302fdba3bf3fbc362c435931d81482e174fbff5396ecee04768068e51c48a8e19be3f881803ae4af77e3637 SHA512 e370ed9435b474fddf0b884d6781bdbfb1cb68dd7f851e72f525d6153235d39f77d28257c6d720f3de63df8ac29a7bf9100669813f4edda177a9dbf21afa3e5e
 DIST notification-daemon-3.20.0.tar.xz 340752 BLAKE2B 9ded1efdb38de0097495ff570b9b91eb151e5eb030fcb9364a5ac04a4a5631c0a8483dc4068dd806d54ef0a096062ca92f9783f2030edb57f681b82015cf8584 SHA512 d9311c71a2915cb6e55bd1408e60b4d7b7fc24114410b8bd8cb358fe86c100198567099843b967f7e01ca03c91afe3f3980fb30b7f2c138bdab949e0e196a0f8
-EBUILD notification-daemon-3.20.0-r1.ebuild 853 BLAKE2B 9ef447d35fb61ac435591e991ce5a1fbb534652e55a48cd06f149016dc22ec7fed03859acb224007db417ff340143c2c36f2ff948a6f0f94dc40917ae034fb1f SHA512 7aa0e5a1781a337db6f5882fb000f285dcdece72af8d0f271af8dd508a37da56ea3d10774f0d350dc0a0ad47edd42a556192e7dc3680c20b841c8b620dc647a2
-EBUILD notification-daemon-3.20.0.ebuild 933 BLAKE2B 6b6723c0fb6eb6d0bb651cf89391044caec710a62c646ce14c449dfadba8bac667260ab134ac3441e908fe66061db130e3a7a35f76cbb48ed56ad35258d7d58e SHA512 5ede8f81fb46b783f0d2f323d95724db34405bc5b9339afd36faea803453bd3b76c47c09b8c8525dd821637d1069572f645593c50d18c4e4b266166a7eac373a
+EBUILD notification-daemon-3.20.0-r1.ebuild 842 BLAKE2B 74258d04a4a7c89663e7046e3e35cdf36ea0e4f39ac3e0cb52eeea8bb95ecb27be3701c0d9b06984984316285009bd36e8a511d1a2977d62a0ccc346770385e6 SHA512 21d68f573d7eaa846e6deb67b570fb8edde276087ed75f5cbacfcf76aa230de9c65c413f4a7eea6faece860792a61e0fe4101f527fd3255bbb0461750362d78f
+EBUILD notification-daemon-3.20.0.ebuild 922 BLAKE2B 82a6de852b65ea70b4516c41d6fe6521809a926f7eaa1e92905fc6113c0c14a22306a670666d7c7a3fdc8be7396034860636080efe55e8f3eeb4ddf87bb3bda3 SHA512 e08f853f4246530fb81e81ff431b9f95af71a28de6bcce35621995267ae68cf4e4cc3176c97fac6bb26dd5fe76117bcdd78464b2f3e1d22ba61a81f18ed6a319
 MISC metadata.xml 270 BLAKE2B 9c2dafa0390cfc7b94b5c44505d72021bf57cf8ffb35be7a3327f4316c3e4b2dbbfa0325d97243a8ea933440a5678cc5d35c639f5aa210b1d5ceb8ab65eb5d90 SHA512 92c366ec57074ced42e6f9960f97d1cd1a022dba7450b51f3617a6a5e00c755496dfa84aa4ac259f4b00c676366b1eaa3ec30eeb9bcb0bf41253d1910005db2f
diff --git a/x11-misc/notification-daemon/notification-daemon-3.20.0-r1.ebuild b/x11-misc/notification-daemon/notification-daemon-3.20.0-r1.ebuild
index 06a28a94b8b9..0d5daee27e48 100644
--- a/x11-misc/notification-daemon/notification-daemon-3.20.0-r1.ebuild
+++ b/x11-misc/notification-daemon/notification-daemon-3.20.0-r1.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
@@ -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 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-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.28:2
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 22fef2824ddd..9a03ffc1902a 100644
--- a/x11-misc/notification-daemon/notification-daemon-3.20.0.ebuild
+++ b/x11-misc/notification-daemon/notification-daemon-3.20.0.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
@@ -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 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-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/picom/Manifest b/x11-misc/picom/Manifest
index d29e203dc483..5dd1de2ed543 100644
--- a/x11-misc/picom/Manifest
+++ b/x11-misc/picom/Manifest
@@ -1,8 +1,8 @@
 DIST picom-8.1.tar.gz 242262 BLAKE2B 69583a7a188f62387f0784e33acfc3d84e6b7b1987f44f7634b1bd2244ae8e8763c2131a824f8ddd748558002a876cb359c656a93fcb55ad33a24cca2b7dc56e SHA512 d1d0428e5761db6820c775c07b966b5fec6a9e9d049ba9f555eb49721f855a018df7242ef61e29c0ea003644b20e1bb733ddf668053a8d4040240e98707fa4d3
 DIST picom-8.2.tar.gz 242653 BLAKE2B 1c76ad4b3152d47155f957f8f1e75447ec8e30d05bc5fb9bf09c890552168cc3c607c8980b262b18cd5f3dc2654a3416cad20cb7fe829eaef8380783d1847c82 SHA512 bdc6675e73a211075ee0df2b056342cabb19ad27fd73586f5216886f503cd994536845eb866f371e07a8dc0404346c67b899a14830e9b7cbc9c01cbd782f36b1
 DIST picom-8.tar.gz 242059 BLAKE2B cfeec7f40eaa43c115bd326abeaa547553f7bdd22a2e6b2a96f46d87c164b0e9403a876f069077e3b85d11af685aadb0cff2a4e7df2cf87646f2552f9c1a01df SHA512 154dd42dea16aca463e7d7f9913a8f10740df892bfdda2fee210a94b13c8eaf6201b35e505daf45075fdb1980bb9b85adf170b649702c1b1e2fcdc1d88406b4a
-EBUILD picom-8.1.ebuild 1423 BLAKE2B 982c38dcfab72f6b6c97168e785f88c2a5c74ac69909abb4d40beeec3442cadf8525b4279b026c5ec65a2e24b6cd796f38a0be279f2b814a174d6adc30f9a62b SHA512 ee99faa95b5510d6c3d6726eb8c07b2a7156b6a52d361e1796909ec3def0fb81578ae8b87acc4a277043b4e6d25c518a49582af9010007ffb81b345ad4e71994
-EBUILD picom-8.2.ebuild 1423 BLAKE2B 982c38dcfab72f6b6c97168e785f88c2a5c74ac69909abb4d40beeec3442cadf8525b4279b026c5ec65a2e24b6cd796f38a0be279f2b814a174d6adc30f9a62b SHA512 ee99faa95b5510d6c3d6726eb8c07b2a7156b6a52d361e1796909ec3def0fb81578ae8b87acc4a277043b4e6d25c518a49582af9010007ffb81b345ad4e71994
-EBUILD picom-8.ebuild 1419 BLAKE2B a991549fde6f0bec57766fe29e7a0c15fe9277ec4c178b6697789bbb0d1f923e3e9c307161e2fc2557b4d8bcdc58d705325c018cf19f7518165fcddf21fede18 SHA512 3611ee43a9782ff7df23edab1a509450573daea133ff32c01c8149dbedf70a3ff6f3b49c73931a69aba2cd401ab1daf5217b603b4b9c8351ca01342f5c42af65
-EBUILD picom-9999.ebuild 1056 BLAKE2B 658917c293650ee1b6a44c61fe5ee5704221c8bd36881c289dbd503a13c2b4b6b70c6324b88027b486b2cdd9f4d6414558e1825fc2e3c45a7312669c9b724d72 SHA512 88b6b3d7fabd2baaef316d301663bfb61a7b8ba0d131fb6235d6bd294c3bed28fa61178d32b829e38d9faec09e7984b73e02952c2d9c4aed9f31248299f80cde
+EBUILD picom-8-r1.ebuild 1421 BLAKE2B 5661b6b9a7e8c9818b288687478c403cc2bff9286ea10df328aa260f223ea4b64ac4f5324ba2d5f9d18da245612354f20f10f5035fa68acec26a64b41842a248 SHA512 6419e7c6c7cf811d466029a668059480cc6efb21d7db870c3a23403350df6cc6569af6297871a03a30b1fc8273d7ce9e199a28b79a4f11e195282d8089259d11
+EBUILD picom-8.1-r1.ebuild 1425 BLAKE2B 32410a201072dbf0d395fa6919523032b504f73c04d774d3cde44c27bdaf4ccaba5ada2effd3e6a0a10e45a0a4f6aca16c492b14eba7d1c46ef6ddaf5f7b1789 SHA512 43ffa762c595dac44502a8b04969e117ea5177f2c0aeff7b56da0d2e36bcb175ebbc3b4cf9413face77af3666678c310d0a24842c0e2a25a6138cfd5a9664bf4
+EBUILD picom-8.2-r1.ebuild 1425 BLAKE2B 32410a201072dbf0d395fa6919523032b504f73c04d774d3cde44c27bdaf4ccaba5ada2effd3e6a0a10e45a0a4f6aca16c492b14eba7d1c46ef6ddaf5f7b1789 SHA512 43ffa762c595dac44502a8b04969e117ea5177f2c0aeff7b56da0d2e36bcb175ebbc3b4cf9413face77af3666678c310d0a24842c0e2a25a6138cfd5a9664bf4
+EBUILD picom-9999.ebuild 1058 BLAKE2B 2d54678317b62b9381b0a2ab217851cc0d0ebf8ea857c037408ae8816fa6a70ac163b86aac677b285b98b7f4d3e76547ebd0e19a5471713cf655369ae27313ca SHA512 c04a55ff9313fe204ac0f56d32129eeb6bd5e70f5c0a733d1e58f4f6cdc15d84726854cc0da948d1feb9d5d172e30171868394df13603f0b102e73e9e6001dee
 MISC metadata.xml 677 BLAKE2B 3d9d1ca23a81c30ac451c45ecad35c3cfbc63ea0a1d5c2cfed587990b33158ca8b3c188fe611aa51b77d2c66a270f8cc95ea5f38cb6270bd1ebf92411cb8ba8f SHA512 9a77cc79578426ae9e1e89e471d4368ef662f3bff757015d4cb48f08e2cbec446753ad16233bafde8ae1c61da0ec1bbd8539534c6097c7525c5905532c8cc9a5
diff --git a/x11-misc/picom/picom-8.ebuild b/x11-misc/picom/picom-8-r1.ebuild
index 2530591a444a..b03005b7a4bc 100644
--- a/x11-misc/picom/picom-8.ebuild
+++ b/x11-misc/picom/picom-8-r1.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
@@ -28,7 +28,7 @@ RDEPEND="
 	x11-libs/xcb-util-image
 	x11-libs/xcb-util-renderutil
 	config-file? (
-		dev-libs/libconfig
+		dev-libs/libconfig:=
 		dev-libs/libxdg-basedir
 	)
 	dbus? ( sys-apps/dbus )
diff --git a/x11-misc/picom/picom-8.1.ebuild b/x11-misc/picom/picom-8.1-r1.ebuild
index 993b85a8ab0f..ff52bddb5e7d 100644
--- a/x11-misc/picom/picom-8.1.ebuild
+++ b/x11-misc/picom/picom-8.1-r1.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
@@ -28,7 +28,7 @@ RDEPEND="
 	x11-libs/xcb-util-image
 	x11-libs/xcb-util-renderutil
 	config-file? (
-		dev-libs/libconfig
+		dev-libs/libconfig:=
 		dev-libs/libxdg-basedir
 	)
 	dbus? ( sys-apps/dbus )
diff --git a/x11-misc/picom/picom-8.2.ebuild b/x11-misc/picom/picom-8.2-r1.ebuild
index 993b85a8ab0f..ff52bddb5e7d 100644
--- a/x11-misc/picom/picom-8.2.ebuild
+++ b/x11-misc/picom/picom-8.2-r1.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
@@ -28,7 +28,7 @@ RDEPEND="
 	x11-libs/xcb-util-image
 	x11-libs/xcb-util-renderutil
 	config-file? (
-		dev-libs/libconfig
+		dev-libs/libconfig:=
 		dev-libs/libxdg-basedir
 	)
 	dbus? ( sys-apps/dbus )
diff --git a/x11-misc/picom/picom-9999.ebuild b/x11-misc/picom/picom-9999.ebuild
index 8d71941fd1a6..8bfde4079c7a 100644
--- a/x11-misc/picom/picom-9999.ebuild
+++ b/x11-misc/picom/picom-9999.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
@@ -23,7 +23,7 @@ RDEPEND="dev-libs/libev
 	x11-libs/xcb-util-image
 	x11-libs/xcb-util-renderutil
 	config-file? (
-		dev-libs/libconfig
+		dev-libs/libconfig:=
 		dev-libs/libxdg-basedir
 	)
 	dbus? ( sys-apps/dbus )
diff --git a/x11-misc/qterm/Manifest b/x11-misc/qterm/Manifest
index 1df4f4deab97..8f216d9464c7 100644
--- a/x11-misc/qterm/Manifest
+++ b/x11-misc/qterm/Manifest
@@ -3,5 +3,5 @@ AUX qterm-libressl.patch 1838 BLAKE2B 806757d7a8d63cbdffd2b6eb99bcb9333cdbcbe8e7
 DIST qterm-0.7.1.tar.gz 901169 BLAKE2B ab5337680f49e5f5f0d173585a9b9bc9a8606f086faf03405e2eb7efbf73cc3d9808fa6868deae3fe82e00d0ed2c0ec2d461d3085303b51ee1026bda672d8ddc SHA512 94f4c3f7974572c29eabf98c45e962b9232a4b0fbd6710c7725e0d23e6ecc91456f52a8c112779cd3b4732cb2e4302629419f7365b2d359ccbf39578e6e67cdd
 DIST qterm-0.7.3.tar.gz 901423 BLAKE2B e3f799946bfff4531e77d04fe535d53ef92093d1435aca32b06fa43c444c55798ab1c8408847dde81d1d24b5fda0c4a4f58fb563369f2c4669ba43929695cbd8 SHA512 93fdd24d79a81853654a4702ff55b2fad80c1cc734ec3230a297b3a2613cf24d41f4c645eadc5f34b6025f548e7c8cd5d291d4c29fc919f8966eeb8b44f5c046
 EBUILD qterm-0.7.1.ebuild 1255 BLAKE2B fedc1e24a115cac7d30f74520d28de368dfbf243d855789dda433f772d9992f8e2b96e371a8fbf4844d59ab46c837d5e1aa6848199962126bc16bbbe471cac8e SHA512 7b34ad4108b4091f329fa47e1f0c9da56fb43e2515d4669e472370c8556279bf35af0ce01815099ca486ef9e716e1d096728e03a0a2554ab416f0c25c207278f
-EBUILD qterm-0.7.3.ebuild 1237 BLAKE2B d696f608cfe373a1aa9902a3651fe7917a1708f185a6023484f53eec09c1b42a63e8332f46e48c7e2d2d73df7580839e7e82910ccb2fb887b960a792e47a083e SHA512 72fa5023b531217f53aa7dc0e3f11b9256f86402358c45037c1fa7a9ec363da90d9d84a6d6d23249f46a1b52375b713afe17288404baf94c6a7946282af97266
+EBUILD qterm-0.7.3.ebuild 1232 BLAKE2B a6a50c25de78620c24210afe6d5d5f7daae19e0381fe7f2c35feb7c01520b3ab9d071642a4c5962fe4a46bb7296616cfadd989b5774236e21905a74140eba3d9 SHA512 43db3c5df8b8205c318c60f89480fd89b3a6d52ac8e749c0daf160da81bec4f096497cd4c80164fb5c1218c80230730037464ae387652f1397d63273e7fcff25
 MISC metadata.xml 360 BLAKE2B 8d292a4705a58ce03c68c3b7933414a5a1e5399258b8d6e4346098c948261d8dbfc2ebe5012c0e2c5a445cd93e4061c0322152d71ba73d8b6ebfc00a6b1935aa SHA512 e93913eefab59f5e1fb1478b5ac530c689b92bc27230d44dd98e233d75c2b8cd8a9e3f3f123dca0f6dbef1ceacb1fbdcfd13c34a0f8f96b09d348ce323334f62
diff --git a/x11-misc/qterm/qterm-0.7.3.ebuild b/x11-misc/qterm/qterm-0.7.3.ebuild
index 8297a404681e..981295849dc6 100644
--- a/x11-misc/qterm/qterm-0.7.3.ebuild
+++ b/x11-misc/qterm/qterm-0.7.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="libressl"
 
 RDEPEND="dev-qt/qtcore:5
diff --git a/x11-misc/read-edid/Manifest b/x11-misc/read-edid/Manifest
index 4640a4427501..c34c0ee93f58 100644
--- a/x11-misc/read-edid/Manifest
+++ b/x11-misc/read-edid/Manifest
@@ -1,5 +1,5 @@
 DIST read-edid-1.4.2.tar.gz 84138 BLAKE2B 300d2bf71477ffaf4a3ee2a100f6935635e17db3bd8419ea13e6d7c7fafc2e2d9476bdeadb231c73a71e299ecf9e62dfe7830187167ac40b92ef6e65e54c509c SHA512 b52c763a7713661a542f707d48251257c9540c4b1ad517b7ddbbc051edf919600cf27f93c13e32d5d6d148dd08327dc91f11eecc0b6db82179d044cef5b52550
 DIST read-edid-3.0.2.tar.gz 17508 BLAKE2B bd27f01fba0b9bf5ca5e5d8d4af422cc14120ce280ec1abe047f31e11f85fbe1b8a8e729b97ef2272e2ab3354871175e91bc11f8c15b2aec0cd10d37aceba392 SHA512 779ebe7f1ffb6e7952762b5f886e07974f2c0fe5fa9be0722b928559466b56aae450f741817bb91bb2e33ca66ab27af39cea3c7af220c99b85dae81734138aac
 EBUILD read-edid-1.4.2.ebuild 398 BLAKE2B b148b8369304073919a5af6b03aa2376400246edddc0357572d5c155d6029c2feef0599252a8e700f5708c4bbe87319879344d7a948e291fdf0d7efefc105739 SHA512 67b788582eed4a5fff82932ca8a10e0aeee71f4bd3e3d8e14821cdc8fd99881bb1f2cf255f4bcbed9510144206bd3b28b69dc3c508e6e24d912e882d8a59274d
-EBUILD read-edid-3.0.2.ebuild 632 BLAKE2B 37ead5344183f471899083553305170e9d436f865bc79d2d974a5638dea0641b4d61a7a248c75807f65a4cd35de6e8d3dbffc9b9c2f3b76c1b24fbb72963f9e9 SHA512 600f885382be075b3b8742c7b55303316f2d0707be5195304d21778a5e4646cf8cabf65f38f4489da401bbdb6cbd49155228af9728b30e0b0e2cbbeb46981338
+EBUILD read-edid-3.0.2.ebuild 629 BLAKE2B ef065bcab0c70fa24c771c7a07949652d6c4b97b0e210915bbe4cdb109f115765102db2754f10fdede931a9c66938c55f3aba3bddb346432b67da4cab6d2398e SHA512 9d07fd2d4045c9d73c3f422dbf6a1dce609568c58a666ae2e7e3a548cda236f79f30b3f0b493df1710ada9b2541293fe1d9154362bc84a31b74e3e302d588708
 MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/x11-misc/read-edid/read-edid-3.0.2.ebuild b/x11-misc/read-edid/read-edid-3.0.2.ebuild
index cef6d33015a8..b0e3a798eb3c 100644
--- a/x11-misc/read-edid/read-edid-3.0.2.ebuild
+++ b/x11-misc/read-edid/read-edid-3.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
@@ -10,7 +10,7 @@ SRC_URI="http://www.polypux.org/projects/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="amd64 x86"
 
 DEPEND=">=dev-libs/libx86-1.1"
 RDEPEND="${DEPEND}"
diff --git a/x11-misc/rofi/Manifest b/x11-misc/rofi/Manifest
index 138f5981c5ef..7afa75927f1f 100644
--- a/x11-misc/rofi/Manifest
+++ b/x11-misc/rofi/Manifest
@@ -1,10 +1,11 @@
 AUX rofi-0.15.12-Werror.patch 437 BLAKE2B 6f230755bb2bcf5c91c354d4d2afec1c9e78a39eb80a871f8c0e21268302dc7baf5bfa13c9d1fe0c832ce008649764896c9ddab6dff1cd66c2c6d933e08e227a SHA512 b26d190bdaccca3cf761599a6e3f938a8f9106c9ee395c5f0bf3e58f5c151674621e66ad61891ec4e764424e42f315caa352761923d5c3b45ca326850e369ad9
 AUX rofi-1.5.0-gtk-settings-test.patch 322 BLAKE2B 652e0c20262bc18abadc8e540d4b9374fe412a97ff6b82b545ec4f050e087b8982b4e16ebf9553c71e5b6c145e8a3b8b469b1b107def04f443c01c57efe9e947 SHA512 75431eac4c6eac56716a6e2ec0ca4f5fd88aa38761b758b58c5f8c3f3fd6eb4a111af9c74b2d7c14fc3e66cbc7f361b2b3bc8658cfb31fb827e01cf19a58df67
+AUX rofi-1.6.1-autoconf-2.70.patch 916 BLAKE2B 21aba99a26a32e5b563e46d9d2ce6b2dafc2d107cfc78ed2702b7ec03e5928557f4c5bae12c8dd5ffd5b2b0a076858e201cf547ea7695842efc9bbc5446a0d97 SHA512 7f7cacd287137524f356e649e80fbfa077deef8cd864991d5d4631cfb8c9b883b33a9cc09ce50709a83a33dd7744d41a11f0f2ca3c48d188463b310425f17e88
 DIST rofi-1.5.4.tar.gz 535259 BLAKE2B 8560dfee631c66a6f2178c0af6926ef317ed6d2cfe3ae46264e5b1ce429113ce810e4fed4c86a81acbbd51c85ad2593f40a39d982d7da0aa8ccc55537cadd2bb SHA512 181dedb0905bfab76f7ad313d299f4c80ee4efb11a2c6345b16044b7fb3f54bc7e304ee9352e562932e55108e328e5f6bd2c1d7fd9bcdec3d8022c2dc4f8d394
 DIST rofi-1.6.0.tar.gz 558808 BLAKE2B 45849f71becd3ab69b85dae64af34ad42199c20976304b89b013405f1d7fbbfa8fdf7d3ac4c26563cc2f5924fad64d45da1ba7dcad8857fb127eaf4b40c08824 SHA512 a993b0d49681eae4bc4aa84277f6daf1467e53bc40fa43e97ccf3f834763a3c9a1ed8b5d1d628158febc9e8b339be3fb745ae5b4e1d86e9f84b7af4b6a30ea23
 DIST rofi-1.6.1.tar.gz 569262 BLAKE2B 938b45f8326b5a28e349ac9f7028c476274faa4f932a773acc350d5e1dc8d5c05c7cfb7ec10f1ab5d8c83590074424c3379768671d37ee799d78e508b8c4a4cb SHA512 b54e75818a98fa9262a3016260051837de189d49beff4f4a158cb2e7f41438641377e11d75c164f423e6a86d8b8fca3b76e2630611678525465d06c21b393f60
 EBUILD rofi-1.5.4-r1.ebuild 1081 BLAKE2B 57e62dbf8e19448372d23438ffea0840144651434e6235798bc558be24d785d03d0e2143cab08b83abb39d3308446f42c46706f9aaa9edb690da1a9a7055a078 SHA512 456f687515cf00aa7826111d393056aea01159aacc88a408d66d5aef493a154ea9c823b57cd6b73ee593c0776d6f6e3d5a2ce94ccd7e97f523514d175778b236
 EBUILD rofi-1.6.0.ebuild 1127 BLAKE2B c279ac1a739c9dd30bbc1a87856e4f3b4e787a20f3f857d805a7775b2a7b363fb1a59d6f7fd7e8ab2ae904f57a8d98ed0d17201876426015ce2bd0de68ee0516 SHA512 c0cd9be17f855fcc119fd58e614aee41d1ab9b368de322f903652360bfa1ba7a166f47d2c3d09a655dec32edfbeafb5f85e0e1ae2484986524c982f3d6a6bc1a
-EBUILD rofi-1.6.1.ebuild 1138 BLAKE2B 9cec65567ecf6a1bed874188de2ce47043a700781bcf3448d8b2d286e37f267842d1c57f5436635809566a9945bcfab001a304339074b2533b33c9117e3493dd SHA512 e66d595ef431b05de35f79016df9680bb82eb907591ef7e3520acfa6aae91b2c5086fc9c295b717c5a572a771487eef0ba3f31b4ac07ad2c8bdd98e05a977861
+EBUILD rofi-1.6.1.ebuild 1222 BLAKE2B 10ec63a1d98f2fc8e304c250d6c30299572f4e46cbe293035e2d8be600aef226f00183ec2c1fa153c0e2c90cf0d55d15564c6e4a3cb54ddfbf5823d9a346e477 SHA512 0db1a92632c44ab92f97d05ea230de23d602b7870b15a7e5ab36c8d1aaf950d4ba05a8b776074d0dd458173bfb1c8d27c9c5faae8694459e306f86a03e6603bd
 EBUILD rofi-99999.ebuild 1042 BLAKE2B 0c684ffbeef5366d83b4689a2e8ab9f27072e82d936985fe1a7d128a65cc8b3edcf6a42b09e85866496b280143af8d5f4ece9d8db452bdf1eae020a93302d10c SHA512 1a08b9ded70d742ef6fe5c9250291a6ff74b1efcb767594c4546bb5f7217d1c50cc04d259a55834b12d3c91b3262d82edfcd5c2ffb5ded4ac8718e54a3ea27a1
 MISC metadata.xml 475 BLAKE2B 6ca3375d564b137bf9e6b9f71dd725c5602a24e2184e420002c161681e314bb0ba4547e171e18e3f036637447001fd8af41e46f7f6b7ca9795020bdfacbd8a57 SHA512 0adff749d0effa8e97ebd8e00714c8f854bd5d71c07f7c83be79da5b80bb9910b06d14a7df7145d92b2aab2d905692c5b3b9481007bb47dc0b7f17f59ef781bf
diff --git a/x11-misc/rofi/files/rofi-1.6.1-autoconf-2.70.patch b/x11-misc/rofi/files/rofi-1.6.1-autoconf-2.70.patch
new file mode 100644
index 000000000000..d2ac9510d3cb
--- /dev/null
+++ b/x11-misc/rofi/files/rofi-1.6.1-autoconf-2.70.patch
@@ -0,0 +1,30 @@
+From 7e426c597539c1b6f33c34300b84d2074f94c9b6 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Mon, 4 Jan 2021 22:27:37 +0100
+Subject: [PATCH] configure.ac: Remove argument from AC_PROG_LEX
+
+autoconf-2.70 only accepts "yywrap" and "noyywrap" as arguments to
+AC_PROG_LEX. Calling it with no arguments will trigger the old behavior
+from autoconf-2.69.
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index e0968b65..03dc1d2f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -7,7 +7,7 @@ AH_BOTTOM([#include "gitconfig.h"])
+ dnl ---------------------------------------------------------------------
+ dnl Lex & Bison language parser.
+ dnl ---------------------------------------------------------------------
+-AC_PROG_LEX([flex])
++AC_PROG_LEX
+ AC_PROG_YACC
+ 
+ 
+-- 
+2.30.0
+
diff --git a/x11-misc/rofi/rofi-1.6.1.ebuild b/x11-misc/rofi/rofi-1.6.1.ebuild
index 44eda2ab0a9a..297c2f078d6b 100644
--- a/x11-misc/rofi/rofi-1.6.1.ebuild
+++ b/x11-misc/rofi/rofi-1.6.1.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
@@ -41,19 +41,21 @@ DEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.15.12-Werror.patch
 	"${FILESDIR}"/${PN}-1.5.0-gtk-settings-test.patch
+	"${FILESDIR}"/${PN}-1.6.1-autoconf-2.70.patch
 )
 
 src_prepare() {
 	default
-
 	eautoreconf
 }
 
 src_configure() {
 	tc-export CC
 
-	econf \
-		$(use_enable drun) \
-		$(use_enable test check) \
+	local myeconfargs=(
+		$(use_enable drun)
+		$(use_enable test check)
 		$(use_enable windowmode)
+	)
+	econf "${myeconfargs[@]}"
 }
diff --git a/x11-misc/shared-mime-info/Manifest b/x11-misc/shared-mime-info/Manifest
index f822e7451523..d92f5d325200 100644
--- a/x11-misc/shared-mime-info/Manifest
+++ b/x11-misc/shared-mime-info/Manifest
@@ -3,8 +3,8 @@ DIST shared-mime-info-1.10.tar.xz 616800 BLAKE2B a63c97aba9184e7926db01968aef2a7
 DIST shared-mime-info-1.15.tar.xz 772708 BLAKE2B 763c7b5f1128882cb8a027ee7fb35daa5d141ccab07ba7aeae5139b94c1ed1c5702741b30c8803b7796bb6eb66fa02fde41d14e078b1960003bd3ba5e0de4e1a SHA512 3666aa500dfa6a28bd0524400c47fa16d90ae61f8c80f350fd895972319ec2f511618b8a7fa3cbde621edee46fde19e4506bda62f0bd2d0ede1b08d7bdb9aef2
 DIST shared-mime-info-2.0.tar.xz 5015272 BLAKE2B 8bac4790177f8b72a8c74799d7abca360ad11a922635aa1207eead78674192b300cf0096f5943a65aa3991c8403b145adb24f5e7746db7ea6ceeab64978608c3 SHA512 f4a1ea9a408ffcff325e57585dec5862405e9fd6c79e444048039f3061676501c40168cecf8935d002644a702a21f08f0f7c680ef6a65fdf188e0d892f3cc085
 DIST shared-mime-info-2.1.tar.xz 5202496 BLAKE2B e8dfc7efe78feb5a38c8115a2b332f46c3dac2f89dffad0834fa7b77560b3ef528e779ab9e42822288f85d8c434fd590859db682f3f99494aa6a4387c985e912 SHA512 87e308281e83c4cf889594f7c2e8dcb4d0d0d3910124c3816fdb886ba7d6113b2581711adcb17032b47f9b8d8b7001fab58daa52b7da7c0ef87915e341d6f1b0
-EBUILD shared-mime-info-1.10-r1.ebuild 1753 BLAKE2B 6103d1535657785a34c498900e26f3b9f023ebf20a36f46b3ea9c3c114f34bf8cc5eaa70c00c70292cd6a59edd675c819f3a70a80d4f4e4fd71639fd2838926d SHA512 89b5a2e4cf5e01417b1bdeb4da4b406b5b78a0b7c1a929a4555119506408d89059ee55c1c5a95affa312fa352b44ffa2bd39ee9a6986244164fa8f235f548258
-EBUILD shared-mime-info-1.15.ebuild 1261 BLAKE2B 26daf82c8bf3275c54d85c515523680c017b0620d9e0fc16806641af7b6fd4e27231a09ad1e7b50f212fe63af1d53b0aa85c54aa2644379debd8fbec6bae9061 SHA512 2ef1d3274e46f7f1101ccbbddace56b65d44db380d65773c3f037d4ff3c582dec46668eec15fef342bcb78135c16e10d1cdba301ccf2ac77477008848849d93b
-EBUILD shared-mime-info-2.0-r2.ebuild 1361 BLAKE2B 6e21efa5ec7b7608448f19fd306c7e2c05303fa31697901f509e53343422f7ba3916ebe7baf9e0a0fd4abd08bd04a5732bab5fac350f893a29a898b06ee0e1b4 SHA512 634758f2256de28ebfec5536f1c890256acaa5c94a05e0529d61e1c31a92801e7fb26bf04d574c3b548f8bfa1ae5692823c150dbfd42a4f8fa128efaf6a308a3
-EBUILD shared-mime-info-2.1.ebuild 1291 BLAKE2B ce45119c61c178025b81896400fd5b23a2a3352feac3fd4dc896f530e4553e2e5b046a104b3cca12d4b0b6694ccee07e2cfdd3feb60d6c36c08832ce161526ff SHA512 6dd08aaa99ed18652cf9b33c3285be54dd63b993e1198d893d2392c59541c7eae9c59fa73762028b9998fc2c92b8ecc91e5125f6367260ad5e41d55115da0611
+EBUILD shared-mime-info-1.10-r1.ebuild 1742 BLAKE2B 6352943a7a7be912d192ef59cd2dc157200ac57f4a71113de862b9f28b2bb8226d69f56cfb30b59e800277d7b6ae9364678f336209e907c7f417d0e33e430f30 SHA512 e13f9f6e1ec22e018802662cbe6149e4a327ce910eac8539bcf865ab2f42d53da9dff1e36f6dc6ce42e350a6d0522955f65b137250404b0123b3ef4ddea13032
+EBUILD shared-mime-info-1.15.ebuild 1250 BLAKE2B c42dfd7c8fbb3d8f4971f9d793dab52fb78a777af69377adab809a1388e340c512d23fe262c9c877651559779dfff96112eaaf0c55cf3093d6f8c4c1c992d35e SHA512 37c017a0bee0d96e03cf9da299007891aa6f772b8717e426c582c9fe36a5f8407691aa4231ecbde3f4d83dafe1a6786981db0485c282010e4895d78ee8b753d6
+EBUILD shared-mime-info-2.0-r2.ebuild 1341 BLAKE2B c7e874069c2761ba52c694183e8d8ebef03f1abb423bdc5be16fb487ce8f9e772dd82d4385844d73d84d1d63737340e016b2352a3f9a4ab737aca8d63ed5e277 SHA512 6040c1b0fd6f53af4531a442f823cda27ec8aa49669af5f0af7071007a3a2979e0d3d9d5d13c5ebbfc51d74e4caee7055e616cb13526b0deb6204488c5272051
+EBUILD shared-mime-info-2.1.ebuild 1280 BLAKE2B f8d118b1046a921f456dd30bafa685c2c9de5c46436401830d344c566b48d18e05e484dc3a31cbbd6ec2984cd8fa6ecad5a128201a075c7ff689d708e9988322 SHA512 076c5d4efd8967bfa37dc79c5b9d5e03641fa730ad54816d0de11766e5ca217215050cad6f767c371a47e38e8cb0aaa46ccc24bc77f976ca02bceceb72a94ee8
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
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 f9c9995cc9a2..3fdb9cb01123 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
@@ -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
@@ -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 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 ~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.15.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.15.ebuild
index 4f43951549d1..b4beb04ef3e4 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-1.15.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-1.15.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
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.freedesktop.org/xdg/${PN}/uploads/${HASH}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-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"
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="
 	dev-util/itstool
diff --git a/x11-misc/shared-mime-info/shared-mime-info-2.0-r2.ebuild b/x11-misc/shared-mime-info/shared-mime-info-2.0-r2.ebuild
index 2724d7ac0421..2114c664ba70 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-2.0-r2.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-2.0-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=7
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.freedesktop.org/xdg/${PN}/uploads/${HASH}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-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"
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # requires installed xdgmime binary
 RESTRICT="test"
diff --git a/x11-misc/shared-mime-info/shared-mime-info-2.1.ebuild b/x11-misc/shared-mime-info/shared-mime-info-2.1.ebuild
index bd0c32878780..c525af2e6711 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-2.1.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-2.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.freedesktop.org/xdg/${PN}/uploads/${HASH}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-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"
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # requires installed xdgmime binary
 RESTRICT="test"
diff --git a/x11-misc/splatmoji/Manifest b/x11-misc/splatmoji/Manifest
index 99a00c8b4d3d..e41b14097eaa 100644
--- a/x11-misc/splatmoji/Manifest
+++ b/x11-misc/splatmoji/Manifest
@@ -1,5 +1,5 @@
 DIST splatmoji-1.1.1.tar.gz 4329965 BLAKE2B 6c9958bc8448d4e1c84358a7631d9b69c6d38cfedf42c86b5b220e0c380c5080de6653698ede6564817fcfd3d9e68603bd472ad43473c528580176baf7735d81 SHA512 d283d633ec9ff6a3345918518aabe72af56ab5bc71991e7324f85d5eae4ec078ca6a5f6aafbd8b8ebad0cb9fb18f15d68eca5662a4c895aa615d851d9c7ed845
 DIST splatmoji-1.2.0.tar.gz 4331395 BLAKE2B 2a786aba2ffc652c16fa479c0c2f2cba9b54508b2567f9d0d4269b81f100a8d1abe81926e9eaa9fbd3eb84617806755c21abdfd56fcdb0e58efcacc7dc2f3260 SHA512 d4f906bd6aac862cf696d159dca0a0a3317912d16a79ed036b313817bfee03b89900975b6d2cd3e24ea907d3e9fe8ffa501164dc9fead1017d91bc4c545e96c9
 EBUILD splatmoji-1.1.1.ebuild 616 BLAKE2B 919cfcecdfc19dab68543e73c7061ecbd48b36f640142a85709b2a524ab3305143d166dbd3c1f7a022c5e1d384b7dd73962812785383fce890694d07500f92ed SHA512 0d29a163bafc867266f529adc4acbb0b8fffaa79796f29bc6c4aa4b7b481fa49f4306d6bf06e6987468e5136aeebc6ddd70ff871abc1929786b06c7012dcaa07
-EBUILD splatmoji-1.2.0.ebuild 773 BLAKE2B 15808f494dd292c4ace6bded70269c9646114129a555d8a4b70631d4a76727b16fe9ea2c4b64876f7c0ea0c7f73bd334e33693fe151fd675c52bb9e22f9150b2 SHA512 632fc39795facec9f5d0761c3a9fb991253c6a960503f4649543a9404d6c119b88e9c8764bc0296b5329be6809a1574d4942c52904ebf7c528bbb24b79f235ef
-MISC metadata.xml 711 BLAKE2B 2435685b82e4e5ac4f35014486ca3fd2187fc0be16e1442d8291ada7d6af70f677b90c8269e965558d62febe8d1ef6d8451f92c6639d029a842e4be4ae7398f1 SHA512 143b894f2b29b60f3fb7b6017e6b2e93641e3f0e4f96300bc250375f497ae5e41120c4e3a1ae0d8fab64984cce55df9f9eb8d1aa6e52d3a85734cbf7be56431b
+EBUILD splatmoji-1.2.0.ebuild 877 BLAKE2B 4eec6f4811af9fc250c40ffa00fd32a7c9da5b8d06f3112bacd200fde68fcc5c3f5e3cd5844dbbc80db83c6efc5d7756b567dc76c3b68d86561b594add41aeb3 SHA512 2f0e7ebfd7d6cc1b851790648c812e0c17210b3cf22bd5f85dd9865db28810bf5cf8ad18ad16cb996920d177bc4218962a95cd7385a932a775e6e063dbaac570
+MISC metadata.xml 612 BLAKE2B ca9e33ad1b59ef01ed77aa8c09053544b1e184009bf499fa105ce7cf23d87baa2943b44549f27c77e02f2f4fd58dbfcbbf8412b06d6364df3d45404f256fc231 SHA512 8a2e21d68bb4e70b8899c91f2a47276808130f57037d91373356077643c653736639e72f24c2c6aba0f8154f3dfe636b9eedeb5b8d16108e767f066a89b1c21b
diff --git a/x11-misc/splatmoji/metadata.xml b/x11-misc/splatmoji/metadata.xml
index 9815be8e15d4..8098c7e79c6b 100644
--- a/x11-misc/splatmoji/metadata.xml
+++ b/x11-misc/splatmoji/metadata.xml
@@ -13,9 +13,6 @@
 		Splatmoji is a tool that lets users quickly look up and input emoji,
 		emoticons and kaomoji via a pop-up menu.
 	</longdescription>
-	<use>
-		<flag name="json">Escape output in JSON style using <pkg>app-misc/jq</pkg></flag>
-	</use>
 	<upstream>
 		<remote-id type="github">cspeterson/splatmoji</remote-id>
 	</upstream>
diff --git a/x11-misc/splatmoji/splatmoji-1.2.0.ebuild b/x11-misc/splatmoji/splatmoji-1.2.0.ebuild
index acac0fd2d021..6bb90f7331e5 100644
--- a/x11-misc/splatmoji/splatmoji-1.2.0.ebuild
+++ b/x11-misc/splatmoji/splatmoji-1.2.0.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit optfeature
+
 DESCRIPTION="Quickly look up and input emoji and/or emoticons"
 HOMEPAGE="https://github.com/cspeterson/splatmoji/"
 SRC_URI="https://github.com/cspeterson/splatmoji/archive/v${PV}.tar.gz -> ${P}.tar.gz"
@@ -10,13 +12,16 @@ SRC_URI="https://github.com/cspeterson/splatmoji/archive/v${PV}.tar.gz -> ${P}.t
 LICENSE="MIT"
 KEYWORDS="~amd64"
 SLOT="0"
-IUSE="json test"
+IUSE="test"
+
 RESTRICT="!test? ( test )"
 
-DEPEND="test? ( app-misc/jq dev-util/shunit2 )"
+DEPEND="test? (
+		app-misc/jq
+		dev-util/shunit2
+	)"
 RDEPEND="
 	app-shells/bash
-	json? ( app-misc/jq )
 	x11-misc/rofi
 	x11-misc/xdotool
 	x11-misc/xsel"
@@ -27,10 +32,18 @@ src_test() {
 
 src_install() {
 	dobin splatmoji
+
 	insinto /etc/xdg/splatmoji
 	doins splatmoji.config
+
 	insinto /usr/share/splatmoji
 	doins -r data
+
 	insinto /usr/lib/splatmoji
 	doins lib/functions
 }
+
+pkg_postinst() {
+	elog "Optional uninstalled features:"
+	optfeature "JSON-style output" app-misc/jq
+}
diff --git a/x11-misc/sxhkd/Manifest b/x11-misc/sxhkd/Manifest
index 0560939c0d99..7a6a6b8a9717 100644
--- a/x11-misc/sxhkd/Manifest
+++ b/x11-misc/sxhkd/Manifest
@@ -1,5 +1,5 @@
 DIST sxhkd-0.6.1.tar.gz 34808 BLAKE2B b25ff934d0a7f28b3950152ef800da90c5f990f2efd92e9178fef8a77939dc1ed1bbde55bb5a990c33fd3d0be7490dfb2e799ca56abf3c3c6f20c258169eb100 SHA512 d8cd6166ff7e7bc800ed79c5d63cbdfad4f9824c5a5e19b6a315b2ec570295150600651376265932f5fde8b6127f629a553337c6454a1c78c62b3395aaeb55a2
 DIST sxhkd-0.6.2.tar.gz 35711 BLAKE2B a1dc409314dda68aa3df99bf584d20e492c7220dceb188b844a6bd9374a4c52b7e1a406b96fc77276498db86dd5e5114a50357ddee660f5f08d6fe974de8f990 SHA512 3f758aec3de76c6336a9008e997317ed7a05db0fcd81025d8f856694c2b8162022e25d9a48876de99056748a2dbe6a561a0e1594973c854ac2c98d44af6b03aa
 EBUILD sxhkd-0.6.1.ebuild 617 BLAKE2B 855913b42866ff8bac062f42d6215bf60b95ff76b120c795fc9288cb0e5719ca647b8668e0afcd7750a7e4be93a6e2a3b3c94e330b1fa1f61490256304656046 SHA512 4a31ec97909773124d3fb04bf3b704b232c09d3f0221a4e1e25eb2ef24f2052b5fb7e19d96b3f2bc1fc41ece9e7e1debb3a13f7af9dff87bd681437b977eee38
-EBUILD sxhkd-0.6.2.ebuild 639 BLAKE2B bc97ad09dd25bc22a8c158aadfb61098082ca2d1e1ab0f5bc94714bb96914bf4c8bbcfb129683e04bc9a7783f418a10e6429b42d669d34aea8332f8703e4131c SHA512 9dc4db7bde068802e3864b49aa2ef095993b3b8a9b104c8127c1c3102ce1ca1a050431922f9f2498b19870ee890407947611db65b29f47f82a438a38bb697f2b
+EBUILD sxhkd-0.6.2.ebuild 638 BLAKE2B 442c9b5c50be2f13d16976f53e0b775403af6fc5b95c43451b3f6c76e06799a80fd4b6d40409879758c0dea2e85c42a93f08914797e815db4b57d1e3b2ffd7a0 SHA512 c3df01cd27a4400272d95b61fcc6178bf53bca665e930d28e97262ffb96a6a3da07bcdba4b054a74adb26825625ee6b20577ba737382b41c22b92a7d4489e7ec
 MISC metadata.xml 327 BLAKE2B 2f3ca988674ff92fd3295c19c9ea30c7d55f1ca7527a5a92a677c4eaaa8d1030dad4acf3589ea9c6d1d81499abc74d8d125a915e02b108bbab8b38d56023a671 SHA512 ccb2545217cf7ca34ec62c6b1c41aa02209bfa8d4d2dcced53df8755850c109ffeefb1a1b7c3824efe1de28778cdfa4460ba22e08d58bab795817390231061fd
diff --git a/x11-misc/sxhkd/sxhkd-0.6.2.ebuild b/x11-misc/sxhkd/sxhkd-0.6.2.ebuild
index 81ef00356ead..da492d24eb92 100644
--- a/x11-misc/sxhkd/sxhkd-0.6.2.ebuild
+++ b/x11-misc/sxhkd/sxhkd-0.6.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=7
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/baskerville/sxhkd/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="x11-libs/libxcb
 	x11-libs/xcb-util-keysyms"
diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest
index 491be9176812..e7b7a02b78ad 100644
--- a/x11-misc/synergy/Manifest
+++ b/x11-misc/synergy/Manifest
@@ -10,8 +10,8 @@ DIST synergy-2.0.0.tar.gz 5892923 BLAKE2B 661f42031499c9c1b2cbb90d9af45f5210c8e1
 DIST synergy-core-1.12.0-stable.tar.gz 8237539 BLAKE2B deb9729cadd59b9aee058cde6c9a9e01325081af3cbde0b294fb000c4f805bdba72a6c12266e9f0f360b7aca8a40718295e7d34263ad851bb27be54f54d0c1a0 SHA512 234e8eb42624f006aa45dfcf50a80089a82347c7151da040f10066b412f729adf01600bc9ec2274a0941965e91ab7bab74abd398287a20906dd4a70b1948db5a
 DIST synergy-core-1.13.0-stable.tar.gz 8657662 BLAKE2B b4da6abd1b396f71aa37531e1adf71ff06d4804b74659db362a8fe2701c44786108ecc8b52932038490dfad8b7ae617f13a365ebe1ecf559f50106772bda9102 SHA512 317f0aae7742a3ecaea2f3138364a5cd1a098d76a2decdb6558900112e5dd0b53c457b461201d25d3a33cc2d9189e1f7f4e777a80b98c87d693f51b636cbb564
 DIST synergy.png 26910 BLAKE2B aa9c5c7c0647937eadc82edbdf7a5a374dd25e9450d6861f1092d8569155e38b3d0729bafb69809e62660802d471899c472a0c9d2066e4b7fcec379f34470535 SHA512 0b5a1813c71fd2923adca4cf7b0f840fc37c73a2f18ad68f8bb2fd2ea312d9a884e2e2bcd78f6dd0f13d1f31ea3991379e141ec62d970a18c3a9c46b26720c5d
-EBUILD synergy-1.12.0.ebuild 2586 BLAKE2B 157712549a01453c2d65aa5f30005d1d978b795e3a85acfc758de79e108f9b578970502073618ddfbb9668c1bdcdbb2a2023f1317ddb778b78732748fde8bf7e SHA512 72715baf7a8d10983bc6ee23165d22deaaa726c302b8f708b6c81c73595e7ea92b515a2fa6493a4c48d9531391dce7de2de3be61b2f52dd600784b5fa3663759
-EBUILD synergy-1.13.0.ebuild 2422 BLAKE2B 8f02ba19401888ab0a8a6dc473c77a45794372e5c0c3126125be212b98502fe1ad0406d95aa4422b06327a436d4c8a528b3171335c0d10faeff8d94a712bd82b SHA512 7ba3f2dfcca262476930ea56db97aaa94062c1dac9d4303c7c82097c5a9b77a0c8b09356a40b434ef602f7321a998bc93749d762a700b75fb81949d6a221b183
-EBUILD synergy-1.9.1-r1.ebuild 2575 BLAKE2B b47f14fbdf5ab56e142e80b84d7d52a1e2aa2ed30b4d0209d1d56496b89aa1d5de6c1541c429ba3d430c1481ebbf53fd31b1ab4f3c8ebf80b8dbdd0b0ba6e071 SHA512 dd058c22b6a547582e2d3e3bd869fe6c19c8dedfe00481907134650687b7a8323055e30d99b8cdb835c4d60cd0678c5ba417869ad77977ef1c5c43816594f8be
-EBUILD synergy-2.0.0.ebuild 1429 BLAKE2B cadd551ffa38911e4e825ffd7ada68d08f5fd8278f71af7321af48aefa81a632c608cba876a17dda8a1f66e0b5762e220389b68ac03c2bfbcf5446e51d9969c9 SHA512 9a931df7b5d5f37b3f5d951aafad19fbb24def897a46fb1d37ecab62bc07141d0f3e19e36e0f9cdd3903e44f23e7e83b8fe6daa56944dada2906026878d489fd
+EBUILD synergy-1.12.0.ebuild 2575 BLAKE2B 577b7b30f0319736860560ae50d89d717a2a55d29bd9afc49bdc44213477cbd24f8659486d84b3719d452a294d73904bd9f2751f1cf1ab3f1d91cd14ca76bcd5 SHA512 9accf85f2ceaef3b35879ad81471e57d4c699b3a0d81a94d756b7134fb51ae25f045614ca42ab0de545917f8590c5f91a57a4f4b6c3c7e17853cbca09195024b
+EBUILD synergy-1.13.0.ebuild 2411 BLAKE2B 2c087da1de993059611347140c8671d3cca039733ed985c28171d4b42200dca7489110cb33797b07ca87619f4c495f590af27692d9a22258f54738f02cdd5b2c SHA512 b21d69b829c6e0ba251750ed662fee7247eb0608bb6a824994757c7361859cbca293c89f6e137ba19fcc1ecc73de5700374a5db43590028fa39081add2c283eb
+EBUILD synergy-1.9.1-r1.ebuild 2564 BLAKE2B 5c4ec4856bef497f2b91275f74cc10244eef9bf7ee8d840dfa718a7bea971b5564d82589483a2eb3b65dc7ea01a9e856fde11b224efe48f5eb803f66f2cfede6 SHA512 633e27d190523b7f1609631cd2c3eda2f0ca921286e78f8e9631fbb2053349b24601bbfed5f86632f5d8ec3a00910629e70d55a0a7fb26a6dfe784aa5da5a0ad
+EBUILD synergy-2.0.0.ebuild 1418 BLAKE2B 3f077859e978dcb2c25d5ea8f298925caa0aa38bb178764a4391802e6e1c7bf10627317c28c2ab9340b4ba7b52d933ad8bf96bbfac7ded4385fefd758b2420e8 SHA512 fb10cb42c79e1036290cc50eeeaf0ee583f8f41ce573534e1dad0b3e8f48690f1bfb2152ffaf26bb0722d060062078ae5fd2145da48f197ba79fbb35659ac83c
 MISC metadata.xml 332 BLAKE2B 04a719c2b19204a1ea7ed755c89b072b271760a85f3b2b7e734796deca104682c147372a1d154d4fdb493d7025e16cfc2012e7d352fdc88dde93d0f3df477b67 SHA512 8c447ce795a81157c40a2839d8845d6db89ee768f70aa397b686b5ec9a7e59fc66f9fec5561e25ab0aed68bcabc369c0c53660ee2a0b7e24b52e169d5debaae0
diff --git a/x11-misc/synergy/synergy-1.12.0.ebuild b/x11-misc/synergy/synergy-1.12.0.ebuild
index d144f9cb3919..09888a621493 100644
--- a/x11-misc/synergy/synergy-1.12.0.ebuild
+++ b/x11-misc/synergy/synergy-1.12.0.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
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="libressl gui test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-misc/synergy/synergy-1.13.0.ebuild b/x11-misc/synergy/synergy-1.13.0.ebuild
index 7849a71bf62b..6f472773fde5 100644
--- a/x11-misc/synergy/synergy-1.13.0.ebuild
+++ b/x11-misc/synergy/synergy-1.13.0.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
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="libressl gui test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-misc/synergy/synergy-1.9.1-r1.ebuild b/x11-misc/synergy/synergy-1.9.1-r1.ebuild
index e44e659f7187..7cabbef64d61 100644
--- a/x11-misc/synergy/synergy-1.9.1-r1.ebuild
+++ b/x11-misc/synergy/synergy-1.9.1-r1.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
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="libressl qt5 test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-misc/synergy/synergy-2.0.0.ebuild b/x11-misc/synergy/synergy-2.0.0.ebuild
index 3a3b2d0bfac9..750ffb44464e 100644
--- a/x11-misc/synergy/synergy-2.0.0.ebuild
+++ b/x11-misc/synergy/synergy-2.0.0.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
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="libressl"
 
 S=${WORKDIR}/${PN}-core-${PV}-stable
diff --git a/x11-misc/urxvt-tabbedex/Manifest b/x11-misc/urxvt-tabbedex/Manifest
index e6ec9772c074..f51d4c78572d 100644
--- a/x11-misc/urxvt-tabbedex/Manifest
+++ b/x11-misc/urxvt-tabbedex/Manifest
@@ -1,5 +1,3 @@
-DIST urxvt-tabbedex-20.09.tar.gz 32254 BLAKE2B 7c2bc4d17ad91415210c039adcb01edbafe539e24d82000314124c518d76af97487c1929c168dbce40b4931822aed6224e309e82a855fbc07adf44a0639b538a SHA512 166fa965236d3f60d17d1ad914b3648895237003704219294b0ce72631e6e0431c61a3c320823f227ee58a07f968a1b7d9c479bc58c6246df2f7059e1f04613f
 DIST urxvt-tabbedex-20.49.tar.gz 33239 BLAKE2B fd5e3619c7b639cbf65364895389145dc7b5d819808a4d40d99732f2d1154ac4418f0a9324b4e8f001ca6786c959886e58df2b8f81e3b9a723b948708c869a40 SHA512 27e508f388e5725866465fe3c3e6ff052eabd14e9a72c22788c61ebed2a9db69517f676071d648a693ba5b9a438ac14d5b9a9ea1208a044001255c2d2562fc48
-EBUILD urxvt-tabbedex-20.09.ebuild 676 BLAKE2B 06458a34bae0eb4cd88949b94492936f55cc8d7443366f1a34af6a05f6a1dab784c5b811d8c324b08d22c1121b5a38815273550d763751c16b846cff49b1df9b SHA512 38f60cb3fd44a1f9e7991ca210aecf79eae48c4e1cbabc1ce6d964bda5f3374d9a59fadb06f81dfea9486612078e356124149f96cd89670f710f44f5f7c9bb7a
-EBUILD urxvt-tabbedex-20.49.ebuild 671 BLAKE2B cd9632ca0961a54a7b2c9cae51e1fb05ed9cbe50e6c686859342291519da4d0dfec10092c4b892b227a9987a88e83ccd1a9e9a31ccf2d327ddfb595e0b323ef9 SHA512 c8b417cfcc53ecf4d6278311c52ee84404a07b76a1928631893b479df9778622f6a94c24f0dc058b2482fbdde5cffe56d7c25be976327f9e39e7bf5d72dec23a
+EBUILD urxvt-tabbedex-20.49.ebuild 669 BLAKE2B 6267580ba36cff7dcb3310157a376485f3f584cdca0183b195c3e94dec109a10507819a0f2f8197827e16f39fc78b276262d927ff6a7bfa744d042a06653b176 SHA512 90b5068210b96f3ab22a59d0fad98815cd83bd51f3a89a64cb59f9499febe48289c0885209da4897d50b9f12bfc8a8fba9369d504c47bcf87e1ebf949a92cfb3
 MISC metadata.xml 279 BLAKE2B 8a35347a0311617855cc5b982f14aee93fd54de69d01d51525a613c788a8d7c50310c62fe1d50e53db598d38a8791bd377fd77b8017d9f435534920673ec45d7 SHA512 03d0a7c99f21ce2ef849387c80f61aaa85dc5ed4128f61a11bc5ef74d5566c255b5306d7c860003177e29a00d95f81ed739c92baaeeaa76b6fa565b5bbc45a1f
diff --git a/x11-misc/urxvt-tabbedex/urxvt-tabbedex-20.09.ebuild b/x11-misc/urxvt-tabbedex/urxvt-tabbedex-20.09.ebuild
deleted file mode 100644
index 28cd53709f7b..000000000000
--- a/x11-misc/urxvt-tabbedex/urxvt-tabbedex-20.09.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="An extended version of rxvt-unicode's tabbed perl extension"
-HOMEPAGE="https://github.com/mina86/urxvt-tabbedex"
-
-MY_PN=${PN/urxvt-/}
-SRC_URI="https://github.com/mina86/urxvt-tabbedex/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=x11-terms/rxvt-unicode-9.21[perl]"
-
-DOCS=( AUTHORS README.md command-runner.sample )
-
-src_compile() { :; }
-
-src_install() {
-	einstalldocs
-
-	insinto /usr/$(get_libdir)/urxvt/perl/
-	doins ${MY_PN}
-
-	insinto /usr/$(get_libdir)/urxvt/
-	newins pgid-cd.pl tabbedex-pgid-cd
-}
diff --git a/x11-misc/urxvt-tabbedex/urxvt-tabbedex-20.49.ebuild b/x11-misc/urxvt-tabbedex/urxvt-tabbedex-20.49.ebuild
index 81d3bcdede94..bf69aac9a9ec 100644
--- a/x11-misc/urxvt-tabbedex/urxvt-tabbedex-20.49.ebuild
+++ b/x11-misc/urxvt-tabbedex/urxvt-tabbedex-20.49.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/mina86/urxvt-tabbedex/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="x11-terms/rxvt-unicode[perl]"
 
diff --git a/x11-misc/util-macros/Manifest b/x11-misc/util-macros/Manifest
index c05958cf319d..6f3f0f3f2969 100644
--- a/x11-misc/util-macros/Manifest
+++ b/x11-misc/util-macros/Manifest
@@ -1,4 +1,4 @@
 AUX util-macros-1.19.2-CPP.patch 1103 BLAKE2B 19ea2f1ca56daa27a8949566337305b383f3e1481e9a2bd8046a05188eff00a8a89dcefc30598ceb2a0641c99bf1c6bf13bbcf55e894767cc77e9b897154c47d SHA512 572f64b4a1fc2989f1fbe969c070f19312c90d7f5c4d3fd98bd749f8024a2e21a1a43ae2520e2bbbe7c9b74f76b55615e3618ca7f700837d6d8fbd574775cf26
 DIST util-macros-1.19.2.tar.bz2 84139 BLAKE2B 94eeeca771042671c6915c562e055c8b965f874c3a5aa1c8107abe38ca984ee32293f68a51ca73d65ac82d245dec6e02ddd62939ab14aee12b4b6fbf350b8c39 SHA512 3f51504b27f0478c136126f15110cf3cdbba218c4d74a8e974cca1381c6e8364609bd0c444f2fb19aa86a7f4e848dfce4f4da940463b224036f75a60b3d88619
-EBUILD util-macros-1.19.2-r2.ebuild 751 BLAKE2B 90eb813b46a7e6a6b98c9a1caa1f8c940e9c3f98fdcf7b9f87facfbb6501d8d9c02eadc29d3d983540e322b1ab98778a2923934ecc835d4b79f96290f02f09d4 SHA512 a26839b357f303760051748403acbc2ae2d03a93010d196ec22b8309142d9f7d20a32695ca311eb5112a0953c6576ca6c7b4b981dc3d269d76c9413f81f64d15
+EBUILD util-macros-1.19.2-r2.ebuild 740 BLAKE2B 1e0cc0ae892d3fcbb08ea0f91f3e5ea93069f8fd8fd811fcf3772c93c91336c2b0f99a7a037853539a3ecb228ada120337927988d3bfaaef9093da6fb0626ed9 SHA512 234abdfd5f9cdc4a57c61a66c4c199324178c60dfa4d08e7ba5bfca75b0d4b7a506bd11f9d866737c587fb85211c8015740fd9e2c9bf31e126cc1a08066f6369
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/util-macros/util-macros-1.19.2-r2.ebuild b/x11-misc/util-macros/util-macros-1.19.2-r2.ebuild
index ea278ad22fd8..6df0fcdf0f9b 100644
--- a/x11-misc/util-macros/util-macros-1.19.2-r2.ebuild
+++ b/x11-misc/util-macros/util-macros-1.19.2-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=7
@@ -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 ~riscv s390 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-CPP.patch
diff --git a/x11-misc/vdpauinfo/Manifest b/x11-misc/vdpauinfo/Manifest
index ef4afb3ee4f3..f55ceb153be1 100644
--- a/x11-misc/vdpauinfo/Manifest
+++ b/x11-misc/vdpauinfo/Manifest
@@ -1,6 +1,6 @@
 DIST vdpauinfo-1.3.tar.gz 12159 BLAKE2B 41dc31ef2f45272221e2eea969d7801cc9c8bfd693e64f7d157b17645da654b7f50d780df698736b3e2ea9c55c7d3b6e7ce75f96aacd50bbaa4032dfc753a43f SHA512 2271053c17d389ea600742ffe14e863921f18e504e07cb5db33c98745d2f71aece908408bca0161b3c2fa9cd67de8c741c132a774a4fd9443c7124168a4da79f
 DIST vdpauinfo-1.4.tar.bz2 11811 BLAKE2B bf0c268505b8eafb9da7c799518296498f2c04bde33443101625c4a80cfde6418428d3969e9ac0f4222a6985b53f3bd4dff688fc03af29de7576f3af3605e07c SHA512 7227205f35d5ad9bc64537d4e47e1924e7efbcd1185420f5f575eadff23f2932484db9c39c377282ed88fa7fd43d436064b10961082ccbf66c49dac72b4129a3
 EBUILD vdpauinfo-1.3.ebuild 579 BLAKE2B bd17879fe0cbb595de06b973bce5ead8f0443d8d993a2626cefc6651259589cf25c3f795a40634c04cc67bd6dba98c714b2fdff927dc66f505f1f94e1aef5c3b SHA512 b2616a840b284e040fcbc84d067b54be3bf771f0efa6da92a63f2d4fb7379c8fee047b79c38fac6c721a95d86d0afba95c794548e95dac8df028093e5257dfb8
-EBUILD vdpauinfo-1.4.ebuild 538 BLAKE2B b9e696012b6ccf8c49187ce9055f031230f63d200902e86c4e7d82ac8d14108ef687753fbb11fee476338602156213a9c61fe69672a7e0b6a625b54b946e6523 SHA512 7b6786c616e0aa71cc9d9ba4b7f2233de172dcfa6bbeda8e9d356f092d3f6105158ec17568e9d3d2d86c0830b5f3b3d59b8f402a2042798006725e5aba08207e
+EBUILD vdpauinfo-1.4.ebuild 537 BLAKE2B 5815c60e765474205f9de927f04977e29fb00e9bdb93c55e0d01857885a3f58a5bff27e843ca2e2ea2a151c30473469d61871321ffae183761ad45a332528b73 SHA512 b106adb9535a7d094709554e6427f8a6faecbbc2788573aa76b95702722f596bba06b9d5cf0fff32a8f06570d09340f37879666620063dc78e51e55b4024e42f
 EBUILD vdpauinfo-99999.ebuild 515 BLAKE2B 787c16d503300c983ca2da1eab61967a5bc2d986cf0fd969906345ae144da3e62eea7da3c4a318775271a9694be858bd5d70def0f956923d53de337432869bd1 SHA512 d65b62f29237d55d5ac6d2cc8a0965b67def68c5ea52a71c28514926bc6fdf53b7ba8781b50469a3e8eb92f16199120b6a909d0700179a6ef033f7d8c846ccad
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-misc/vdpauinfo/vdpauinfo-1.4.ebuild b/x11-misc/vdpauinfo/vdpauinfo-1.4.ebuild
index 39610aa786da..a6abe66f1772 100644
--- a/x11-misc/vdpauinfo/vdpauinfo-1.4.ebuild
+++ b/x11-misc/vdpauinfo/vdpauinfo-1.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=7
@@ -10,7 +10,7 @@ SRC_URI="https://gitlab.freedesktop.org/vdpau/${PN}/-/archive/${PV}/${P}.tar.bz2
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	>=x11-libs/libvdpau-1.4
diff --git a/x11-misc/wayv/Manifest b/x11-misc/wayv/Manifest
index d370af82041c..56fb9da1d46a 100644
--- a/x11-misc/wayv/Manifest
+++ b/x11-misc/wayv/Manifest
@@ -2,6 +2,5 @@ AUX wayv-0.3-autoconf.patch 320 BLAKE2B 38db31b413ae832cf0fb41fc4734a0f77a2eba0e
 AUX wayv-0.3-flags.patch 357 BLAKE2B 20312ebce59bb6bc0f356f34ee321b2dcfaa434fe0ac9e3b89f8693d1750d7fa0892d0a1ea79cf45cab5279aaeb9d75100e1f737c5b635298b4b30e1b72e4e92 SHA512 c6c0116e2cbb1e6de795040bd09d42fa962fecf16933185920101464bfbbfd818fc368940cfb2415bfc5fe68771ca256207109758b16eb19016cbc3e6948d9b2
 AUX wayv-0.3-fno-common.patch 549 BLAKE2B 8e6e07a690c4613f87de41c0fa83ad6a98b60eada9c7ec8582807ce28ecf2e89e021a2a1bad742ceef1cfd2b5464bd71908ab8eabfd940464ad1bf377c752349 SHA512 972c0bab4f9b5345d68235c0f03683d5c16d910c2e19a8ce4f1176661d6cba2ff7dd7c7f46a0e494570479e63a121c69ecd27d5f54325f612ba82a47f705a357
 DIST wayv-0.3.tar.gz 139197 BLAKE2B 88fac982c3647e4fb61fdda7febad3fa57b4a5dd5c0bdb9a2ec85a1a45fd8bff0b9472c161d08b7e9921928f36ead147a9846df12a414f41e28df096bf7361f2 SHA512 dda4dafc63c4393a726175597ae734b321e3c91ab6acd1b4b0ecae5861fa7c87ce83b68ae4a8bb92be9039b22ddb86f7e9ba87559d35095784eb98a5eda14681
-EBUILD wayv-0.3-r2.ebuild 608 BLAKE2B f53094ac474898f1c7ec3b374826aa5fea27687a0cd137d7e36b9e47768d84ca1051bc8a7f9c369cadc0918238aa856337fd7a49a620e7e036fcdb627e9be6b1 SHA512 9b16c9ed56dba7b584080c4e244560e14f5132f4ffa32f18d1a8d55688f67e3d65565de2654c51dece91f06b36f6f31792ea8062580f0f41af3b3b80696ce5bd
-EBUILD wayv-0.3-r3.ebuild 683 BLAKE2B 1c215cef91a7e10a4c30e2c50375f00e5c2bafff9e50981429ccda94340b856d306084f3828410181d56af59489b404f407ee1de70393dc460c9cf53f4078512 SHA512 5ca09ce6ac65250b95152d61bf29b8aa7a040977e2829a25f59baf63eae472157da99e5468030fb5b2e75a1a214df1c0f83070c861570f6adfc74346124066f5
+EBUILD wayv-0.3-r3.ebuild 682 BLAKE2B a7fb368f3217b3d56f1b0b882063a36572ba4f45b04a4c587b329763cace91c4003c0d6cac667165ea949ea1c01bbb6c8dd8bbdaf9213e2df80ba8d1d0a85d21 SHA512 0320aa223e6efa1a0326bfb1fad65cc9f54a2c9c323c387fd432b8143c6a9e389a760579c9a19f863037d386d9a4246fdf179ea599315d5c793bec9d1ab70e01
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/wayv/wayv-0.3-r2.ebuild b/x11-misc/wayv/wayv-0.3-r2.ebuild
deleted file mode 100644
index b7763a8fdc81..000000000000
--- a/x11-misc/wayv/wayv-0.3-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs
-
-DESCRIPTION="Wayv is hand-writing/gesturing recognition software for X"
-HOMEPAGE="http://www.stressbunny.com/wayv"
-SRC_URI="http://www.stressbunny.com/gimme/wayv/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXtst
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-"
-
-src_prepare() {
-	sed -i -e 's| = -Wall -O2| += |g' src/Makefile* || die
-	tc-export CC
-}
-
-src_install() {
-	default
-
-	cd doc
-	default
-	dodoc HOWTO*
-}
diff --git a/x11-misc/wayv/wayv-0.3-r3.ebuild b/x11-misc/wayv/wayv-0.3-r3.ebuild
index cfda0bef6e80..11ed5a71d171 100644
--- a/x11-misc/wayv/wayv-0.3-r3.ebuild
+++ b/x11-misc/wayv/wayv-0.3-r3.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
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.stressbunny.com/wayv"
 SRC_URI="http://www.stressbunny.com/gimme/wayv/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-misc/xbitmaps/Manifest b/x11-misc/xbitmaps/Manifest
index 2522f237bab4..5fa78d5756cd 100644
--- a/x11-misc/xbitmaps/Manifest
+++ b/x11-misc/xbitmaps/Manifest
@@ -1,3 +1,3 @@
 DIST xbitmaps-1.1.2.tar.bz2 129435 BLAKE2B eff2f1e2efbabf447cbe98db09f81db96dc1442d4cce01b570774fb4e3e7323a40385d7821685724a9d9c69219528da980b2ecf01b0d3b822be8879e4d7f3e9c SHA512 eed5e2fce9fc6c532984e6ed1262e440591e311ca6c61a7fe7a5c877df84bfc2d7aff388fb9c894fc098785b8e5352f0bd7c918252247a040cf123874847450d
-EBUILD xbitmaps-1.1.2-r1.ebuild 669 BLAKE2B 38c3fe1f51d97c392f9e0c4d535f3b6c82a6850c3dd0c5a7d6f795637b199b716d06a95d8a4236e10f64857192b37ec4b451617243af879be8914c058e6aace3 SHA512 4d9166903246a0197225bfd487aaf8f2312bdeabc1be60252cb4ad4f9fe153f187f27f54ab550f2aa81ce7372a2003b98874a1f4eb00f1bb868250e89dbf8dba
+EBUILD xbitmaps-1.1.2-r1.ebuild 658 BLAKE2B 318a2d67f855a58dcc1143495c66621a73a42b1867b00aa5cd4689f6e1719fc33db0ae10ef1a0de84746d8e550f549a3fc0989037a61524214b5aa8913697c93 SHA512 579dfae7bade87b8b5591d43b192734da16010b77aeb52e5c68f4c08059ff82efa86aa576d76f502461af8342b7aaeb33fd9fb4529b714372ea1b58caaead85c
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild b/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild
index 77798ff4fa87..afc5a1ef0522 100644
--- a/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild
+++ b/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.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
@@ -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 ~riscv s390 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 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-misc/xfractint/Manifest b/x11-misc/xfractint/Manifest
index af673de77904..7eb891e6ffe8 100644
--- a/x11-misc/xfractint/Manifest
+++ b/x11-misc/xfractint/Manifest
@@ -1,8 +1,6 @@
 AUX xfractint-20.04p09-ldflags.patch 1067 BLAKE2B 4faddadfa0105ffedef7552264971bf685121a74ccd449b12f33d525af61c9fa0557fc3e693848883d88a5b868c96f8e3bd2e14764182ecb2655b6ba64a12294 SHA512 af78e1facb6e436fed67e56871172fef742df1eafa75c55a75752dda855f81f7aff35cfaf042cf1f7502f66d4a9c7bf831b781c8641299873cc2537fe5da0ace
 AUX xfractint-20.04p16-install-phase.patch 729 BLAKE2B 937aa26a6b0e4e4f9c5ef52677f47ed5fb0f7906f116da378b82020bc765c01cd488b1625d61f33324c4984ba2cb1c669b1fca95fc834a948bf22fe87977a0c4 SHA512 fab66eafe5b97b767e6e67f09bde79f3b984e0d40fcb4fff1e5002da5a47e052916b3ec6786921fa393e150ef47e78e286fc0dda58e4affdb2cc5989a58ef7e3
 AUX xfractint.envd 63 BLAKE2B 1622655f8b51034a4f3e7c9d7b11fd7628a33b30a17df15b6af8d5aaccb824f14ab4659fbd356cb188d8c0f1f0d2c1537a8bbcf1fa560eba9c5a2ced7bd7d7f1 SHA512 1e923957e93a53af47a8bc3205c350b9fe4bbfa9f955c5eb5673c1ce857808bdf0ad020c643c7f81dda1c0b5caf2480005c2f31eabdaa39908ef68649687b5a2
-DIST xfractint-20.04p14.tar.gz 1336285 BLAKE2B 946c34551acf131845f1ecf17d4fe82214535627e8ea68d704efcff4b93c525d82f004bde8ae1bac11df8c82caa3bcff4778b2f8dfed1bdb494ba036e62256c5 SHA512 7d13c719f4f4b0680455b9b7f86644928d8145606973d208e5bf0d26b4f7b04ddbf8d2080ea35c872b21e079f1a116f3ef94e9acb36a45d43c16403c473e2acd
 DIST xfractint-20.04p16.tar.gz 1356976 BLAKE2B 2cb05021c76d9761bf7020a2b9a0fbf7d682a620d931b7841ce75780c1a3aabb6bbbd1b2e378fba3e96b2cfdaf845ff9cdafcf3219ee756fe7d128a19b342132 SHA512 6696daf21c2927d87f58f7d7136c5d51bd8c60d78e901d537f1ef38f27b70c42a590b05c663363c49a8cb30d7013a969813e7bbe4a97f49b9c286497b440bdf1
-EBUILD xfractint-20.04_p14.ebuild 1046 BLAKE2B 41ae48fe45aeef7169d01d2ae52f5484655ec45ba8f7a284466b6cbacb96bff08322fe4c4f0669dbb888221866d6947f81b50c56a6f98175b3970db0e5930db3 SHA512 bbb5ecc9db4ef63e664aa99a7d6ab242ad74c3f0ae57d3e52efd7bf7232fbe9bef8b6aff43393cb3e5ff25e711950effc86c817da9d6b69e513a908d1cc343cb
 EBUILD xfractint-20.04_p16.ebuild 671 BLAKE2B 537cf58481f902508d41458a71295c1c0fc44e7ed4d9c81343c7201a9a22e5280105bc6b39d6e02b4addee97c52c3713baa9e1020957a52e351d23015126e196 SHA512 0327cd8a0e1983ba9a2b176455e7d52c2a49d727cba1cb065aaedf2fa8445c3f95946b30e7b71b965b7c939b29d5b9a8b303526ca10e8210349f0834c2ac4735
 MISC metadata.xml 366 BLAKE2B 5cfc7ce6a7f5e6d02ad5f78d0e9d177c346b498b679f5623cf7d2321021a3d0289fe30c1b2360cec5903409627898de04fec3d2a7c26ea875f8e891685158549 SHA512 d602f03153bd9f03c962a47d7b10c829e2bdbde64cb5e67bfb4fb7c8755eb87784139ae1e1b287d6dd5c99d2f7a96f7c04f67fede847095116385db7cced5f2e
diff --git a/x11-misc/xfractint/xfractint-20.04_p14.ebuild b/x11-misc/xfractint/xfractint-20.04_p14.ebuild
deleted file mode 100644
index b06f10dad010..000000000000
--- a/x11-misc/xfractint/xfractint-20.04_p14.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MY_P=${P/_}
-
-DESCRIPTION="A fractal generator"
-HOMEPAGE="https://www.fractint.org"
-SRC_URI="https://www.fractint.org/ftp/current/linux/${MY_P}.tar.gz"
-
-LICENSE="free-noncomm HPND public-domain"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-libs/libXft"
-#	x86? ( dev-lang/nasm )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/xfractint-20.04p09-ldflags.patch" )
-
-src_compile() {
-	# Untested, any x86 archteam dev. is allowed to uncomment this.
-	local myasm="foo"
-#	use x86 && myasm="/usr/bin/nasm"
-	emake CC="$(tc-getCC)" AS="${myasm}" OPT="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${ED}/usr" STRIP="true" install
-	newenvd "${FILESDIR}"/xfractint.envd 60xfractint
-}
-
-pkg_postinst() {
-	elog "XFractInt requires the FRACTDIR variable to be set in order to start."
-	elog "Please re-login or \`source /etc/profile\` to have this variable set."
-}
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 12bd841eabab..95077abb1d05 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,4 +1,4 @@
 DIST xkeyboard-config-2.31.tar.bz2 1705328 BLAKE2B a6fe680a8f32f1ca58363faeb0955ae621712f045570f66ce1c211093f0021f60e7fa29076b9dac80ee6c07ef1e4abb738ad64fd01a75ad776e582e2dbcc286e SHA512 f6f260253e1757640cc0591f9efb55ad5d08023a53ec2f0b468465b36bae0aae4f78dc4d6e603c95aa21c9993d9a42bd641edf2017be3183921a0b1c125f4669
-EBUILD xkeyboard-config-2.31.ebuild 1346 BLAKE2B 35bcef6adc8aef0c9f951c7c40adccea362ba6a51dc52577b5880c34e3bad3899e1ec19b90313ada23c114810782b9d01c27581662c701cf4e303157d101deb2 SHA512 5fefaf5f48e9f9bb436cd263fe7191029db195909e2d8b7dae177be5bf76ce9af3553cad60c462ee4362ded3492eff6ea65aabc6ea36fa0b1a55ee1b82951f9c
-EBUILD xkeyboard-config-9999.ebuild 1025 BLAKE2B 40114e9b867de73171361cb9bbfc524d4b9ec67af46f58ec4aa12851ed34f9e6be3851aadb1758ae6dc7b0870eb84c83db77deb0c76ac63cd01e5438dbb0d8fc SHA512 a61f3525effabe287198ca34aa64198e876feadb44188e8a3df47465b3fddfd9cc2d56f2bf080ad19b9e8aceaff1387cff8893e7d46727903c480879fd85106c
+EBUILD xkeyboard-config-2.31.ebuild 1335 BLAKE2B 014596bf596a35450bdbe8e3f3474432f8db295b2cb04c3685b3c41caca5ed02feee214a698e123856c7e9cf382d9c8b14680449ecdf00c702acf8e63167e363 SHA512 db3c30f2dd112ac935e717f8e4262a5f378ac47cebfe6d08b17362cee6c45d715c81c396afb6ca975dddf76dac4efae02efb19f47af03a86667d627bc3f88288
+EBUILD xkeyboard-config-9999.ebuild 1014 BLAKE2B 97874c925224539eef09dc40f7bfe0bc296caba17d54f089ee178f53d49cecda7073096970659746e74a86b5c499fbac61e6ddfb76a6307c938ea31db31975e6 SHA512 51664f40efe39231b8fb704b170bebb29bce5046607c7f5e83e7e75fe16f5b191df64d492d7df1f0581cb0b7b909922bb7e653735b9eb128ef46b3a173596dd3
 MISC metadata.xml 337 BLAKE2B ab0893146e71b0d96879e7ec41c7c4e057cb92570227daef015b6fa1a24c55709cd3d19e16df5afe80f706995e12a44a9fc29826a552bd436b1e9381e44acde5 SHA512 6a43f86407638d3f156d4ae64caee882878dbd1ee7c23991c8f378d55cfb0afe016202866f95c328d8b4e59186efa6a7cb7335a1c86e3fbdda4c16a96e175cf0
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.31.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.31.ebuild
index 700f24a9a820..3150bcaad748 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.31.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.31.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
@@ -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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-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 ~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 2d42374cca5f..726568b1f400 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-9999.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
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 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 ~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 ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/x11-misc/xorg-cf-files/Manifest b/x11-misc/xorg-cf-files/Manifest
index 1c78e4d03da0..4a0f94402a67 100644
--- a/x11-misc/xorg-cf-files/Manifest
+++ b/x11-misc/xorg-cf-files/Manifest
@@ -1,4 +1,4 @@
 DIST xorg-cf-files-1.0.6-solaris-prefix.patch.bz2 4364 BLAKE2B 219911bf7fb6907762b70062c43842f116bb0c8ff033569d3a033918b004d89514eda43d1f478c7f0dc1b18adb17f5792990cc8d15cb9770b57e555c0b362f10 SHA512 159d55da274decdac934cded63f33164f5866dc81e853b1a205abdbe56fba4099ab4278e2fb5ff855c0b76784ba2b3fa89e6db2b4fdc9647111698e2c77da4a3
 DIST xorg-cf-files-1.0.6.tar.bz2 337859 BLAKE2B aab1495a699e6236095585c94151b3bc2edbff9e2b1f414fc916e09eca8d5dd4a5492ee9c69f8b21bf7d6c6ef1ab0639ba0d96be02b6736968b13b9d4d6f4a26 SHA512 1749a5fbcda2c15c300028abce79a3304cfb10f215bf98cf30558144eb64f9fa06a69203159f44405224ed567ac5bc0ff1222e3656367f69acc99f44871424fa
-EBUILD xorg-cf-files-1.0.6-r1.ebuild 2092 BLAKE2B d245169aa5b563c64892404b086f30d43ad89f43b0b9db06c63f95f9bed8bcddde07d7e44e06390f93423fdd79db437c70d79a85fa41d5f3b4854f3bb9236142 SHA512 92236dcd22dbb321336c1c0f53c9597f00aacb025cda6d02df03f3b702f5245a88a10bc7751d873fd36175e578dd0dff166a852e0c204b2e493dc0fa9c3055e5
+EBUILD xorg-cf-files-1.0.6-r1.ebuild 2081 BLAKE2B 8f4f0132a287de9b46fc27f5c3bfad1accdad4b534a9ff4c568e71b96f63be7dad85231a18cbb7929db6688f1878dbc6806212c8ab656ea11908130b8b056253 SHA512 12ce1ea91bc29d63ee53038a1a68ed428b9efc9bf676bf07c6e2dee40479a5cf011a3dd9ab09e52f7e5eb4fbdbb4dac554b6e932caadcdaee1c2bb8fa560d882
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
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 12a31b976dbe..c1a023f830c1 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
@@ -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
@@ -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 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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 BDEPEND="
diff --git a/x11-misc/xvkbd/Manifest b/x11-misc/xvkbd/Manifest
index 4fc2bbae9d09..43022d679b81 100644
--- a/x11-misc/xvkbd/Manifest
+++ b/x11-misc/xvkbd/Manifest
@@ -8,5 +8,5 @@ DIST xvkbd-4.1.tar.gz 408704 BLAKE2B 45667706005f508e22dcd6d24631b5488ffd32b0bba
 EBUILD xvkbd-3.7.ebuild 1058 BLAKE2B e1d2840d95f6831e7c442598227843d008a1c4906f8dd5ea64f1a33725dcd9e78e3d0d175fa0bbd264eeb1a66c6439a71b5dab6713e72adcd77deac5d2b4c82b SHA512 df24a91a9509a4fc6907052b87fec5f8c95e9ec5b7e4b8b6a5e8dcf0d6b4c17f0c6c171d7e22d9214827fec937fbda761859697f5ae0f5dfb7879abbfd696d7c
 EBUILD xvkbd-3.9.ebuild 1026 BLAKE2B 4eb776f6731a061978855c629118433fc211e1c54dabacd0ee7368fb2e62350a0d608f59cd23f43105602406ac13f46b6d6aa3e7facf7b209fce5e3a101aae9c SHA512 f8e311e4940a8b73bd9b096b27f04adf5b890de6ce953299bd3cf06d6fcea229b81213c6db605051546e7d21b6383941bd4212b1b26687ed7e00fbd65db9504d
 EBUILD xvkbd-4.0.ebuild 770 BLAKE2B e9ee8979ec4892f4202d5ce888029596362e08727f540b5db0f5a17b7933441cda3617f22d16249d85905df39459f54d675cb94d6c4527395e5403eb9cdef3e0 SHA512 6700a6a773290a24dd083bc5fe34b036b0d907c718dc827d2565f8aac3f493475ec2f0f985ae9d6f7a7f663018e813b4c4134b42a1a42a99b14ad3af8e70233b
-EBUILD xvkbd-4.1.ebuild 618 BLAKE2B 4c72784c41abd44ac7a05b10bfab8caf42ed27d7806ad82a4cf726503f77c317db7351490eda075189ea6bbc3bef3cbe7b1a98f6d2ee1645259415449f9d9e70 SHA512 5ee5d8ea4094633ea27bf941dfec7c4c22dd38e89cc3b37e10c2417cde86f23759e73e7ea4144a2a8a519f1802e0fd72a16462faae6b5085616047074e599199
+EBUILD xvkbd-4.1.ebuild 615 BLAKE2B 330f359558c187bb956d15509ba21be02a45288ec625fd30af5aad4a3fa2d82297c806c7454dff03e3e93c0b1a6fc9f7c90492b5804ce1349c21a7205f657c66 SHA512 6b538830bd84981da2a036ddef9fe52f488cfaff57643bcff1b1faeb5319a55f1fe9d4263a9c554fcd3476cc1b52c2fcfaceb944f89cb19c522f21834d3a5ea3
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xvkbd/xvkbd-4.1.ebuild b/x11-misc/xvkbd/xvkbd-4.1.ebuild
index a4291a7738c9..8ae5d116f165 100644
--- a/x11-misc/xvkbd/xvkbd-4.1.ebuild
+++ b/x11-misc/xvkbd/xvkbd-4.1.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
@@ -9,7 +9,7 @@ SRC_URI="http://t-sato.in.coocan.jp/xvkbd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ppc x86"
 
 RDEPEND="
 	x11-libs/libX11
author	V3n3RiX <venerix@redcorelinux.org>	2021-01-08 11:28:34 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-01-08 11:28:34 +0000
commit	24fd814c326e282c4321965c31f341dad77e270d (patch)
tree	033d63b33c21a3209964ab56005bb9bdd523630d /x11-misc
parent	129160ec854dca4c3fedb5bcfbcb56930371da0f (diff)