gentoo resync : 24.07.2021

36 files changed, 565 insertions, 58 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index e4bdadcd6418..e8de53fb52eb 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/obconf/Manifest b/x11-misc/obconf/Manifest
index 5062804cb5fa..48a3f9cc8cf6 100644
--- a/x11-misc/obconf/Manifest
+++ b/x11-misc/obconf/Manifest
@@ -1,3 +1,3 @@
 DIST obconf-2.0.4_p20150213.tar.gz 154638 BLAKE2B 9ff9d206b8f789d2c7bf68f6f959f34d19f368645bc4efb77b5a730a8f69db5309ddecc0afb09e7cd2f9cb2af4e705112f3365f43dfbe94c4ff523d8a7f0dff5 SHA512 987c97729b248e9d9fb4c82a131517ee8f31df5dd455b5b658730204c354bf17f7876c269c1d1ec6497ca360698a393c7275b9e7ada5b31abb75ed7b06092e30
-EBUILD obconf-2.0.4_p20150213.ebuild 976 BLAKE2B aec99c9fd2f2484c4d6354cf270ad54251403f69a065030b530c73e6a01a2816b750319fdf61d5da51a041dbc1efe4a62671969eea14a798a33de126c4c0833c SHA512 ae2642d9d7c25c2168628e4638a7768c40e782fd7b9b874f4fb9147f8d0cced60072bc68e4ead366d04935beb639272f566196e283d2f4468d6f821be1b86617
+EBUILD obconf-2.0.4_p20150213.ebuild 983 BLAKE2B b8c9fd85a019c53ffee70bd7f871da3737d063d0cc538ac0b08f1dcf248769a5055e91c0fe374245082e3546db3931fb7a5e749d8a7ba6bd2b86d55e6e5c8c39 SHA512 b5a8209b8d2c0775afd116469d0bc8ab79c5e2d9c28d48def08527d14d0491a68c49c80ea9994fac76a3c23346072d9fe3b2f512f313acd7f965d71c07365e92
 MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4
diff --git a/x11-misc/obconf/obconf-2.0.4_p20150213.ebuild b/x11-misc/obconf/obconf-2.0.4_p20150213.ebuild
index ffe3dca0ef43..b7462187832e 100644
--- a/x11-misc/obconf/obconf-2.0.4_p20150213.ebuild
+++ b/x11-misc/obconf/obconf-2.0.4_p20150213.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${COMMIT:0:7}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86 ~x86-linux"
 IUSE="nls"
 
 RDEPEND="
diff --git a/x11-misc/pcmanfm/Manifest b/x11-misc/pcmanfm/Manifest
index 7a8b00dc0dae..e9aec5fae2d0 100644
--- a/x11-misc/pcmanfm/Manifest
+++ b/x11-misc/pcmanfm/Manifest
@@ -1,3 +1,3 @@
 DIST pcmanfm-1.3.2.tar.xz 424236 BLAKE2B 7d13383cd2b61905bdf14b4b4df8c3d8043a340b597f4d43e40148f61451f82ad3ca36c4c199d81a41dc7e07dde6ed5832aeff985112fae352bc49e873bb67a0 SHA512 bcca1af20500e7a84ebfe5f1efd5a1a2945d32ad3ea5fa945ad908794c56614bd85921fac1e7a3b2fc5ef82267d5d3ffc5ad7065e9878a920dd578cb830776c9
-EBUILD pcmanfm-1.3.2-r1.ebuild 1179 BLAKE2B 7e4d10bf5db4c3b814f70d506a894fd6407fa26f9f002b80c7fa019eda18bd1d995505e0dc626a8cdbb9bccecd57798cd698a1928b22e0021bc6ec6b84d5f9b1 SHA512 5086abeafd65f666e5464fb64dc22a2de5313d84ccb55edc4ca840c018de3f0118ed640e7e1a5d173276156a0da1e377ba039e0b3cd4f087f0294461ea68a124
+EBUILD pcmanfm-1.3.2-r1.ebuild 1186 BLAKE2B f778a3d528700b1ef9726da094c0bc73de722b72e2958971ed7b8cd0500439813b0cfa21e195c37f46faf8d9a9042779bbfdbb9a208cf3a9b2a06ec426ff996e SHA512 cf3eb25101ba8791c7daf5e9dc9df5b0ccbe09de3454e94309c7d2a3686186dbccae9dc43cb9e9d4878dc209eadb06e1133b727bc8f961ec3c093bf1ce825e66
 MISC metadata.xml 249 BLAKE2B 9253edb9862aabb3fb8518f030c5b2b5c61ab29edf4967dbb44a18c76a95bcfa6927b0c6fbd31ac67ca0ac4a8fb4041483bbce6a01c16f721322804fe3c631aa SHA512 ac804612b7a417323548cbf30fcfaf85b782e0b1f90084d6ac194d28044c9445e07f0a30d54ab41d6861cf0d9f3e7135649477bfdcac340d3a16936420091d94
diff --git a/x11-misc/pcmanfm/pcmanfm-1.3.2-r1.ebuild b/x11-misc/pcmanfm/pcmanfm-1.3.2-r1.ebuild
index f157cddc9ac1..1ddb63ffbf8e 100644
--- a/x11-misc/pcmanfm/pcmanfm-1.3.2-r1.ebuild
+++ b/x11-misc/pcmanfm/pcmanfm-1.3.2-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~riscv ~x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/x11-misc/polybar/Manifest b/x11-misc/polybar/Manifest
index a2ede45eedfb..1aa68e8c14cb 100644
--- a/x11-misc/polybar/Manifest
+++ b/x11-misc/polybar/Manifest
@@ -3,6 +3,6 @@ DIST i3ipcpp-cb008b30fc5f3febfe467884cb0211ee3c16386b.tar.gz 43681 BLAKE2B a17c9
 DIST polybar-3.5.5.tar.gz 282816 BLAKE2B c6bd7283fa30197446cc328f52b0d9ed6eadefaf6b19327898f559f860009b43d9923ad1d00bcf173f6a3663af6813c368563a9b59e91828ab8966aef722eea8 SHA512 f4174e82871aafcd890145eba472fc8c3055dafff4ea19123fa844d8bce2e85152e0e597496df8af257ef00d676e744249d204bb52668e3f303cc57a6fe3fcee
 DIST polybar-3.5.6.tar.gz 282964 BLAKE2B 518e8b2e1d2e0698540c4c93cdfce5283c5479b077859dfc98d57072ad23f6140cc2e7d34c34f5af71aeaf9e86642d111f409c53baba0b9398d923ad9b4058a4 SHA512 5022f7876489cc28805a52894c8ea42c2afc0600c84f6ce27f1a7c738fcc48fbf5f5d5537472378eae4f3d5ca36fc2fc8b069b379e35b1047d12a3b294e1857f
 DIST xpp-044e69d05db7f89339bda1ccd1efe0263b01c8f6.tar.gz 84121 BLAKE2B dea2384773803bbc5de2ec971ed0cf769b0af8b987bbcf918718647e4787b4713af54a358c029e9603c28c5424488731f76ecc430b6b124bcd9255aef893431f SHA512 646e159d47d6dac8f08a27a1cb54e2ef48e42cff952b55b3906c2021c424e015c070a31a7a1e70b62e0edc7a8b42b935a23b9a922eaab138d3f6929bc1fdb8d4
-EBUILD polybar-3.5.5.ebuild 1911 BLAKE2B 805f8315391694f97b9d61169e421dca938922ee03e86355481a27e38530f04deda99cb39fb0b9636f3b947311f955eb70e462a521a3aa3ad0ce7caa9c6029d6 SHA512 587b4f2310137041cab875d2997b3d87bf450573db3f523c25ad6a3cbb95039ba34253f774e9465710fb9cf6f3691a44a7f4559f9545614121fecf355c887fca
-EBUILD polybar-3.5.6.ebuild 1911 BLAKE2B 1dee88289eae8e2472183b2e003f72bfd64592f5c4770b6f3c6ff613229c198a156d668430ddb94def1c12c64a016d81c6b3517cd27f776597502f45823794ad SHA512 3a1cb63773a9a43d8fff76eeba762b3acea4477e259d65d357f46e18b677af0e813058758d8fc2ecbc5398f817d16bbfd038a1aeb5c6a1986e9eddd64ee0686a
+EBUILD polybar-3.5.5.ebuild 1903 BLAKE2B 60af426615bfe96edea2ae7670638c0adb2ddd5fe647d3671b4b32fddc7ef308c0aa93297d21df58978c5198a22619b125ec4b6924e1c6300f969e82ffb8199e SHA512 f13325e46b0af3f3e145793748b7b4c92da3b5d928def009f1cdb6f4c109f06ad7236455d5cc764e9eac1465adb90bf565aa9b006c69c7a9cd20deed938d64bd
+EBUILD polybar-3.5.6.ebuild 1903 BLAKE2B a6256133894fe5e4d8ec5d66c47411376246b65406d5260a6973c5a2d7fc198319e54d767846a96b238feaba64de877013eb44acb86cf0d3688f72bfd317686e SHA512 1e772151348fb9029517f184f30adcbcc1700b1a7176b487b368ceb7dd61e224dd82842af20f7beba471ffabc053d8cdd87be3fe8ea4b2d3dfef5a687d9a79a2
 MISC metadata.xml 690 BLAKE2B a67ba0ba7acc59f754a50d95fbde39c861a0253845f1bf965b82d3b7e9ebaa699ff12ea60ebb2018a6518d7b0fbd3baeed05ff7496d302932bfd11aa3077387d SHA512 16b3f3e709976ac75c8c45d8963d7224d34c36a452cc7beb18883b912abbc901336dc0d9576ccaeb94f4c28edef5bf951306aca4fce0ca163dfbb970d031d88e
diff --git a/x11-misc/polybar/polybar-3.5.5.ebuild b/x11-misc/polybar/polybar-3.5.5.ebuild
index 9cf689dc360d..61bb99a7d5dc 100644
--- a/x11-misc/polybar/polybar-3.5.5.ebuild
+++ b/x11-misc/polybar/polybar-3.5.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 XPP_COMMIT="044e69d05db7f89339bda1ccd1efe0263b01c8f6"
 I3IPCPP_COMMIT="cb008b30fc5f3febfe467884cb0211ee3c16386b"
 
@@ -23,7 +23,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="
 	${PYTHON_DEPS}
-	$(python_gen_cond_dep 'x11-base/xcb-proto[${PYTHON_MULTI_USEDEP}]')
+	$(python_gen_cond_dep 'x11-base/xcb-proto[${PYTHON_USEDEP}]')
 	x11-libs/cairo[X,xcb(+)]
 	x11-libs/libxcb[xkb]
 	x11-libs/xcb-util-image
diff --git a/x11-misc/polybar/polybar-3.5.6.ebuild b/x11-misc/polybar/polybar-3.5.6.ebuild
index ebab3b6c6567..d36b8fef936b 100644
--- a/x11-misc/polybar/polybar-3.5.6.ebuild
+++ b/x11-misc/polybar/polybar-3.5.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 XPP_COMMIT="044e69d05db7f89339bda1ccd1efe0263b01c8f6"
 I3IPCPP_COMMIT="86ddf7102c6903ae0cc543071e2d375403fc0727"
 
@@ -23,7 +23,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="
 	${PYTHON_DEPS}
-	$(python_gen_cond_dep 'x11-base/xcb-proto[${PYTHON_MULTI_USEDEP}]')
+	$(python_gen_cond_dep 'x11-base/xcb-proto[${PYTHON_USEDEP}]')
 	x11-libs/cairo[X,xcb(+)]
 	x11-libs/libxcb[xkb]
 	x11-libs/xcb-util-image
diff --git a/x11-misc/shutter/Manifest b/x11-misc/shutter/Manifest
index ca627183ab92..d6067ba8e9e0 100644
--- a/x11-misc/shutter/Manifest
+++ b/x11-misc/shutter/Manifest
@@ -1,5 +1,5 @@
 DIST shutter-0.95.tar.gz 2567849 BLAKE2B ecb29ef21990dfcb29f71c87b690f0e0609890f88edb2ed3ae3d0650456974242ff278e443a13bd3081625491b86c5d53642c5c2c997a37fcd1d7752994a7cab SHA512 77df43b952c10e6280b12170de997c12e0e13d5868f80f1ab22ad9a062b4b67eb93dfc540d4ed0f5db2e950eaae8a258f3d01d9ddf6043d26f8f16f0ce93e75a
 DIST shutter-0.97.tar.gz 2558672 BLAKE2B 72d641750b81b0d4ea1942883b15bed20980c1eb2f96cbc3af101387897b686487b7d0a4e46dfd1ae82cc0d889fba6dd48472c340d088a9600ee9a919c262fe8 SHA512 40315ee03a138c71c29e05e82202d4a1adc0d930aef163e643e757ea2674dd8470e7a4d7d8b38ab5d3386ce8b9d774cbbb9a8b4bc2cb4d5b3b13812c77cf4334
 EBUILD shutter-0.95.ebuild 2101 BLAKE2B 9dbc3526fc832f35ecf43b4f6f9e71ba4bf163d77aafc84745abd8dbe5c2c819c5b099e25ff73a397477e2fa9324228429731a4ba970e84d4a6082e0c6780694 SHA512 e5d94e24724be26f6dc6d6a7b78c55f8ef7cbb1cc261369b12671304276d1b37185904c193b527bfba0622be301f46a5e6aab0a9341d550f004be03e78107f68
-EBUILD shutter-0.97.ebuild 2133 BLAKE2B 110e656054c1268a0f3d1033452b905c106c6b9397836cb242a770772a9c814e16d80fd80f228306a9b5fe75f6afb7d9f511db04ae7b2c5f684808fed6ad874b SHA512 d18f9ebbff1bcf5c553d1fa25e6bfa8e06e8f92a0e77583ea02582c7fffe8a7b266a7e6a3a974a66daa718a6c5c5c7d71350d41afc0a956347d515ee61bd091b
+EBUILD shutter-0.97.ebuild 2132 BLAKE2B de17585c65ff3fc69a490c3ae3e073ce3f750c98268baf9f1ef390f754adfe2fdc05580a2c13bea2252d6c25c4c28bafc717d243732c465befc97199549d6a51 SHA512 b37fcacdb758e8798eca72ef19c3849d84c94f9e85bb0cc496fd00651ef65ff2c603ab67ee5f106f523ac57d5182872b672ce9fcf6376b865a1bed59738ac150
 MISC metadata.xml 403 BLAKE2B c07092357bb7c9820fe97d4c08081d1074576757c53e81ff0836f4c6b9b4ae7bd604d1c8272c40bf40c0cbc76ea09501ed261d6a65798cde887d85acbf93005b SHA512 69fb60834dd62cec6ec79c6d2d4adf2eb0bcec46914f1794ad6ec611e999919a1dbafd9e648341d7cf2bb03dfd35004293a1192b5392682534ca331aed8681b1
diff --git a/x11-misc/shutter/shutter-0.97.ebuild b/x11-misc/shutter/shutter-0.97.ebuild
index a93ac100854c..e37edd03ab72 100644
--- a/x11-misc/shutter/shutter-0.97.ebuild
+++ b/x11-misc/shutter/shutter-0.97.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/shutter-project/shutter/archive/v${PV}.tar.gz -> ${P
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/x11-misc/slock/Manifest b/x11-misc/slock/Manifest
index 6cb9e898c677..2df30cd705d4 100644
--- a/x11-misc/slock/Manifest
+++ b/x11-misc/slock/Manifest
@@ -1,4 +1,4 @@
 AUX slock-1.4-fix-link-paths.patch 558 BLAKE2B f2ef75f836b02ec23b98fdb9f302e671ec8a284b75d83f701e14f5d44a746916b670768730759d4767c9617259b6ad1ec6aceecd851973038ffc2382edd99558 SHA512 3610b7e03e7089ffb4207b136f08ac0944d411284dbbf6614c615596451dcab11ad001c01c4f32c0f040138c99d6764428d60050da59933619a8bbf7fd2a011e
 DIST slock-1.4.tar.gz 6889 BLAKE2B 67f956fd00e7536a9db81b82e85e4128b537569d16cd25428822607a5c2f3b0310bcfec896f7e83c0091e85d21b68438f6f42da715a55cad7fac90d0d0d64b8f SHA512 ad285360dd3f16a225159abaf2f82fabf2c675bd74478cf717f68cbe5941a6c620e3c88544ce675ce3ff19af4bb0675c9405685e0f74ee4e84f7d34c61a0532f
-EBUILD slock-1.4-r1.ebuild 1245 BLAKE2B ed18dc22ffb299afd7a1e4db0020fa9fefd61121314ba38aae0fe679be18f8d915f87af88dd4d55500da94b0a1caf52276a5d5c6b5ca0ca5592ad21f6a6f5704 SHA512 14b23e80aac03935b325a64ea74d2bbab0275e6e64d01397b534577c6c25bb8aa1909f4e926c173927946ae27967f6aa6b86604eb553135a3be3127375abbace
+EBUILD slock-1.4-r1.ebuild 1244 BLAKE2B e4987eac42de79fe7ff35f76c8495f628fffb109b1de4bda65ea12dd9abe01722cc1ab501a458788106457a061f7c65025ba46d1a92e8bd555caf08ca4f1e0ce SHA512 7c8d9f5c5fb6d7d55445dd496c3f6642dd6cdec34a05eb69990b275d2c01506611c7783f048849d9d51cf8021c51916fc3a27dcfbddde682ce009ff32f9488cb
 MISC metadata.xml 251 BLAKE2B e9e9d48943645d8b737bc1f7ab0efb05db0f8eddad759c9bb40d07dc008fbfb8f5cca2020de71a9ff6945f5d66292ac02355773545010cd49c77fe6dd5ab7b40 SHA512 1b6a6955118c1a74cc89a77d6de9be8f4ff9c7137c186753462670a5b93457dfd034ad5d1f4d2507ac95cc149c2a042fa5324220b58702a56b09d91de40151c9
diff --git a/x11-misc/slock/slock-1.4-r1.ebuild b/x11-misc/slock/slock-1.4-r1.ebuild
index 5c0b10dd2b89..2753a8449711 100644
--- a/x11-misc/slock/slock-1.4-r1.ebuild
+++ b/x11-misc/slock/slock-1.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~hppa ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~hppa ppc64 x86"
 
 RDEPEND="
 	virtual/libcrypt:=
diff --git a/x11-misc/sxhkd/Manifest b/x11-misc/sxhkd/Manifest
index 0339bd2636c8..fef49486e83d 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 660 BLAKE2B aa45349c8cb332e204201991a5c52de18b3e4eb9e7893aa00d3e94e30ce38613dbb70c96ec4125f25eae82f8668ba6351f39b0ba6cd7fdb355f53f74e1d0de91 SHA512 66b15c4bf975886f6cac5123d576f478dbbde6d8b1e857024fc0c5bbb44dd220549679699c82d7f127470932a31fd98587d4e7846dd76552d94cd94f66197943
+EBUILD sxhkd-0.6.2.ebuild 667 BLAKE2B 7f066bf4563c1bedb2ca00c383cc4f9fc85ade14c1241ca6ecc07eb947d2273aae67ec8c08dcd8d085afa6fa69900c2299cf0b104a4e9be0e4b4e1b01b6aa2ee SHA512 32c4aaa0cf8020a71edeadda136db6a124c91ddb3d14898c09011060e536bbe2b5a58fd913bdf94196c676ee810ca1d09fcb6b20e9db740282b4fb4628b776ad
 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 0bb670aea4e9..62e4eb5b3616 100644
--- a/x11-misc/sxhkd/sxhkd-0.6.2.ebuild
+++ b/x11-misc/sxhkd/sxhkd-0.6.2.ebuild
@@ -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 ~riscv ~x86"
 
 RDEPEND="x11-libs/libxcb
 	x11-libs/xcb-util-keysyms"
diff --git a/x11-misc/tabbed/Manifest b/x11-misc/tabbed/Manifest
index 668f5093e238..edb154c33f05 100644
--- a/x11-misc/tabbed/Manifest
+++ b/x11-misc/tabbed/Manifest
@@ -1,3 +1,3 @@
 DIST tabbed-0.6.tar.gz 12926 BLAKE2B e92e2c7132f7a760286c61c99faa0b26e411326e172c231f3354e61f8151f561babd4a35998bc06cb7fd87dc962334ef0ddac78ba284cd3090bb1c2dcfa159be SHA512 bcad873251be6b5de21311531e8d24330003b42790cb94d559a0d1be45408b3e0722c14e7c7f2cefd0717fd2a2d7a100fa08fc4e10e7bb669935909602286553
-EBUILD tabbed-0.6-r1.ebuild 969 BLAKE2B be21de436a42fb6249b12675bc05ea6db5ea054fd8b912286ce80bdaaf264b5c91cd5e8a8cb5829e69028228e22b0b2c08aa05b687a17ad37ab13227f6289d27 SHA512 84cac979d2bc0a2ff7627d3358cc108ba48e1b22e1bb19544fa6dff8b0ccb34db1dc97429f4046b7c4b7daa4e132fe02aaa23eb77f2d6d7590effb47cfb98c08
+EBUILD tabbed-0.6-r1.ebuild 968 BLAKE2B afc340c83772fea0c290492a263204dc61638fa733b0a8c32be76a9bb3edc08ece30cbe22b02d5a85dc7ca03d93e78deda4b19bb4abe67d8e2aa4eb79f920acc SHA512 63026c59d94a4ff5d774d6cfa97092d2137a4022904aa39d54a7b1a0688c4201744eae044714e4978a003d7e1e9ea4ebc23d0225c893d3e2de80990c02dc917d
 MISC metadata.xml 251 BLAKE2B e9e9d48943645d8b737bc1f7ab0efb05db0f8eddad759c9bb40d07dc008fbfb8f5cca2020de71a9ff6945f5d66292ac02355773545010cd49c77fe6dd5ab7b40 SHA512 1b6a6955118c1a74cc89a77d6de9be8f4ff9c7137c186753462670a5b93457dfd034ad5d1f4d2507ac95cc149c2a042fa5324220b58702a56b09d91de40151c9
diff --git a/x11-misc/tabbed/tabbed-0.6-r1.ebuild b/x11-misc/tabbed/tabbed-0.6-r1.ebuild
index c2e509149082..d03d6b606626 100644
--- a/x11-misc/tabbed/tabbed-0.6-r1.ebuild
+++ b/x11-misc/tabbed/tabbed-0.6-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11"
diff --git a/x11-misc/x11vnc/Manifest b/x11-misc/x11vnc/Manifest
index f830022484bc..e091d677bb30 100644
--- a/x11-misc/x11vnc/Manifest
+++ b/x11-misc/x11vnc/Manifest
@@ -7,5 +7,5 @@ AUX x11vnc.init.d 1728 BLAKE2B 45680af6aad530a9b36f29adc61c1f90ad272bd7201c30f29
 AUX x11vnc.init.d-r1 1737 BLAKE2B ac457d4acf27e3a2e26b6315530d326efae4e5583770623362eed65e45aad5a596a13da5325de8ad4155a2d335d3a8a62a41a1bc01facfdefacd5d5e42005df0 SHA512 b39efb164beeda4cf62c530aae4a3127358cc7ccea888df09e48f6a3a53affad0d3f3fce9cfbcfb17e9de131ec945a51e2680d7410e14b169d0295aa4cf85e91
 DIST x11vnc-0.9.16.tar.gz 1708009 BLAKE2B a8789f95ef421a78a83703748e1d80fd45539dff24f80493fd75e357bc22378213915853f9d114248c172cd83977880e1e4e8a3f8df0771017e9988d83b7307d SHA512 69f65ee312f8dede6051b401304987502a213c6c28c7f41e855734f11de1fae14d5d493dc9c28b2e4b7c0be55f8dbd3b35dd2610aae910183772c3e626736fec
 EBUILD x11vnc-0.9.16-r6.ebuild 1971 BLAKE2B ec83908a840e64367f24479464335dc14977b0851e8fd7853afe69fb96ddaf2474e3209c84ed2f86e1b7be2d9fd2eec74f5b1aebd147029570fb180200a248e5 SHA512 b164d832673fcf2752ac7c5d3372ddbaac0196a80cf1f3e82a25784e7ad6c6303f744ff27b45d20f2b5dda5aebcf48d679e3a402d030e95ea589f9d21528f88e
-EBUILD x11vnc-0.9.16-r7.ebuild 1974 BLAKE2B 8fdabc764af69564cb4eb0708f1e231fcd0f2f3473134c53f71a968b80f85c9629652c38e6987e8fcae1685ea89dab88fe0819a5cfc26c6b1bd56a65bcf21472 SHA512 251853ea13121ad3568ddff63f0f252992bd8656e3c7f8df5bde21ffd3cb13ea490f798d167a02778062ddd40ca7e11473e0783b5c89aea97e2ca593ed1f1d09
+EBUILD x11vnc-0.9.16-r7.ebuild 1981 BLAKE2B f8d8b9ad3d5db228def8ccd8d767dad330a62670084494f7f99bfe13d35f7040a7ff8d02399d52102ff3e9eacd109f8caec62b27a326e80cbff1026c507d5fd6 SHA512 0070581125bdae6cc9a9443182ad9143505b9fb33c8415ca5f6b7146e215f66d577bc74b972b0a3ee7cefb2c7415834ac196b175f9c37a424da8a31cda5ebcc6
 MISC metadata.xml 952 BLAKE2B 4ac05ec6aa72acea1a2eb3b8f5b6d2ae885d5dc9c53eceb352f9fdd24ef19d3f269acc438421a2d3b13a0b9e1dba92e05562b5017aee5f8409f1db4b9d424d7e SHA512 4860713eb293d1aa29342953129b92525fb0ef5b6cd5462f1e5a425c6d28bc70a5cb421f2755643ecb42921e574b6eefb932cef80a420458f25ed12211da1c8e
diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r7.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r7.ebuild
index 97a1cb224ec4..74b94b9ee0ae 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.16-r7.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.16-r7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/LibVNC/x11vnc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+-with-openssl-exception"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="crypt fbcon ssl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf"
 
 COMMON_DEPEND="
diff --git a/x11-misc/xdg-utils/Manifest b/x11-misc/xdg-utils/Manifest
index 495cfcb5e24c..7125e28bbc1e 100644
--- a/x11-misc/xdg-utils/Manifest
+++ b/x11-misc/xdg-utils/Manifest
@@ -3,5 +3,5 @@ DIST xdg-utils-1.1.3.tar.gz 297170 BLAKE2B bd281df73d8c966d11b502dd7ec88d96dbc96
 DIST xdg-utils-1.1.3_p20200220.tar.bz2 287080 BLAKE2B eb9067527d5073f290d10ad36bcda24d4b813f3c98776b57955a7f254956795c26f1536c858ac104259f68f755746976d2cfc3aeccb9b9b35eaca5ea5eb89806 SHA512 8445109e87fb9e92edeebbf6b07a41b79344bc5016eb7224f5f2b7e599c6d075363337c81dd2ddf8f3007c633debba7f814631188c02db3ae002f622b4c323ec
 EBUILD xdg-utils-1.1.3-r3.ebuild 2149 BLAKE2B 2667f35f3884df4914818a4e3d636d8c95d3e5902e529711cc5b747aa3c4fcbd981c865aecb4f89f330b2d8168c0f7acc791f21e710e17da4cbdbda199c579c2 SHA512 1611da3a14d1e2072085a504e637c5bd24ea2a28c1347a07519d66f06cdfd42f4c354f003509e18e575db2eb212816ef6d0523639d7a8e82aa7cdf38123989ee
 EBUILD xdg-utils-1.1.3_p20200220-r4.ebuild 1978 BLAKE2B 95c71a624e36413fbe9784275be219995471464e9e21e43c37e3952a1270f44965309dbcaba1386d84aad103845fddf5b372361df57b8be2f79a8066f05a1d81 SHA512 36a1965057ee1844254bb54e1283dc3dc382f8bdd6e054a294b54303c4fe5d38e8fc657ade7394f6699c7831ec512b75fe8b51279f67e5ae0de528fbba0f5a1b
-EBUILD xdg-utils-1.1.3_p20200220-r5.ebuild 2052 BLAKE2B dca1a17cf790e51ec895e5030ee8f02387bf211c796657859b8149d126daefade6559622d6320bf5b8ccabd148f524d3279a2fe04787a798a49aa37cb79ddcd0 SHA512 660a8012bdb82b54983e5d3be4ca7af839ae4224c2ed01c7b35d1f0a3ee4d64c948c223a219048d47b1353c575e4af18104040ea18cd22f8e8d0149bc09ad83a
+EBUILD xdg-utils-1.1.3_p20200220-r5.ebuild 2059 BLAKE2B 409eddc1d402ce75a9104c31e250167ab2d64bb0f887f5e77c5f1ed055abbb7e04e5c815209e8499f9c78f62f03f53e621e47bd66d73cbc704ce6d2fdf171b38 SHA512 6f5311b7b3878e6c65f7dfdb68af8fe2a54399a1a12c0a95eef2bff01cf3a7ff14ef2a767fb2df29334ab90ecdb4bc27e54362cdf4b4e0dad542619c30feddd5
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220-r5.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220-r5.ebuild
index e5f2efaba8e4..013d4ccde699 100644
--- a/x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220-r5.ebuild
+++ b/x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220-r5.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/xdg-utils-${EGIT_COMMIT}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="dbus doc gnome"
 REQUIRED_USE="gnome? ( dbus )"
 
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index b0ce3f1f26bf..e3669d071f64 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -8,7 +8,9 @@ AUX xscreensaver-5.45-interix.patch 950 BLAKE2B 6bbebbc4ff8eb2dc0a3179441c281355
 AUX xscreensaver-5.45-remove-libXxf86misc-dep.patch 1879 BLAKE2B 2e4f8e39b557cf32302bef97f846edf1585659340d1212710654dc1162d3be0e2ecfc8846a04732976c40b0167630fca0d12f64a6cc0d04fabbe0b323dabae83 SHA512 552a9674d2954168af666a0e61bbe8b7302fab8630116196482507c595b3a9a902eceb58387973a23ad931e54c8f3f35953dd86357e25492f03a552a168ef88f
 AUX xscreensaver-6.01-configure.ac-sandbox.patch 4010 BLAKE2B 8df5adba88e04594b18e12080be0624daccdfd6e101a762e6b3ce42f8fd8405c1c02f7beaf07405f979c959d79e804daade57cd1e087cc9adb4e96aca851ca4b SHA512 2c033fed2a48a8dae46a394624f4174ebfc33ed944ad568327823290b803a2d8812767654d7bec084bf861b731dc56840fe74286473d364ee580b48708e40549
 AUX xscreensaver-6.01-gentoo.patch 1303 BLAKE2B 8ae9f4e545eed146c08f34fe9c56a9e73721c6cbcc361792c1b3b1c529da409e6f75b8727049d83a34be40747e516ab4e86efaf15bd027651dcdbdd64fe25ef5 SHA512 60f0f841e77c42f8b8afe3c94c6ec86c72e80bc2fb771979b798e7bc8428cb1d903c72a6176f60a3c5b98e850f4bb82cec01bae87eddeb42e99ba8099a1223aa
+AUX xscreensaver-6.01-gtk-detection.patch 792 BLAKE2B c941ea71b795af827034196150732848f2c63dde71fef3c87a090da5b652336c4b3220ad4ddeaf50ad80b54ead12632515495acc9ffea31897cd03dc68684aed SHA512 0de9b48fe74964ecd9ceb9421c1a48b15e168e4b89d412162f625d3423a12b20ed8662c6893226aeaeadfc455611e1856049086b9a84625c1b38559e6e2af056
 AUX xscreensaver-6.01-interix.patch 946 BLAKE2B e5a61a4de1373195747abb8f6e6580278bb9418bc17943422969f6571d4913f27347b088aa9404b11c14662de5b6144ef555521b1cb506b4ba8cde440aa63e78 SHA512 491e2861f2fb59b9c60f2321fd7e47f8cccaa8b2e69b5e9bb56ddb7893a6304983cefbed6ac6baf984f31ddf3b85e7354fc68ecac88058bfac79c9fac16deb44
+AUX xscreensaver-6.01-non-gtk-install.patch 1780 BLAKE2B 38d2a71fb9d35d1694fac4d92b60860e9a4e53b48cbb80d22981d4cf1d76b838538e19fb390a30fb5783023c66e5aa14b03e7f9ab3ca857c1fe29c7709afb6e1 SHA512 d949fe410df79833b112f1cd7442a1ab11d68f10b2415a39feb51229b0b067612d6970e6909cafd89b28081959754c98c35f0776be2e6069771bdb9f2310bdfd
 AUX xscreensaver-6.01-without-gl-makefile.patch 862 BLAKE2B 9762e84d535b4e913c0e4da6818605d8ff6fc0c9d184ff2cdc60969fab977b603bc18b16dfab7b1124948e814d230a50cd384bfabe785ad1e38e735a5e063d0c SHA512 8b445ca766d24b23904423c8d3a561a0558eca6d4b70b242d05df4949c371e455251be5a473b07fa837505550e00ea13c3154e2efda239468bf7a2a73a063c1f
 DIST xscreensaver-5.45.tar.gz 27729147 BLAKE2B 132301dd6645a21e04cd6f8b2f85e4b2454f5281e8cca3c5a89d50e16fee7f7e79d0b323e639bf7a18ddbcae0b4c8e7e5c9a84409bfe9f57253062cdaab30880 SHA512 1b21418c591fd99f3caaea9d31ca49abdb94b8e89f33e661c464299bc81bf4ff13fd99a187070fce19b3843c28a1f2a2a7b94bd6949d2b3b06bba730cae59f14
 DIST xscreensaver-6.01.tar.gz 27820165 BLAKE2B b2c90b47fb65db79d2473c1e396717156e414a0200672971adadf5729056ad9210822955a71f1a098e2142c00c5e60b24aababf9431903f96ff76e8c2d474052 SHA512 3a6e875196e1340909b2a379c25e758fef490d3d10154aef3096ec1be50fabe0d852de806d45a067eefd061381c8541acd7902d28be3bac15b76bd9d4bf0c02a
@@ -16,4 +18,6 @@ EBUILD xscreensaver-5.45-r4.ebuild 4160 BLAKE2B fdcff85c0e4754ca0363275cf395c132
 EBUILD xscreensaver-5.45-r5.ebuild 4159 BLAKE2B 479874f5e3823dbf1b8570d8285a868d7296935d3205a3d090f8ba2bef4491590ddaf7d838fccaf5f1f513aa7de8f09cc7ac62e25f4c9dd13ed5974e5c32b5b0 SHA512 c57b913d19031492a487f22a998fcbc790886cc7b96d238e84e16d57acc0305f587ae03bc9292b9f499c3ebd326ab51de2b5614d0519785b53708dfe5abd1662
 EBUILD xscreensaver-5.45-r6.ebuild 4264 BLAKE2B 2b8226f3b3695ded5884327e557a8bc9741a78ead7a526a5d7a2bea3fd2ac157f9c741802f1352ea6cdf130d5a3c3a147ecf6c934cd74099f336b92eea75c5ef SHA512 b670776352e96fc33ca2223e2f5d164e179015abc52afdd303c2f5782ac983ed60d12f7e1582e3d9bef05d4ce508a2e3ccf2fb586b7435873510c2b3e1cf8d21
 EBUILD xscreensaver-6.01-r1.ebuild 5084 BLAKE2B 3d62384d1c574228b0237effd608229d4b2d740a0d886320eb49226857372a60781f44a84e547cdabaf90863501ea6f10994b5e19b8837c54373d7fa9ff1c670 SHA512 92cd7a2adbf50dbdc474e10201ee04e699261d29759edf25c22e987608578df7916562c872b48384f579accd7bd0ba4d6eed1840ef6b09eaabfc34cee40d0b43
+EBUILD xscreensaver-6.01-r2.ebuild 5178 BLAKE2B 980f127f3238072282a7441308f9814860bd613bc5e530c8aeb7a378d2b0f6b983003e5667b5416542402359cfd37b0aadcd0b6b21e2b3ad3f21364c52909842 SHA512 fb7a433a13ec93c90f59dca6fa4bec80227a7c7e284f2d70c181bb8f50e24439ab5c3fddadad49c0edea51e853c475cff7a023552294993866aae27ee67f52d0
+EBUILD xscreensaver-6.01-r3.ebuild 5692 BLAKE2B b1189fd5bd80acb5b7c346fccf0842b4b826e9e5fc9229adc033bb41f798cee49fbf7a3456a43bb4e92276a9edb6757c6ffa36b33965f4c1e80bab0990e55555 SHA512 af8ef285717215b82e286e8d8609ea0ab052d488269be32adee903c86444075bfc14ccc59b74f407ee1b72caecb0bd907f80c910faaa8441ab6767405b041ee5
 MISC metadata.xml 887 BLAKE2B c24cdade56b44dad279fd6353c3e42f5c9992d2328a3aa29e003eee4d4051fc2505b35c01031041cc87cd033a93796e05aec9bf9379329f5c1a315b2702d295c SHA512 5b62ff9b4fae658f906a040ccea03f9df0fca1b5b6b5a5c5a47c7649de814f0ec443c81baa80d7d089b295ffb9bf15665ff47374e2be166d02fbbee57dba55b1
diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.01-gtk-detection.patch b/x11-misc/xscreensaver/files/xscreensaver-6.01-gtk-detection.patch
new file mode 100644
index 000000000000..1f70ad29dbb1
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.01-gtk-detection.patch
@@ -0,0 +1,25 @@
+From 9ff9a74152ebd8c04df12d340ab6e7c726690a82 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 17 Jul 2021 23:50:16 +0200
+Subject: [PATCH 2/2] Fix detection of GTK+ for systems without gdk-pixbuf
+
+---
+ configure.ac | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4cb3385..bef0d1e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2819,8 +2819,6 @@ if test "$with_gtk" = yes; then
+   pkg_check_version            gtk+-2.0  2.22.0 ; ac_gtk_version_string="$vers"
+   pkg_check_version         gmodule-2.0  2.0.0
+   pkg_check_version          libxml-2.0  2.4.6
+-  pkg_check_version      gdk-pixbuf-2.0  2.0.0
+-  pkg_check_version gdk-pixbuf-xlib-2.0  2.0.0
+   have_gtk="$ok"
+ 
+   if test "$have_gtk" = no; then
+-- 
+2.32.0
+
diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.01-non-gtk-install.patch b/x11-misc/xscreensaver/files/xscreensaver-6.01-non-gtk-install.patch
new file mode 100644
index 000000000000..cb8b6e45db2b
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.01-non-gtk-install.patch
@@ -0,0 +1,56 @@
+From 25b22d16fabbdb3e7a6afcd6cd8d1a25afaaa252 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 17 Jul 2021 23:44:44 +0200
+Subject: [PATCH 1/2] Fix install for --without-motif --without-gtk
+
+Related to https://bugs.gentoo.org/796992
+---
+ configure.ac       | 4 ++++
+ driver/Makefile.in | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2eaea28..4cb3385 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -4148,13 +4148,16 @@ fi
+ 
+ PREFERRED_DEMO_PROGRAM=''
+ ALL_DEMO_PROGRAMS=
++SETTINGS_PROGRAM_OR_NOT=
+ if test "$have_motif" = yes; then
+   PREFERRED_DEMO_PROGRAM=xscreensaver-settings-Xm
+   ALL_DEMO_PROGRAMS="$PREFERRED_DEMO_PROGRAM $ALL_DEMO_PROGRAMS"
++  SETTINGS_PROGRAM_OR_NOT=xscreensaver-settings
+ fi
+ if test "$have_gtk" = yes; then
+   PREFERRED_DEMO_PROGRAM=xscreensaver-settings-Gtk
+   ALL_DEMO_PROGRAMS="$PREFERRED_DEMO_PROGRAM $ALL_DEMO_PROGRAMS"
++  SETTINGS_PROGRAM_OR_NOT=xscreensaver-settings
+ fi
+ 
+ 
+@@ -4306,6 +4309,7 @@ AC_SUBST(INCLUDES)
+ 
+ AC_SUBST(PREFERRED_DEMO_PROGRAM)
+ AC_SUBST(ALL_DEMO_PROGRAMS)
++AC_SUBST(SETTINGS_PROGRAM_OR_NOT)
+ AC_SUBST(SAVER_LIBS)
+ AC_SUBST(MOTIF_LIBS)
+ AC_SUBST(GTK_LIBS)
+diff --git a/driver/Makefile.in b/driver/Makefile.in
+index 0e986a9..1877d8a 100644
+--- a/driver/Makefile.in
++++ b/driver/Makefile.in
+@@ -212,7 +212,7 @@ TEST_EXES	= test-passwd   test-uid        test-xdpms      test-grab     \
+ 		  xdpyinfo      test-screens    test-yarandom   test-xinput   \
+ 	          test-xkb
+ 
+-EXES		= xscreensaver xscreensaver-command xscreensaver-settings
++EXES		= xscreensaver xscreensaver-command @SETTINGS_PROGRAM_OR_NOT@
+ UTIL_EXES	= xscreensaver-gfx @EXES_SYSTEMD@
+ SETUID_EXES	= xscreensaver-auth
+ DEMO_EXES	= @ALL_DEMO_PROGRAMS@
+-- 
+2.32.0
+
diff --git a/x11-misc/xscreensaver/xscreensaver-6.01-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-6.01-r2.ebuild
new file mode 100644
index 000000000000..628041e77c80
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-6.01-r2.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic font multilib optfeature pam
+
+DESCRIPTION="modular screen saver and locker for the X Window System"
+HOMEPAGE="https://www.jwz.org/xscreensaver/"
+SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz"
+
+# Font license mapping for folder ./hacks/fonts/ as following:
+#   clacon.ttf       -- MIT
+#   gallant12x22.ttf -- unclear, hence dropped
+#   luximr.ttf       -- bh-luxi (package media-fonts/font-bh-ttf)
+#   OCRAStd.otf      -- unclear, hence dropped
+#   SpecialElite.ttf -- Apache-2.0
+LICENSE="BSD fonts? ( MIT Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="elogind fonts +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam +perl selinux suid systemd xinerama"
+REQUIRED_USE="
+	gdk-pixbuf? ( gtk )
+	elogind? ( !systemd )
+"
+
+COMMON_DEPEND="
+	dev-libs/libxml2
+	media-libs/netpbm
+	virtual/libcrypt:=
+	x11-apps/appres
+	x11-apps/xwininfo
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXrandr
+	x11-libs/libXt
+	x11-libs/libXxf86vm
+	elogind? ( sys-auth/elogind )
+	gdk-pixbuf? (
+		x11-libs/gdk-pixbuf-xlib
+		>=x11-libs/gdk-pixbuf-2.42.0:2
+	)
+	gtk? ( x11-libs/gtk+:2 )
+	jpeg? ( virtual/jpeg:0 )
+	new-login? (
+		gdm? ( gnome-base/gdm )
+		!gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
+		)
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+	pam? ( sys-libs/pam )
+	systemd? ( >=sys-apps/systemd-221 )
+	xinerama? ( x11-libs/libXinerama )
+"
+# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
+RDEPEND="
+	${COMMON_DEPEND}
+	media-gfx/fbida
+	perl? (
+		dev-lang/perl
+		dev-perl/libwww-perl
+		virtual/perl-Digest-MD5
+	)
+	selinux? ( sec-policy/selinux-xscreensaver )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-util/intltool
+	sys-devel/bc
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.01-interix.patch
+	"${FILESDIR}"/${PN}-5.31-pragma.patch
+	"${FILESDIR}"/${PN}-6.01-gentoo.patch
+	"${FILESDIR}"/${PN}-5.45-gcc.patch
+	"${FILESDIR}"/${PN}-6.01-configure.ac-sandbox.patch
+	"${FILESDIR}"/${PN}-6.01-without-gl-makefile.patch
+	"${FILESDIR}"/${PN}-6.01-non-gtk-install.patch
+	"${FILESDIR}"/${PN}-6.01-gtk-detection.patch
+)
+
+src_prepare() {
+	sed -i configure.ac -e '/^ALL_LINGUAS=/d' || die
+	strip-linguas -i po/
+	export ALL_LINGUAS="${LINGUAS}"
+
+	if use new-login && ! use gdm; then #392967
+		sed -i \
+			-e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \
+			configure{,.ac} || die
+	fi
+
+	default
+
+	# We are patching driver/XScreenSaver.ad.in, so let's delete the
+	# header generated from it so that it gets back in sync during build:
+	rm driver/XScreenSaver_ad.h || die
+
+	if ! use offensive; then
+		sed -i \
+			-e '/boobies/d;/boobs/d;/cock/d;/pussy/d;/viagra/d;/vibrator/d' \
+			hacks/barcode.c || die
+		sed -i \
+			-e 's|erect penis|shuffle board|g' \
+			-e 's|flaccid penis|flaccid anchor|g' \
+			-e 's|vagina|engagement ring|g' \
+			-e 's|Penis|Shuttle|g' \
+			hacks/glx/glsnake.c || die
+		sed -i \
+			's| Stay.*fucking mask\.$||' \
+			hacks/glx/covid19.man \
+			hacks/config/covid19.xml || die
+	fi
+
+	eapply_user
+
+	eautoconf
+	eautoheader
+}
+
+src_configure() {
+	if use ppc || use ppc64; then
+		filter-flags -maltivec -mabi=altivec
+		append-flags -U__VEC__
+	fi
+
+	unset BC_ENV_ARGS #24568
+
+	econf \
+		$(use_enable locking) \
+		$(use_with elogind) \
+		$(use_with gdk-pixbuf pixbuf) \
+		$(use_with gtk) \
+		$(use_with jpeg) \
+		$(use_with new-login login-manager) \
+		$(use_with opengl gl) \
+		$(use_with pam) \
+		$(use_with suid setuid-hacks) \
+		$(use_with systemd) \
+		$(use_with xinerama xinerama-ext) \
+		--with-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
+		--with-configdir="${EPREFIX}"/usr/share/${PN}/config \
+		--with-dpms-ext \
+		--with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \
+		--with-proc-interrupts \
+		--with-randr-ext \
+		--with-text-file="${EPREFIX}"/etc/gentoo-release \
+		--with-xdbe-ext \
+		--with-xf86gamma-ext \
+		--with-xf86vmode-ext \
+		--with-xinput-ext \
+		--with-xshm-ext \
+		--without-gle \
+		--without-kerberos \
+		--without-motif \
+		--x-includes="${EPREFIX}"/usr/include \
+		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_install() {
+	emake install_prefix="${D}" install
+
+	if use fonts; then
+		# Do not install fonts with unclear licensing
+		rm -v "${ED}${FONTDIR}"/{gallant12x22.ttf,OCRAStd.otf} || die
+
+		# Do not duplicate font Luxi Mono (of package media-fonts/font-bh-ttf)
+		rm -v "${ED}${FONTDIR}"/luximr.ttf || die
+
+		font_xfont_config
+	else
+		rm -v "${ED}${FONTDIR}"/*.{ttf,otf} || die
+	fi
+
+	dodoc README{,.hacking}
+
+	if use pam; then
+		fperms 755 /usr/bin/${PN}
+		pamd_mimic_system ${PN} auth
+	fi
+
+	rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
+}
+
+pkg_postinst() {
+	use fonts && font_pkg_postinst
+
+	optfeature 'Bitmap fonts 75dpi' media-fonts/font-adobe-75dpi
+	optfeature 'Bitmap fonts 100dpi' media-fonts/font-adobe-100dpi
+	optfeature 'Truetype font Luxi Mono' media-fonts/font-bh-ttf
+}
+
+pkg_postrm() {
+	use fonts && font_pkg_postrm
+}
diff --git a/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild b/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
new file mode 100644
index 000000000000..10eae1bbfe28
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic font multilib optfeature pam
+
+DESCRIPTION="modular screen saver and locker for the X Window System"
+HOMEPAGE="https://www.jwz.org/xscreensaver/"
+SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz"
+
+# Font license mapping for folder ./hacks/fonts/ as following:
+#   clacon.ttf       -- MIT
+#   gallant12x22.ttf -- unclear, hence dropped
+#   luximr.ttf       -- bh-luxi (package media-fonts/font-bh-ttf)
+#   OCRAStd.otf      -- unclear, hence dropped
+#   SpecialElite.ttf -- Apache-2.0
+LICENSE="BSD fonts? ( MIT Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="elogind fonts +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam +perl +png selinux suid systemd +xft xinerama"
+REQUIRED_USE="
+	gdk-pixbuf? ( gtk )
+	gtk? ( png )
+	opengl? ( png )
+	elogind? ( !systemd )
+"
+
+COMMON_DEPEND="
+	dev-libs/libxml2
+	media-libs/netpbm
+	virtual/libcrypt:=
+	x11-apps/appres
+	x11-apps/xwininfo
+	x11-libs/libX11
+	x11-libs/libXext
+	xft? ( x11-libs/libXft )
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXrandr
+	x11-libs/libXt
+	x11-libs/libXxf86vm
+	elogind? ( sys-auth/elogind )
+	gdk-pixbuf? (
+		x11-libs/gdk-pixbuf-xlib
+		>=x11-libs/gdk-pixbuf-2.42.0:2
+	)
+	gtk? ( x11-libs/gtk+:2 )
+	jpeg? ( virtual/jpeg:0 )
+	new-login? (
+		gdm? ( gnome-base/gdm )
+		!gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
+		)
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+	pam? ( sys-libs/pam )
+	png? ( media-libs/libpng:= )
+	systemd? ( >=sys-apps/systemd-221 )
+	xinerama? ( x11-libs/libXinerama )
+"
+# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
+RDEPEND="
+	${COMMON_DEPEND}
+	media-gfx/fbida
+	perl? (
+		dev-lang/perl
+		dev-perl/libwww-perl
+		virtual/perl-Digest-MD5
+	)
+	selinux? ( sec-policy/selinux-xscreensaver )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-util/intltool
+	sys-devel/bc
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.01-interix.patch
+	"${FILESDIR}"/${PN}-5.31-pragma.patch
+	"${FILESDIR}"/${PN}-6.01-gentoo.patch
+	"${FILESDIR}"/${PN}-5.45-gcc.patch
+	"${FILESDIR}"/${PN}-6.01-configure.ac-sandbox.patch
+	"${FILESDIR}"/${PN}-6.01-without-gl-makefile.patch
+	"${FILESDIR}"/${PN}-6.01-non-gtk-install.patch
+	"${FILESDIR}"/${PN}-6.01-gtk-detection.patch
+)
+
+src_prepare() {
+	sed -i configure.ac -e '/^ALL_LINGUAS=/d' || die
+	strip-linguas -i po/
+	export ALL_LINGUAS="${LINGUAS}"
+
+	if use new-login && ! use gdm; then #392967
+		sed -i \
+			-e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \
+			configure{,.ac} || die
+	fi
+
+	default
+
+	# We are patching driver/XScreenSaver.ad.in, so let's delete the
+	# header generated from it so that it gets back in sync during build:
+	rm driver/XScreenSaver_ad.h || die
+
+	if ! use offensive; then
+		sed -i \
+			-e '/boobies/d;/boobs/d;/cock/d;/pussy/d;/viagra/d;/vibrator/d' \
+			hacks/barcode.c || die
+		sed -i \
+			-e 's|erect penis|shuffle board|g' \
+			-e 's|flaccid penis|flaccid anchor|g' \
+			-e 's|vagina|engagement ring|g' \
+			-e 's|Penis|Shuttle|g' \
+			hacks/glx/glsnake.c || die
+		sed -i \
+			's| Stay.*fucking mask\.$||' \
+			hacks/glx/covid19.man \
+			hacks/config/covid19.xml || die
+	fi
+
+	eapply_user
+
+	# Must be eauto*re*conf, to force the rebuild
+	eautoreconf
+	eautoheader
+}
+
+src_configure() {
+	if use ppc || use ppc64; then
+		filter-flags -maltivec -mabi=altivec
+		append-flags -U__VEC__
+	fi
+
+	unset BC_ENV_ARGS #24568
+
+	# WARNING: This is NOT a normal autoconf script
+	# Some of the --with options are NOT standard, and expect "--with-X=no" rather than "--without-X"
+	ECONF_OPTS=(
+		$(use_enable locking)
+		$(use_with elogind)
+		$(use_with gdk-pixbuf pixbuf)
+		$(use_with gtk)
+		$(use_with new-login login-manager)
+		$(use_with opengl gl)
+		$(use_with pam)
+		$(use_with suid setuid-hacks)
+		$(use_with systemd)
+		$(use_with xinerama xinerama-ext)
+		--with-jpeg=$(usex jpeg yes no)
+		--with-png=$(usex png yes no)
+		--with-xft=$(usex xft yes no)
+		--with-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults
+		--with-configdir="${EPREFIX}"/usr/share/${PN}/config
+		--with-dpms-ext
+		--with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN}
+		--with-proc-interrupts
+		--with-randr-ext
+		--with-text-file="${EPREFIX}"/etc/gentoo-release
+		--with-xdbe-ext
+		--with-xf86gamma-ext
+		--with-xf86vmode-ext
+		--with-xinput-ext
+		--with-xkb-ext
+		--with-xshm-ext
+		--without-gle
+		--without-kerberos
+		--without-motif
+		--with-proc-oom
+		--x-includes="${EPREFIX}"/usr/include
+		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
+	)
+	# WARNING: This is NOT a normal autoconf script
+	econf "${ECONF_OPTS[@]}"
+}
+
+src_compile() {
+	# stock target is "default", which is broken in some releases.
+	emake all
+}
+
+src_install() {
+	emake install_prefix="${D}" install
+
+	if use fonts; then
+		# Do not install fonts with unclear licensing
+		rm -v "${ED}${FONTDIR}"/{gallant12x22.ttf,OCRAStd.otf} || die
+
+		# Do not duplicate font Luxi Mono (of package media-fonts/font-bh-ttf)
+		rm -v "${ED}${FONTDIR}"/luximr.ttf || die
+
+		font_xfont_config
+	else
+		rm -v "${ED}${FONTDIR}"/*.{ttf,otf} || die
+	fi
+
+	dodoc README{,.hacking}
+
+	if use pam; then
+		fperms 755 /usr/bin/${PN}
+		pamd_mimic_system ${PN} auth
+	fi
+
+	rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
+}
+
+pkg_postinst() {
+	use fonts && font_pkg_postinst
+
+	optfeature 'Bitmap fonts 75dpi' media-fonts/font-adobe-75dpi
+	optfeature 'Bitmap fonts 100dpi' media-fonts/font-adobe-100dpi
+	optfeature 'Truetype font Luxi Mono' media-fonts/font-bh-ttf
+}
+
+pkg_postrm() {
+	use fonts && font_pkg_postrm
+}
diff --git a/x11-misc/xvfb-run/Manifest b/x11-misc/xvfb-run/Manifest
index bd422f125762..27cc2b07803a 100644
--- a/x11-misc/xvfb-run/Manifest
+++ b/x11-misc/xvfb-run/Manifest
@@ -1,7 +1,7 @@
 DIST xorg-server_1.20.10-2.diff.gz 152303 BLAKE2B beb1d07e86378a62bad956990ee210375c3cfa0135acd51e2756c0ddc2933d13092e400a53909a72755b3c1dfb31faa32a137c7ff719fdb8dcc23f11cca72e05 SHA512 c19e16764720b79df53b8032947ca64bb4ca0b9c380d4c2e3317c37b6fa2937815de01e82019ec93921919690c0a5ae1b59bf1fae189d8f7e9e80fb4860fd713
 DIST xorg-server_1.20.10-3.diff.gz 152420 BLAKE2B e87d8800a905962cf3ddeb41e5e9cf0962c5b3ff16ee8ce4d31de96a3d94798fc70dee4ee3f05759d16758f2083436fb91c212ab22f719bd3f086fac51ee5d73 SHA512 16fffd2c92d30c985f55093f46249440388a1eeeca9bd70cd06883f75052170c9717925b18dd01b16ce55d03758bbbf5f2b10c76de00f752b3e7ff64e74e646d
 DIST xorg-server_1.20.8-2.diff.gz 171769 BLAKE2B 5572320e4bc1de63ba221e5c9804d6676cc7c918d417b4069572fec4385d62b73e5636a4f17eebb1897f410e323e190dff68056abd888373df4ccdd688ed7c47 SHA512 89115023fc802a3cf2fc21fabed4499112b1e6f52967eb134795f041194b05d86c59b1477d8b9001c2935efdeb64e8a0dd281a43a6252802df2d19349972f7d7
-EBUILD xvfb-run-1.20.10.3.ebuild 775 BLAKE2B 9c070bbee3901b23015422be999c7c853e3a0ba6673648c1ac6083506f14f1dc51fa3dee63e6d9324d2d862438d3b23ab8288d1e96b94caf0dc5edca8ea7b7eb SHA512 36779fcdd347a8fd5021e5614625aec9d91c18bb9b7b2fa628fee9e4f313f0d99507ca8a5200633b511d3d0ce39f449953d55575d2a12b23c6394d655d78a65f
+EBUILD xvfb-run-1.20.10.3.ebuild 774 BLAKE2B 5d28b2fa3704b40bdd5bf9800928b9c3e72678357f8e3d2145d12922794ddb677a0c334c1bf393781fdd0f56548c653c6548b523ad9a87b7e5903fe901c62e32 SHA512 c6b7c50dce35e2496b95812c597e2680ed5107031359e8fb54abfeefd72d68e9930fff6bb9acca54615827712bb2d560e93e88c458c11a53359f5be3eae96f38
 EBUILD xvfb-run-1.20.10_p2.ebuild 757 BLAKE2B 480f78fea0fb293e3656ac40a94833c37cacb294c8dbeaddd6629e3c2ccc329b6f47277926d7435b41c35a33eadafb59bdda731ec006fa93465fd9c7c772f397 SHA512 7948f90a2716af559e6c8028898454dae4d4419e337163ba962e24a72f6d2fed11288a39cee3e0fdd921e1fcdf6ee57072646aa9dee56c2f7ee38a0c301cc5d3
 EBUILD xvfb-run-1.20.8_p2.ebuild 754 BLAKE2B 68043da68ba05bd0e7e054aaed496dd4476ed1c88ebd1f644c9e878b1f92eb5afbb5755799cceb75a027c37965c286c1b1cafe265a0f758b8cae2e3193fb3718 SHA512 c666c2c5b58462cb0a58f90062143e091ae902665825ea1d6c6cfd6a3507501f54073cc050da2a4c8da08105b9c77f18662582d512e22df960d71181f6012984
 MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/x11-misc/xvfb-run/xvfb-run-1.20.10.3.ebuild b/x11-misc/xvfb-run/xvfb-run-1.20.10.3.ebuild
index 4c53cd93e986..d69d1d8e509f 100644
--- a/x11-misc/xvfb-run/xvfb-run-1.20.10.3.ebuild
+++ b/x11-misc/xvfb-run/xvfb-run-1.20.10.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/${MY_PN:0:1}/${MY_PN}/${MY_PN}_${MY_PV}.diff.
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="dev-util/patchutils"
diff --git a/x11-misc/xwallpaper/Manifest b/x11-misc/xwallpaper/Manifest
index 41a8456db8bd..bf89862c667c 100644
--- a/x11-misc/xwallpaper/Manifest
+++ b/x11-misc/xwallpaper/Manifest
@@ -1,6 +1,6 @@
-DIST xwallpaper-0.6.6.tar.xz 85368 BLAKE2B fcb0861d4cecbafc980208b3d2a174b9931a93cd8110b6f2c38eddae19e890295ce5d6d75dc4f09924279a2b0463234f4efdb4dda758ed14ed728abfec6b9bf3 SHA512 e37055b9adfa6950fb423228ff880afaa03dbdf2a7ced6ab1e110dbf4813f68aae3c9147668ebd20665b582bea195470c39b6948cd36879afe54d61c90b6f8d9
 DIST xwallpaper-0.7.1.tar.xz 86260 BLAKE2B b8327b15bc421275660cc81d14e4952b37a1310fd50eea61b772115e2c345c01cae9c4f908d9ca55427e642b10bea7277af02e1d3525db6c1d6e80a356db1b2b SHA512 706f814ee892f9d136ef20bb3c9bb4b8537e3ed7029b3b20fbebb1504426529d2fa6a45117a391419253543a48230f5786ffa3f871f85477699c08dfa3ba5c92
-EBUILD xwallpaper-0.6.6.ebuild 956 BLAKE2B 60de096484a1ec26cb1f81e8ef5bfe891e2e65130216e675fac462e0bb3dcc216d36bc9b8df93a9ac07d3b84896d06042b5679a15e79e6c71adfc360053727d2 SHA512 8b15ba0f030336a0dd7140e2274be8ff171cfe5e85b6788ef4771ff65c0f74bf16df9709bbbc12915ab313a5200d0e820995d9f93f1d5934421025791cd39a62
-EBUILD xwallpaper-0.7.1.ebuild 971 BLAKE2B 42e1e0addea931748d0e8ea7aeb1e62bb53f99cb7adeae748edd538c981436264d684ef9a1bf94e3d3b4f5a2fab05f42798bad35ebe1e92aae17f2d2d4deaab7 SHA512 ec15f6d477ac8dc5ea5af86c2cbe725860241dde179eaac399ee6d2824ee786e62b99217ce1b2e543664074961590755fe23211cd678a0259855e289be6a23ad
+DIST xwallpaper-0.7.2.tar.xz 86212 BLAKE2B 1958ad8eb3f80f2cccdd969230e32986e7d144bf820a4c820a93d0bfdbcaa5512f08eb4014a8b57edb40f1ed55ce54080835c2d2dd46205c399b2ea6adcf1df1 SHA512 2b7166b719edae0d21460682d6c8991739d1a753078920bccb253f905300c694cb6fb12695456be58707d895f8adacd6007023c8e1abd23a0e369e9e80e5106e
+EBUILD xwallpaper-0.7.1.ebuild 970 BLAKE2B f67defaa9be6474d998299b8e052e2682e0849434bd25ccb348b22250357e3e8406cbd4b3a5ca4c852d782357e88220143cd5e8720d1e65db342d899e32ea28d SHA512 0f44b45d7f56fc62a291a98727091c316555d560e4b6ddb686ac72aa9dc113c50e9bbdbafb037837fb28e4e1bc07040b293963b14a9a4dee34565905609f626f
+EBUILD xwallpaper-0.7.2.ebuild 972 BLAKE2B b4311d7453e1e242967db28ac436806dea2bc2fa75cf6964264635a4f4bfc3d5dc757639c767c5b1a68d3f4efe195946220f583cdd724069e81cef1fccc91381 SHA512 3b9d7c425c81ee841e0c17d463d4b1e52ff9bee238c65ca2d39ffa8ac4686d45d437425050cb4e4fd2115680ee16c0aa6935ce046b506b566cd3f73472c3ce7c
 EBUILD xwallpaper-9999.ebuild 967 BLAKE2B 015785bb4227a1269a03488df74bf4258cf6e39d621be80bf8b0c11d22dd863f9c1f9034dbf08b41717cd4a5b445cd6bd3cc22e987ccb0b7e859ca5376748e5d SHA512 ce4fb8f6f20922422e2f7ff1a5537f3f03f9664db850461e411b3a5f4e89e60c4cfc7e848f12d6f574dd5b7f12f3849c78b6ae56c23989a10d8cf444c34f4b37
 MISC metadata.xml 804 BLAKE2B db3ea33826679dd19ae2631256fb9570b190fed70efd5084059cd7b23d620f632e654658062ddb1d92ec1ac31a67285c2610282e2c5d0af0806e4c1b554dada2 SHA512 ecd6a763905744ab6a8aae1772027401810e0d18e806147a0bec305722a2a4dae39cc9fa5e400db6933b636ec9787b80fd0f1b0e2c0eaa4f5c87d2e3f4cb4991
diff --git a/x11-misc/xwallpaper/xwallpaper-0.7.1.ebuild b/x11-misc/xwallpaper/xwallpaper-0.7.1.ebuild
index 9f494806c799..65b6db83de5c 100644
--- a/x11-misc/xwallpaper/xwallpaper-0.7.1.ebuild
+++ b/x11-misc/xwallpaper/xwallpaper-0.7.1.ebuild
@@ -13,7 +13,7 @@ if [ ${PV} == "9999" ] ; then
 	EGIT_REPO_URI="https://github.com/stoeckmann/${PN}.git"
 else
 	SRC_URI="https://github.com/stoeckmann/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 arm64 ~ppc64 x86"
+	KEYWORDS="amd64 arm64 ppc64 x86"
 fi
 
 LICENSE="ISC"
diff --git a/x11-misc/xwallpaper/xwallpaper-0.6.6.ebuild b/x11-misc/xwallpaper/xwallpaper-0.7.2.ebuild
index b4afc4de2784..2c89348e8c20 100644
--- a/x11-misc/xwallpaper/xwallpaper-0.6.6.ebuild
+++ b/x11-misc/xwallpaper/xwallpaper-0.7.2.ebuild
@@ -13,12 +13,12 @@ if [ ${PV} == "9999" ] ; then
 	EGIT_REPO_URI="https://github.com/stoeckmann/${PN}.git"
 else
 	SRC_URI="https://github.com/stoeckmann/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~ppc64 x86"
+	KEYWORDS="amd64 arm64 ppc64 x86"
 fi
 
 LICENSE="ISC"
 SLOT="0"
-IUSE="jpeg png seccomp xpm"
+IUSE="+jpeg +png seccomp xpm"
 
 RDEPEND="
 	x11-libs/pixman
@@ -27,12 +27,12 @@ RDEPEND="
 	jpeg? ( media-libs/libjpeg-turbo:= )
 	png? ( media-libs/libpng:0= )
 	seccomp? ( >=sys-libs/libseccomp-2.3.1:0= )
-	xpm? ( x11-libs/libXpm )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
+	xpm? ( x11-libs/libXpm )
 "
 
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
 src_prepare() {
 	default
 	eautoreconf
diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index 35156a7a9762..30c259291085 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -4,9 +4,9 @@ DIST zim-0.73.2.tar.gz 2611490 BLAKE2B 05fd020b3add3ac9c6fd860ca002a5c0755a1a1f1
 DIST zim-0.73.3.tar.gz 2648597 BLAKE2B c3709fc418317bfbd355f3715e5fceb346026393bfaec65ca8713fb2cd33243189dc3328b4be20b08452545704d4d1196f99f96df9445aaed5d0277b310d37f0 SHA512 880839495e3aa434267ac02abe2c1779c8cb3c9c7b73de91a19e962e7face2cd05399871789d719d89d0776d09fb9b339370f4fac8e4019be538e282accbe180
 DIST zim-0.73.4.tar.gz 2648686 BLAKE2B 47ac293494fb61808c80afccbc7b97c5539ceed050abdfd84048b5d0a6dd0667f8f23e1fd9cbd06aa77f8895787da76c3297e041e435ac45d0b5874fd8054fc4 SHA512 8205335e07d99ab340af4f75a429aeb3114446cc9ae2ccfbced4eb95b723c26b5d8c8624e94c5b38373a9368cf058c03f160a36730feb37d9c00abcd61b6d147
 DIST zim-0.73.5.tar.gz 2702734 BLAKE2B 494dbe8ac0cbb46c15655cdf56bc25010591bd00faec94608ccd9fa7cec01385c6756480e5a3f37b50f44984ed69d30f33570ca913dab7ede2b89a4bf0cc4016 SHA512 f2c335d4697e7d0535b2abb200af45b7d753f2964e94a35c2ec8d4fb8deae0842aef086e09430a50d4ff5ecee89eb1f6f881a0b430877209e4a8d83ee046c4f9
-EBUILD zim-0.73.1.ebuild 2002 BLAKE2B b971044002f24335c7f3daf11968169b09afdecac11ea83b4523f10e1251e6315806862903edfc2c5e2f6856a6d401764ee1cf4ef9d6e79de0ca137f27dbf9dd SHA512 dd386c113cb04feef79e9c00ba5c362789fac4639fffb14b6075b19f78bc81736ba74229407084bfb0f1558fcc1b8069e99b1a02af1800fdf3725a2c70e65ca6
-EBUILD zim-0.73.2.ebuild 2004 BLAKE2B d6478af537b4a15014f485eda1244ebcc8731ea2cc25b674982a393fab6772694722dd4049a04d9f59a41df128d7c26d669b0a94e0eefd9e05a98f9484f0daf7 SHA512 76ffbc31bae087720a1a4dea30d0d38b5e377e4bba1fff7a42df28c4652ba76421012ff0ba82f22fc4573654d7f7c4d876ffd05d68a3972ca06d3e857380b8e4
-EBUILD zim-0.73.3.ebuild 2004 BLAKE2B d6478af537b4a15014f485eda1244ebcc8731ea2cc25b674982a393fab6772694722dd4049a04d9f59a41df128d7c26d669b0a94e0eefd9e05a98f9484f0daf7 SHA512 76ffbc31bae087720a1a4dea30d0d38b5e377e4bba1fff7a42df28c4652ba76421012ff0ba82f22fc4573654d7f7c4d876ffd05d68a3972ca06d3e857380b8e4
-EBUILD zim-0.73.4.ebuild 1836 BLAKE2B 48ba230f3107c73756959d990fa50760a274bd6041aefd635a1e71176598532ccf2cc031ddbd7184c1fabe8eb023be97f84533e0dbc1d50e0a468948e314d106 SHA512 4e1b01089107eb7bd13cb5c55245d7b8eed655428c2e92afa49b3bbdb494222931c4b4a29c09e7ce465e4bd49616a0a44ceecb171b9273e44ada685bf24478f2
-EBUILD zim-0.73.5.ebuild 1834 BLAKE2B 24c1e73ef3b410816917da6680b4f9996284bcc7589255a28fd080d1bb1a44a26a5e01f1f4bfa9c7b431e7227739ddade33aae10aaadd2069ddf258e0f5b159c SHA512 147ec7db53eea984d7732d3cec990c91d6e915c7b46492b41a47c69a9bfa13339a8a2b023fcde86ee9a7bd2bcfbda15cfa03bfc6ba878553f1e21ee232d21198
+EBUILD zim-0.73.1.ebuild 1986 BLAKE2B 88fbe13dcd18afd80187f4af47b361bd08b0e2a1ef951f3d3adcec88d8590115057f5a0a371faffeeb7d3e38576838940e63bdd11eb2d511b50f2f7a6ab2c2a5 SHA512 413ea5d8eaa4f4ec8484c3ae84fefd89c1327ed813c7bafc8f6c686bf9de63a83eb86448ee5a5d29ba6a76b158b382ec36de3f2a606893ed11a9cd9542af12be
+EBUILD zim-0.73.2.ebuild 1988 BLAKE2B 698705bf7c0b00ef6eda2fd333d94fe4179748795e8fc526de4e81561cc12fe4299af89f9597e8e253c6933a4e609d563448a4588711b1d604441c261566c20d SHA512 8fc7c4831844b13b24446f5bbb85cbf5fef082cec5de694087b2bd9a9ef85cf8691dcc4766831fcc7de720ab11e318874ab1382f742edc4a81e53947957d0160
+EBUILD zim-0.73.3.ebuild 1988 BLAKE2B 698705bf7c0b00ef6eda2fd333d94fe4179748795e8fc526de4e81561cc12fe4299af89f9597e8e253c6933a4e609d563448a4588711b1d604441c261566c20d SHA512 8fc7c4831844b13b24446f5bbb85cbf5fef082cec5de694087b2bd9a9ef85cf8691dcc4766831fcc7de720ab11e318874ab1382f742edc4a81e53947957d0160
+EBUILD zim-0.73.4.ebuild 1822 BLAKE2B e07614d05c5b81cd4aab38029af5e07675e7a44579b78e27eaf683856e84760603050446535d53262fde93566f24e84822aac9456b0c0a1ec9275650b25ce9b7 SHA512 c8ccbf826b541d23125a2f37c3524257514ddc8c00413586ac43aaf3679e1392baffe48a1346ccab6cad9765ce973d9b10ac7b9fe2f2a5287ff7a9ae93cd4b19
+EBUILD zim-0.73.5.ebuild 1820 BLAKE2B eeb3f5184d8e68aa56f461979e48fc11bb96979aff04a8063993da14b88c05a52c695e7d5163e15992795d3669554c26aa13b12e1d0093f8c815ad57805ef3d5 SHA512 6b82081c2ade2497a49db760a3cf2ea0c7e073de9ca639e2deeeff5e68c0d5a299c93b35839c96fcd6764f8f3c939504f4541fb0d296d390680131def695b5d7
 MISC metadata.xml 804 BLAKE2B 3b238d0a00d1ff9edc20e2b65b06aefa6b324e71c70e545372e3d05fb4020a67a2be45ade5065439f7974eaea6fa25ae8d65addc9e940d5c3762f7bd4c6ea1d1 SHA512 95e103028935e95fdb0d3ab00c1695db0f82a6f9cb33c0defd298edb50adf69ba5b00194ea2dbc6adb8b2da500fe45d17451e6354b6020ff9a75de837653244e
diff --git a/x11-misc/zim/zim-0.73.1.ebuild b/x11-misc/zim/zim-0.73.1.ebuild
index 729a04173999..10d8bc60c6d3 100644
--- a/x11-misc/zim/zim-0.73.1.ebuild
+++ b/x11-misc/zim/zim-0.73.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_8 )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=no
@@ -22,8 +22,8 @@ RESTRICT="test"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pyxdg[${PYTHON_USEDEP}]
 	')
 	x11-libs/gtk+:3[introspection]
 	x11-misc/xdg-utils
diff --git a/x11-misc/zim/zim-0.73.2.ebuild b/x11-misc/zim/zim-0.73.2.ebuild
index 058d33d2b60e..684fc2fc3ddd 100644
--- a/x11-misc/zim/zim-0.73.2.ebuild
+++ b/x11-misc/zim/zim-0.73.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_8 )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=no
@@ -22,8 +22,8 @@ RESTRICT="test"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pyxdg[${PYTHON_USEDEP}]
 	')
 	x11-libs/gtk+:3[introspection]
 	x11-misc/xdg-utils
diff --git a/x11-misc/zim/zim-0.73.3.ebuild b/x11-misc/zim/zim-0.73.3.ebuild
index 058d33d2b60e..684fc2fc3ddd 100644
--- a/x11-misc/zim/zim-0.73.3.ebuild
+++ b/x11-misc/zim/zim-0.73.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_8 )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=no
@@ -22,8 +22,8 @@ RESTRICT="test"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pyxdg[${PYTHON_USEDEP}]
 	')
 	x11-libs/gtk+:3[introspection]
 	x11-misc/xdg-utils
diff --git a/x11-misc/zim/zim-0.73.4.ebuild b/x11-misc/zim/zim-0.73.4.ebuild
index 7b47f41caeeb..131369dc0283 100644
--- a/x11-misc/zim/zim-0.73.4.ebuild
+++ b/x11-misc/zim/zim-0.73.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=no
@@ -22,8 +22,8 @@ RESTRICT="test"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pyxdg[${PYTHON_USEDEP}]
 	')
 	x11-libs/gtk+:3[introspection]
 	x11-misc/xdg-utils
diff --git a/x11-misc/zim/zim-0.73.5.ebuild b/x11-misc/zim/zim-0.73.5.ebuild
index 2f81c04016f3..db96dd8a5459 100644
--- a/x11-misc/zim/zim-0.73.5.ebuild
+++ b/x11-misc/zim/zim-0.73.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=no
@@ -22,8 +22,8 @@ RESTRICT="test"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pyxdg[${PYTHON_USEDEP}]
 	')
 	x11-libs/gtk+:3[introspection]
 	x11-misc/xdg-utils