gentoo resync : 16.09.2020

28 files changed, 157 insertions, 133 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 4914a90dd497..db9b19ba2e48 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/aewm/Manifest b/x11-wm/aewm/Manifest
index 638953ea54dc..566f10047432 100644
--- a/x11-wm/aewm/Manifest
+++ b/x11-wm/aewm/Manifest
@@ -1,4 +1,4 @@
-AUX aewm-1.3.12-fno-common.patch 489 BLAKE2B e8e8deaf9972fd5008291d438c21acb2e24285467aed5d64ee23175b69960cfe767eba12330f3ad7840ce337584469ab277aa898a6419cab165d10ef7bf7adbf SHA512 02bcbaf0187221637195239b6263c4593dc18a269ecfe1cbb64f3320a7998457372b7afbda8ae4b9964ad99064f335c7445d2c93a1375519ea218580026cdd81
+AUX aewm-1.3.12-fno-common.patch 493 BLAKE2B b234d4e64d4f2d1287b150df3248eb4a2587ea1e74877afa935fcb89294a6be59e8a84d4c1712f70959afaa95ff5d83d2e71c060423941552fabd62045d006c0 SHA512 f3a19a135923fccc310ac3066629791c4279ecce0fa5e3dc29d05f4c059e5faf454a2b39eaf13b7ad3687256b260344a2ff3ae9f1617109eca5b901d09f0402d
 AUX aewm-1.3.12-gentoo.patch 1690 BLAKE2B f8bb7d861f3852d48c4a4919d06138baaabb053546261fbeb8d6f6e79d49f7561381cc02a614cc17998e37d40e000df1def0be71c8417194ea448797c911e6c8 SHA512 39c4d3258b29550fc99ac088c84f83af40645ebe48013f053584dd60baf99d9e58e3c3b4f221835c5ba7da27f6cc66a5d387a74928d596ba4a99a38aabaafb32
 AUX aewm-1.3.12-r1-gentoo.patch 2259 BLAKE2B 427a3286dfdf7170866a2e8b73b14259f390553fb53fc60780c6e5a8c87c224b46d6fcecda2784a17024ded5e513c1ca6be71a5aad5bd7dd6a82e783e6a4c8d6 SHA512 e3039462193018661acf9ed6532c67034a1352e381bb378a41ca3493580dfe847fa244b41389c37b3882fb5d0db4a26b9c6067b25a47134cc2d39f88b53415c9
 DIST aewm-1.3.12.tar.bz2 36677 BLAKE2B f84d272b82408600b10a3d08523219484cfbefff1ea5134284759e8743ae29918ceba842de07c640ca6fbc52c875df93f30f1692239119afcefb5a28ba3aa55e SHA512 69435edf1ba99661464221070ab6708a875056d244ee73b2eba1ed2beefba52ac2418d37e0d8b9f0c7c8a382e9d8740215b9c7098eca4f39cdf73b3c894125f1
diff --git a/x11-wm/aewm/files/aewm-1.3.12-fno-common.patch b/x11-wm/aewm/files/aewm-1.3.12-fno-common.patch
index e885161ce883..7e3d75faff15 100644
--- a/x11-wm/aewm/files/aewm-1.3.12-fno-common.patch
+++ b/x11-wm/aewm/files/aewm-1.3.12-fno-common.patch
@@ -1,4 +1,4 @@
---- aedesk.c
+--- a/aedesk.c
 +++ b/aedesk.c
 @@ -11,10 +11,6 @@
  
@@ -11,7 +11,7 @@
  static unsigned long parse_desk(char *spec);
  
  int main(int argc, char **argv)
---- aepanel.c
+--- a/aepanel.c
 +++ b/aepanel.c
 @@ -36,9 +36,6 @@
  void sig_handler(int);
diff --git a/x11-wm/e16/Manifest b/x11-wm/e16/Manifest
index fc7fb6fa746d..9f86c628e0e3 100644
--- a/x11-wm/e16/Manifest
+++ b/x11-wm/e16/Manifest
@@ -3,4 +3,4 @@ DIST e16-1.0.20.tar.xz 1438516 BLAKE2B 32800ed079eb3c51c34277fa5d49ef7a892c0ccd5
 DIST e16-1.0.21.tar.xz 1440484 BLAKE2B ea9521d4939400e292e9e2be6e73770a48d966702897c30babfe036a655ef3c5d9766eca3867e1a84b8fbd934a05c4a0487239a78d641c41a6e93a19feeb70a2 SHA512 0f5984d3c3594bf94338c9b53c681cd40f8cc165a18d7d9e0e6202fdf237ace52d9aac9c5ba04f052f94dfd463dcf558b8015044b4d457114c19a7a27ac23723
 EBUILD e16-1.0.20.ebuild 2934 BLAKE2B 74bb369190c166513dbb7d918ed657f840a21dd1f849b71e1d7b1bed716d9052cc921edf9b052984c42253889d222c3c8dbdd6856a08e4eec6b495bcd0f0193d SHA512 307eb6d0b721a77eb790475f1da9fbdc72829f9c0efe9bb9701b5add6842e2c869ce01a31c9bfa489805c7ba1c04626a3fe2040642e926ddcc46faad8de879ea
 EBUILD e16-1.0.21.ebuild 2934 BLAKE2B 74bb369190c166513dbb7d918ed657f840a21dd1f849b71e1d7b1bed716d9052cc921edf9b052984c42253889d222c3c8dbdd6856a08e4eec6b495bcd0f0193d SHA512 307eb6d0b721a77eb790475f1da9fbdc72829f9c0efe9bb9701b5add6842e2c869ce01a31c9bfa489805c7ba1c04626a3fe2040642e926ddcc46faad8de879ea
-MISC metadata.xml 1752 BLAKE2B 49a4d0adb7affcaf5d0f5156bc89057b701ea2ed9c469e3e3ff37720624e5d4f3740934b52537902148e7bde019c04d9b5b41ab341a24447fc3caf1394da4459 SHA512 dc40df2c5cc12d8d59d8446f3cb3195ce9f0ec988ba913f6fb6e3cac429fbe1151432226e170e260aa8e61d08cac13d7bf7f191a1fa845c101e0124df82b9ebd
+MISC metadata.xml 1636 BLAKE2B 10638b577feb461fedc925dee696ba44bdd2cc3e781c37150bfb50d252777cb33bebbc16b2fbf7c27fa7cd194d1de7871d9037bef690b653c3e197e58af86f52 SHA512 06fc94f51d8ce392cd1dfb3c1ebe96167e9e792c5a707109d3a58779bbd054ea6a13b18351823875d408befb5dac1dcae85ea4bcc7a8d73c7243a72f643da955
diff --git a/x11-wm/e16/metadata.xml b/x11-wm/e16/metadata.xml
index 94998b76491c..0db909981669 100644
--- a/x11-wm/e16/metadata.xml
+++ b/x11-wm/e16/metadata.xml
@@ -21,9 +21,6 @@
     <flag name="xsync">Enable X Sync support</flag>
     <flag name="zoom">Support resolution change of current window (zoom) using<pkg>x11-libs/libXxf86vm</pkg> (xvidtune)</flag>
   </use>
-  <longdescription>
-    Enlightenment DR16 (E16) is a classic lightweighth X11 window manager.
-  </longdescription>
   <upstream>
     <remote-id type="sourceforge">enlightenment</remote-id>
   </upstream>
diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
index 98116986e788..b12efc259818 100644
--- a/x11-wm/enlightenment/Manifest
+++ b/x11-wm/enlightenment/Manifest
@@ -1,5 +1,5 @@
 DIST enlightenment-0.24.1.tar.xz 28713452 BLAKE2B 1d4713a4887a687a5425888e65b358cd01fe12e42865799265f5092dc6784eb29c25b5563805d1c7be9856037b0570027c2f01a8eb848299e7729d905e291470 SHA512 3835d898f1fdb96ab6539543e9af910b4a9078372af5cfd90abb33c0d5ecb41496499629c54613e3fec4c230233b69bf1abde68f3ffba4996c69979a526da418
 DIST enlightenment-0.24.2.tar.xz 28716060 BLAKE2B 432722693beaece97eeb318a1120b6101bf76e1536347b824b00ba4378326c093f3333eefa634d7266a59c09dc4337c8bd1f9a4d89e0a4c9a223fdcacd924fa0 SHA512 5d96b17d89e822271048a0a6a8356658fd02680f54da2f15dde7c632752bbf0a396eaf23986164402e61f631e68937b3ba7c29d9dd787ddd470cff4a390abace
-EBUILD enlightenment-0.24.1.ebuild 2834 BLAKE2B 67075f39d81bf0e9ff5c73439c8a34a9852899f82b054b31dac358cc4c32178732a802636e8a289fe5d53240b8d6f6a089fbf0b9f5823231ebea6608f4039015 SHA512 429ed851d600e7fe029637818ddef3473f78ed6cfbc3eb6d58ec2239b427b6d21873c0d564c5e0939c0cbffc57bed1a08ffc13d567729d7fc6f0ea4864bbbb48
-EBUILD enlightenment-0.24.2.ebuild 2836 BLAKE2B 590ee18adfcba7dde36322307fe0a0457f6b38602d715e0acfe434688d59545573dbe89e2d72894dff530eba8094216cde81a92fc375aa3c500fd7265c1bfde4 SHA512 0460438b0bda971bae141e3b1d3c0fe66f7cada94f8a2e3d80c3fbbcab7baf99a471421fcaa941d86f99d5eb5a9420f4a75c78f0b543bf2cb0de3c69f35e3a81
+EBUILD enlightenment-0.24.1.ebuild 2838 BLAKE2B 3beb5dde2734c53a3647e7b8ae7c70698030d7c933c66acf290f98037541d2b6225ab0b36e97711122440b9e22a2a1366b3853dc1fbcdfa386ff47d630298d9b SHA512 d863b7bdebe49c476368c00b9eb4022a859cdbea32873bfd692c2f2d4d9af1eb23bddc34f9262c9ff7e2f29aee47788ce5fa977fba80ffa2450f51c1fdf58f9e
+EBUILD enlightenment-0.24.2.ebuild 2838 BLAKE2B 3beb5dde2734c53a3647e7b8ae7c70698030d7c933c66acf290f98037541d2b6225ab0b36e97711122440b9e22a2a1366b3853dc1fbcdfa386ff47d630298d9b SHA512 d863b7bdebe49c476368c00b9eb4022a859cdbea32873bfd692c2f2d4d9af1eb23bddc34f9262c9ff7e2f29aee47788ce5fa977fba80ffa2450f51c1fdf58f9e
 MISC metadata.xml 721 BLAKE2B 85587a677b7e22cd1dbfe187c367574ccef7ad88a1bdde00acecc9fc5f62d48adb9e14c2086953287efc728cc616d6d286fde1b659a44404086fef5e6bde90b1 SHA512 6d22a2f8639b3b75fd1113c0b381edc2869d91e5d3d04d6c67c845c15fae9ba0e370918e30b45e89e91c695f873f1d0ef5966f7720ab5e9cd270c6254c792dc5
diff --git a/x11-wm/enlightenment/enlightenment-0.24.1.ebuild b/x11-wm/enlightenment/enlightenment-0.24.1.ebuild
index d0fb774324f3..cbc938e2391a 100644
--- a/x11-wm/enlightenment/enlightenment-0.24.1.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.24.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils meson xdg-utils
+inherit meson optfeature xdg-utils
 
 DESCRIPTION="Enlightenment window manager"
 HOMEPAGE="https://www.enlightenment.org"
diff --git a/x11-wm/enlightenment/enlightenment-0.24.2.ebuild b/x11-wm/enlightenment/enlightenment-0.24.2.ebuild
index b35c9836e6a5..cbc938e2391a 100644
--- a/x11-wm/enlightenment/enlightenment-0.24.2.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.24.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils meson xdg-utils
+inherit meson optfeature xdg-utils
 
 DESCRIPTION="Enlightenment window manager"
 HOMEPAGE="https://www.enlightenment.org"
@@ -11,7 +11,7 @@ SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0.17/${PV%%_*}"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE="acpi bluetooth connman doc geolocation nls pam policykit systemd udisks wayland wifi xwayland"
 
 REQUIRED_USE="xwayland? ( wayland )"
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index 165f718d093f..85eb1df30e71 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,10 +1,10 @@
 AUX icewm 33 BLAKE2B 5605658012ad8ed16bbd4cf0c4cb7cbe5204f73c20ef2c3d9fef1011a80b9e68863de64b45e4b043604b147c9d31f3f5d2617d067b694f5ec5329ad895472b0e SHA512 3fe619e59cc5d354242ccd85d3b1982dd7db6d0f6170f46f9d33975872f6d5a342a08d69db763162dc43681eedb96e9ba5075455bf54adf4fb86bf19887bf6e0
 DIST icewm-1.6.6.tar.lz 1684639 BLAKE2B 20daba42f19d86ceff6ce31c8df9cb1b9b09cc53d8933f70a9a8e750470c4f485e79f8de5e47ed503c83ac5433931c4ff98b10584566941e6a3bcf22d58e3dbf SHA512 6d9848924253fee5f57be488d2eb0b602767f168ce623b10c768a73197dfc6265daee7e70373d45ff5fae1c15b029d62c77ad13f0f631283bbf13aaaa9c6234d
 DIST icewm-1.7.0.tar.lz 1668130 BLAKE2B 90739f862cf320c43dc2ddbd1a5ecdf2918e6525e45d5732b19adaaeef0f104d9a66d29acab776658f869d7149954d4b531a07e2595a4c80b4dc50dc679473f0 SHA512 1b0faed0e9ead837dcb0d3ce91ad5248d7fca5ad48455c838700c66482a3373bb4e552dbc252b93b0a5613d53e2663cea756e64b3f3fb073d9ba2797e2b69601
-DIST icewm-1.8.0.tar.lz 1679913 BLAKE2B 4facdf69abd4ffc58bf65cbf5603b64d82e8e384b9a4f68249feaf8656010f08121a2a13ad5a38d867be2b0c29ca0952ac527ba4281f6d03f81ef4fdad47c825 SHA512 b49247bfbeecd7e68999d349676f889cf4514e27d1eb0d8dab38826f874d2273fab380e46ae3b2fab85ce2a3a495dd29f6caf4dc3bf5dec355b240550cbc117b
 DIST icewm-1.8.1.tar.lz 1682283 BLAKE2B a8b13e8e5a2d675a3c7c488620e44201a4ac07bd9dcf55502d4399242d3ded5ab2b1a51f393ef185b602f1c6bd4b8044dd13ac39966c194dc30c65f05b4ab350 SHA512 b84c767ae96cc78eeea810e35ca01cdd800f1847bc847ee7e41c0d6c5f9f3e28901e3d4b5fee2992e80c86fa3694b5d6f8760c2a6b6df316db67a2248e726d05
+DIST icewm-1.8.2.tar.lz 1686746 BLAKE2B a2dcf77284f5dc2f908ec949c6e1ea792292648fbd5cb8167216ee994706b1a208ca6fe29831f6bf98d2ec02e5e5120eca8f3a93a20a4a75d80d839210d829bd SHA512 3454b9547b7f4857957133cda4436814149bea99886cd4564f947391a1f42d474d56c7cd3208ff2471262c57f623de1ec22e30f0d9b14874f29ac3a4855b9a45
 EBUILD icewm-1.6.6.ebuild 2670 BLAKE2B 6fd31e08fe11f8ebb664ff0d11269df39b47433dfafc1058281af3896dcf10a81930707846efc4d2b964d881b9f6c7eef5a21548d50fba58462e101f360d6c95 SHA512 3dfb0a7502141b5916a2bb5d088bd533bc70281dc4c3171a8fbf87e65c94b7b88bf99c592ef3ec3e20994d9913226b760fb9037b2bec7b0aaabdcf679d428eab
-EBUILD icewm-1.7.0.ebuild 2671 BLAKE2B bd804dc452c94c778f53fac9fa4cb4697020014ba5cada5bc4279d49dff76056697c88392c9d81991d7fb1f8193d6187a71b1e4b2557a1e06a9a5423d4209d81 SHA512 dd7601c6714263bbdd6bdc9074acfb662231cc5d02fb364934e91210bc655863255a36374f6c1f621a0a6e2edbb1fdb6c4869117f3fa20a3c20a06188e1048c7
-EBUILD icewm-1.8.0.ebuild 2674 BLAKE2B 527d266c70c5a81b2664778a828f6d73156e64a03da93d0b33499fe83f9b2036e75f19ac4f687b069f834d72d0ba8503f27692c5d9c7a4d39365433ed6fd64eb SHA512 7497f2c29f337623c803fbb30ca1df6b0019a3ca76b143d0b320ca7a923ccc84389895797a1bce5382c6d2671e3c27f7ad73a554320d8ef0495e270228f0980a
+EBUILD icewm-1.7.0.ebuild 2670 BLAKE2B 6fd31e08fe11f8ebb664ff0d11269df39b47433dfafc1058281af3896dcf10a81930707846efc4d2b964d881b9f6c7eef5a21548d50fba58462e101f360d6c95 SHA512 3dfb0a7502141b5916a2bb5d088bd533bc70281dc4c3171a8fbf87e65c94b7b88bf99c592ef3ec3e20994d9913226b760fb9037b2bec7b0aaabdcf679d428eab
 EBUILD icewm-1.8.1.ebuild 2674 BLAKE2B 527d266c70c5a81b2664778a828f6d73156e64a03da93d0b33499fe83f9b2036e75f19ac4f687b069f834d72d0ba8503f27692c5d9c7a4d39365433ed6fd64eb SHA512 7497f2c29f337623c803fbb30ca1df6b0019a3ca76b143d0b320ca7a923ccc84389895797a1bce5382c6d2671e3c27f7ad73a554320d8ef0495e270228f0980a
+EBUILD icewm-1.8.2.ebuild 2674 BLAKE2B 527d266c70c5a81b2664778a828f6d73156e64a03da93d0b33499fe83f9b2036e75f19ac4f687b069f834d72d0ba8503f27692c5d9c7a4d39365433ed6fd64eb SHA512 7497f2c29f337623c803fbb30ca1df6b0019a3ca76b143d0b320ca7a923ccc84389895797a1bce5382c6d2671e3c27f7ad73a554320d8ef0495e270228f0980a
 MISC metadata.xml 747 BLAKE2B a986dc65f9b603519ef92fecc63cadd2921d6569e8735956a55ce91673426082e367664cce23c2b80cec19e0d997da357ac8f9d3d78c738ad92f42f6f426c225 SHA512 f9b84c60b780b5999c8a295b64bdf1bdb734108984e48f1271257cb35602df024a347560526de52f43ede16f67031551f4ae3f37401d3320e4dbdfb913e557fe
diff --git a/x11-wm/icewm/icewm-1.7.0.ebuild b/x11-wm/icewm/icewm-1.7.0.ebuild
index 0d6bcdc9b635..fe0e2ed27f4e 100644
--- a/x11-wm/icewm/icewm-1.7.0.ebuild
+++ b/x11-wm/icewm/icewm-1.7.0.ebuild
@@ -11,7 +11,7 @@ LICENSE="GPL-2"
 SRC_URI="https://github.com/ice-wm/icewm/releases/download/${PV}/${P}.tar.lz"
 
 SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE="+alsa ao bidi debug +gdk-pixbuf nls truetype uclibc xinerama"
 
 # Tests broken in all versions, patches welcome, bug #323907, #389533
diff --git a/x11-wm/icewm/icewm-1.8.0.ebuild b/x11-wm/icewm/icewm-1.8.2.ebuild
index f3a5bab3c272..f3a5bab3c272 100644
--- a/x11-wm/icewm/icewm-1.8.0.ebuild
+++ b/x11-wm/icewm/icewm-1.8.2.ebuild
diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index dbc0e7e3d2d9..0eb07f0065c7 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -1,5 +1,7 @@
 AUX muffin-4.4-gir-fixes.patch 2133 BLAKE2B 07635927daaa45e5f83c419e27efc9863b43b23591b908fbaa94c7b951c9bd6626ea8df6682f8a16cd4e18192486d84ec6d3d431e91cc20488546077c2450683 SHA512 01fe330ba2dc2bb965b5870ba22bb11c1d31d8d318457bc5a1035d49386a117e605aa0edbabd1ad2d34b6c4ab3cf347936b13d6a2f6f4dea94db8d0aac82f7fd
 AUX muffin-4.4-gobject-introspection-fixes.patch 16907 BLAKE2B 02cc9f22053580f046eb9f5ea2d9ca55364330e729f7f2e765c7c7f100077e81d33f47e4097e24ac95ab901447a1c4eccf0dd09d85b5af93f91daccbfba3eb5a SHA512 181007af23aa61c0d9422a6c7fe1cdc7cc4ee5e506d789ffc12b5a799171a34aa4eaba995c00cf04512d81549d6e675ec8259fc7440a21d97c19a2148a9e7a46
 DIST muffin-4.4.3.tar.gz 5194631 BLAKE2B 10221560daed72f776f6543b8d044442fe8f501ec42cc2f6ce15f0d00f26fe74d3dbe763145c48ecf18d0f821277753a71a607e8c705e6dc624c16d7f17b9785 SHA512 a11418f9ab6f6dee0f4df45f06ec6df5666490effec7468fd4c1e9cb6b537448f1aaf0fe743b208194488b86de0b269ffdc442ee677b45940761bbdfa4fafed3
-EBUILD muffin-4.4.3.ebuild 2059 BLAKE2B 95ad8ac24d78556542cbdc537e7826184fcc169238b95d6fd78e7de280d984d13fe98c13f4bc889abf937945be6f1626e521109d54bd19d702d8ef2c3b972a01 SHA512 aec02f556eca9b4325c4177eb4ad12baca81c2b88c6ae8c1d80dd2c3f8e8e885c997f61e4e82d7c3bb2309f3df314c01afc972049a7d3c1ce0db81175a8ab5c0
-MISC metadata.xml 568 BLAKE2B 508383c07145ee7f1d2e24749a32499ac1786a26af8034eb87f0fd1ddcd0c4a27572fbeb8e4a288ad1122348162dbaa34063ec268e0b90aa56e1f2f9ee097067 SHA512 ae69e0756469ba11a738248b601489de534b54d5e7f5f6765f77be3fb4437ec7c42f85c5b8ae19d52cdc9a2cf664bffbe0d65ba7b90a49be48448e97606629db
+DIST muffin-4.6.3.tar.gz 5196072 BLAKE2B 1b8c0eeab13c35fc0b66898328f378331cb2bfc78b27a48a8f9e22c842df1a223613f27f5b29fe28c1edaaeb59972262024ed656dfabafa6c9454c4c4c0a74b9 SHA512 c07d83656d3a9164ad488b500f98acb88e0c8e2374af858776ff27dbe90880db4310405505d79539222ba3b4ddedb22934ef3e0f1f6198dc7b36986b784b48f5
+EBUILD muffin-4.4.3.ebuild 2129 BLAKE2B 2666ee555fdd226e7ca873369b8d698241ff9660734575a49a6f04fe6222f97af97b11adb3ab20893da2d0979ebb08d3cd407d2dc89f0e8a8b224e29ff8097e3 SHA512 d3f3c37d8788824f1a2ad7e88d636b8067340ccf254a46216981b62752740c5ed6fdf9dd3042ed4db30ce27a71ee5caada99ec5ae2fbbb65105c047bcc19f810
+EBUILD muffin-4.6.3.ebuild 2222 BLAKE2B 3c6b46af4077b9ef28189861a610caa378111514d27a99c65fc469b35f5488cb2803f52d2def6d1e12a36a4261280dba013c3661a708825ac09617e0b24bb95c SHA512 d3d6e5074fd5b5dc69d9ffe7eecf7b3455fe4e55ed3920d2e824ad0f0c4078f461cd8a0a93bea13aaf3c73c6be395ebb7e66c43767d6cd3c4ddfb9d60a5527c9
+MISC metadata.xml 455 BLAKE2B d4584f37c17ed7f43e3200c5b4cf5db9d73634ec2634575d0667a2b6de278f746839cb52b037f9239aa1a570a056fa6ff3990bd26a1cde3975a391ef44360660 SHA512 e21ad4e3cab168c13fd6b34335e1d615a548160f78c558655def493f1632ac6cac170892b781a020f8e6a877526d320051154aa0cfcf986d3e76dcc89e61bf21
diff --git a/x11-wm/muffin/metadata.xml b/x11-wm/muffin/metadata.xml
index 34a28b9277af..4339a3ad386e 100644
--- a/x11-wm/muffin/metadata.xml
+++ b/x11-wm/muffin/metadata.xml
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>cinnamon@gentoo.org</email>
-		<name>Cinnamon Project</name>
+	<maintainer type="person">
+		<email>sparky@bluefang-logic.com</email>
+		<name>Matthew Turnbull</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>sparky@bluefang-logic.com</email>
-		<name>Matthew Turnbull</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">linuxmint/muffin</remote-id>
 	</upstream>
diff --git a/x11-wm/muffin/muffin-4.4.3.ebuild b/x11-wm/muffin/muffin-4.4.3.ebuild
index f8d8c2d3a9c7..b77326d58632 100644
--- a/x11-wm/muffin/muffin-4.4.3.ebuild
+++ b/x11-wm/muffin/muffin-4.4.3.ebuild
@@ -21,6 +21,7 @@ COMMON_DEPEND="
 	x11-libs/gdk-pixbuf:2[introspection?]
 	>=x11-libs/gtk+-3.9.12:3[X,introspection?]
 	>=dev-libs/glib-2.37.3:2[dbus]
+	>=dev-libs/json-glib-1.0
 	>=gnome-extra/cinnamon-desktop-4.4:0=
 	>=media-libs/libcanberra-0.26[gtk3]
 	>=x11-libs/libXcomposite-0.3
@@ -36,6 +37,7 @@ COMMON_DEPEND="
 	x11-libs/libXfixes
 	x11-libs/libXrandr
 	x11-libs/libXrender
+	x11-libs/libxkbcommon
 	virtual/opengl
 
 	gnome-extra/zenity
@@ -46,6 +48,7 @@ COMMON_DEPEND="
 # needs gtk-doc, not just -am, for gtk-doc.make
 DEPEND="${COMMON_DEPEND}
 	${PYTHON_DEPS}
+	dev-util/glib-utils
 	>=app-text/gnome-doc-utils-0.8
 	sys-devel/gettext
 	dev-util/gtk-doc
diff --git a/x11-wm/muffin/muffin-4.6.3.ebuild b/x11-wm/muffin/muffin-4.6.3.ebuild
new file mode 100644
index 000000000000..3cbf7b38cc64
--- /dev/null
+++ b/x11-wm/muffin/muffin-4.6.3.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools eutils gnome2-utils xdg-utils
+
+DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
+SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+introspection test xinerama"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+
+RDEPEND="
+	>=x11-libs/pango-1.2[X,introspection?]
+	>=x11-libs/cairo-1.14:=[X]
+	x11-libs/gdk-pixbuf:2[introspection?]
+	>=x11-libs/gtk+-3.9.12:3[X,introspection?]
+	>=dev-libs/glib-2.37.3:2[dbus]
+	>=dev-libs/json-glib-1.0
+	>=gnome-extra/cinnamon-desktop-4.4:0=
+	>=media-libs/libcanberra-0.26[gtk3]
+	>=x11-libs/libXcomposite-0.3
+	>=x11-libs/startup-notification-0.7:=
+
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libxkbcommon
+	virtual/opengl
+
+	gnome-extra/zenity
+
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	test? ( app-text/docbook-xml-dtd:4.5 )
+"
+# needs gtk-doc, not just -am, for gtk-doc.make
+BDEPEND="
+	dev-util/glib-utils
+	sys-devel/gettext
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	xdg_environment_reset
+	default
+	eautoreconf
+	gnome2_disable_deprecation_warning
+}
+
+# Wayland is not supported upstream.
+src_configure() {
+	econf \
+		--disable-gtk-doc \
+		--disable-maintainer-mode \
+		--disable-schemas-compile \
+		--enable-compile-warnings=minimum \
+		--disable-static \
+		--enable-shape \
+		--enable-sm \
+		--enable-startup-notification \
+		--enable-xsync \
+		--enable-verbose-mode \
+		--with-libcanberra \
+		$(use_enable introspection) \
+		$(use_enable xinerama)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+	dodoc HACKING MAINTAINERS *.txt doc/*.txt
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_schemas_update
+}
diff --git a/x11-wm/qtile/Manifest b/x11-wm/qtile/Manifest
index 39546ec45d4d..480e417dd0f3 100644
--- a/x11-wm/qtile/Manifest
+++ b/x11-wm/qtile/Manifest
@@ -1,7 +1,6 @@
 AUX qtile-session 1854 BLAKE2B 260c39642f805f9b94e59ab25d9e8d6e53abcb9fbed76f33434fdd2ccd65dc24c71b7ea654ced6393404656f2f26d96dc45a2b7e580190da408a396e76af2897 SHA512 4d7418316f6baeaa28b254f341c74641004bd58444c425f626c92e44bff046ec108d128a9e91c10daae75b222c5758e8f0e8a5e3b778b2af36409f4d4b778cbe
 DIST qtile-0.15.1.tar.gz 522233 BLAKE2B cb5c35ab6b2e22d36c2ef69a3d6367033440a25a1c06dad5c4d455b67aa1ddf2c639451e051abcd40b5a76e93250a54271408bbe09008b44a5ebf0a520b3eb2e SHA512 57dfeeea212346c14b922303b5d2fd950292383a1da3be6bf5ca0880bedaa3adb7ffc121df617cf763fcd1208c44e34a7ba128a1f2a6e8d3042dd6906ece7e20
-DIST qtile-0.16.0.tar.gz 543646 BLAKE2B d0d2ae1bf44e08c7a40601fee0643fb387807546ebee5ab6f6756d7651be22fff75034227226fe978042b33594158b5493ca6203ecab92434418219a423a5817 SHA512 c8f712fcf48f166be0782560541d02959809f5c7d6ee209e3bf0b12325309521be79eab81e4f17f5111fb9426601ac5445db0bb3dc8330e9b426fa1031e95065
-EBUILD qtile-0.15.1.ebuild 1524 BLAKE2B 5b0a5da5aeb221f0a3003913476e91716e6e992e258315c1363a49a0fbf313cdd5c897c974aa1814e205e6eee4de0860b3e89725cae5d6322d85121dda5fc9d6 SHA512 6472d1237ac9a1f47c1ee08c924cbcae018acaa6ee0f4e7d69de725eb31a964d39a67f6ab8bb58756e31ab25d964b4332ab851ca96ce56850691ba63a562e40d
-EBUILD qtile-0.16.0.ebuild 1524 BLAKE2B 5b0a5da5aeb221f0a3003913476e91716e6e992e258315c1363a49a0fbf313cdd5c897c974aa1814e205e6eee4de0860b3e89725cae5d6322d85121dda5fc9d6 SHA512 6472d1237ac9a1f47c1ee08c924cbcae018acaa6ee0f4e7d69de725eb31a964d39a67f6ab8bb58756e31ab25d964b4332ab851ca96ce56850691ba63a562e40d
-EBUILD qtile-9999.ebuild 1577 BLAKE2B 7f082e34f42d2bcf6e355c71be6076263cdbb7b6060819dfbf22e9b311e09c4f772630a290ea176e9a7c178796610e7cbef7ca0d67867a07d2502435888681af SHA512 44b510b6405c03808052311b557c7f27bc799715063cc589d5d1344d7a2735220ec542778353e97e3b892d5b8c394b747d5764521a8d1fdaa225e733144d43ae
+DIST qtile-0.16.1.tar.gz 324668 BLAKE2B 1f75f5dbcab6180dcf778e28108e70b6dd01105fa275aadf4a53d96ab84f3b759cb8553bcf3de2011b0990d61adc9269663afa32b83d1aa9c052b00ef9e89358 SHA512 aea42f7f6799a88b586167a57f5b5ab6f1c5bb663dec352d15eb47ce0d37fb23c31d1631cab8178c71be5ae714ec12c35a350377383dba1749a98cd45c22515b
+EBUILD qtile-0.15.1.ebuild 1523 BLAKE2B a365fa9d927e72c0356b3982d455b0cd2aa98c5afa3c5e8f653220d5f761025f8675f72a8d54e8562b721eaddf908b8f07a52d07fd4d5ec03376b8c3a8048e0a SHA512 5ea08eaa0a396ac9157d1e0ba592290e3348264bf61dda1c2f33d2484a02bb14d555fc27e18542d13c40b4b652b69a520b75c4b651f0efa450c8eb8122c18771
+EBUILD qtile-0.16.1.ebuild 1054 BLAKE2B a742ac4720950a0006ecc72ce4b0be81339062e842c87375632c778c4cf5e3713d363f3db61454ee0eb097b033a7785c1057ce67dc6ca648267acd5eb288a2a8 SHA512 2c70f99244911102f5a82344a47ff51b789546f30f1264be661441b1a8bc4e85842a0da20db9a41fcdae3277e64d3e5cf95b1754ba58ffa09a2c9100794a78d6
 MISC metadata.xml 323 BLAKE2B e89bf065a17c1ae7499e749e1b2e0af729cb64cdadc6c2ad8b06d34290ae0afca0da51802e3b855c24c9ecd23e78bae8ba9ba89e3a7f464bcf88b90622a9a442 SHA512 33be266eccb74e19b4bc89ff482e44b3542543b3f693d00bb37f1e3cd08e2465632050119d2722410d23de278bb6b1a52e2769441ca3456d3c116ef890a99a7b
diff --git a/x11-wm/qtile/qtile-0.15.1.ebuild b/x11-wm/qtile/qtile-0.15.1.ebuild
index dae1095c6247..afcf3b32b6e2 100644
--- a/x11-wm/qtile/qtile-0.15.1.ebuild
+++ b/x11-wm/qtile/qtile-0.15.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/qtile/qtile/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="A full-featured, hackable tiling window manager written in Python"
diff --git a/x11-wm/qtile/qtile-0.16.0.ebuild b/x11-wm/qtile/qtile-0.16.1.ebuild
index dae1095c6247..87156d77f39d 100644
--- a/x11-wm/qtile/qtile-0.16.0.ebuild
+++ b/x11-wm/qtile/qtile-0.16.1.ebuild
@@ -2,54 +2,37 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
 
-inherit distutils-r1 virtualx
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+PYTHON_COMPAT=( python3_{7,8} )
 
-if [[ ${PV} == 9999* ]] ; then
-	EGIT_REPO_URI="https://github.com/qtile/qtile.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/qtile/qtile/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
+inherit distutils-r1
 
 DESCRIPTION="A full-featured, hackable tiling window manager written in Python"
 HOMEPAGE="http://qtile.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="test"
-# docs require sphinxcontrib-blockdiag and sphinxcontrib-seqdiag
+KEYWORDS="~amd64 ~x86"
+
+RESTRICT="test"
+
+# requires internet and specific
+# pulseaudio settings
 
 RDEPEND="
 	x11-libs/cairo[X,xcb(+)]
 	x11-libs/pango
 	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	>=dev-python/cairocffi-0.9.0[${PYTHON_USEDEP}]
 	>=dev-python/cffi-1.1.0[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
 	>=dev-python/xcffib-0.8.1[${PYTHON_USEDEP}]
+	media-sound/pulseaudio
 "
-BDEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/xvfbwrapper[${PYTHON_USEDEP}]
-		x11-base/xorg-server[xephyr]
-		x11-apps/xeyes
-		x11-apps/xcalc
-		x11-apps/xclock
-	)
-"
-
-# display retry backoff slowness and failures
-RESTRICT="test"
-
-python_test() {
-	# force usage of built module
-	rm -rf "${S}"/libqtile || die
-	PYTHONPATH="${BUILD_DIR}/lib" py.test -v "${S}"/test || die "tests failed under ${EPYTHON}"
-}
 
 python_install_all() {
 	local DOCS=( CHANGELOG README.rst )
diff --git a/x11-wm/qtile/qtile-9999.ebuild b/x11-wm/qtile/qtile-9999.ebuild
deleted file mode 100644
index 1115fc9d170d..000000000000
--- a/x11-wm/qtile/qtile-9999.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1 virtualx
-
-if [[ ${PV} == 9999* ]] ; then
-	EGIT_REPO_URI="https://github.com/qtile/qtile.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/qtile/qtile/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A full-featured, hackable tiling window manager written in Python"
-HOMEPAGE="http://qtile.org/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-# docs require sphinxcontrib-blockdiag and sphinxcontrib-seqdiag
-
-RDEPEND="
-	x11-libs/cairo[X,xcb(+)]
-	x11-libs/pango
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/cairocffi-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/cffi-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
-	>=dev-python/xcffib-0.8.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/xvfbwrapper[${PYTHON_USEDEP}]
-		x11-base/xorg-server[xephyr]
-		x11-apps/xeyes
-		x11-apps/xcalc
-		x11-apps/xclock
-	)
-"
-
-# display retry backoff slowness and failures
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.12.0-tests.patch )
-
-python_test() {
-	# force usage of built module
-	rm -rf "${S}"/libqtile || die
-	PYTHONPATH="${BUILD_DIR}/lib" py.test -v "${S}"/test || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( CHANGELOG README.rst )
-	distutils-r1_python_install_all
-
-	insinto /usr/share/xsessions
-	doins resources/qtile.desktop
-
-	exeinto /etc/X11/Sessions
-	newexe "${FILESDIR}"/${PN}-session ${PN}
-}
diff --git a/x11-wm/sawfish/Manifest b/x11-wm/sawfish/Manifest
index 7fb427130f20..4eb9be158b24 100644
--- a/x11-wm/sawfish/Manifest
+++ b/x11-wm/sawfish/Manifest
@@ -4,5 +4,5 @@ AUX sawfish-1.12.0-fno-common.patch 987 BLAKE2B 9f5a94a226453b831efab89b46dc0022
 DIST sawfish_1.12.0.tar.xz 2814340 BLAKE2B 58901cf62d10641ef32756a3283c6d53b27a68a4af7c578c49e6968045f5993f744eb0b6c7b81da08b91774f1fb8faec467a6a22cd046a2fea135f749ac24319 SHA512 e8f831a9f6206ccf4e2a823bc3464c11b9d2d38a72ada4a142f952813a56c620b511f9cd8912bbf06e38976e54f1d9445f68d6dd24ee5ed59918c18de379e71f
 DIST sawfish_1.12.90.tar.xz 2602372 BLAKE2B 180d3ed1081fffa0fe6c60c15b96a4b530be1349e162d0b6e7553e753e0462aea89caf7bfe379b1993f883e544e27bb553d259d0348fcceb53619dc54536cc47 SHA512 444cdc21b368d9ffb89e1ccd0377d9ce9d9b42f9bd93aa85ca29763781f90cb393a0c9c8da47ff0a161bf5e3881e6d6895a7c5749761ccc7b4b5a1ed8438c93d
 EBUILD sawfish-1.12.0-r1.ebuild 2032 BLAKE2B 6aefde862da34a34dc1f4c570385e65a223d1b5538322877313dc9bb177939f485afb4ff7c70605976bdc351c042830c82e32e39e18d208893819c16aaaf7f39 SHA512 5a85929922b63fec43b0c89ea512063b743a178048b6c84efbe829444683ee6e0d8978d0b35cd6cc25ef2ea7f2602b5d5c0067521d58e740f5dd775dccd58865
-EBUILD sawfish-1.12.90.ebuild 2209 BLAKE2B 6f2468079cbb6a26fdc69a3282b80855c63743889cfcc3369f0df3bd2c7904326a715f9c6e20e47a55b2bd147d04cfb0fb2c7086dd0bbeb30d926f670426937e SHA512 4fbe6ea35405827075ce6f7d7073961bfdf41557a95aae433323c6aac77a45ecaf77229cac079af40315791f2ec85a99a9145b2ed8516302a242f5cb6f569852
+EBUILD sawfish-1.12.90.ebuild 2208 BLAKE2B f5d0d5ff6f7c37f92bc58e23ff4295f8c034aae87188bbfcb0bfe7bdb86b00720a763a11c5d290776d495013262372eaa636f5faec5a25e82f64cc7530150b70 SHA512 6252bb4d23a5fc15c50fdf9e8148ae3895de10c0507a2083c56e05f931113d22b8fb7497cfd2ca62b850b3deec81f166ec5629824059deebb8a52583d105e7fb
 MISC metadata.xml 357 BLAKE2B 7ff08550d41c65ecf933abf4a3c1932a06f9462016ea8cff09145c713e7017dd68dd5e6473845eac654e0ae1fdded17e6b92b36a4f97db539524dfb67b5aec4f SHA512 ab28ed64d52513cf76bea32b2f289dedab2420e91592ba31d2917efc2d7868a4bf949067562594254a601e62885cf530d7ec00404cf62dd4705b7ac1a892ba9b
diff --git a/x11-wm/sawfish/sawfish-1.12.90.ebuild b/x11-wm/sawfish/sawfish-1.12.90.ebuild
index 3f0c55898053..ea8f5ba03694 100644
--- a/x11-wm/sawfish/sawfish-1.12.90.ebuild
+++ b/x11-wm/sawfish/sawfish-1.12.90.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://download.tuxfamily.org/sawfish/${MY_P}.tar.xz"
 
 LICENSE="GPL-2 Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 sparc x86"
 IUSE="emacs kde nls xinerama"
 
 RDEPEND="
diff --git a/x11-wm/spectrwm/Manifest b/x11-wm/spectrwm/Manifest
index 799e4fed7d73..20b75fc68188 100644
--- a/x11-wm/spectrwm/Manifest
+++ b/x11-wm/spectrwm/Manifest
@@ -1,7 +1,8 @@
 AUX spectrwm-3.1.0-Makefile.patch 977 BLAKE2B 1f76bc331ee1d048387ab82900b44339e092986a793f5d03fa317f4247987ebb8ede090c0b157ae508d2a3ed05a374a9d06910e99fa9c5dd6df2169c54cfc3b3 SHA512 5d2be769544e4446e4e6780793bd61fe88a63c26b865d79e19892aca4734e600f16d55184b2e35d3f8e0d8456ac0c5c229854fcd607bd32c036a4397150ce118
 AUX spectrwm-3.4.0-gentoo.patch 1134 BLAKE2B 01f472388c38b276fc91747cb1e06bf4709b1a53caacd1e16f3ef7d0817eb3d127aac76c665e92d05c41c9f01ce8b79525dd0bacbeecdd5d36c1d012bcdcb1c5 SHA512 9c8450fcdd198dd0ef88d13c38edb0cc48c7324cc8a3b3e2c331d9ca5608cfa9fa041b9cae466429e8b77fcb9eb28a29d484590106ea604f27163d07ee428508
+AUX spectrwm-3.4.1-musl.patch 259 BLAKE2B 61dde875af4c9fb8be72a098debe0ac00174ee4bf15c727778d37f80f844a60834959c8ab6f2f15200e4fb5968528f06c03a18fa4d89d074ffe1f32eb7fbfd8c SHA512 5780b9fa2504b3fe0d426bc373d9e43babc642af402035bcdf453b71766adac9d9e903226a63ccac1edc4f90d44c61723f80ceb2fb0c8743702cc1b14da0491b
 DIST spectrwm-3.1.0.tar.gz 147206 BLAKE2B abcce22bc7859dbcc109f02ea832d65091c842562579d47cd1dd83c5de82a015b02343972d4d85cf291b63bfbaf0e901616cca94d911014672ffc35436bdd3c1 SHA512 dd8e16361b979a55b210a88a1ae5d53e7086fd854e92320e09b6407d374580cc271c0e974e38606481ab57a504a86e16293edee967d251b043a1eb65e8c77687
 DIST spectrwm-3.4.1.tar.gz 164507 BLAKE2B 8047e639be3d4a07616f7ef3911765c5d6dd7dbd56c684453db90283faee08aac2cb9e3e20ae42f839582b67b778a4490a04fa21fc90fe489f798c40c517351e SHA512 94d468833124b51fa12b29b173126f10f27dd551d599459e4bea589721b3df6f1f0af0ea67326ed3ad462e1203d3bbcb82032ff83abfa0943ec45afd29dedaa6
 EBUILD spectrwm-3.1.0.ebuild 1132 BLAKE2B dacd1cfb94ef799132eef7ee5d7f0c4d521b417529403ca81c4657074df5e61f52af0bd3baee5d53a8652f8e5456fb835ae9c11320a902b99cbb4eb97e7bf06e SHA512 b31a2e6cd77ae1117929f063f8b6cc7cd3a0167189fd3fd86d95254ea91bc6173414b7354af029d2671e08b6f62c9f0cefccc509ea89108fdb562fdf906096bf
-EBUILD spectrwm-3.4.1.ebuild 1128 BLAKE2B 8747ca9aba5e6a65d5b622729a3c1ac35f2b7c2e078bf34a43a43f5069a9bf78aa2b03b31c79b36319ed71d63cc7b6a62f43100cfe6462844b9c76544ab544c7 SHA512 de30080599900e14beb0d982ff237f8a45e37df764328a748afab6898a7528a456229c199cf3c5195a81d8a07c5700ffefdd249cdc58e81b854be04260b65757
+EBUILD spectrwm-3.4.1.ebuild 1166 BLAKE2B d1d4b36423904d895100af64cc518e6bf2f56388f19b55c77fda2d47aa0e5c8c969a8465ec9c391ff9c11b66acb6cf8f42a0a982876d4a951d2445d9caf9e6b9 SHA512 c105ab1e5b86a214647a447e0ac58721a0ae4cb669e332e449a9d3e77c99958cdcea2b9f788291ed9cbe8760fa68bce7cafeb3233640b4e03df5152d1353fa36
 MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784
diff --git a/x11-wm/spectrwm/files/spectrwm-3.4.1-musl.patch b/x11-wm/spectrwm/files/spectrwm-3.4.1-musl.patch
new file mode 100644
index 000000000000..79c05c8e78a4
--- /dev/null
+++ b/x11-wm/spectrwm/files/spectrwm-3.4.1-musl.patch
@@ -0,0 +1,9 @@
+diff -ur a/linux/linux.c b/linux/linux.c
+--- a/linux/linux.c	2020-09-03 07:25:24.937163198 -0500
++++ b/linux/linux.c	2020-09-03 07:25:35.470882700 -0500
+@@ -1,5 +1,4 @@
+ #include <sys/types.h>
+-#include <sys/cdefs.h>
+ 
+ #include <errno.h>
+ #include <errno.h>
diff --git a/x11-wm/spectrwm/spectrwm-3.4.1.ebuild b/x11-wm/spectrwm/spectrwm-3.4.1.ebuild
index 67195eaf70bb..d70a5915120a 100644
--- a/x11-wm/spectrwm/spectrwm-3.4.1.ebuild
+++ b/x11-wm/spectrwm/spectrwm-3.4.1.ebuild
@@ -26,6 +26,7 @@ DEPEND="
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.4.0-gentoo.patch
+	"${FILESDIR}"/${PN}-3.4.1-musl.patch
 )
 S=${WORKDIR}/${PN}-${PN^^}_${PV//./_}
 
diff --git a/x11-wm/treewm/Manifest b/x11-wm/treewm/Manifest
index 541ca3571592..09f5f84e7b19 100644
--- a/x11-wm/treewm/Manifest
+++ b/x11-wm/treewm/Manifest
@@ -1,4 +1,4 @@
 AUX treewm-0.4.5-gcc43.patch 568 BLAKE2B 481b948412109a7febbf97dbab7681b7ff33c3f603885755103cff663288b97925d8122ee3eb18ce2b0c448830c73b92db4162c02c992781f9ee07955e925de5 SHA512 db7bede71787693a561072ad2fd89a8a5a9c46918d4f98021d587ec447318adaf76235db189990597eba36db44f720b5ab486ee7b4aae529fb0a4fed26eeebc4
 DIST treewm-0.4.5.tar.bz2 87098 BLAKE2B 4ec890573aa32fafef99590f12b1e5491759ece65347339654844f077e9fdf794a96322d62066196eb3c50be271e8f16e842344a755411f3914a347b8cf2835e SHA512 96eb8eec11cec992daa4492b5a9243db5cc80b23d3827169d223d81b9ff289b62dbe6c8c3ea9da5da2e32435d98cc4552038c26e975cddec795de3b88f9db9cf
 EBUILD treewm-0.4.5-r2.ebuild 1583 BLAKE2B 9ea87f10c0b815c46c000791b3cbb673b60e8d3a1568d5be33e59d9d69df02d900800b1fa1350a1d21bc558c803bd9d925426c32fdb5decf829a58322bee7e7b SHA512 d83150b844b926dbf4c2531f1715facc401ef6abee1b5cc4d2c74f8cd2ff9b63b73d6d9ec738395ec68f4787bcfb7ed9d50deea23f7db89a80298d86edb11732
-MISC metadata.xml 436 BLAKE2B 666d6583ce2dc47607e4e99557a889d765cd2436131ccba2496e4ea00e9d288e943e4b8aeed2bf4645671baa6911b5063c41fc65511bd854c0dd008b9ba65ba3 SHA512 cde7c7c0dadb71cb58c15a2fa7efb031fda246d1464bebb476c4a02c64baf1f90a03198b82e1188ac83b36eb4778e21595335bce5af14beb1cf20de4b978b7e8
+MISC metadata.xml 338 BLAKE2B db33d5a3e022a7af0d178b9ec1af229ac92b35be140b391b4fee669918d9af2b105cd39da83b694273da26b53d5dbb81f18a8ffd41b073c2dfabbd71c43bf99e SHA512 ad0fb2fb8a63f50a8813cfa2ff5a890510316278dc498ec72913990152fde12441837031ce20b9ce52734a0f6ae7ff02bf3a72eae56bbe35500b98e639775d24
diff --git a/x11-wm/treewm/metadata.xml b/x11-wm/treewm/metadata.xml
index 37df03dd573f..9a9cd0e9e7f0 100644
--- a/x11-wm/treewm/metadata.xml
+++ b/x11-wm/treewm/metadata.xml
@@ -5,7 +5,6 @@
     <email>lordvan@gentoo.org</email>
     <name>Thomas Raschbacher</name>
   </maintainer>
-  <longdescription>WindowManager that arranges the windows in a tree not a list</longdescription>
   <upstream>
     <remote-id type="sourceforge">treewm</remote-id>
   </upstream>
diff --git a/x11-wm/xmonad-contrib/Manifest b/x11-wm/xmonad-contrib/Manifest
index b0a7f1c12a1d..ff11325ada63 100644
--- a/x11-wm/xmonad-contrib/Manifest
+++ b/x11-wm/xmonad-contrib/Manifest
@@ -1,3 +1,3 @@
 DIST xmonad-contrib-0.16.tar.gz 540237 BLAKE2B 7ddf8730481c39e9b5e40a548f3cbe36f301901656c57cc5ffdd11e05ad516019dc0b82c7dcf77665c152c390f7b7ae49c04ec6ae39347565b11a23aef23cce3 SHA512 22a18b4045cbfca0229cbf6c0bf1dfa595cbffbe6b82fd58b1fcf941cbfd306642160995b55859cead3cf574df696d2a3cea6507cac4d5c7c58cf09b3a86bc25
-EBUILD xmonad-contrib-0.16.ebuild 1129 BLAKE2B 13465d4c72818c72fe290942915da6913e96d9835b755139830e3bb1db039a4bae7f3f8a34cca1118232687d5595a853e7cb9a3a9f65470e0159181aa42a3dbb SHA512 51f21157803d431d9c681eeae7c2e5d27246caabf5464ea03b4a007201f148da6278c477bb9ff1aef3cc34f660b91b605f18ea3faa7d83ec528c3fd19eda398e
+EBUILD xmonad-contrib-0.16.ebuild 1130 BLAKE2B 1b213d6d84eb8a90eb3d74d1d349435d86aa282150cf2103f15abd1605d75a9347e3c86735be937f5850b874b712a3f58529bb720b89640f3ddef31437733da2 SHA512 7ba168951bb75a94c513342863fa8062c6111c555194e013aa400f4b9fb2932053d8d5ee1fdee74558da1baa21918da567471953710369e92f1ecd366f7ca44c
 MISC metadata.xml 708 BLAKE2B 0aae3704519ca0ffba4e25ae3236ebd02ecb6a9e7bef7d23a32107ad6e6826f09613dc6206fd1e350a8e3536061136cfdd463f7e2a80b16e7f38b30db14c4fc4 SHA512 570916b2bcf06efaeccb486d3161d0b751c675955abae7efc57d471961e2c1649075bc155e75849cd1b56c0a5917341f7ef2cbb12e81255787cfb282a6ea1fb7
diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-0.16.ebuild b/x11-wm/xmonad-contrib/xmonad-contrib-0.16.ebuild
index 5156c063509c..6f76b2aba064 100644
--- a/x11-wm/xmonad-contrib/xmonad-contrib-0.16.ebuild
+++ b/x11-wm/xmonad-contrib/xmonad-contrib-0.16.ebuild
@@ -10,7 +10,7 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="Third party extensions for xmonad"
-HOMEPAGE="http://xmonad.org/"
+HOMEPAGE="https://xmonad.org/"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"