gentoo resync : 17.02.2021

32 files changed, 120 insertions, 355 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 1f6b9a5a8e10..152cb3bce861 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/bumblebee/Manifest b/x11-misc/bumblebee/Manifest
index 5ba0c5c7fb07..e39b0ab0efa6 100644
--- a/x11-misc/bumblebee/Manifest
+++ b/x11-misc/bumblebee/Manifest
@@ -4,7 +4,7 @@ AUX bumblebee.envd 127 BLAKE2B 2a993cd77706c2da4f90a3a77b4a6d0014b1322c584ae8970
 AUX bumblebee.initd 488 BLAKE2B be625ab381b6f588bc86402bfe7aacc8f541c0ebe2f8fdbc4309bdef5dd1cfa44953a3488bde8d0af67b8cf4b14b7b5de77ab125067b6b59379ceba75863fc45 SHA512 5c733a901e2bed20082d01f0db2e8d168106b082f2f6300388edbeec7f5b7a70ddfed908012c8ccf9a3caf070669cfb550368237dd6f8ff62018f8b767012cd7
 DIST bumblebee-3.2.1_p20190421.tar.gz 63640 BLAKE2B 62bf3e7556b3cc3651f0e1f9fabd22501b82e78c0820b5ae113fddc24816cefd9c788a33d506944dc971092ae22dc3389ced79da6284a5e812ffad909bb03ebd SHA512 e24de3b60e55828ccbbd85774b9a776ba01b62850489b9d7952c4bf807f080b68d084f11de540a65d1bf78f6a35ce89d35f868de14e7ab9d768cdf21a1d422ec
 DIST bumblebee-3.2.1_p20210112.tar.gz 63840 BLAKE2B 53f433c90ea7925a059597f9ce1e6b764bf204337cda2a87b3e862951fbd86e18cf3bb973a2a43c0ff913e9b290170536760ed9163ea746f5b28b7fed4ce9c6d SHA512 2d23db5a6d2a06c37176440568fd30c3afd80a75e13db00f081c0029f9e03275bf6c7b019778b9c31dcffe49ba56ec86a3303f00074123c95560a850bdb0f36b
-EBUILD bumblebee-3.2.1_p20190421-r1.ebuild 2317 BLAKE2B 5189a2f0ab287b44c2fd72f5f4f06734e4db53db95ff2b98cf093a01202f1764275483f03a7383f82e0799135976a7d8b039870d626f9959ecf8072fcf623d3d SHA512 75ecf2b663e7f72ddc38a55a56783e218d9f6f2ac6e8bb91ddda91e902f0841c1c1b655679e9316981a4398f84df6baf4630e6102dfc17e7f5534c120d896acd
-EBUILD bumblebee-3.2.1_p20210112.ebuild 2203 BLAKE2B 7cab41e8e9037f3fc3094317d7402d15c4af198f714aa03d22f46a894e2f2f68f677005b951b1ab68639aa8ffe6efe035970c2908814a59da76e23b312331d23 SHA512 28718f6459d80ca30613a0432430fbf11680d1acbe79fd1d4965242a93c0fb06b20bd67d3ed97c5ecb10ca1f33f865581d27e576c42c9e5d04fea7347f2128b0
-EBUILD bumblebee-9999.ebuild 2215 BLAKE2B f9f61a4183cc43c2c1442101b433fec6a3477d6062da340d8421e0e63398927c5767177ea4d3c98ef87bd261de39b821d003d7a67e209de21b47c57c5e7aed21 SHA512 7da89e2bf3ee757b29fde2757dba5e63c157ff0b15b59d244df8ec43ce9a25adcd00b6f149b694488a916eb7d293b6a59d48e40c18eb94b4be1e9fa35c26a69d
+EBUILD bumblebee-3.2.1_p20190421-r1.ebuild 2295 BLAKE2B ee30265b3733279db824a9a97a62428d0c480590543475b18eed9450c1735dafb26410a838467f1ce0c98617b9d705f02015f63ee8e4662847d07c7bab296696 SHA512 e4cb4d0c2083134ca248f59e5d709ab61b36429f13ee2a4f3cff8bb5ea8bbd384d759f7193151bff146c11e96914ac70e6eaa0e88b4d1742b69980aa08f735a7
+EBUILD bumblebee-3.2.1_p20210112.ebuild 2190 BLAKE2B e4802c77f1d18a6172a3178695e9d0d64c651d6695a40a03507d1efd5c0347d54f0519c6c1451f4e597c8112688e3dfd747862213e03486b9d6112daa2767229 SHA512 c7bcc34cdb778ee55b7ac83c792d3203f23e052072bd9a9fa9817dd64f3008ec4346d05c41c8af4bab4811cb935d3face9a2b36300a5a31beb65d78c798de4ad
+EBUILD bumblebee-9999.ebuild 2199 BLAKE2B e19016ca68387e551f0694b924217680f46752f81e6fa5126b14217c33f0dfe29b41fd7d8555ab05ef69a11c31aa94013f6d705538002d3daf80c4afad36b36d SHA512 a483f2303cba245bbcc94d8cf984e606539ad200d7db9bd53e36152719dc9f64038b2b4046ca7121d8db0af4f1b8400c1e006fffa17e0cd75c5dac7065555f9a
 MISC metadata.xml 1111 BLAKE2B 9f9bcd089280889ccb6990617f6b470c0c69a8b77b2af849d5bde7ff45ec94e121569d2c217a87d7375e19503bf0d90de775c514e7b400c0dd2a6fbc897c21b4 SHA512 dc2f37b1def7e302fc3d82325d3179b0c64c96b2fa609f6cf5196cb97b89854fade361005327ee2f8ccc5927e0aefe1c997cf5e6f9862cc18ef09deb3a2aa814
diff --git a/x11-misc/bumblebee/bumblebee-3.2.1_p20190421-r1.ebuild b/x11-misc/bumblebee/bumblebee-3.2.1_p20190421-r1.ebuild
index b45b50e5519a..3c344ba46d4d 100644
--- a/x11-misc/bumblebee/bumblebee-3.2.1_p20190421-r1.ebuild
+++ b/x11-misc/bumblebee/bumblebee-3.2.1_p20190421-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,6 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Bumblebee-Project/Bumblebee.git"
 	EGIT_BRANCH="develop"
-	KEYWORDS="amd64 x86"
 else
 	COMMIT="7aa457fe7b4fffc3b175ad36fdae00d7777065dc"
 	SRC_URI="https://github.com/Bumblebee-Project/Bumblebee/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
diff --git a/x11-misc/bumblebee/bumblebee-3.2.1_p20210112.ebuild b/x11-misc/bumblebee/bumblebee-3.2.1_p20210112.ebuild
index 422ac388e2dc..58973b2a9eb5 100644
--- a/x11-misc/bumblebee/bumblebee-3.2.1_p20210112.ebuild
+++ b/x11-misc/bumblebee/bumblebee-3.2.1_p20210112.ebuild
@@ -9,7 +9,6 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Bumblebee-Project/Bumblebee.git"
 	EGIT_BRANCH="develop"
-	KEYWORDS=""
 else
 	COMMIT="8f3d307b6aabbc2cd8444c6e5a4360f3bf2915ec"
 	SRC_URI="https://github.com/Bumblebee-Project/Bumblebee/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
diff --git a/x11-misc/bumblebee/bumblebee-9999.ebuild b/x11-misc/bumblebee/bumblebee-9999.ebuild
index 65477c88d732..e66fb829acb9 100644
--- a/x11-misc/bumblebee/bumblebee-9999.ebuild
+++ b/x11-misc/bumblebee/bumblebee-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,6 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Bumblebee-Project/Bumblebee.git"
 	EGIT_BRANCH="develop"
-	KEYWORDS=""
 else
 	COMMIT="c322bd849aabe6e48b4304b8d13cc4aadc36a30d"
 	SRC_URI="https://github.com/Bumblebee-Project/Bumblebee/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
diff --git a/x11-misc/i3blocks-contrib/Manifest b/x11-misc/i3blocks-contrib/Manifest
index 05ae6b834659..4afda4135111 100644
--- a/x11-misc/i3blocks-contrib/Manifest
+++ b/x11-misc/i3blocks-contrib/Manifest
@@ -1,4 +1,4 @@
 AUX i3blocks-contrib-respect-CFLAGS.patch 654 BLAKE2B f3633b4046a55d31d5ae694b37517ac72cffb01ff3d6c6ab58a38df5fcdce64ae3532cfb9629e7d51dc9cb5d1b399623d275456ba3ef84f9376f2a2797e003a2 SHA512 a60f83fd008deffd819a6997b0061474ead9b37b5a069c592b6afb79c0a11b360e5bfadedfa2279919990923e9283adf6c1851972cfdedfdbf27addc44fc58d0
 DIST i3blocks-contrib-1.4.0_p20201127.tar.gz 738457 BLAKE2B 1db16c40323d0c191bb44c50d6a66523391adfdf9652976f78238fffe0ee50d99d3bd6fbcfd1a0eeef8308fd466a3eeda479299f462b4d4d31ae2f2bc7ea6b31 SHA512 ff09c7b8e4b630d014f0441342835dbf03642f32de6806a1204eccb6166eade190abe43b331ef72aaa3ba5a77f9690ae8c36a9ef9aa6d312ae5e543a46b99a72
-EBUILD i3blocks-contrib-1.4.0_p20201127.ebuild 732 BLAKE2B 65f9771d2b72486d01b24b3b94937148eca140799a043336c90ce212c2abada5f352b07e5fd1c17a490ab8805a83a1ae06d7cfe43e47394e23cdedbe1a802df0 SHA512 aaa52e06493792bb9b972bb8b5965ec3c0703541310d7e431b2ea61752dc215ce67a06f090cedcf17f1238404246ea92b0e4957c623b24dd00039947d15539b9
+EBUILD i3blocks-contrib-1.4.0_p20201127.ebuild 1611 BLAKE2B ebe6c49665058c5ec97987c0c20712096b104be6eafb5435b2a2cb70c45a6cadcdd4ccec7b94cde80a72c59fb512159d7b5f5e6a42b9587ff9d128450c21c02b SHA512 1587b39e97440398b87ad65803ec8622f091554c29b729d232b9ef90585b39362dca36a025fc5fd98c5de1c8ffeecc164bcc9a9e559fea37da20be888ce5304c
 MISC metadata.xml 332 BLAKE2B 174061304cb0b09fdc2279117f1dd3974b94104fe9926f854f149c580d6e64b4e2201f5a48f989b4f11a3db95e9e5051d393365069d95ca0f83b2db8b972b868 SHA512 911353979e4ca52a7fb5213811cfbac924f05eaa11f92313d65cc96d67eead4872deda29a5aa2572e67d63f2feb0f6e54bb4fd1d4bc41e4c9d6406e6153bb5f8
diff --git a/x11-misc/i3blocks-contrib/i3blocks-contrib-1.4.0_p20201127.ebuild b/x11-misc/i3blocks-contrib/i3blocks-contrib-1.4.0_p20201127.ebuild
index 701962eefc8d..5977a9b1339b 100644
--- a/x11-misc/i3blocks-contrib/i3blocks-contrib-1.4.0_p20201127.ebuild
+++ b/x11-misc/i3blocks-contrib/i3blocks-contrib-1.4.0_p20201127.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit vcs-snapshot
+inherit optfeature vcs-snapshot
 
 COMMIT=154001e5713c26c70063446022919225b6f916f0
 
@@ -29,3 +29,21 @@ src_prepare() {
 src_install() {
 	emake DESTDIR="${D}" PREFIX=/usr install
 }
+
+pkg_postinst() {
+	elog "The following deps may be required for certain ${PN} scripts:"
+	optfeature "backlight" sys-power/acpilight x11-apps/xbacklight
+	optfeature "battery{,2,bar}" sys-power/acpi
+	optfeature "cpu_usage" app-admin/sysstat
+	optfeature "disk-io" app-admin/sysstat
+	optfeature "email" dev-python/keyring gnome-base/gnome-keyring
+	optfeature "gpu-load" x11-drivers/nvidia-drivers app-misc/radeontop
+	optfeature "kbdd_layout" x11-misc/kbdd
+	optfeature "key_light" sys-power/upower
+	optfeature "kubernetes" sys-cluster/kubectl
+	optfeature "monitor_manager" "dev-lang/python[tk] media-fonts/fontawesome x11-apps/xrandr"
+	optfeature "rofi-calendar" x11-misc/rofi
+	optfeature "ssid and wlan-dbm" net-wireless/iw
+	optfeature "temperature" sys-apps/lm-sensors
+	optfeature "ytdl-mpv" "media-fonts/fontawesome media-video/mpv x11-misc/xclip net-misc/youtube-dl"
+}
diff --git a/x11-misc/macopix/Manifest b/x11-misc/macopix/Manifest
index 70051d5f3507..c67c787f6570 100644
--- a/x11-misc/macopix/Manifest
+++ b/x11-misc/macopix/Manifest
@@ -17,5 +17,5 @@ DIST macopix-mascot-triangle_heart-euc-ja-1.02.tar.gz 310099 BLAKE2B f52f2ad14cd
 DIST macopix-mascot-tsukihime-euc-ja-1.02.tar.gz 616138 BLAKE2B 8616fb0f3b8e4b72c6576dfada3794dc3e387d250e3a6f64eb2b290ef793f62c43f20ef9c03d2b309f4fd3860ce828a562f28ec37ca55ce8e2831315ccbd8a63 SHA512 226a175846a1f81a5aeedab6d7b85e38903d3b85a88a4a2c9a91365ba8a149a9ee54d6174bf8c4595cbe6542d3afcebd440a4185402c2139310664059515a2c5
 EBUILD macopix-1.7.4-r1.ebuild 1813 BLAKE2B 91da4479a1a1385166ad0553b27610061e100486dd23b54dbfcdf97543aa6e180282b2f8283cbef50b3567308e9a1a3d5f611b104e46b3614083959cdcef0e97 SHA512 0d5f63840612f49787422e1a670b840db03f381d38cb686873a0bbd8e6cc86f2525b5dc826f4d003c769c03ec801920d389684fc7fa37838d78ddb4a2155f809
 EBUILD macopix-1.7.4-r2.ebuild 1794 BLAKE2B 77e5701b7376e7dd6bdca55bb0428091ccfee074db21885b1768c192f54056462afe11bafd88d6883c7c83d1b655d11b9ce1a6b20699a0b40d250de5ecf1794b SHA512 570bbe33da66bbd83c7d8292dde3033cd89c45482e4b2bffc6dedb12d1b2fc5aadf2f2eead9d1dfb4ca3f6cf1f0bfada9efa15eaeeabfbb444c7ed199b980301
-EBUILD macopix-3.4.0.ebuild 1876 BLAKE2B 15f98c786f0d25315b442ae83158b1447ed532bf41d6719d75a44004cdb5f16f3552f5230ff87146c49ae8c0b0cd953086ef6ac266119d0cc4a4a5353bfbb324 SHA512 6a5ec9ba297e604638c5b6b8c206f850052d33142cfd33e2791e8bbcc177b12378d7e426ab8c329509a2a5842dc6da48b135e981d2c3d8769b2911c0a11a0640
-MISC metadata.xml 272 BLAKE2B 4dbd2b5ae92564a97b2a06ab0ec6562e8dce2dd636aaf0788ee09f8688ca5d5b6483084a65366dfbe6d144d30170e5558bc5759adecb96abb405ea96a5147285 SHA512 ebe67da08587903b5b82fc194aa3c8f1ab65371f60d2c134928362e089550d9e9fd9531bffe8b676a345b5bf0ab209ce7f50d37d98201a88176f002e17582493
+EBUILD macopix-3.4.0.ebuild 1911 BLAKE2B 4e0d5238ae726e376a0b8df95a2c9f01fa27c38edba5dca270b10548df94a8bcfcd92a15de731558743df21e00ec9903fa46ae67df36ed2cf3197d78417228f2 SHA512 01ed6a5adc73b50e5b746d06fa1d8b83f3131e35a190d7ba1045220e88acc7ac9e849a7b32d80d714c0a02f05b22037d8c54cb877b2a493532445f36953e2c62
+MISC metadata.xml 247 BLAKE2B 9b6f19fbcb6084773af3f04b2965ed66f9dd87ed94de032b9e88ef713ad0e980d87bf0e488ec0858ff98bdde4e2fd8e34bf9b7e3de4cd20474c0b293b7f06887 SHA512 6fb7777fe5e0553aba14e07da24c8fec5fc21ef1b032aaa4846dedf7ff71ac86e2b0e6fc931ef2fedec3073eb8114d698ec77f21edec8b4ce87e40c50620008d
diff --git a/x11-misc/macopix/macopix-3.4.0.ebuild b/x11-misc/macopix/macopix-3.4.0.ebuild
index 4765b8dbb419..b7351081a80f 100644
--- a/x11-misc/macopix/macopix-3.4.0.ebuild
+++ b/x11-misc/macopix/macopix-3.4.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 inherit autotools
 
 DESCRIPTION="MaCoPiX (Mascot Constructive Pilot for X) is a desktop mascot application"
-HOMEPAGE="http://rosegray.sakura.ne.jp/macopix/index-e.html"
+HOMEPAGE="http://rosegray.sakura.ne.jp/macopix/index-e.html https://github.com/chimari/MaCoPiX"
 
 BASE_URI="http://rosegray.sakura.ne.jp/macopix"
 SRC_URI="${BASE_URI}/${P}.tar.gz"
diff --git a/x11-misc/macopix/metadata.xml b/x11-misc/macopix/metadata.xml
index 49c86a887b6a..d5a7512e6c1e 100644
--- a/x11-misc/macopix/metadata.xml
+++ b/x11-misc/macopix/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>desktop-misc@gentoo.org</email>
-	<name>Gentoo Desktop Miscellaneous Project</name>
-</maintainer>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">chimari/MaCoPiX</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/pcmanfm/Manifest b/x11-misc/pcmanfm/Manifest
index 5647aaa5b52a..493b06d17615 100644
--- a/x11-misc/pcmanfm/Manifest
+++ b/x11-misc/pcmanfm/Manifest
@@ -1,4 +1,4 @@
 DIST pcmanfm-1.3.1.tar.xz 423380 BLAKE2B c117f789d88b8c776f09dd598256bc889bf1d1ea2854a646da30e57e8e3b4a1410cf8411841e1b3c303f7f0cf4ec3d4046c0e05ad9c453efd1589592415119f3 SHA512 68fbc55b3ffd9da17c861d2cc41590a455ec2c0eb590ba4862f8a0ae01caac34a58645d847d318553ff588df20d355bbcbf1138a792cb45922eb04b047f681c4
 EBUILD pcmanfm-1.3.1.ebuild 1565 BLAKE2B fc0f3ba5ca8a32de15f12ca95ad1abff2af31e237e747a9a0690806305bf2acf77d13f179cdace5772343b02a5d35f45926eeb12857188da8adf04f9cd3f8824 SHA512 1ea8ce53886860a24e528ce5f384abf62a86a18794e00bea1a20df6bb45ca817ecc70ef83270d62974709b16e7073fd930a9550db9d53a969b43c2b4b55923b9
-EBUILD pcmanfm-9999.ebuild 1764 BLAKE2B 7886b9c70db89b2d86b2f18b0981fc7fc90e1e4feb23c9551b2a81bf6be0d0bff74026d04174bf507d43e5eacc7df16616bf63d17e8cf194823ccdd560e107c3 SHA512 010cf7f72a855c3cfd8486eb5a7f3f56c90856f204ded84dfc30c5d95972a952e2027469880e39435f0fa08851aae3dfe45ce38e46849d810db238ae9f52d8a0
+EBUILD pcmanfm-9999.ebuild 1748 BLAKE2B 17066821d0bb4851251f899edf72c69af1aee1882957b8b5c7a163dd9e0fd589df568ae88f694ec6f47042ad0f4768a89e6d4b4dbeb1371722eb56847eb0178c SHA512 8e60059b397d80d94ed62a38e8562bd714b328314c0ad9153d955f08b2cc7a49a99a31df3074ddb441f588f0a0495d94f8cbecc303c02d42487433d29cb177e4
 MISC metadata.xml 249 BLAKE2B 9253edb9862aabb3fb8518f030c5b2b5c61ab29edf4967dbb44a18c76a95bcfa6927b0c6fbd31ac67ca0ac4a8fb4041483bbce6a01c16f721322804fe3c631aa SHA512 ac804612b7a417323548cbf30fcfaf85b782e0b1f90084d6ac194d28044c9445e07f0a30d54ab41d6861cf0d9f3e7135649477bfdcac340d3a16936420091d94
diff --git a/x11-misc/pcmanfm/pcmanfm-9999.ebuild b/x11-misc/pcmanfm/pcmanfm-9999.ebuild
index c23a058f92d1..73fd47c92e65 100644
--- a/x11-misc/pcmanfm/pcmanfm-9999.ebuild
+++ b/x11-misc/pcmanfm/pcmanfm-9999.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
@@ -13,7 +13,6 @@ inherit autotools eutils xdg-utils l10n readme.gentoo-r1
 if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}"
 	inherit git-r3
-	KEYWORDS=""
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86"
diff --git a/x11-misc/primus/Manifest b/x11-misc/primus/Manifest
index a1524470a483..c66750ed13e9 100644
--- a/x11-misc/primus/Manifest
+++ b/x11-misc/primus/Manifest
@@ -1,6 +1,6 @@
 AUX primus-0.2-libglvnd-workaround.patch 662 BLAKE2B c2a4af4171487405ca08248c162e7ea38cdf7af0ee32636f19f867741794d18dfbd66490163c7eb38de975f5adf29b69dabb47ec8c6196a5d36781e25be58c24 SHA512 529d62808a488237b0730aee9e83448d0d9910f4b3b1f707012724a571a3a94362d5e19f8f347b94f999ee3c4b7ff9260113718bc8a4d7450264579de8ee7fff
 AUX primus-0.2-respect-ldflags.patch 733 BLAKE2B fae740396454d1051f3e4b5714e281edf9cab2b11144cbf5af2edfb6010c1e5adeb501a64289d7093105cfd039928e06c13246c845fc6dabf0a4b23b921a1f1a SHA512 d15fbebb12c5f9d299fcb9b7bf8004e2933d7739b754fc2de45cf13232938000ec187369eee28be85ea4502844b67b991f3c49b7ed31c0036e2da974e72e3248
 DIST primus-0.2.tar.gz 26248 BLAKE2B 5e7822e66f3abadc442c30792c03dc731814a084ca2911b9e0333efda1fdfd36ce3c31be612426ae3747d7be0575aca2e7562054ba4ae719812cf800ffc04ff5 SHA512 4108f4e721c9cd8f8dc592a41706230b29bbcfcb8ba49e61d1f07f715c81304471e0d00407bc59a314568b3b42e19f0962ba1dbb8ef1996fe0d4ac13af2e3d2b
-EBUILD primus-0.2-r2.ebuild 1625 BLAKE2B e18eaa7725803456bfbe131a1fca8b74134b3ac9ec79bba11d6d0c7137a311ceade22c5ce309f07d9213942d47d5dbc5c055ffd29b05d752f7ef6dc7a024c74c SHA512 8796ca9ca8a8ab7937266cec1b37bd83d4ab6233fc6507a6820b359e6e672bb187b22fac685ee99c546015e82c998df2e0350485ccc0af79d9340044969dba3a
+EBUILD primus-0.2-r3.ebuild 1625 BLAKE2B 276ed5d7fc7bcf0879da96237306e9cb34a602dba6a305b45d9abd7e361d312029e854c80a78bae6defcbf2e37b8283db440f05c059a32b2df946168d207813f SHA512 d8df53124cdf5ffd6fd5ad4ae33dcd445fa83a5936be8274e689e74450c5487884e395ddae8e2c2cc3145f71ce291638ffa2dde2c29330229dbb4d65feb92f6c
 EBUILD primus-0.2.ebuild 919 BLAKE2B b1eb99e7e0b18b69e24a7ade73729228b6829a36da518539072bb7919dd54c338c0c9bedcf8a69a557563bcc85e7a61d716ad851e2ae084ebf767c8fa0827635 SHA512 9c967343163ac52b2ef9e5e061b8ca6be8d3cb0b7be1e51ad0a913c8fd9953ee486fa70a697b41814440d5739eebf39f3d6b84f09d2c3cdbc4082a75ee7debe3
 MISC metadata.xml 423 BLAKE2B b55ae11da7b5968ec0b88042f4180c690d818c28690824eaf0511890dd747d64d0bd12510c2389e067e5ad190d295c27ed6a6e8ca43b8fd1abffbc22a3581096 SHA512 7d9a32f2d32a8973f17679e8658ebf461c7c88ba028f85209629767c097f66c4bfd0e3e1c9fd80d7a6b88bd4d6ccc52bd56a5650a61a68f6259278b172aab72d
diff --git a/x11-misc/primus/primus-0.2-r2.ebuild b/x11-misc/primus/primus-0.2-r3.ebuild
index a25dcfebb0f8..b70260a99d7b 100644
--- a/x11-misc/primus/primus-0.2-r2.ebuild
+++ b/x11-misc/primus/primus-0.2-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=6
@@ -17,7 +17,7 @@ IUSE="+libglvnd"
 
 RDEPEND="
 	x11-misc/bumblebee
-	x11-drivers/nvidia-drivers[libglvnd(-)=]
+	x11-drivers/nvidia-drivers[libglvnd(+)=]
 "
 DEPEND="virtual/opengl"
 
diff --git a/x11-misc/qcomicbook/Manifest b/x11-misc/qcomicbook/Manifest
index d1fe86a715c5..5d283c86d2a0 100644
--- a/x11-misc/qcomicbook/Manifest
+++ b/x11-misc/qcomicbook/Manifest
@@ -1,3 +1,3 @@
 DIST qcomicbook-0.9.1.tar.gz 739887 BLAKE2B c4072e849f173bc6014e1765adc18ac359e5508b5c6bb110782bb92c81fe7683911a68910976cba16263950d9ac9b9ad53de44c4cd692d0bd24374c38012ebbe SHA512 87bd983c4442e220f1bc463e54e0ea583cddbc6becd9eec64801dc5e7e061cdac5805cba83167685ab454e41fcce329fa399d622d7f588940bf057ce4b1f423d
-EBUILD qcomicbook-0.9.1.ebuild 1644 BLAKE2B a1bae2b0284d9268c625c1911d7cd3dc57a27af8b1cf0829591d5a8979fd5d986e649649ac846237bcbb177a9d0ffbe5b38c14c3086ef4958699d2f9292f3e5e SHA512 2681ca210738433495d5d0934aaa7b80d532e5e5093b66ec8a7ddc092fc794b94164948cbe66f5bd912ccf355d2e9c5f8808faaaa1d2a24373bb70a22d8134be
+EBUILD qcomicbook-0.9.1.ebuild 1621 BLAKE2B b42a54d50841d54c6bc88a4ceddce1727ba5b8f3553dda6d8ee76a089452a7a2aa8428f1bdbdb3fea7c53d6a0a93de1387b4ccf53d2afc9d4fd35104b36aa20c SHA512 0851e70d9161b6c323e41d7a0909ebe1b1fbf1f60b41ae3db54541ee7a0775b8f3577577abe5d146a01662683c8e198ad68eaea2d8000f0e6182a1bf97e2a1f8
 MISC metadata.xml 469 BLAKE2B 09213bed780c0d2f966fb7ba16c052ad397999be2e6e238c8e915ebbbb938f3210409e2d7961c629ae0d8abb20efa99b2b833d2cd268e7239ead845294b8fc68 SHA512 4c8f85cb1afed375e4b2c19e873c2c70ca7c11f139305af70a2b8556230ddd17f52753b1302c8d5547b4922e35c1922fdc001e62b420645f1c36097ebf5e855b
diff --git a/x11-misc/qcomicbook/qcomicbook-0.9.1.ebuild b/x11-misc/qcomicbook/qcomicbook-0.9.1.ebuild
index ec3dbfe2f756..e17000ce7a5a 100644
--- a/x11-misc/qcomicbook/qcomicbook-0.9.1.ebuild
+++ b/x11-misc/qcomicbook/qcomicbook-0.9.1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_PN="QComicBook"
 CMAKE_IN_SOURCE_BUILD=1
 PLOCALES="cs_CZ de_DE es_ES fi_FI fr_CA fr_FR it_IT ko_KR nl_NL pl_PL pt_BR ru_RU uk_UA zh_CN"
-inherit cmake-utils flag-o-matic l10n xdg
+inherit cmake flag-o-matic l10n xdg
 
-DESCRIPTION="A viewer for comic book archives containing jpeg/png images"
+DESCRIPTION="Viewer for comic book archives containing jpeg/png images"
 HOMEPAGE="https://github.com/stolowski/QComicBook"
 SRC_URI="https://github.com/stolowski/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
@@ -17,15 +17,15 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="debug"
 
-RDEPEND="app-text/poppler[qt5]
+RDEPEND="
+	app-text/poppler[qt5]
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtprintsupport:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
 
 DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
 
@@ -33,25 +33,24 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 src_prepare() {
 	rm_loc() {
-	        rm "i18n/${PN}_${1}.ts" || die "removing ${1} locale failed"
+		rm "i18n/${PN}_${1}.ts" || die "removing ${1} locale failed"
 	}
 	rm "i18n/${PN}_en_EN.ts" || die 'removing redundant english locale failed'
 	l10n_find_plocales_changes "i18n" "${PN}_" ".ts"
 	l10n_for_each_disabled_locale_do rm_loc
 
 	# fix desktop file
-	sed -i \
-		-e '/^Encoding/d' \
+	sed -e '/^Encoding/d' \
 		-e '/^Icon/s/.png//' \
 		-e '/^Categories/s/Application;//' \
-		"data/${PN}.desktop" || die 'sed on desktop file failed'
+		-i data/${PN}.desktop || die 'sed on desktop file failed'
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
 	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
diff --git a/x11-misc/qlipper/Manifest b/x11-misc/qlipper/Manifest
index 8e5623c833a4..33e30aa855e9 100644
--- a/x11-misc/qlipper/Manifest
+++ b/x11-misc/qlipper/Manifest
@@ -1,6 +1,3 @@
-AUX qlipper-5.0.0-build.patch 1690 BLAKE2B 904b17740275aba865f5dc619a4dd95862f2c81995016d655b0a34b4cf4b14471ff675876c80e12806ae5136cd094c97b498888a0709421a8c7720250231ea62 SHA512 b3c137e2a5ff8f838f238431f5b187d205937662003004205565e0d7367faf269e01b069428fec64e05a7f955ca55fedd3617f1974fee519ce033af70ea51b4f
-DIST qlipper-5.0.0.tar.gz 94281 BLAKE2B 04834165a70d71fad2ee945c0b8389ffefef110554d234e0b1f25f02f7b33a0c8cf809cafd7f7a74a2845f949d35a6ad8045d23981efdd9e6c091c5e61ac9367 SHA512 d2bd834f33531a175201244bdd6e9436da16c6f77e1fdc79616c8c3faef531ae50d4cc3b072074fd5efa494cc7be30ffe617912cf54494a66a72420095b0c642
 DIST qlipper-5.1.2.tar.gz 104652 BLAKE2B 841b984d4720dfe7d69424a79beee8d84f5d66109ac1afb75c39cf16ff27da309d929f91eab2222e43a547d4d010809f31d59adb321c9f9f0ae19fb580cff0a2 SHA512 1ad49424855abf5f446026856178291b6ed8c1152338013f2228bbe5a923bc2e989754fe41e8b03f069f815c3850073eb1063842b5f40462005693a9029b187b
-EBUILD qlipper-5.0.0.ebuild 774 BLAKE2B d416c001338ac1b644282e4d2ab6c9153030a77c6d73d9ed27c55f98120f11d09a4bfbf6440b64c5352ae58f7b6d59b7d3fb0e9426d6b714d4d7308a8346ec4c SHA512 214ef740bea26e7646f77fee465aba7f25f566783503e5b66556e537cfb29cdca6588614a4de1645c01d84fb7fdfd6830d0285f77d1debf1c6c80e8f6dff0b51
 EBUILD qlipper-5.1.2.ebuild 669 BLAKE2B d462649c3b3e35e636293da4d125d08e47b076b6909b01127c7b5a184e23efd2d728870e5713bb7d725b454ddcf21374f9701fe5b58e1ac650abc733a5471390 SHA512 1647756c69566c8b2a75602975a79ddee841f595ad4ce3705efa33d316bee3db73018ec57b1123bf305901103e749d4808a2c30e08274f9f9b421c958b5695bc
 MISC metadata.xml 326 BLAKE2B 345890725be13fba9c48c60bcdf1be0b14d41d803820fa1d7fa170d44c442a60c50454552697386ddd3732b3d5226f8c96e66fea9bd1b75a1a7c48a08d8e3520 SHA512 5a8bfb530bd363777d529b7b70eec99ba70e6ee41ad9f6fb5ba7fd4c9259ffd381d4343d7a1c6dce34fc1566f5cab4fd474bc3726bbee49edc92d78250d87775
diff --git a/x11-misc/qlipper/files/qlipper-5.0.0-build.patch b/x11-misc/qlipper/files/qlipper-5.0.0-build.patch
deleted file mode 100644
index 20f6b35c56a1..000000000000
--- a/x11-misc/qlipper/files/qlipper-5.0.0-build.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From b3cb6a08c82deacb905459b66f16eda35f0c3779 Mon Sep 17 00:00:00 2001
-From: Michael Palimaka <kensington@gentoo.org>
-Date: Wed, 9 Nov 2016 21:42:08 +1100
-Subject: [PATCH] Fix build with ENABLE_NETWORK_CLIPBOARD_SHARING enabled.
-
-qlippernetwork.cpp expects network-related variables to be available if
-ENABLE_NETWORK_CLIPBOARD_SHARING is defined, but qlippernetwork.h defined those
-variables if ENABLE_NETWORK_CLIPBOARD_SHARING was *un*defined.
-
-This also adds a missing include that is no longer available transitively via
-QtNetwork/QUdpSocket.
----
- src/qlippernetwork.h | 4 ++--
- src/qlippertypes.h   | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/qlippernetwork.h b/src/qlippernetwork.h
-index 9163cf8..ce1ac9a 100644
---- a/src/qlippernetwork.h
-+++ b/src/qlippernetwork.h
-@@ -21,7 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
- #define QLIPPERNETWORK_H
- 
- #include <QtCore/QObject>
--#ifndef ENABLE_NETWORK_CLIPBOARD_SHARING
-+#ifdef ENABLE_NETWORK_CLIPBOARD_SHARING
- #include <QtNetwork/QUdpSocket>
- #endif
- #include "qlippertypes.h"
-@@ -38,7 +38,7 @@ public slots:
-     void sendData(const ClipboardContent &value);
- 
- private:
--#ifndef ENABLE_NETWORK_CLIPBOARD_SHARING
-+#ifdef ENABLE_NETWORK_CLIPBOARD_SHARING
-     QUdpSocket *m_socket;
-     QString m_id;
- #endif
-diff --git a/src/qlippertypes.h b/src/qlippertypes.h
-index b55f0e1..c97c311 100644
---- a/src/qlippertypes.h
-+++ b/src/qlippertypes.h
-@@ -2,7 +2,7 @@
- #define QLIPPERTYPES_H
- 
- #include <QMetaType>
--
-+#include <QHashIterator>
- 
- typedef QHash<QString,QByteArray> ClipboardContent;
- typedef QHashIterator<QString,QByteArray> ClipboardContentIterator;
--- 
-2.7.3
-
diff --git a/x11-misc/qlipper/qlipper-5.0.0.ebuild b/x11-misc/qlipper/qlipper-5.0.0.ebuild
deleted file mode 100644
index ac11c2bd92c9..000000000000
--- a/x11-misc/qlipper/qlipper-5.0.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Lightweight and cross-platform clipboard history applet"
-HOMEPAGE="https://github.com/pvanek/qlipper"
-SRC_URI="https://github.com/pvanek/qlipper/archive/5.0.0.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# bundles x11-libs/libqxt but no qt5 system version is available yet
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
-
-PATCHES=( "${FILESDIR}/${P}-build.patch" )
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/x11-misc/safeeyes/Manifest b/x11-misc/safeeyes/Manifest
index 833d9fd8c622..cad7c5c3692d 100644
--- a/x11-misc/safeeyes/Manifest
+++ b/x11-misc/safeeyes/Manifest
@@ -1,5 +1,7 @@
 DIST safeeyes-2.0.9.tar.gz 291147 BLAKE2B 61f56b7c73964f1663eff4da7965c54ff413535d55fcb3c4dbe2b5caef6f1d8e7330d5191711b87f274cbbf4458d0dff2c0dd6f5531755c556d81455438b46cc SHA512 6a168686faa716bc1da9966250bb55654ccab926775207ff1c2104b2da802ccbd50f916ed9f7cec55ffe2b5b12ea63b5bdefcfbf35f044a7fb9ba9cb4918b2b2
 DIST safeeyes-2.1.1.tar.gz 342791 BLAKE2B 0051267daacb1a8f5dcd6c88c0132d09483cc5181c59a19f34b956ea97672a44fbefc78b8b1ec2223428df159dab3074280afd3069618dc3b3257f3703e9078e SHA512 ad1f7810646010902b30effc899743c986a5bc56734f6ded0f22f0e428ec772b419aa11348d75c406f931b126737a809fabf9e029a4936976f889714629ac0b1
+DIST safeeyes-2.1.2.tar.gz 348431 BLAKE2B 03d51c435f62e00703aba4c1224a5a961b1a187d22e3470993a7bb4c2537dc27dfe784d4c53403905853fa79aaa1ef8e8bfb2333045a2e0d2ec48452483baa7f SHA512 2d67c198fbbf7d5813d900450c6608870f5ca692f533cbb68d36e7f34e197e2e9b52b3210b328318d5c64fc430092748ddd2dfa6e493a585fdada920f933a434
 EBUILD safeeyes-2.0.9-r2.ebuild 1061 BLAKE2B f1f2da8fd981b9bae189691a6f3da6313c2b70138f3282cc536e20e0e30d9953236b81a65d8fe0f823129c1a4306673b530571da5a7c3959387bf9983335c2b2 SHA512 e9e1d7fdb90c1be5640bfa0457dcab4fdf8069198d76c9d66ea3011004b7b9963023a9b4730d8cf96dd6b0b5bcecfac78cdd003b64a37446c6dd69207c484a08
 EBUILD safeeyes-2.1.1.ebuild 1100 BLAKE2B b2bea10c80ec9014257debd33a69caa149ccbb0b3243a8f59e183ab04deefedfe6cd41147af6aba636368e5b5f00dba7e268b044c7efc7ee46c567298fb8ce5f SHA512 c93e668802febe7d6ca873017ada4f096c852da76fd06cc7752d3c1eab76eb437d53df7e856dbfd870100ee2adaf12d042be4f36dfb7c1338bdaa4411e2bdce0
+EBUILD safeeyes-2.1.2.ebuild 1100 BLAKE2B a698de06b0e7382e08c3bd19f07f997c9a1de6a7219623a448e6852105aab3d5aa124bba564d11b963493f0cd28b8ee99a9c991e4c07813f42a65f193b1e3f6d SHA512 f0164bda39aebc214d9a3a890b91760ee856da098bc799dbb67dbb8dbb3904f770302bae8a7595a90258c3239d34dcf4a1308183ac549e148af60956dee0b6c3
 MISC metadata.xml 346 BLAKE2B 317884987f99b4eb097fbd1b7166eefab1a7e565340c6dd28a8d485cf926cc8dc8b610a57bb39d6ccf03896bb09b50bff440c1066bf00cbfd059b7219fc4b5af SHA512 f73ca2191cf257ffe2fe79094187eee3cb8eb9eef4108f29e52713ab1e3ccab1148fb28a73e09c7cc723523fcf3b5fadd15528ca015864b38967207dcfb68609
diff --git a/x11-misc/safeeyes/safeeyes-2.1.2.ebuild b/x11-misc/safeeyes/safeeyes-2.1.2.ebuild
new file mode 100644
index 000000000000..9f1c4ee65890
--- /dev/null
+++ b/x11-misc/safeeyes/safeeyes-2.1.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit xdg distutils-r1
+
+DESCRIPTION="Linux alternative to EyeLeo"
+HOMEPAGE="https://github.com/slgobinath/SafeEyes"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="${PYTHON_DEPS}"
+DEPEND="${CDEPEND}
+	>=dev-python/setuptools-38.6.0[${PYTHON_USEDEP}]
+	"
+RDEPEND="${CDEPEND}
+	dev-libs/libappindicator:3[introspection]
+	dev-python/Babel[${PYTHON_USEDEP}]
+	dev-python/croniter[${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/python-xlib[${PYTHON_USEDEP}]
+	media-sound/alsa-utils
+	x11-apps/xprop
+	x11-libs/gtk+:3[introspection]
+	x11-libs/libnotify[introspection]
+	x11-misc/xprintidle
+	"
+
+DOCS=(
+	README.md
+)
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/x11-misc/tint2/Manifest b/x11-misc/tint2/Manifest
index 4f462c8483e6..f73071dcf032 100644
--- a/x11-misc/tint2/Manifest
+++ b/x11-misc/tint2/Manifest
@@ -1,9 +1,3 @@
-DIST tint2-16.2.tar.gz 537236 BLAKE2B b8ff236f4c21465603c3cdf1e3d9f62e238cfbd05fbb7976e4f90ac054566eb433d8be78ee657421b94465dceeb8461ace202090b08585693f13003d401e4faf SHA512 0e267d59aef3d812ab41c1e5904e3e96162afd8d98c76dc697fe8c2815707f34a31e392f68260311bdc66fcb4c0b1766ad549ff30d4314e6ab2e2debf069cafe
-DIST tint2-16.6.1.tar.gz 546590 BLAKE2B 0e970293b09ba766d795b7bc454f06c7a9e95a7c3534144583f5739fd275d3fee2568677f24b5d9b0809ebbc466351cfa17f91dbb726f5cdae3a0bdc9b9df16f SHA512 ae3b8c7b1573f7bb993a587a125341e4018ace605b4b357a7d633beb02e7622443b92cd11b95028d4704e94211ae9f2e13e89cd3bca91474e7daba2fb9fc2b46
-DIST tint2-16.6.tar.gz 546960 BLAKE2B 083e29d754c1faa9eff50dc480d18df99d64f44a2f88673f06e659d55de13c074eacf4614a57211d5b5aeec3a10f3d68471212d24a7280020b52fe91777d305d SHA512 f81770f330d3f2462292f726a6a90ac0182c518b2db7d79f098babe52863e5ceaf4293f975708f83fbc26735c79fdfefd110102ef0f4be45ae242b4f664d72b1
 DIST tint2-v16.7.tar.gz 551197 BLAKE2B ef1c5b3dea255e12f6dcea80a29f016e32e48f729f4be3e1fd7421c6fbdbbacde70f42f3052547dca8421b8343d4b41fbf2ea52b07aa4471974f9f0cc6eea7a7 SHA512 a9bb0b55536e09f70b1d14a5748635f5c5ec1b7b22517453a963b240ab593aae43c56e5cbc7b79d5f19103f0e13200faceb2d25afd66c3d941580424ae6d9d31
-EBUILD tint2-16.2.ebuild 1273 BLAKE2B ef37602f6f90f16fe0b6fef490bed60e55b326437d925cac0187df093c16b0038eb2e7460db16bb8f02881a797064510076ac7f8f99e26a43e6b85fbf4ea8f4c SHA512 329bf5a8f20b644e6fcc5e382cc72a8d1fa3766f66e302c3648d59c7f9495efb3babe31848772116320dc0df23f687d86233859fafd54f762a46aa26e2db132c
-EBUILD tint2-16.6.1.ebuild 1275 BLAKE2B f8cacb894d6955a00e3432a2ebc3de37faefd9e1c07a6da5da3cf288d7382a63252bf5b88ab87c085b3eb2616da7b133e15c04212407df5133b36ca33f92f472 SHA512 82db6f40551561c1ffa5fd315380f929f3747de63cedecf7e2ea66845db444aba2dc350b4dfd32f90172af750917e3a5a28044d5a7fceb08414e944218ac0893
-EBUILD tint2-16.6.ebuild 1278 BLAKE2B 0f8fff73d71aa594f162e951c8258a70902b303c7db43ae3d9a238f4a2d92e04cf160791f90e8648473012862cd86351a16256ac4aacc57ebd4e8a9afdb60288 SHA512 f80543332fd3602c29423d8420b85afa8b1d2f3e55550acf54151dedab7405e587b7e5cfab6874fb5fca1eb9c7eb0dd3343e21fc11461fac65c12d3865902419
-EBUILD tint2-16.7.ebuild 1300 BLAKE2B 02e58401a6a39173ce5ebcecb7209db422f1e2f2b76c9474351452dc0a8341251614e6f5b09ae54fe764b27679194a2f17150475509f69cd92a7c5a88f8ee0ea SHA512 7c2b6de1c0933ef0c75394908ce39cd4f1ad8d3e955d07b842f9284623ac77f156963e468a1b0dd579ed2e98699247b7b7060d31d963db8c5e1938a5d33057ba
+EBUILD tint2-16.7.ebuild 1100 BLAKE2B 0a447a106c7164a4ce916ddfa372385b00fdf2ce16f1c67d5ce1e4ecc56771fbbee3adaafae01612296c4b84d19c7eea9088744d1648070995fc0b83c3f07ae8 SHA512 5aa6c300572869f3bbb1232a89a3e14c17cfcae5ea604d3d9fe4165eecc0061dbd37d22459a045bdec22d86bf97f4de9d5bf1b6e605972b9ad4927f689e47f36
 MISC metadata.xml 789 BLAKE2B 95159a0de8a09e4381a7cccf494554faecd8ca1e20e3d175eeb1ef76015f7609a3fe6cbbc0208414b7b703d78339b0a8b643263766269e1e466506ee25a4cbe7 SHA512 e50c127a10ae89a7ec04c7b3a1d5dad3fd1ca89ac37b66378d8b24921d3ffe43ea4037182e20a624880be0eea527414e3727726e6799bbec4d46e2d3bdc934cf
diff --git a/x11-misc/tint2/tint2-16.2.ebuild b/x11-misc/tint2/tint2-16.2.ebuild
deleted file mode 100644
index 97820dabd24e..000000000000
--- a/x11-misc/tint2/tint2-16.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils vcs-snapshot
-
-DESCRIPTION="tint2 is a lightweight panel/taskbar for Linux."
-HOMEPAGE="https://gitlab.com/o9000/tint2"
-SRC_URI="https://gitlab.com/o9000/${PN}/repository/archive.tar.gz?ref=v${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="battery svg startup-notification tint2conf"
-
-DEPEND="
-	dev-libs/glib:2
-	svg? ( gnome-base/librsvg:2 )
-	>=media-libs/imlib2-1.4.2[X,png]
-	x11-libs/cairo[X]
-	x11-libs/pango
-	tint2conf? ( x11-libs/gtk+:2 )
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXinerama
-	>=x11-libs/libXrandr-1.3
-	x11-libs/libXrender
-	startup-notification? ( x11-libs/startup-notification )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-		-DENABLE_BATTERY="$(usex battery)"
-		-DENABLE_TINT2CONF="$(usex tint2conf)"
-		-DENABLE_SN="$(usex startup-notification)"
-		-DENABLE_RSVG="$(usex svg)"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/x11-misc/tint2/tint2-16.6.1.ebuild b/x11-misc/tint2/tint2-16.6.1.ebuild
deleted file mode 100644
index 5a5f9d056fd8..000000000000
--- a/x11-misc/tint2/tint2-16.6.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils vcs-snapshot
-
-DESCRIPTION="tint2 is a lightweight panel/taskbar for Linux."
-HOMEPAGE="https://gitlab.com/o9000/tint2"
-SRC_URI="https://gitlab.com/o9000/${PN}/repository/archive.tar.gz?ref=v${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="battery svg startup-notification tint2conf"
-
-DEPEND="
-	dev-libs/glib:2
-	svg? ( gnome-base/librsvg:2 )
-	>=media-libs/imlib2-1.4.2[X,png]
-	x11-libs/cairo[X]
-	x11-libs/pango
-	tint2conf? ( x11-libs/gtk+:2 )
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXinerama
-	>=x11-libs/libXrandr-1.3
-	x11-libs/libXrender
-	startup-notification? ( x11-libs/startup-notification )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-		-DENABLE_BATTERY="$(usex battery)"
-		-DENABLE_TINT2CONF="$(usex tint2conf)"
-		-DENABLE_SN="$(usex startup-notification)"
-		-DENABLE_RSVG="$(usex svg)"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/x11-misc/tint2/tint2-16.6.ebuild b/x11-misc/tint2/tint2-16.6.ebuild
deleted file mode 100644
index e901507e5acb..000000000000
--- a/x11-misc/tint2/tint2-16.6.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils vcs-snapshot
-
-DESCRIPTION="tint2 is a lightweight panel/taskbar for Linux."
-HOMEPAGE="https://gitlab.com/o9000/tint2"
-SRC_URI="https://gitlab.com/o9000/${PN}/repository/archive.tar.gz?ref=v${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="battery svg startup-notification tint2conf"
-
-DEPEND="
-	dev-libs/glib:2
-	svg? ( gnome-base/librsvg:2 )
-	>=media-libs/imlib2-1.4.2[X,png]
-	x11-libs/cairo[X]
-	x11-libs/pango
-	tint2conf? ( x11-libs/gtk+:2 )
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXinerama
-	>=x11-libs/libXrandr-1.3
-	x11-libs/libXrender
-	startup-notification? ( x11-libs/startup-notification )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-		-DENABLE_BATTERY="$(usex battery)"
-		-DENABLE_TINT2CONF="$(usex tint2conf)"
-		-DENABLE_SN="$(usex startup-notification)"
-		-DENABLE_RSVG="$(usex svg)"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/x11-misc/tint2/tint2-16.7.ebuild b/x11-misc/tint2/tint2-16.7.ebuild
index f71adacd17f3..41eb579f0bee 100644
--- a/x11-misc/tint2/tint2-16.7.ebuild
+++ b/x11-misc/tint2/tint2-16.7.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils xdg
+inherit cmake xdg
 
-DESCRIPTION="tint2 is a lightweight panel/taskbar for Linux."
+DESCRIPTION="Lightweight panel/taskbar for Linux"
 HOMEPAGE="https://gitlab.com/o9000/tint2"
 SRC_URI="https://gitlab.com/o9000/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz"
 S=${WORKDIR}/${PN}-v${PV}
@@ -13,7 +13,7 @@ S=${WORKDIR}/${PN}-v${PV}
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
-IUSE="battery svg startup-notification tint2conf"
+IUSE="battery startup-notification svg tint2conf"
 
 DEPEND="
 	dev-libs/glib:2
@@ -33,8 +33,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	xdg_src_prepare
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -45,22 +44,5 @@ src_configure() {
 		-DENABLE_SN="$(usex startup-notification)"
 		-DENABLE_RSVG="$(usex svg)"
 	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
+	cmake_src_configure
 }
diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index abef7ccc2c72..9e25c8d28c8a 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -5,6 +5,6 @@ AUX vgl.service 254 BLAKE2B 0a0e73228821019a764b1bc3ff61a752b15001018f704739d86e
 DIST VirtualGL-2.6.4.tar.gz 1198141 BLAKE2B 34794897f62ccdf7f5d80b1c4465af5e22d72408e14ae9243c66315c9ffeedb21eb5dc6afc95c889c000c46685b8ab6e0756edaee4f34d9d28ea0b71459efba3 SHA512 a475e5b7373d0c86ec7d1274f7527cd7bb1d82acdb38d42366faae58175052f957e090a4c8fdb4e3ba4b2b9063957c14b46d55316b69420247d2f9cf3afb1280
 DIST VirtualGL-2.6.5.tar.gz 1201656 BLAKE2B 4dc38a144e197ea7578dd29eea5eb69fb3e96a75c2729605f6678fbc96f3cf039c2e1780aa69ca8836771f72731cd8cdd795237d69d4b591e330124496aecc1c SHA512 0ab9e744e400d323bc16f6e2cf310905361745ea4da9e9e9a41cbeb45b1d661eebd38a0fad8ae5df4664d02b341de44c5730af8437e6ef49c7351b4afb953532
 EBUILD virtualgl-2.6.4-r1.ebuild 2929 BLAKE2B 2c591c97f2cb5fd44fb96d970a7e99f2c0c6414303a179e7a455e53a0699d38d7358b814b5d67a4bc58eb3bd666cb5b9956317ae3b8255fcb77c405a72e01323 SHA512 7d72262e2e9f00c4895aef235b054281fb4c93843055d7802029d3f38bce1bcfd3f577ea015004ed805505b3d958b28579bf3932d6fefaf3976c12fe4cdaec81
-EBUILD virtualgl-2.6.5.ebuild 2931 BLAKE2B 5150dca6a9a42c2a07a89253aa178bb84d5bfd3900fa9dd06376420f043a2a5a6d0fec04e49c035807e4fedb6141a002dceb419f28d12d7e3e0a582f6975992f SHA512 f710ee90dff478f5777cf5571e38b4b3ca5eb54897f04eda438f6684bc5a2de2c3292d43bea31fac627fdd1808789cf0ad8a0dac8738a8c9d513155e04baf5a1
+EBUILD virtualgl-2.6.5.ebuild 2930 BLAKE2B dc45078b746e7d88ee1d3dc749975d48a9a1c5cbd9a88d94c76b04378f7d66a5106240e3f845a102ff56a35363aeb56c241883653472901f4acd74ac0d83920f SHA512 2b18743822305fb59ba1a5c6b57d4dc64cbe083390235712073d0d01a63f22fb56d7fe938afdfbedbd48427cad42a5d9a0d34ae9a53ec6dc4aeea5354d0c2866
 EBUILD virtualgl-9999.ebuild 2711 BLAKE2B 6e80ffef02dbb840712e2d8767a3de5acde047a119e3550ad341174d7206ebb811b86a2fade4af739a66363d681106811c6b78a55d8e01160d59ee85a58e6cbd SHA512 53dc4e4e1bd74c0866d165e8e76cc36717081408046ebb798cf31abfcca27d0b93048ebb9a66c513a5914a8f455127d89b667ad210696eb849380f85457bcc10
 MISC metadata.xml 840 BLAKE2B bce303f2b3aac9d5cccd03062f64761f6fadc1194fc78c5850e8ecc3ae00ae0282d21be2f64e2fed294255c3fc3405a48b8cab7270e2c6e20b557b72d1dd82ae SHA512 7b4ffc9dccfe1c5bee2168216854b4020d1854fd85402a4757b8cbd6cf11e90e85ddf352f210d02d55388569b1dafd953377793a35f4130bd45210625c95f3af
diff --git a/x11-misc/virtualgl/virtualgl-2.6.5.ebuild b/x11-misc/virtualgl/virtualgl-2.6.5.ebuild
index 7decbf89ae3b..38ff0e247462 100644
--- a/x11-misc/virtualgl/virtualgl-2.6.5.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.6.5.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 @@ else
 	MY_P="${MY_PN}-${PV}"
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 x86"
 fi
 
 DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration"
diff --git a/x11-misc/xprintidle/Manifest b/x11-misc/xprintidle/Manifest
index 93e74b28c0e4..05b5ab16e50e 100644
--- a/x11-misc/xprintidle/Manifest
+++ b/x11-misc/xprintidle/Manifest
@@ -1,5 +1,5 @@
 DIST xprintidle-2.0.tar.gz 87308 BLAKE2B b2ef3cd82f7208b2c2a2a2cf3fcff028c318e682b7b1e5de4982a50bb757b263044cf54edcd5452fea7fd93f435b86da3da6d0ef38dbacee761bc77399f43665 SHA512 cc2f62b33ef387366246ee9a195be4cde68b2d13a49a4d1299640da2d42f7042152bfdf6932e7904a7f4211b0dc22486bbd62b47fdaf9d5d3db895e296b5f2f9
 DIST xprintidle-2.1.tar.gz 92360 BLAKE2B 9bfc08151a18200eb83b6569c2e9d79cbeb6326c39f0e8b9f5e400d0d3e28baa889ada32e3e0452197af77f90bae50d1094bae6972aeb0c3dbe81732246b6f1f SHA512 12393e10a6e53491f3e803fb2e946cc5e20d9fb6198c95d53512b3418034d0f262fddafe9fa10e1aa3f335940134365dcdecb0ac00216e32a2bc4cc5be1c8ec5
 EBUILD xprintidle-2.0.ebuild 653 BLAKE2B 8f17fd7c476ec814022435caba734d1cbe0cb21dc8d9c522d52a267304efd1ab0b96f73166e6ca0efdc63d793fff03f674bd094857fb36108c5e35c9788f3e18 SHA512 94c94b601d05b720c99c080074af43276a74415f3ecd670a517298945f96c5efdfa393483028edbb35ef7f4a6fe4a80ccf35b44cdb0466205f1b540c081a343a
-EBUILD xprintidle-2.1.ebuild 508 BLAKE2B b7bf36e9923156b0bc80ad2394934db771d865646f6cb5d1c85aa24ca35778b71c349070e06a0c1c8eb1d53b3a513b2c8ba91a04fc8a168bc50d36cb6e47b61b SHA512 995eece01c19c9eb1b5001e6fb1ccb753f41b8fb57135828d5802bbed91d412f7335f931d9c35d4691dbdde7816036900951929dcbe2b12b183cf4645e87a58b
+EBUILD xprintidle-2.1.ebuild 512 BLAKE2B 9c5cdd449e651e540626d6f0dadc0a405b0237c7c404456b93a2c09c7df188c987b3e2515991d77bfd25ab83a9a365bd7a2bae279873f3238c25d59cd52aa5e0 SHA512 ff01449cd64f7e82e211a3d46e04838104124bd63aca3d221cf09f67ad1c89fed04b583310f89681e06f5e6be2018bdc1d9cfd5481e6ed52eda5adab4ef10f42
 MISC metadata.xml 304 BLAKE2B fe9f1bed50a82bcefcf1ecdd2196e57f2176ec406b13d707a4bc6013930127a61b515e66ba382a2f6a9bb01a59f6cc4b6d757a0ea1ec988c0315eb5bedb5ffba SHA512 3f2adb57b1759967aefe91475feac1723efe2e29c86f1111635f9f1c1d909ab518a80e60666cb500247b6a66772067901a3513d1b01a39ad42cbe3044c96e875
diff --git a/x11-misc/xprintidle/xprintidle-2.1.ebuild b/x11-misc/xprintidle/xprintidle-2.1.ebuild
index 276895f91bf9..6ec6053ea3aa 100644
--- a/x11-misc/xprintidle/xprintidle-2.1.ebuild
+++ b/x11-misc/xprintidle/xprintidle-2.1.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
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/lucianposton/xprintidle/archive/v${PV}.tar.gz -> ${P
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/x11-misc/xsettingsd/Manifest b/x11-misc/xsettingsd/Manifest
index fae1f5c82dea..ae1a7a4633c6 100644
--- a/x11-misc/xsettingsd/Manifest
+++ b/x11-misc/xsettingsd/Manifest
@@ -3,5 +3,5 @@ AUX xsettingsd-1.0.0-return-1.patch 829 BLAKE2B 9e6024303ffa9f7977187e6f718f03f9
 DIST xsettingsd-1.0.0.tar.gz 23627 BLAKE2B e9f7dcb9fd017f34ed88f29e1954e0824764db66eac5fbcfa55e7edef51c4bdec1cb9383efe0b6cb18b88c04818b106b9c4f95fb25daaf09a76b4b4ef4e0b75f SHA512 39077050a2fc3206c308ba399328719303884dd668b61f7756f0a3a4388ed25a3cda0849a713126c22c6b80466ab74c1317fdd9cb3e652169c80c54ba0a45790
 DIST xsettingsd-1.0.2.tar.gz 22481 BLAKE2B 1f7e8112b8910ea20492109ebc2df90d7113804653d5758bbac2b52116e737505026ddd0e17b5444951ad83606ba41495ce8e165bbe04573c740cc3faee75c1b SHA512 da2a82d0b3f5061a1fad7632d800539f4e81bd3f8631dd724705d0601556c044c62da7469a974cbe8f6d8e070247493ac5776bac966cf36f1fae825562457baa
 EBUILD xsettingsd-1.0.0.ebuild 543 BLAKE2B b2d84af5b7091b0bab3b41122e2397bf7fb57d7094c7f942c9a6231d2d25d2f31023dc3adfaa1e23dc8c9e2a25ab7bc7447f2627aa304b5b52fc0e096549fb0b SHA512 355acc37e97dc3e33af015136676434cc55f8160abe1566530688093a50507faa9c7c527056f143808be81521718acbdf3cbe28e06e3c0b54f03e2611aac149d
-EBUILD xsettingsd-1.0.2.ebuild 684 BLAKE2B d26ea4ee199ef6a5558c9e24ff9154e4370ee6e38fd622a3e3725d00d2892c8d1319b00f1cba3d810b3d6d0a16ef274c677a66c225fe9227a665f6019653b329 SHA512 debdb6e4708d1c756430cac67e341f08209fa39d8c4e8adc1dbfaa91b5dc94ed4a7830a33534450b912acb3e184465c7ac9f720900bba224bb6ad21753b7c533
+EBUILD xsettingsd-1.0.2.ebuild 682 BLAKE2B 49180b042c9528fe4a91bfba6dd3c8685253057531b7fb7ceee5b2d04c5e9a41c77759f7f2e5dbb4f88a8400620afbc75c6e7782a7a3baa59e8844b3e4dc63ad SHA512 f27ba0676a73fb0d4381ef369ad61807eac09f36a95bb130e1eef65c2a9f8980ba050d9ee7a42d6219d0dcf2d10a626cc88ab33a4716ec91a5f772c0ddd7d7ec
 MISC metadata.xml 330 BLAKE2B 0b8f27cf4be7ed52be5e6656a64497815cbac57febe612b3755ca2cfa9ce97f34d5807318ac39bc184b7e61b3086cecfa4e5b2e19066adfb32caead8e8833a89 SHA512 834c1c90c8297497e13de12121a39f113807228ede6ec87ad774096e870840f1f1ddc73301c63375f2600b035be12f88c77c978a8fec2e089b0624df16444959
diff --git a/x11-misc/xsettingsd/xsettingsd-1.0.2.ebuild b/x11-misc/xsettingsd/xsettingsd-1.0.2.ebuild
index 127a824fb368..e26053ae120b 100644
--- a/x11-misc/xsettingsd/xsettingsd-1.0.2.ebuild
+++ b/x11-misc/xsettingsd/xsettingsd-1.0.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/derat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"