gentoo resync : 02.09.2020

49 files changed, 116 insertions, 121 deletions

diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index bc23a481e910..c2b9bec016b9 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 0a94a286c68f..3ff35b40d084 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -3,5 +3,5 @@ AUX calentry.schema 3661 BLAKE2B 0235e8d98d1367f209a31cc74da9563d53dfc12ca34e020
 DIST evolution-data-server-3.36.4.tar.xz 4636308 BLAKE2B d701e2220de9aa68a1c5e112de16675c53a33e31441fbfd88d6ac7afa08d60faa3c06d74ee4161f3329b1ba93950f97f32d3cf5714a0de68560053b506425707 SHA512 dea044e12aac92f1cfde18c10f793b75e68e40e27fb9b299c6bdb91e6f19df4224bda7ed32d54a8b8dd517580b69929cff6be0b340e377dbc3bda5c4860f5a3b
 DIST evolution-data-server-3.36.5.tar.xz 4636800 BLAKE2B 5708ec1f064b723cb5421dad50145d2377c2c683ef37fe82d24b6f27a895b89e43c55ae6c900797d477b1af052e0cc6381649c790744d8591010d928822917f1 SHA512 65ec23a665e3a547b10ad6a6be5f0533db269406c3e8db64a63cffb8e1b410e83b9c39bd7cd5dac5ecd5cf61ef96dc529ba1bd00ad0a09b3bf2c4e98f3d156e3
 EBUILD evolution-data-server-3.36.4.ebuild 4200 BLAKE2B 3bce351bf145ed7a50c0f365ffaa06ad4bd807478a7c15478a50e5a53976424a9cd4d676fef2abc53cadcbd823b7171d92ed77ef2fab9f64c45d31b20406318c SHA512 f8dbefdd85d854e85e683cae10de5ff1355ed05cdacb1111db773465a344c0746b8ea61dd1eda2331d7e11af2eb2587010eda8582556862edb2783e6a6b14531
-EBUILD evolution-data-server-3.36.5.ebuild 4257 BLAKE2B 5164bfd121dea72010ae7917df40650c3ad19e6043cd798c03e896979266367b73e16db4d7ea0d0eb269972a0c48209c5748189e2e608386079e9aa843673773 SHA512 d14e1569dd8dff4bf1e76798e6ad0301b47e0c0207c09b3eeece51cca89d881003da474046d077028f6ae08a1ce5f43dcdc9b47b2c78519280d529a9125bd66b
+EBUILD evolution-data-server-3.36.5.ebuild 4255 BLAKE2B 6fd03b8970ba47efeb5d309b921ec5408040182c2ae21132c302717d96b8da3c8f66561851e2d5578bd55fa9bdc6181e4b9cb065add8054ec54433616d7130da SHA512 fae5318c170006755829ca6009a12060c4020f61244bca05d4a0701800c70f5dc915d1419dc898e21f1dbefa08ba76a4c4e12dd8f583ba152976cf7d0d43cd0e
 MISC metadata.xml 849 BLAKE2B a02a770ca4498189e14588af9aa58d82a7e28fbbfd99d891dfaa7e4148c71a0d7c89ae33a6b41899a174fd6dfa8ba012a2c0a3e342b58c8d84369010859f4b8c SHA512 da5fba1f5313c6bb027d870279ead3f9cf6da27a3fed183dced79abaaf3de4bbbc49076a01968e3af5dbe004f1641c7f0773801a040ba824924955894bcbbb1a
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.36.5.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.36.5.ebuild
index 39aaaae43b51..8ea1ba4ebd94 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.36.5.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.36.5.ebuild
@@ -16,7 +16,7 @@ SLOT="0/62-24-20" # subslot = libcamel-1.2/libedataserver-1.2/libebook-1.2.so so
 IUSE="berkdb +gnome-online-accounts +gtk gtk-doc +introspection ipv6 ldap kerberos oauth vala +weather"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 # gdata-0.17.7 soft required for new gdata_feed_get_next_page_token API to handle more than 100 google tasks
 # berkdb needed only for migrating old addressbook data from <3.13 versions, bug #519512
diff --git a/gnome-extra/evolution-ews/Manifest b/gnome-extra/evolution-ews/Manifest
index 4807eb7a4da0..7af37b5ed073 100644
--- a/gnome-extra/evolution-ews/Manifest
+++ b/gnome-extra/evolution-ews/Manifest
@@ -1,5 +1,5 @@
 DIST evolution-ews-3.36.4.tar.xz 558764 BLAKE2B 04823d04577b9d5597edf4b534d13f3bd82ac345bcfc5600a28f104917bb3f26513ae2fd7fad7b650728336fdbfac7cd94f4dd4b7cc77789570bf54def38feb0 SHA512 3b0ff6fec5dc857e49386adec9cf4ed962fc1bc95c23cca3852bbb4a63a4a3ae737511964adbccbbc52c409749dbdc71969231d4003ed284f12d655046f4ecdd
 DIST evolution-ews-3.36.5.tar.xz 558900 BLAKE2B 059a72b087287d0e553e085dc764a928d838bc8bd011c16b00f240b29d12bc7cfda98d33f8dc102866f5747313975e32506dc016435342bdb6c35f7d73749b52 SHA512 9cc40ae5d56bc86a8aa4e7aaa36fa10b0841278dd1edb075155bfe3666da4051e4fc4843398f74d00d77f550aaeb93bf576007828da4c574a17d4f17c41bfb7f
 EBUILD evolution-ews-3.36.4.ebuild 1408 BLAKE2B 4c50c511fc049d334447938e4e2027bc4e3b353a684f453e90d4e20c3988e113632826b9107ed5726b5cbf59991bca285512cb80ab51071d45eb9e5eb307bfd0 SHA512 b845c4d3b3cfb3760e89c2f8cb8787f5a09db8840984cbc43ab427808db7436b9d58584514b4d83c5eb8e4ad6286f86bf2014c9656e32bade0c7b5dba307b91a
-EBUILD evolution-ews-3.36.5.ebuild 1410 BLAKE2B 0d8b0f84ad75a021656eb7dac6207d129ed4e8fdf4af60f31bbee26a0692d570a113bc04647f03d03f6a3567152fcc2d515d02dc4890afe9198b82916985f93e SHA512 76193cf66e8908e03cad8da4d315939ebc5daf657483b53119ec50e0d2a38655fb218767f31ff44157d7af1f9ea4f0063dbb4adcacaf9dc470903d4366329afd
+EBUILD evolution-ews-3.36.5.ebuild 1408 BLAKE2B 4c50c511fc049d334447938e4e2027bc4e3b353a684f453e90d4e20c3988e113632826b9107ed5726b5cbf59991bca285512cb80ab51071d45eb9e5eb307bfd0 SHA512 b845c4d3b3cfb3760e89c2f8cb8787f5a09db8840984cbc43ab427808db7436b9d58584514b4d83c5eb8e4ad6286f86bf2014c9656e32bade0c7b5dba307b91a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.36.5.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.36.5.ebuild
index b3b87637eb31..3d5c7d9b8f15 100644
--- a/gnome-extra/evolution-ews/evolution-ews-3.36.5.ebuild
+++ b/gnome-extra/evolution-ews/evolution-ews-3.36.5.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 # libical-glib currently (2020-02-29) oddly behind USE=introspection
diff --git a/gnome-extra/gnome-boxes/Manifest b/gnome-extra/gnome-boxes/Manifest
index 9c2c2cbc20c0..df189addff2d 100644
--- a/gnome-extra/gnome-boxes/Manifest
+++ b/gnome-extra/gnome-boxes/Manifest
@@ -3,5 +3,5 @@ DIST gnome-boxes-3.36.5.tar.xz 1263156 BLAKE2B ebce9f5cfa6740e8d7691bc4ea726999a
 DIST gnome-boxes-3.36.6.tar.xz 1275972 BLAKE2B a4b6bc98a8ed644020dce7ce5f5f08ae75291e2ac3351d1b3354d495a0579a59a245d63ba22754679b9641088bb71f96cd3abc7944f9996526ad7e6db9552458 SHA512 a37f34ea54d60d2d927dfe07a6ace6bd74910054b63a58bc2782f6dcd087d4a2153db0662d715a1bc67e2687742a162b3f66ff97b7678eb280f46b53765c7f73
 EBUILD gnome-boxes-3.34.4.ebuild 3845 BLAKE2B 015af32def3ba463bb8e3ea71df4fe49d006c214c520cfbbde098e9aa9c8c48851d64b4c3edfa4870580d1793eb39bc0e09abedec4d2a1bf472ec77819079b3d SHA512 2f256357212a84ca77e45127c3032b3e3de1032e9c0d00a24781fbfd54c37328d63b23f73c5be81a7d3c1fff721849cf5eb2e04d76bc41863f864f831b7df1ad
 EBUILD gnome-boxes-3.36.5.ebuild 3846 BLAKE2B 02b095991fdab02dbbc561bdf29cba7a49e491f9abaee1dc594a74cac4aaa30ae348e2ddeb431d223f50aea4f42e31ce18c8579548f5bf7498256dd3026b4dd7 SHA512 c092b3b90179b6ae85796768f25ec8d55fc8af8267d0030579f618b62ee9329d289dbe33f749c90924e669ce7acb405aef34a1b85499cc4301ca92b1e64647c9
-EBUILD gnome-boxes-3.36.6.ebuild 3854 BLAKE2B 9794c4a7b63578e43f060326538e4875377b5caadfcc84316111ca8e4a0634c4fd494c6f82542b3f8a4ebfcb87f8e6cd7e048fa44ab3b1706148857c3052baaf SHA512 8891bf794519384e1d2eb77258b175d225f78522e9a229a551772d37643b1a0e349177ce0cddbae3296c17beda93ed913ae419226374a40c6142fbd258e0c786
+EBUILD gnome-boxes-3.36.6.ebuild 3853 BLAKE2B 0dc09c0bfa2f18d7bf4505d29895d33aa8fccf6cdf8437d00dfc59f671e9c4f40d8607f0ed7fe3dc5fc18595f77672b67781b0278cd463b5186548f2adddec60 SHA512 4dd12bd869e7acd101a65bae9226debf43fadc1cd090b9175caedb6df3e6dcb9a7a373103de62dd84cc1b62cb36d222441b43d660f13f33899790f808363b91a
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-3.36.6.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-3.36.6.ebuild
index a51339d1dc88..098d16b342b9 100644
--- a/gnome-extra/gnome-boxes/gnome-boxes-3.36.6.ebuild
+++ b/gnome-extra/gnome-boxes/gnome-boxes-3.36.6.ebuild
@@ -14,7 +14,7 @@ LICENSE="LGPL-2+ CC-BY-2.0"
 SLOT="0"
 
 IUSE="rdp"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 # FIXME: qemu probably needs to depend on spice[smartcard] directly with USE=spice
 # FIXME: Check over libvirt USE=libvirtd,qemu and the smartcard/usbredir requirements
diff --git a/gnome-extra/gnome-calculator/Manifest b/gnome-extra/gnome-calculator/Manifest
index 679992f5dfce..0582e08530d7 100644
--- a/gnome-extra/gnome-calculator/Manifest
+++ b/gnome-extra/gnome-calculator/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-calculator-3.34.1.tar.xz 965520 BLAKE2B 7dd7af4d2065aee9a8962983ebf723aa06e4b2e3ef98213a89044d70e47057a747a88fdd58185abb272589433f84a6fcd3a3c5fd7dc0281d13f34ccaba690b50 SHA512 43900cebc6b479292a45619f1e4f6afc5264e2dceda5d0049b59f27ebe2a32b5f4b2465a22f33b33b882ab0e737f7048fbe9395b18f9b5d2023da2941b6783f6
 DIST gnome-calculator-3.36.0.tar.xz 983532 BLAKE2B 5e28a82cb93cb944e69d4d7c7cf1a14cd91375ef864cbd5624d87a66ee79f0aff17f871ba734d35ae372b761ce67c809acb6fdfe66597980f33e06fe86d6157d SHA512 5e8d3b17703260928e9d0594a6e0b06b6a25d71590b4ab6c371e0c21be5e53698011407886f09f6bd67660ecbfa182d725d5e3a1c51fe4ea9125b175bd4d279c
 EBUILD gnome-calculator-3.34.1.ebuild 1443 BLAKE2B 58d185671862d68932e3f20a71699e239deab3b19cb666a57ed30c097f425ca78ed74f17676ab10c1b296054637a69b82ded0f823506aa974bb33200c3df8025 SHA512 2ddcad67d36bc63f69ba82e5311e3254fe2e0fd113c8c396996289cf51efce80add1d782f1e3832ee788593b5782e74932b53c69545020f59812a86110dd5355
-EBUILD gnome-calculator-3.36.0.ebuild 1597 BLAKE2B c28e9bc243ad6226ed5f7a1fa033cbfaf85a8a4991c847190645db9110e94b9f4235d5e5d4ac4289d0d39e8786fb8440927a2ecddc0f49e6b95be26ef1d86a98 SHA512 456977c6299876c3b77c386c2e62c42fa3f33c1b13a0c503046e4c2d0f193ae6e35ed609e87d839352b7e53fd1ea7c564d4e908402a394c9a5883ddd0febf643
+EBUILD gnome-calculator-3.36.0.ebuild 1595 BLAKE2B 1f001f68ca0a0035c09d66ce59bc846b2750282cfae7e70f43aebdd865fe757a0358a6eeddc2c671d9b835ad5aafe94b9caa1eab99ef0004a92a21ffa18b457e SHA512 00608448db8af20a0d33678f05446e5a579fee1f924700f847d5653fcc767bc4d1d921f5da69b4e6d6e63f7a0741e989231eaaf968a0bd8fb6969cdb9e76c76a
 MISC metadata.xml 435 BLAKE2B f9ee442cf41d13599b2ac8bbe73a3f69961b5bce68e82544e8d1e5f886c97301b92675ccd38607d5bad961c910ec8ed9ae30a12ca9028e3d9cd92a2ac3bd8681 SHA512 4af60d7bd9142bc3293176d47ff239dbbc10d86493801244e9766bddd556a9c3b34b188f76d250074b3f337e88dc3d97c803ce244e15503c7380015772a9228c
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-3.36.0.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-3.36.0.ebuild
index a8604b323e2a..925cda6f56c6 100644
--- a/gnome-extra/gnome-calculator/gnome-calculator-3.36.0.ebuild
+++ b/gnome-extra/gnome-calculator/gnome-calculator-3.36.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Calculator"
 LICENSE="GPL-3+"
 SLOT="0"
 IUSE="+introspection test"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 # gtksourceview vapi definitions in dev-lang/vala itself are too old, and newer vala removes them
 # altogether, thus we need them installed by gtksourceview[vala]
diff --git a/gnome-extra/gnome-calendar/Manifest b/gnome-extra/gnome-calendar/Manifest
index aa0bc7a8c97d..d66e027e40f8 100644
--- a/gnome-extra/gnome-calendar/Manifest
+++ b/gnome-extra/gnome-calendar/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-calendar-3.34.2.tar.xz 588996 BLAKE2B 114ea7a7ee2a8d7cbaa1d47bcb782d16891ef1bdd87838b62ac51f6c20d2f5711cbddc12a35278c7710ee660b18538211c9eafb64a1efa3df57f721aa7b1937a SHA512 6c69a1ee46a5ccfb4d6d1b7a60932412b486ad4576a4c78c89e03270147e30828ecaca6b5f0e27a741eb9d5ed74ca474ba0ddfb6d044748877b6c9ab7ae023a5
 DIST gnome-calendar-3.36.2.tar.xz 605904 BLAKE2B 42b0337a01a5316a60d41eede91c453e3c0fa2b056e9053f8868f344a662fdf4b3de4ade1f1a59b729f2bc3e087cf6b971094cd282d75432a83acc89a21054a7 SHA512 83d0157a3958ff7f16af2f6a06c2c5fdd7ce19bb532c1cda0982ab37d78149f4c0ae252de937103baa56d105a1cf54c2e29174f6f3f969904071e187cf564c33
 EBUILD gnome-calendar-3.34.2.ebuild 1129 BLAKE2B 2a12595c66caa9fe91d1ba09d61a4c30c3ed72e111152925c93aabf2b146d97e4bff0d1b3e0bafa60896f9952223b1fa2c453558a40b3461883164965ba9638a SHA512 da592cc9507de330e516c6c2f22804c07695d174a70453a1dcd3c10663893a83f819c9dfaff2febc0f07fb4a448d8a66c5df9d4eaea8067d8f9d3ab9b19ee14c
-EBUILD gnome-calendar-3.36.2.ebuild 1163 BLAKE2B b711a957515d016563149208b021ae82df2be2ea63a0edfc2fc807354c2b9cf91b24dabee4a1d87111785ec4a067e2d672603d24e8da85be8ad954d8fcb5f2fd SHA512 67549b65156269daa0b64d3255c17d38535c31f8c1b0dc7706fb6dee7ca540eb08e3fc10b6cc2380b5589db13ffd13b004e7232d0020b38e3b3a2508c34a1bb4
+EBUILD gnome-calendar-3.36.2.ebuild 1161 BLAKE2B 552a219456498bfc668ee77679e8d612f02424a93e3ed6203b847345b387ab2993deb220bfd6f67dc5b27ba22aa8dcd849f7cf7729b4f69425f50ec1dc85ba66 SHA512 4370221f5610fad479ead77121c790102cf215ddaf7f4c3a691fe1fb2a2e93820231cd4b61e6a68b5b7f04b5bef8c077dc8afdc81f1319d4b27e1705828c6066
 MISC metadata.xml 522 BLAKE2B 24cb41757041daedf83e72cd8620bef49d2bced678ede42c1a071c3cf99f2f157b086acc393953b42a612dd5c4d622b0a869934f89661c28be742370cd4688c2 SHA512 f595d013522df745a86b01e6696ea5fe6dafa55d55e3fe22adf469fef56507846194f24c2ec5cd13382c69a494ca530438d12c69a6bec41247da1783fc78eef8
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-3.36.2.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-3.36.2.ebuild
index 23459051d17b..6f29d313e0a1 100644
--- a/gnome-extra/gnome-calendar/gnome-calendar-3.36.2.ebuild
+++ b/gnome-extra/gnome-calendar/gnome-calendar-3.36.2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Calendar"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 # >=libical-1.0.1 for https://bugzilla.gnome.org/show_bug.cgi?id=751244
diff --git a/gnome-extra/gnome-clocks/Manifest b/gnome-extra/gnome-clocks/Manifest
index 6896c402671d..306627f68256 100644
--- a/gnome-extra/gnome-clocks/Manifest
+++ b/gnome-extra/gnome-clocks/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-clocks-3.34.0.tar.xz 506772 BLAKE2B 04844fa95ac58915694f3bac3fafb78f2117be259fda0b799403563bf5e52a0921d5b7d7fbaa85fd9dd8438b9dcbc2f7aef97f61bd812d62bfd188b81cbe0c35 SHA512 9e59534c5c8257ecab97876fc2742d37fd5dd1aad770ac31dd1c7dbafa9843f992c7cc39e3f5025f5091baf852538eb9d62bb07dd0a5c3c7a6cd69befa61ab52
 DIST gnome-clocks-3.36.2.tar.xz 364544 BLAKE2B bee9d987726cab95d6d447b33b8baf4e684950354e5ee3febe01522ee30574db495aeb4fa1cb9aa070756d611dd6da7bb84d2d164dc9172233d04c37b22daf86 SHA512 7b55a72e10c857e3dd0e6726b46647cb544bcee76f151af9b17a65e83b8a2e06564ed6875a0ac52dcdae6ac0f700b7b39aaf25194af52a5cb5449b2653316af6
 EBUILD gnome-clocks-3.34.0.ebuild 942 BLAKE2B 4aec57393393da6de41e80abb2f7282f789d71990b4554341dbab14dcd544c1ca063c61fe81cdbed95e35138b12a393dd9acda64ad3448337b1da8e2ce79b50d SHA512 99a5a60322ed7feea4492e90ddd4840522816bdd4bc649d26a00ebc724f207dfa445fda76d9989a8c4cb687bd0ea33b8067181d79734ea8a37628934d89031f6
-EBUILD gnome-clocks-3.36.2.ebuild 1060 BLAKE2B 8636dc45f8de81c354486b33bc02471ef510237f445dbcac7cd72cbcc5797629e963c7517f0d3efe03d4e74e50d48c391abec8844aef2a9abed949685f27b9f0 SHA512 adc81b383fe7b77240a83259adcec05f1730990f6650efd4752d52515dfb547f4aa8ae3775a61ceeb268e6003255e6f98667fafd82f4581e86078a268a48d786
+EBUILD gnome-clocks-3.36.2.ebuild 1058 BLAKE2B b80af52d9fe65dbe3868aedd6a0239559fe70cdf39b95488c6475759122af617701fff945a348f9dd321a95e6971048014971193eab7080b19abf71d90faed43 SHA512 c6c8215ded9bd27e54fc9e6c6d820add3eb359e570c5e219c4b9c3bf7aa653ec37a4381211b2be8a129995ef99b5e5dac608ca52886626bed062fe11d22f58e3
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-clocks/gnome-clocks-3.36.2.ebuild b/gnome-extra/gnome-clocks/gnome-clocks-3.36.2.ebuild
index 73c63ce275b6..9cc150364c8d 100644
--- a/gnome-extra/gnome-clocks/gnome-clocks-3.36.2.ebuild
+++ b/gnome-extra/gnome-clocks/gnome-clocks-3.36.2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Clocks"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/gnome-extra/gnome-color-manager/Manifest b/gnome-extra/gnome-color-manager/Manifest
index 01f8627b0f1f..28dff55277f9 100644
--- a/gnome-extra/gnome-color-manager/Manifest
+++ b/gnome-extra/gnome-color-manager/Manifest
@@ -3,5 +3,5 @@ AUX 3.36.0-remove-libcanberra-include.patch 556 BLAKE2B 83f94fc9192c516b99ebb6c9
 DIST gnome-color-manager-3.32.0.tar.xz 2602104 BLAKE2B 6219c3b7dd31ba49c671ef1f330d8ce561b7d8716a5cf5ef393dcf827c6bbc4e82b95c082e9297a27be7652d958a92c397fbafa8bd68f2c48b32533a3fe14483 SHA512 e5b0c6a39f9202fde79af1e966be65ef3d770fe4de777a281398ee68feef6c57dee95a1fcba496512f163bf561528ece840480b3c8612b5c3af2b7f550335f38
 DIST gnome-color-manager-3.36.0.tar.xz 2175016 BLAKE2B 263bc58c2a4ebafabebeba958279e4ad607eeca986dda9093c3e9d1a0870f44eefec7248aab11e6b408b063c5d5a28a3cdb88c96a58e3a0a5064055c44989143 SHA512 217c00696d7d0e99ee4cc65ee343c09682387d909feabdd6e4a52f9fd0586dda553b4796fbcb11392b880aa5c5bbaebde27906afb4e3ffd692ee3187023bfaac
 EBUILD gnome-color-manager-3.32.0.ebuild 1844 BLAKE2B 50be2919d7e59c1a8c8425e4fa25d13ef7261b63c71ec2822a5aa948f9d9d4350e88b8438c877a225afc067d8e1408db2b230d665f38909b95e8501b97d57649 SHA512 b77ceb55414a7172c80ba68e49cdb508c6c57765a8675dbbedc7aa3798884110e689bbe856841d7d8d81ce39030501ad84a47ae52181d7929fe4553f5851bb30
-EBUILD gnome-color-manager-3.36.0.ebuild 1086 BLAKE2B 3212e1d90dc5a93346e30e6df12cf6e132b27ed82d095ccc041f567ca276e483f64b9c8ecd0af4c206531a51ecfee273c7104f7f4c500461824be9b02400f58c SHA512 25e236bb2ae3362ce4f2283871c16c9dad807f384094bd051d8f1fb38c68539d8cca8eadf14ca64ce3ec87d01774e83e792c001e2617e48905c9db0003fbee08
+EBUILD gnome-color-manager-3.36.0.ebuild 1084 BLAKE2B 4413e0a0f4150d1a4706010d41a027be5e0e3dc9188e7ecbd3ae3d9dd8daebde09f0c093f6bd91888656a933376da4926787c760e43aa5f302f03926a1b0b4e8 SHA512 401292151e97a6f7733301187faa77bdaf36e8c10a59513179e5c99346146ba816307662dc30df698bc66dbe354c8615c3257c1fbcd0a377a762c69ab77f811c
 MISC metadata.xml 525 BLAKE2B cc643bcc16f4fd5e8a76dd22ec36d3c4a3226d9062594cb313b445218cf9276e7d1b79b9a7a54afd3a2c9454ca1aa6a0e886bd2e2145ffcb7d656db1d538b652 SHA512 81f5a273a4686935f1b0d267fd056d2ba5a8f13750845ef3feda74586ffea0ce1bf98ac0c8a94b61c6bc893fbb9dc5bcb4864a020817bc27d4e61c9008069d2a
diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.36.0.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.36.0.ebuild
index 117633a19538..53d146e56720 100644
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-3.36.0.ebuild
+++ b/gnome-extra/gnome-color-manager/gnome-color-manager-3.36.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-color-manager/"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/gnome-extra/gnome-contacts/Manifest b/gnome-extra/gnome-contacts/Manifest
index 368d5ca819b1..9de10df05ada 100644
--- a/gnome-extra/gnome-contacts/Manifest
+++ b/gnome-extra/gnome-contacts/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-contacts-3.34.1.tar.xz 365384 BLAKE2B 3563ce0784c19b2cf61e3cad60afaeaa310c53c68f11da459a3053df6be769fe0bdfea84f106e11fd2921c3f6bf8ef6a03b8cd90a680dc5b46d9a0486fd0c737 SHA512 6dad3fd9d199ad87c642e9f36102a142958cd3f577eba36fa3ed2800af5acb44752fa1f8b7eb8991974c514245af51015e6b5e08636274b9048813c37abcc478
 DIST gnome-contacts-3.36.2.tar.xz 635932 BLAKE2B 9bcdf093d99477d1162c9ea78007e65cf20a1e4038fe284fafa4c174ab1d1d0c2ceb7ec2806c9abeed1c8ab168549c80b2763e65ece22c76a9044781eef8ed5d SHA512 ebbce67aa5c0af55559230c558c5f28b065182d434582431595bffedc25dd0ec3caa44e60f4670b4b2a1f784e90c8dd4f56df937054697b4ea932a39da78f1c1
 EBUILD gnome-contacts-3.34.1.ebuild 1606 BLAKE2B 5471e3e83083b4883f084a84b2c73644adc6798e20d6d20dbc60f5f3d902f87119a6a74acebddccc9f39494bc5bf4474f1e5222c7f882a81c6ed26f7c88606bf SHA512 83e50d5070d7f79ee692963cba4f0600a5c3db216f4e910047f4da79b47c84376d01534dd465412d33c1abf1957c48ba658a99ac4fabe8510462ad0abc7933f2
-EBUILD gnome-contacts-3.36.2.ebuild 1609 BLAKE2B 10b54d02b6a8ff945ea21e846eab2c128caf27e6939d87ab7b6e91510a325a2f594ad05c3b8881560c4b07c0ca84b7ec2830ff997954ebe1de95980d0fe3f146 SHA512 6ffbec0fb63f2316e6e0ffcc091033ea949193a680bc02277d72210d0e72d7ac8b5d24341c510062b567d7a6dbc70fb19fa0431926169fea1c116a81e7d07f73
+EBUILD gnome-contacts-3.36.2.ebuild 1607 BLAKE2B b9cb09c718233406ed755a13fb20e529ab1cc92f44e075b20d6b478d61d62797cdf9d11c13dcc126e2779eea18ed3722f02d70a99267cea6fc0d0418b81d3360 SHA512 18c7531db93c6f2ce45ae3273004c0f056e98c3ba2c9b55477c670b4f291dad19978f9bdf942701d66dcb2ac52f6657a7c92945f5c174ac627d268a56cc56ac9
 MISC metadata.xml 325 BLAKE2B f00835a4dbd2fafbc578f1d36cd3101da6ccbd9236b6a874c862f6e584fe856c7fc1585e0d9da7c3c6a243cc1ea271fc281a127c2f330ba91495873baea0ac6b SHA512 5c6da9fcb4666a80a2fcdaeaa0263feee21140932084683dec7257bbb9e686a08d7d2b476684800216c13f3c851a92416267d5415c25643200250edd8d6041f5
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.36.2.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.36.2.ebuild
index 27cb89e1c61c..78a498c0a000 100644
--- a/gnome-extra/gnome-contacts/gnome-contacts-3.36.2.ebuild
+++ b/gnome-extra/gnome-contacts/gnome-contacts-3.36.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/Contacts"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="telepathy v4l"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~sparc x86"
 
 VALA_DEPEND="
 	$(vala_depend)
diff --git a/gnome-extra/gnome-getting-started-docs/Manifest b/gnome-extra/gnome-getting-started-docs/Manifest
index d034841e2a77..4411c5d72748 100644
--- a/gnome-extra/gnome-getting-started-docs/Manifest
+++ b/gnome-extra/gnome-getting-started-docs/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-getting-started-docs-3.34.2.tar.xz 82634148 BLAKE2B 0e21096e57b8e622b48cc174f15a16c3bd4a99cd6fe54920cca743aefcab2643ad3b4b686fb16de0f0b3b412c58119c9bfa0c12982211d7efdd5cb8fa27cf2f5 SHA512 8ff540e095f5afc07b93b52412e92a6854e83435415ed2c9d6f61a5fdba5a70debfacafaa3c7fde3ccc274b880bf01d98d67dc1023b7c7dafefd7eff5c329419
 DIST gnome-getting-started-docs-3.36.2.tar.xz 81799372 BLAKE2B c4928e00c4acbea73d9195363976f07152b3562287157f82fd88f03ac04cfc579bfd64f3f6564d41b8f1bf0a2c6748b3ba26e7e9fe057c0df6a977db7339fd7d SHA512 d555d491335a5bf7807ffd9f25d658a6507d86b3db26016623cf8b105f73c1258ad9b83dbadd6d91c782457993d51e69fcf114833c573f14e705ef0581484441
 EBUILD gnome-getting-started-docs-3.34.2.ebuild 418 BLAKE2B ec3e85f27f7e6ebb7833f2e9ac90911d98e807a4b8b1b8dd7655cd3071179f91a7f7bce9f40c9f68a1df246e8f70444aaa777ae0735c29173adbccf67c358983 SHA512 e86cce3515aef24960dfe44e05ae429e49ec2f892a44098ff8ab3aed1a13410369486f5f90672e18cb08d7566c5d92580e413f2d06e35d35be80a42ac6ac908a
-EBUILD gnome-getting-started-docs-3.36.2.ebuild 420 BLAKE2B c538a7321e2b358c714d90c017d76e6a8802de11b7f3ed293b8d826c007b3838d828235f8130d6ea84b1b2d18073f53eefffb54385f82628b33828c0e8ccb9dc SHA512 4c2f07f20e0915386a005900534b626443edfa3e15c67ebbd749bdfe4899d2e989cc527492dcfe7a474ada7c60cb2901e0fd178382f9f173aaedc9a069c5719f
+EBUILD gnome-getting-started-docs-3.36.2.ebuild 418 BLAKE2B ec3e85f27f7e6ebb7833f2e9ac90911d98e807a4b8b1b8dd7655cd3071179f91a7f7bce9f40c9f68a1df246e8f70444aaa777ae0735c29173adbccf67c358983 SHA512 e86cce3515aef24960dfe44e05ae429e49ec2f892a44098ff8ab3aed1a13410369486f5f90672e18cb08d7566c5d92580e413f2d06e35d35be80a42ac6ac908a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.36.2.ebuild b/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.36.2.ebuild
index 643475314c66..f9651ce7e447 100644
--- a/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.36.2.ebuild
+++ b/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.36.2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://help.gnome.org/"
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 RDEPEND="gnome-extra/gnome-user-docs"
diff --git a/gnome-extra/gnome-logs/Manifest b/gnome-extra/gnome-logs/Manifest
index afba25d67f89..247df2ee2f94 100644
--- a/gnome-extra/gnome-logs/Manifest
+++ b/gnome-extra/gnome-logs/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-logs-3.34.0.tar.xz 755704 BLAKE2B 2f9c494f062adce6f325baf5eb29bd6b9ad8144bf1e5ca5ee5672922ed6086f3ddf5be9dcd0d33c74b9c8ffacd1f2de060b2d62f3ae4b9d2206c1f74d7e88260 SHA512 4c93f85539c0cf51de9fb27212800466ee36bc1e105906456db3854b663bee68024eb10b288327893ba27bf1f5c10feeaf0101baba6a34cf18171a3ba5c8c48a
 DIST gnome-logs-3.36.0.tar.xz 744104 BLAKE2B 585c39577ff1eba6b3af638d0cd5d452cbb20ce0444386fcd8fbbbc0192e59a7cc9139263ecbfb7ada85f71f044a998c51172cae1a7ba481c14c0a1650817cb5 SHA512 3a4a1f6af63f97a8814fcdbcf6e23e6a89dd150f2a5c5ebce21d8b9b74f6a8985ae5b3789aa37857b1631b33108d5048d7cfe32ebb7c7413d8ce27f25c8a58b8
 EBUILD gnome-logs-3.34.0.ebuild 775 BLAKE2B 3448ed177f9cc53d932d69bdcb29c70c5861e45144b3427de7fdf972a63f6aa9bdef2ae5f9ca7e881b037fb4e4c93493600841cefb7b64da6631d38a4f2106f5 SHA512 cd05e10779a19c4474f133146a87bd436c5a64184222f83a98c4b5eeb20dbca46924dce21ba02852d1d9c7f7a30dde4220ae24e5cfd83a7c054972a99e210604
-EBUILD gnome-logs-3.36.0.ebuild 777 BLAKE2B 513715e8472ab902fea643c44cf760af4aee46935fb33b5e64aff8ba9d4131f9263eb56a569d0ac3309bbe5753f23d68e6f8ce0bd14f44a4f96d589bbf531399 SHA512 bd297025332da2b1c8fbcbe9e4fc0f5cf4624e49df7cbfea8e0386d27220a4bb7a874193194ea143ab058b66a5d73cdf77deaf6bd340804dc24cbfc5cb286ed6
+EBUILD gnome-logs-3.36.0.ebuild 775 BLAKE2B 3448ed177f9cc53d932d69bdcb29c70c5861e45144b3427de7fdf972a63f6aa9bdef2ae5f9ca7e881b037fb4e4c93493600841cefb7b64da6631d38a4f2106f5 SHA512 cd05e10779a19c4474f133146a87bd436c5a64184222f83a98c4b5eeb20dbca46924dce21ba02852d1d9c7f7a30dde4220ae24e5cfd83a7c054972a99e210604
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-logs/gnome-logs-3.36.0.ebuild b/gnome-extra/gnome-logs/gnome-logs-3.36.0.ebuild
index 0b0cd46dfb9f..e4ad50940fca 100644
--- a/gnome-extra/gnome-logs/gnome-logs-3.36.0.ebuild
+++ b/gnome-extra/gnome-logs/gnome-logs-3.36.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Logs"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	gnome-base/gsettings-desktop-schemas
diff --git a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest
index e0b47a2b7988..81484f9aaa35 100644
--- a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest
+++ b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-shell-extension-applications-overview-tooltip-7.tar.gz 79965 BLAKE2B f7698bdad46837f1ae736bbb2d9b376a28946df5f8a00d2e9b19d48bc4c2f4e742030f952d14bf5816ca1aae9b172a2639e2170d6bd87f373ff23c7ce9bd8912 SHA512 1cfaf23fefe5a940ae448658e176c69da9bb319f6200983b4ac14f65e76f5e449b9a235e6c1ccaf9b6d6db0fda9576e963fa1273b776dbfb5a72c608961e2d48
 DIST gnome-shell-extension-applications-overview-tooltip-9.tar.gz 81415 BLAKE2B 518352e80b5a3c6f8a2ff05e692178436625ea533e10a2afde82e73b6216f82dc29119c0e0a204ac8f1619de9409c47105107b94e3c4d1027c852b255eeb27ab SHA512 b8a2879f303a76e68eb5921005453e3fb73d966f1ed3f5978d9d210f447d8f780b5d9fa359aaa411f7ed8cecf72171dfcaa8da8515fd620193676b1b63742636
 EBUILD gnome-shell-extension-applications-overview-tooltip-7.ebuild 1257 BLAKE2B 0aa3332efe830f8924e37dfa0d601c13c8e2e5109a4ffb5096fe62a4762f36d46b6d828d09a077a235ed8bdabe79274b6091a1098c2ca7df711e0b0ee3002d88 SHA512 efdbd3153a58a13fc3ea5e66d438e6913b774ae4318f81b417b00d920a6f75043aab9cee11074322c5025c678d0d5f45ceb930ad88d4cd114941fc62b6b343b4
-EBUILD gnome-shell-extension-applications-overview-tooltip-9.ebuild 1259 BLAKE2B 7b257404bc940753228a1d4d864f594c62a4ebf43ea6274aa71aaddf5ce14120487c9919fc08fbb81368052e0a0fa0482858c3cc3486cf3b4b843f7e543eda39 SHA512 613c633b34d14bc8f895b42c053c9718d63593323dec266623355067d84c37e3c8a5905fd077d67532ff4d5fb3f9e47782b9c3c3dfcd7535f982a991a14341ac
+EBUILD gnome-shell-extension-applications-overview-tooltip-9.ebuild 1257 BLAKE2B 56d3fe14b44a58c5d2eb9b59ffc99ebbe0448227e27a68252950d0f676a765a5983e44c554d1e06249653ef74b0655a1f516f15509baa05b3e9310c0beaab737 SHA512 faa26aa51c48098efca83872ac76ad3215d30ebf8c8493df70e32dc719da37378d21b9b87a47d45c89caf5d3958a7205496bfd08f9d4a060e67c8383ef616130
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-9.ebuild b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-9.ebuild
index c88a77d8ce4f..3e3514c3af9f 100644
--- a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-9.ebuild
+++ b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/RaphaelRochet/applications-overview-tooltip/archive/
 # https://github.com/RaphaelRochet/applications-overview-tooltip/issues/7
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 # glib for glib-compile-schemas at build time, needed at runtime anyways
diff --git a/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest b/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
index a08f0bad2728..6de38d5838a5 100644
--- a/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
+++ b/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-shell-extension-bing-wallpaper-27.tar.gz 7202160 BLAKE2B bb908ccf0c67a06f80ef34edaed6257c5ae1b00570d6f3ab15a9a9c330368a2ae658f019943bf1806c1c97573cc5612b3c7dd22720d3048d628fcc2c15336420 SHA512 eaedbcf7e442d86b06f13745ac7796789bd5c7ccb0e64a4fbe10d4f6a2917ef9b4b9c1733d56c6620e0e8b4c4ef1281fd0d48151938519dd28249f07d54382f2
-EBUILD gnome-shell-extension-bing-wallpaper-27.ebuild 1105 BLAKE2B d20f24d8e88782b49126b387686dab10648a11d87448149b5f15451f7ef970bdfa2bd3ddc2bcd20c3d50b78398b8ec3741a0f632dfaad21ba2990e1b81526bfc SHA512 1acd83fc109b4bc6812cb61fe50a5328b0a13ff1c2124c644a5436e65e60d14bd0aec638be998679368530e9ee081a670ad2526dfe836b4c9d20ea05ca664a37
+EBUILD gnome-shell-extension-bing-wallpaper-27.ebuild 1103 BLAKE2B 890f5954af5f0d692aa02c9935e476e4560269a3c34b94bb44d3638df6d968493e1867862f5c85fc714b4659b4f5d34048c621d552191dc812a9a18fd12fab86 SHA512 2b7bc8e72d7c4b6d588148731adf5b8d5ca981a67cd11b36aff632a6494909234e5591b39ac87e2c17d14a285e9f5895ae39704a984e199d2f946ca676f2b847
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-27.ebuild b/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-27.ebuild
index e8f218093449..31312f7a34b8 100644
--- a/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-27.ebuild
+++ b/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-27.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/neffo/bing-wallpaper-gnome-extension/archive/v${PV}.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest
index 9043e55ba67d..6cb0082e3f0c 100644
--- a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest
+++ b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest
@@ -2,5 +2,5 @@ AUX gnome-shell-extension-bluetooth-quick-connect-10-3.34.patch 218 BLAKE2B d44c
 DIST gnome-shell-extension-bluetooth-quick-connect-10.tar.gz 18214 BLAKE2B 6ca20071041605c5b0a34198562b0d913d4527b2521a0f219e7533730fece41607b2270f0349f0511a6270a9f5b4f5d936247be740a6813aa9901adf3cc0fdba SHA512 5d2dab53b5377cba00743de6501259691c519dd404922bab0e500ca54bcf8942731795aff122c1669471fd3d6a51521ecea966cd2df843777ef1aa871a548772
 DIST gnome-shell-extension-bluetooth-quick-connect-13.tar.gz 19937 BLAKE2B 3b5c70d5302d8508d0a6165b06e41db9d256805c35ab4de095b7d97ce9bb24ee58185b6a7afec15a2fbe22ce9dc7859229670d4e00646c5353825dab1d1b4b5b SHA512 494827fa61e02bb3df0a054c7274fd61bf7d42aa4f8ece8c2b30a29a459b6fceba110b4016bd069f3cf5504561aee06fce3260cf9496b3d41516f077e8f99563
 EBUILD gnome-shell-extension-bluetooth-quick-connect-10.ebuild 1185 BLAKE2B 5c2b96964368d4fd74251f9eb8bad7b84f247eae4dc0b8768e5bb53c4bcdc71d8cedeb71182bffcfec5eec066afc53fcbcee0c4f5197c833f8d9217b3afcacf0 SHA512 5fabfe97d49fcfc2f873b50757b26aabdbfe0ad1923e13d8922d41c5dfd0bd7c030b56832bcd7a82b71c40de64667172cfc4147fd3851e15717711b6900c7849
-EBUILD gnome-shell-extension-bluetooth-quick-connect-13.ebuild 1141 BLAKE2B 7a8a85f9362bb9f491dbbb75b3d1357beb80b2d5cbc3b2c905bfbdcbddcd3655191ce8341e9b8727b8d600807770f429ca04f6dc9e3a42eb91b749e6d5ec6315 SHA512 090d1f177ea3f283e8b59dd7c9db301c3a200a3449bf10e9e9cea07c1980fef244763b9e6a1274f57421707705241c8a1bb464f5ab5220b826af005f762323c4
+EBUILD gnome-shell-extension-bluetooth-quick-connect-13.ebuild 1139 BLAKE2B 44b974fdb78c81f5215d7124220dcc4109c775af99a55f34b82bda63c736e41041bc639f70ec134bcf971563c06c411470883bb372ce1447d4c0ec5a09641604 SHA512 9e75dfa7a8448960c0c5dcab2e346a5a741332c0d577a51499f85cd0443dd55a69eaf948ca7863ac9fff3a663a6812737e7418af206d79472ac7f570c90179e2
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-13.ebuild b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-13.ebuild
index 5e6edf0907c3..01c2202fc70c 100644
--- a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-13.ebuild
+++ b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-13.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/bjarosze/gnome-bluetooth-quick-connect/archive/v${PV
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 # glib for glib-compile-schemas at build time, needed at runtime anyways
diff --git a/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/Manifest b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/Manifest
new file mode 100644
index 000000000000..2abe1af06505
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/Manifest
@@ -0,0 +1,3 @@
+DIST gnome-shell-extension-control-blur-effect-on-lock-screen-20200713.tar.gz 3431 BLAKE2B 6355135f9027d53b10ba1f02f2fdf90dc0acbd090be8905addc78f22f7b136464831985152d8a112febc8891bbd18ea42aedd8009c7db4afc52ba48b6d502511 SHA512 322da0bc511bbb6943713fd3fc3d75d8f32b9872ced9eeb611acc77756392d0b9c9dc1311bdb4e255d131637de6a17a3d0a76f1cebcc71218d67d2ef6078a4d1
+EBUILD gnome-shell-extension-control-blur-effect-on-lock-screen-20200713.ebuild 1330 BLAKE2B 5fa31ccac489303a350c07a479310b22c18a1cdb18d3946b8f2345b72ac6a6c46ec9d2e6b6d8a41db5a54d8fa0095b181661cde21049a0565dca57e35ed2e716 SHA512 71643acd4848f8432bf80d199ac8e13e560e571d9d60edb608ccd98eaf82059909a74321e90ae39ba3bd25493bfce5437faf34f27badd675ec97bafa10fc67da
+MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20200713.ebuild b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20200713.ebuild
new file mode 100644
index 000000000000..3425f057ff48
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20200713.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome2-utils
+
+DESCRIPTION="Control the blur effect on gnome-shell lock screen"
+HOMEPAGE="https://github.com/PRATAP-KUMAR/Control_Blur_Effect_On_Lock_Screen"
+COMMIT="824675a32d47346c89655f89b416e653f60c4d68"
+SRC_URI="https://github.com/PRATAP-KUMAR/Control_Blur_Effect_On_Lock_Screen/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+# glib for glib-compile-schemas at build time, needed at runtime anyways
+COMMON_DEPEND="
+	dev-libs/glib:2
+"
+RDEPEND="${COMMON_DEPEND}
+	app-eselect/eselect-gnome-shell-extensions
+	>=gnome-base/gnome-shell-3.36.4
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND=""
+
+S="${WORKDIR}/Control_Blur_Effect_On_Lock_Screen-${COMMIT}"
+extension_uuid="ControlBlurEffectOnLockScreen@pratap.fastmail.fm"
+
+src_compile() { :; }
+
+src_install() {
+	einstalldocs
+	cd "${extension_uuid}"
+	insinto /usr/share/glib-2.0/schemas
+	doins schemas/*.xml
+	rm -rf schemas
+	insinto /usr/share/gnome-shell/extensions/"${extension_uuid}"
+	doins -r *
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/metadata.xml b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/metadata.xml
new file mode 100644
index 000000000000..020b40648ee8
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pacho@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest b/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
index c3906d6e29a1..a1a2a8d47a82 100644
--- a/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
+++ b/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
@@ -1,10 +1,8 @@
 AUX gnome-shell-extension-dash-to-panel-26-branding.patch 637 BLAKE2B 1e124561143b577413090e16c7ad0c8cbb66911b079ae5844da9cf04e0197aab15fc4f746d3020ab7d4e6756b8a35befa773967c223d29289e13c6b3ffd70234 SHA512 8c176972ff10e87e957cfdda23e86a3e434dc050e8a954e7c2257942301daa5aa7c5b788188768f13c5b009d842fca8b14819a255a6a561dac8fa60e355ec211
 AUX gnome-shell-extension-dash-to-panel-26-opacity.patch 578 BLAKE2B 64feaf9d1acba25d991d52e10c78741dbe9f948639c951e9b11dfbc1ebb7e83c854ffcb4ac2b3661b5482868bf9de8d91b661775f3eb1f6a762ff36e9b737a0b SHA512 0c09afaabcbbe6c10c930dfc9acb72fabf2c458486bc9f62661aab41bbb2b3fd2fbb430e31c36915dd2233c28486597aba5ccd9fb25c9e7945c10cd856b6e26d
 DIST gnome-shell-extension-dash-to-panel-37.tar.gz 21116028 BLAKE2B 3e35f1f4b809f17e3971b708cdbed9f35a04cccbe651d804f101b70d1067310def60a7c8f6b2ebcf09087ed76a0214ce31e5560c8b8b4ef211bfa1f5befdbf79 SHA512 3f76ffc9e05ece7a96807815b229b6fb3fc391ec1b7ab35fb5db9fd61899f3c626a979f3d286f7f5ffb39890f9c99242c702d84d7690d0c9ee20b35a17e3303b
-DIST gnome-shell-extension-dash-to-panel-38.tar.gz 21122697 BLAKE2B 3db2de6ed6716996552ed4aa62e41d59fb94870ddb6415f891b99eed9c8caeb8cd8cd2eb7fa600af055b6a21f6ea457e27a507bf1518c25c0c7666fb4143fcb2 SHA512 f4c353e9557db173c37fdaf59246875f4ddcc08ce2a8963845df6718b13889cd4f2c0b66d1b0d5037591229f61bf99dedfca310688ada741a7dd6cc5bb20ffda
 DIST gnome-shell-extension-dash-to-panel-39.tar.gz 21123453 BLAKE2B 6cc5bc56368d1e65d601894251642fad1a28508b475a8abcd9566c0a5bd9e48677a98401fa1b263b4df6a0650442d253ab297bdfce5409feec96933fa1d3a67b SHA512 37ff633b3ab04024d65c25e42885e6e9f8b11f5d2e7516fefe7b8ae791b7beac62d7c7a2d5f88fbb8e69e28688f90e4b41cd4d330f381aa7b351e5603a14c007
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
 EBUILD gnome-shell-extension-dash-to-panel-37.ebuild 1700 BLAKE2B 4350cfab57f90892f8ac0f236ca9780170cb4b4d1fecca2984c2e5665ceaadb45cae64f66f41d2bb2d81268a2a90c0bb4b432414188ea95d21a94526f3e51ad1 SHA512 61d1f5bead3b607b87e1a7a43c25ff1af33dc3064eeec6d710a3f3453344bc492f16dd6ac8c824b3ddb066263a60ef8e8e3c0fa388b5025b292243b4bb01d826
-EBUILD gnome-shell-extension-dash-to-panel-38.ebuild 1702 BLAKE2B 9514ce8cc1dd5ea768fbb20ea2b9c803144f22345d431d66ad560c1d74be07c98be15497cac65d28e2ea7f969b4eb1c9cb3d9529be60989bb29a7b216a0fb384 SHA512 36ba1fd0008239e33017b58fd9ada13b41669cf3fb9c0d21b3d8fa54aa39ccb240d0e14662ad0042af81a52d82235a1fd0035422361d098e119284c30ef764d3
-EBUILD gnome-shell-extension-dash-to-panel-39.ebuild 1702 BLAKE2B 9514ce8cc1dd5ea768fbb20ea2b9c803144f22345d431d66ad560c1d74be07c98be15497cac65d28e2ea7f969b4eb1c9cb3d9529be60989bb29a7b216a0fb384 SHA512 36ba1fd0008239e33017b58fd9ada13b41669cf3fb9c0d21b3d8fa54aa39ccb240d0e14662ad0042af81a52d82235a1fd0035422361d098e119284c30ef764d3
+EBUILD gnome-shell-extension-dash-to-panel-39.ebuild 1700 BLAKE2B 4350cfab57f90892f8ac0f236ca9780170cb4b4d1fecca2984c2e5665ceaadb45cae64f66f41d2bb2d81268a2a90c0bb4b432414188ea95d21a94526f3e51ad1 SHA512 61d1f5bead3b607b87e1a7a43c25ff1af33dc3064eeec6d710a3f3453344bc492f16dd6ac8c824b3ddb066263a60ef8e8e3c0fa388b5025b292243b4bb01d826
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-38.ebuild b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-38.ebuild
deleted file mode 100644
index c5470a35cce9..000000000000
--- a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-38.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome2-utils
-
-MY_PN="${PN/gnome-shell-extension-/}"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="An icon taskbar for the Gnome Shell"
-HOMEPAGE="https://github.com/home-sweet-gnome/dash-to-panel"
-SRC_URI="
-	https://github.com/home-sweet-gnome/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
-"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="branding"
-
-COMMON_DEPEND="dev-libs/glib:2"
-RDEPEND="${COMMON_DEPEND}
-	app-eselect/eselect-gnome-shell-extensions
-	>=gnome-base/gnome-shell-3.18.0
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	# Enable by default custom opacity to get panel slightly transparent
-	# as was done in older Gnome versions
-	"${FILESDIR}"/${PN}-26-opacity.patch
-)
-
-src_prepare() {
-	default
-
-	# Set correct version
-	export VERSION="${PV}"
-
-	# Don't install README and COPYING in unwanted locations
-	sed -i -e 's/COPYING//g' -e 's/README.md//g' Makefile || die
-
-	# Provide fancy Gentoo icon when requested
-	use branding && eapply "${FILESDIR}"/${PN}-26-branding.patch
-}
-
-src_install() {
-	default
-	if use branding; then
-		insinto /usr/share/gnome-shell/extensions/dash-to-panel@jderose9.github.com/img
-		doins "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg"
-	fi
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-39.ebuild b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-39.ebuild
index c5470a35cce9..23612f13646a 100644
--- a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-39.ebuild
+++ b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-39.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="branding"
 
 COMMON_DEPEND="dev-libs/glib:2"
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/Manifest b/gnome-extra/gnome-shell-extension-gsconnect/Manifest
index 537f2843351b..326e13611852 100644
--- a/gnome-extra/gnome-shell-extension-gsconnect/Manifest
+++ b/gnome-extra/gnome-shell-extension-gsconnect/Manifest
@@ -4,5 +4,5 @@ AUX gnome-shell-extension-gsconnect-33-whatsapp-duplicates.patch 1317 BLAKE2B 39
 DIST gnome-shell-extension-gsconnect-33.tar.gz 314704 BLAKE2B fa4f2eb6325356a058b24b92b683ca7331af30112d27060e8ee191c21a3269639da58992d53434c7121ea511ee9e07869b082f908b59e19fc2434f3c07e09624 SHA512 26ef929b9b128db0cb29fba22203a3afd500c5b1c3bac6917926a60350d271e67bb0985866f84877355c079fe4a5656b8ac5e8dae976d17d9a068cc825293bce
 DIST gnome-shell-extension-gsconnect-41.tar.gz 614195 BLAKE2B ebcf9fca448e27fe0e74bf4118528a5f8f7055ea962d4e928feceaa3257e9ff6f286a2b11631468abac1355c2506a0d8923fe56d4370f37fd7e93fe7cd8e8d45 SHA512 12de97683e4bcbf49774b6b6f93803bb0d0005f3114a581ccd7a7219cc2cb27a0e7b10d45a162c879f27e058d99b791ce33425e465651fe1f4e93f1a332a0eaa
 EBUILD gnome-shell-extension-gsconnect-33-r2.ebuild 1842 BLAKE2B dbf4d5d232fa28b389f20225108049f4f2c6367dc6e8f0facd734bf96f55f5e3a824e56563246f7958453d4a97dfa700c8ad32bd33bc8b4a541a442d3f0986ee SHA512 a4d2a37fdda6e53d9fe9faf733ce03216af380c494959374b813be6a42742013021fd5ca39dde2b10ddf856a059c6e47a1a5187d6c39282967b80a29eb553faf
-EBUILD gnome-shell-extension-gsconnect-41.ebuild 1591 BLAKE2B 446b258e25a47c5c7b3fcca2610f94b575868094e3b4d72a1cc52cdbeac28dcb55c5ef565f077453acc280b1364202b817f3784225fbf46bd9f913229e7f61ff SHA512 04bd85df70332a96d66bb5e0a84956d8acd01c37f273d90a9315d4ec59f1848679e35563d2e74ec8d96ed9274e39a3ac92832dadb2f37cde6d6274cf9396a4cd
+EBUILD gnome-shell-extension-gsconnect-41.ebuild 1589 BLAKE2B 2fe5b45b50e276f1b075d3541f78bb798a9ce254bcc88c40e9ddcf13a1668386cb97710e33db19fdcd5f71ae11603f42a8d005c6db7b13793526a5af2a328688 SHA512 c74181be8de7a50b6bb1938b9d756563bc7d9f89ecc609a1204a7f3aaadce7f2f801499f4374f8e0ce29b832575e1eace11979b83b7e76fd4446d18cd3b2ffb1
 MISC metadata.xml 321 BLAKE2B daf09efc56bcbf90c8a190e25127a11d12fa7935ee49fbbb5881f1aa3e552485e63ffd9dd8e4099260b504ebdf2a7342a868328cd591b8f4ea1dde173292a882 SHA512 f8b184239c05241cac2b86acfab2f265297cee49a7fe254633181208ec7d29b875582091f34ccc0d8fed2fa41bc4488509a913d96efc9ca8155cbed5f362683f
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-41.ebuild b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-41.ebuild
index 532f48d0ea14..9c0438922d3f 100644
--- a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-41.ebuild
+++ b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-41.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/andyholmes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nautilus"
 
 COMMON_DEPEND="dev-libs/glib:2"
diff --git a/gnome-extra/gnome-shell-extensions/Manifest b/gnome-extra/gnome-shell-extensions/Manifest
index 7974dcd9f812..5cff6a9c2af0 100644
--- a/gnome-extra/gnome-shell-extensions/Manifest
+++ b/gnome-extra/gnome-shell-extensions/Manifest
@@ -3,5 +3,5 @@ DIST gnome-shell-extensions-3.36.2.tar.xz 207976 BLAKE2B 74be0821693d92f615e95f2
 DIST gnome-shell-extensions-3.36.3.tar.xz 207956 BLAKE2B be266e773e8adae06e063eac7b363ac628bde672cc4977ea38d437bfd078d1de61f4fa9402b433d22b61509fb530fa169731decd2e75c822b4c6b693bac61b9c SHA512 812580abb07f03bd82a80ced7aabca5a9daacd0ef1ec5990ee8e8f4cc231f93f880c33adc87519432cad3fc90f3a6fd3e33f4cff0a90c001bfeb825951d40bf9
 EBUILD gnome-shell-extensions-3.34.2.ebuild 1881 BLAKE2B cd917333aacbd79a1b33d1c21d713dc402824bc1f2689c47becc23926411baf21474dbc0a98261f46c9fb8b17b3e906fbeeb9da9abde19b2399681841f184798 SHA512 0ad35ffeef92e2721eb5b8aa02654ac1edf566492316081a34d4c963aae558801b5034de790bb4e2e8abc6f975621397c3e973c294b9638cca93fd18953bf3ed
 EBUILD gnome-shell-extensions-3.36.2.ebuild 1873 BLAKE2B 6fcad76ecc64471d4b7b8b3ca5c4f5604752f37f99f53397f14ef0f7147d2112d1fe77e0293de0abce170b378855dfeb47f907df63e10c03b19b43a73a340fe5 SHA512 a038a8f5a6893a38424cfb59765661b3f8b83dc3e86658783b629720a5c47f58055c89c359754e79c217df27aa196a75841f78b669444ebe671fe87a099acd7e
-EBUILD gnome-shell-extensions-3.36.3.ebuild 1873 BLAKE2B 6fcad76ecc64471d4b7b8b3ca5c4f5604752f37f99f53397f14ef0f7147d2112d1fe77e0293de0abce170b378855dfeb47f907df63e10c03b19b43a73a340fe5 SHA512 a038a8f5a6893a38424cfb59765661b3f8b83dc3e86658783b629720a5c47f58055c89c359754e79c217df27aa196a75841f78b669444ebe671fe87a099acd7e
+EBUILD gnome-shell-extensions-3.36.3.ebuild 1871 BLAKE2B 1c16f0938118bf58bc411dc23260d9994119b4045ed339718187ceeaab197b57cd527736630811987287b9d0adcf82d36ecabc638c34a86346d03e68871dbf64 SHA512 9ebf73cfb78ab7e8d716997f418cf96939ce30cf688b0b526752d22e02574e526aa4f6afa02c4ae489efb3296f6f7deb95a94c1be6b46decce6a98351610625f
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.36.3.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.36.3.ebuild
index 88401c357a10..6711e1f3fd73 100644
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.36.3.ebuild
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.36.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="test"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.26:2
diff --git a/gnome-extra/gnome-system-monitor/Manifest b/gnome-extra/gnome-system-monitor/Manifest
index baf015459dac..fc33648c467c 100644
--- a/gnome-extra/gnome-system-monitor/Manifest
+++ b/gnome-extra/gnome-system-monitor/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-system-monitor-3.32.1.tar.xz 676936 BLAKE2B 815c677f637919966868b454b47f9633f130155573f7895e0c70025a59978818051bf8d087761d15416ccb0470c7341365dd95fdeabcdd0711802f828eddfa37 SHA512 badfb98e4508096336bba4be79ce359cf4363649e97c1da534ed96a04de4bc57e12b84ed75bfa9086e00b61b6558ee4af25eee14f0d2636d3ee0b62956122cbd
 DIST gnome-system-monitor-3.36.1.tar.xz 705024 BLAKE2B 93f0bee524797ef76a8c90c9675d12fe4a9bc8c63a48fb86e3212f8be6bcebc26d5098f163b585748ac9832fc38f8591b8fa2509e1a541ed7637aa7c47ce0bca SHA512 52443c0dbcd4fffb7451f540f0e48088a956a4e176af708d198c6ac2054f454dbf910df21925daca484a30d6c1c3526ad634c38ab01f905a08a64b11938c0c2d
 EBUILD gnome-system-monitor-3.32.1.ebuild 1158 BLAKE2B d734f3eb0a4447210fc213ae71f94fd5b796d1c31728e79591b6ee1d3d9f0774ff6f226f9030e26b4d7caa20ca2a4cf704d4ad20000e70aa87defef2c52d2d9e SHA512 62ec004d8732b0195258c7a2b3aaffa6b91fd954cf2292fa3c521e7bc01b3bfa02698b0599f81e1826d642a097c59afc7a47c417b620240a80bd1f66e8791246
-EBUILD gnome-system-monitor-3.36.1.ebuild 1160 BLAKE2B 2ce8cad559ffe853bb540fe3095eb51c8a9ddbc0aa2e206ebaba26d2b7e0f7c7edc650e00d52b4e754b009fd1025069acebae747208c3231cf95d9d44ee490e3 SHA512 d9cc988d0b1b722a2125cb395adb1938bd2319e5cfe2a7dd3858698745c89e3f9b70b092441306ce0efb97247475f9c8bf15c503db3e1d0a76b1e5d5d642540e
+EBUILD gnome-system-monitor-3.36.1.ebuild 1158 BLAKE2B fe1cda5e2a1686b675f516dafdb55852f585e992d33883a53833ff75b73f990a0b90747e4c26362aded27b02bd8a64775519ab349fc3f693ef108e5ee0595554 SHA512 0bfb1f3db867a78a44e56bf1fa57049da56d30179368e4563d87faac6ac0e6a1c7e2518ee69c3910636ec32a57303aeb791a9a18da14f7a8d6b7d5196ba6f9f4
 MISC metadata.xml 378 BLAKE2B 2087d7820bf1a1544e22fa7451cd241ce73b899e2e48886f0feb234bf72c97710ec9bdee27fbeefa96ca43a0c36fcf87eec2161805a46cf7d7047f3d9472a286 SHA512 62f13c436d761ad3e4dcad32486a4f163b88e19644e4d1299813c22b0158cbf23e1d8d41ec20aa800c7cf638e89e721e6296b93446144e7b067f26b66bcfda88
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.36.1.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.36.1.ebuild
index bede4e5d6400..b9f217af5965 100644
--- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.36.1.ebuild
+++ b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.36.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://help.gnome.org/users/gnome-system-monitor/stable/"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="systemd X"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-cpp/glibmm-2.46:2
diff --git a/gnome-extra/gnome-user-docs/Manifest b/gnome-extra/gnome-user-docs/Manifest
index 1ef9aa08ccd7..c9c863305335 100644
--- a/gnome-extra/gnome-user-docs/Manifest
+++ b/gnome-extra/gnome-user-docs/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-user-docs-3.34.2.tar.xz 15979452 BLAKE2B cf91c33731ced37a685318ebef0948bd175670cdbfe555b1581ecac8f04b1206e4259f7a1c729e3fddc79322a1cc9cadd1e98a5f95646dc7b1afd64f0d324e9c SHA512 3e9c9e720959b758419201b9e0481ea7d352c77e9a195880f1085ba54485ccf787aaba6ef1cbf48c0a9955e879ebd5fc3d4003d195f522d35d4df047038e1fa2
 DIST gnome-user-docs-3.36.2.tar.xz 10568116 BLAKE2B bf53e85276d455bfeed645621b8273ace47644c5de0896f07b46c1dde5316f03385cbedce5ca259fe6c6460d35c090ad0dca8cbf46e3db0df95cc6a832424dc0 SHA512 6f9d5e6c86a377a7c77a89246b1c0555a5ddbbf9e0ec983182b9cc019c03c53d585c71f63fedb67ff1e0547ec65e1c2d832947d7e58ac2f1491c268735617c77
 EBUILD gnome-user-docs-3.34.2.ebuild 947 BLAKE2B 2d63b7d012c49dd350c274f6e7bc2776c58cc2637512bd9dbf139f53a0d1500c7869832f7a0bfd4ed3ca941e459e3d0ba411c4183ac4df738a91f01cacf6bf32 SHA512 e53c4bbe490e9ae8b08abf8bce2e297c665b38bad680cb52866ffa567240d90757a0f9e1bb8f1e9746ed27d227a5f5b0dfc582cf9a25231d73eb50d462e51dbe
-EBUILD gnome-user-docs-3.36.2.ebuild 949 BLAKE2B 4e576f3a233baa42375a2086e5a18db47ee0d0316063faff9f6bfcf6e4cf766ccf64e12f93d2d300907ac06ff085cd21544782e5d81abc76fa69883b92b2e8fe SHA512 b0cf4e019833cda7ab1e35eef0855fc82fe9e648d4cc3f9f56fbdb2f6290023430645f59540fecd1fdbb316e6e42f68c744118d5f1026590bf17e2c677123888
+EBUILD gnome-user-docs-3.36.2.ebuild 947 BLAKE2B 2d63b7d012c49dd350c274f6e7bc2776c58cc2637512bd9dbf139f53a0d1500c7869832f7a0bfd4ed3ca941e459e3d0ba411c4183ac4df738a91f01cacf6bf32 SHA512 e53c4bbe490e9ae8b08abf8bce2e297c665b38bad680cb52866ffa567240d90757a0f9e1bb8f1e9746ed27d227a5f5b0dfc582cf9a25231d73eb50d462e51dbe
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-3.36.2.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-3.36.2.ebuild
index 1c83d246f5a8..33297d29337d 100644
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-3.36.2.ebuild
+++ b/gnome-extra/gnome-user-docs/gnome-user-docs-3.36.2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-user-docs"
 
 LICENSE="CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 
 RDEPEND=""
diff --git a/gnome-extra/gnome-weather/Manifest b/gnome-extra/gnome-weather/Manifest
index bcdb9d2bfc3a..7e85c694c7af 100644
--- a/gnome-extra/gnome-weather/Manifest
+++ b/gnome-extra/gnome-weather/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-weather-3.34.2.tar.xz 5957924 BLAKE2B d6257fb7654862f5fbd308bc202ce8b8f98a0b6baa5a150a1729962fa05812a93cd19f9462d83fec3d076b896be1d8166e360811c84bc3ab4f13b212b48884e5 SHA512 9e9ebbdf795b175f7640ad684da7642a3e6a07da4d95c520a8673f0001aac119c5ebe22737d254a75b878f503910265fa0fdf05b1c219063f6b4dfc6bc8d1633
 DIST gnome-weather-3.36.1.tar.xz 5959192 BLAKE2B f0745506ffd2b72a1a5fe0783fe04c563691840fdf2150e7850cd331ba2027b1d1fcbbb4565830d05c7e39e62a2c94e4c87443ce5786cc70f3ebabcc66e97eec SHA512 c3d4b0e7258c0bfbc1ab2b5695d601fe79326e1bed856734edc309c612f1cc0adc9cfd6b4afb4ad3069b864c807ca0b21a60f89feba68f1dacac58d0fd2221be
 EBUILD gnome-weather-3.34.2.ebuild 1333 BLAKE2B 8a40937674d245eaff3481b2e76fe9e1d0d176b5b6c23067a8bad7bc90a4f6b3027862176649051e814b128986e7680d24ed48f417635728fc4359b35a715379 SHA512 4fdace50c44207d79068e06da79d7e88c436cf364eb044798e1872d58cd41748e6fc07b3687bece07b98a182bfa74e93c089deab0effa0015386d319325f23a7
-EBUILD gnome-weather-3.36.1.ebuild 1335 BLAKE2B f2213bda169d47563c1998d28c107229aaffdfedbe3126a34c181db83f40a06f0ecb30ad3184ce4df3dcf4f1326116ceefca14d0565138bcc81f180c02f6c788 SHA512 beb6cdc6253ce24bfe9a479cfd47ecc277ed011e8ce98ca0c0aedfa1f89db672eeb2167ac0ba114ea74bca5fc18654957fdb113ef4254f2ae3795dbfd107cd90
+EBUILD gnome-weather-3.36.1.ebuild 1333 BLAKE2B 8a40937674d245eaff3481b2e76fe9e1d0d176b5b6c23067a8bad7bc90a4f6b3027862176649051e814b128986e7680d24ed48f417635728fc4359b35a715379 SHA512 4fdace50c44207d79068e06da79d7e88c436cf364eb044798e1872d58cd41748e6fc07b3687bece07b98a182bfa74e93c089deab0effa0015386d319325f23a7
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-weather/gnome-weather-3.36.1.ebuild b/gnome-extra/gnome-weather/gnome-weather-3.36.1.ebuild
index fa585992b10f..7dbc4abe0b21 100644
--- a/gnome-extra/gnome-weather/gnome-weather-3.36.1.ebuild
+++ b/gnome-extra/gnome-weather/gnome-weather-3.36.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/Weather"
 
 LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND="
 	>=dev-libs/glib-2.32:2
diff --git a/gnome-extra/pch-session/Manifest b/gnome-extra/pch-session/Manifest
index 98277fcdaf2a..96fb338625de 100644
--- a/gnome-extra/pch-session/Manifest
+++ b/gnome-extra/pch-session/Manifest
@@ -1,5 +1,5 @@
 DIST pch-session-3.34.3.tar.bz2 9189 BLAKE2B 82c8f346ef8b627c4756f6781e0ccc9274c5152cd723ddcf00e23411efdf3ff633ca0078cd0a4b3ebc24e1f2ef79e7d736fdc6f9b46b750f7f88177c7977a408 SHA512 dcada2ac88fec4fe2d893bd0fd76e63fb574452612b3c9286fe42f3c51fba3b2f3992ff3015b11867c01c1d328fcd8f007f9dc1e1e3030c1e722d3b4df4740b5
-DIST pch-session-3.36.0.tar.bz2 9341 BLAKE2B 0656ab4ff0ba4d7c916734b68cab68cbc2db5206de9bc89de78bad7a21c639ee20e63988f50a00f544cfa40ddacd3c913e2ae2ce68c0f441f96132cbcdc4147b SHA512 e431d13e98cd8497e023257f6d67eb447e0f99ecf1a3cbb2adfe04143562d52b1fdecc6fd13cb54d821e142ceb8dbd124768958727aa4bcba1e23c2f729a0ec9
+DIST pch-session-3.36.1.tar.bz2 9461 BLAKE2B 069e0b8753dab8ccf7e9b8600f15f554bd38f1ee62c63ff77e308ef54013a7e82883b58a9ceedbec5d95dfcf30e398009c217423479b30919fca0de15a1e0d1e SHA512 d8bfd058e3237d2cccdce420be04dac496f9c04ef24b376875d4c9f38fe2e3b7199406e4b3963cc601e3cb3572f187eac6811e9028a276bba2b6a06cb43fde65
 EBUILD pch-session-3.34.3.ebuild 1116 BLAKE2B c40d8b6fe8e344c57ceeebc9ef1299fd77810a8fce722aa9469c9cc327ee288f1f665dab820835ca914b7c7e07dea82344c64fe0795f03a2050d09f3adddd42e SHA512 a0c2d66acf1d40d340747684904b6f08e8fcca8a336828a4711aa7bd8d5f300eb69e6c5eadde8fba8b2a4d38a291008a0b7b74949f8838bf57cabf02cc2c9d07
-EBUILD pch-session-3.36.0.ebuild 1163 BLAKE2B 05aa487a38145cc3007b379726115f867713793c25671b43887ac1683ab76655733fd183949a700bad71a1161add6368c7068b3cf036289703d186c466aa6ddb SHA512 e256b7b65e216e38ca660f07892f250e6cd3288a7c46808d48bb7da7f5d74d56850ea8348216f26fa53499f979f35a743f9ed71d52550196a62e31eaff913f35
+EBUILD pch-session-3.36.1.ebuild 1284 BLAKE2B afa6c9ea764c95d17425fdcf30ca1a4c870c57333c31de2d69be68d5cb98d88991dc5509546bc288657233a88299ca8ba09ebec54840af2218a4e1acd5697792 SHA512 d3c8c23ac76a2b141518d6d604ba4c8ee40f378d88cd66b6f967b5a4699dbde4b7b21317c0c7a0430a1fc2f61742eae03a2c3e9fa92fc90628c8f41b8761a14d
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/gnome-extra/pch-session/pch-session-3.36.0.ebuild b/gnome-extra/pch-session/pch-session-3.36.1.ebuild
index 40bc8544aa0b..e72ccd6232b4 100644
--- a/gnome-extra/pch-session/pch-session-3.36.0.ebuild
+++ b/gnome-extra/pch-session/pch-session-3.36.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://gitlab.com/pachoramos/${PN}/-/archive/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 # gnome-extra/gnome-tweaks to configure extensions easily
@@ -20,6 +20,7 @@ RDEPEND="
 	>=gnome-extra/gnome-shell-extension-applications-overview-tooltip-8
 	>=gnome-extra/gnome-shell-extension-bing-wallpaper-27
 	>=gnome-extra/gnome-shell-extension-bluetooth-quick-connect-12
+	>=gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20200713
 	>=gnome-extra/gnome-shell-extension-dash-to-panel-38
 	>=gnome-extra/gnome-shell-extension-desktop-icons-20.04.0
 	>=gnome-extra/gnome-shell-extension-gsconnect-34
@@ -29,6 +30,10 @@ RDEPEND="
 BDEPEND=""
 DEPEND=""
 
+pkg_preinst() {
+	gnome2_schemas_update
+}
+
 src_install() {
 	insinto /usr
 	doins -r usr/.
diff --git a/gnome-extra/yelp-xsl/Manifest b/gnome-extra/yelp-xsl/Manifest
index 8ea307d993b0..3e5e848f0919 100644
--- a/gnome-extra/yelp-xsl/Manifest
+++ b/gnome-extra/yelp-xsl/Manifest
@@ -1,5 +1,5 @@
 DIST yelp-xsl-3.34.2.tar.xz 640968 BLAKE2B 108d3fb52eb0548a9592442287513d3deea4ef595a252d3a46f6936243404bcdb31bb3adc234ba69e28a4de03ae35b1a5cac5ea2b2ffd4c6e4d4245c00b457b6 SHA512 ec31a46c8ee2f751f84fb309bf9a1ee3af090856b313375afb8db0ba17e9758b1616cddda4945de7c65f163893bb89a94a7372f90040b37a836f5d6173c80472
 DIST yelp-xsl-3.36.0.tar.xz 642608 BLAKE2B 59ee903e4d6cf6e0d40ff6ddecab8d65e9d81f9889afc37b4369136728cb5962d6e941ab39b80ed6e0613f172546cf659ea57a4b77c0f4633463f2b760bf0aeb SHA512 50544ae434a93cf37779db3be4e2b8d4eebd3575e9d31d3db8426f686ae262f4655d8d4b957e673daba4314d8e1c4c7a5e6485ca17b6627424b18087acd74a12
 EBUILD yelp-xsl-3.34.2.ebuild 557 BLAKE2B bddb7cd5cdb86a227e7d952822af17583748910343f306e30637d3bc790357be2cbfdca80afc280e454ba5b44b5b004dc889cb78345e36ba090509b05a0fd73b SHA512 780b30ae2432561ba7d207d25d5101fdedf3fc749dbc2ac01522b74814795049c5057b84e80b20b8755dd813abaee9441b64b0d3cb001f4f1572b0630baa7c33
-EBUILD yelp-xsl-3.36.0.ebuild 566 BLAKE2B 2f9c5b6e1a35587611956ed392c563f41406a40f03db3881c8feb74b885bd904427d7d1df5d3a6634f85df15ed0fbc87264885a9d57b541f4041c3f390b9c3e1 SHA512 18f003fc43fc925eb3b05c27787001dc4be392403e35039efba3fe00b75aed96fb6525d6b8939eaeb90a88a843bc562e8888b012d3844d91d20c7582a4f43bcf
+EBUILD yelp-xsl-3.36.0.ebuild 562 BLAKE2B 7e640185fcf089609e5619781ae40200b5ccd31000a6e16f6aea8f7e50d340d75a16e4664cf11507c7c415803d014e76e52ebb43f535ee1218766fb032bf945f SHA512 8f24bdfb8d673e86f6a4a58d5324af722f372251ea68a4ae3901f47f3ff7666795eec554fa5d06e71b880c31fe572b1d4c4ffe132923da3e9297b838f47985d2
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-3.36.0.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-3.36.0.ebuild
index 28f7695035cc..a132d476e288 100644
--- a/gnome-extra/yelp-xsl/yelp-xsl-3.36.0.ebuild
+++ b/gnome-extra/yelp-xsl/yelp-xsl-3.36.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/yelp-xsl"
 LICENSE="GPL-2+ LGPL-2.1+ MIT FDL-1.1+"
 SLOT="0"
 IUSE=""
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-libs/libxml2-2.6.12:=
diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest
index fe0147a68ee3..9d2426585180 100644
--- a/gnome-extra/yelp/Manifest
+++ b/gnome-extra/yelp/Manifest
@@ -2,5 +2,5 @@ AUX yelp-3.20.0-man-compatibility.patch 4229 BLAKE2B 1ebe101f4a0031ca46d6801e8dc
 DIST yelp-3.34.0.tar.xz 1538980 BLAKE2B 5b9af7a0f1b334555d6a4af2aff658a20e1b703f67663437fe4a967d5501382b23b2c8247908a232c79ec93fd6c7e1634816b3ce34eb11e609f4a6734ab06f4c SHA512 799a55df98bf176ee19e9b48ef321734b5df9d8c83bdb5c8c910b3def214039c8730a079d032b88dcc886c70418abb968c85c5c998b8ac340fc5ce27e6228eaf
 DIST yelp-3.36.0.tar.xz 1538076 BLAKE2B d3f8817a54506997581ddc5477c87e2b61be0303c275e9174602a005838f141b1b7ad1904b682dfe3cf1118aaf497abbbfc855c5b57e2f7f3fdf6108a90f3ef1 SHA512 533916c61f6c0c830ddd21533c4462bea8493c76246092b1d77fa145f29cda15ae01817a4ac680bdf61ed591513320faf48e0aa727567c677fdb0ad66b6fa0c8
 EBUILD yelp-3.34.0.ebuild 1236 BLAKE2B 4718064927a9cafcbbb1b53146e4d25916183d90e8d7c6c86270d8a547af7f027ae23abeaaeb4103836dd59ffafc3ba6e0badc8b84667bfec5da5ead18ebbf0b SHA512 49c550d5ec380c1708661b6de856bfe610443938ff04d5b10215abdac197fb4c8a24b489c6a7cd3874b595f14d37adfc5cd32b014f4476290fa50fdff5fef50d
-EBUILD yelp-3.36.0.ebuild 1238 BLAKE2B 9e10d20d864b6ad0b1214ccfacba54bdf6fa10bbd5219ae2e06253fa1763b74d0ad0413adf3305612c38a9911d794f5207f420f304de283bd73230524287baa9 SHA512 775012e60d8eae89f4bf4501f463bbfcd0594790adf8c944414385037ad6fcd7597797f39294768b501496f2511e16866ed78b4f096404899836f7dc341840f3
+EBUILD yelp-3.36.0.ebuild 1236 BLAKE2B 4718064927a9cafcbbb1b53146e4d25916183d90e8d7c6c86270d8a547af7f027ae23abeaaeb4103836dd59ffafc3ba6e0badc8b84667bfec5da5ead18ebbf0b SHA512 49c550d5ec380c1708661b6de856bfe610443938ff04d5b10215abdac197fb4c8a24b489c6a7cd3874b595f14d37adfc5cd32b014f4476290fa50fdff5fef50d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/yelp/yelp-3.36.0.ebuild b/gnome-extra/yelp/yelp-3.36.0.ebuild
index 4fca088de720..ed004a1603d1 100644
--- a/gnome-extra/yelp/yelp-3.36.0.ebuild
+++ b/gnome-extra/yelp/yelp-3.36.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Yelp"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 RDEPEND="
 	app-arch/bzip2:=