gentoo resync : 30.05.2020

35 files changed, 1189 insertions, 37 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index ddeeab2cb01c..c3dfe01ff1ff 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
index ef532c51b58d..50a223076a5a 100644
--- a/x11-wm/enlightenment/Manifest
+++ b/x11-wm/enlightenment/Manifest
@@ -1,4 +1,6 @@
 AUX gentoo-sysactions.conf 3056 BLAKE2B 155b0826c544a5a4829214b4b43d49e2dad455d041f0afc7077dc44780d12bd1a99a1bc94bb5a4a9ba21f59f679e1d4c82609791ee5a5e9828543b1e9154fae5 SHA512 688f02cbff0d50a847eb08ca7832699b836adca9b22e15a780943a8e5a8213aac04b335cfdf3cb96adbff238f681ae8954a720153e8e35b2afaba3225d53206a
 DIST enlightenment-0.23.1.tar.xz 26426096 BLAKE2B d781dc951ad8eddd90f633b29a6b1180be63e6052a56e60644b4f738f4c0d42617aeb4f7326cf3284d0b331dd87d605fa0625ea6435f4e36b8f5b3ccce82ca53 SHA512 b5b8a34f6abe47d9b23dbcaf09d2f61f74b3f8d5a97b30a9666916b4bd307a45cb2ad874288419ab40ef06fa57c3b7dc15377dd9acaeb6eb71cd8c0c24fc42cb
+DIST enlightenment-0.24.0.tar.xz 28712348 BLAKE2B 97294beaf6456ca5512796fbfbff72207e2c57aad130f802b6a63c7a9a30e8bc6cd98ad6947a1f4edb8508a96ef135b66297827edfb63c4ea4330588677a9abc SHA512 7255ec5c2e85143df8d92e37456f5392feb3a264daa81ec6b10ae57886d714c524869392ddc753914f3a9c5fd71e1b2c5dd1d1e1f7a5a649fb6aaaed81214b95
 EBUILD enlightenment-0.23.1-r1.ebuild 2752 BLAKE2B 272b992ec94ae89c9105c547b23511acc46b58f20cca99e608b1dd0684d9666957ee07b9f97272291362912a3ab7dcad9a6fd84bdfcd829d97c8c0ab89d6e6f6 SHA512 2c04ceb74c05e55911b18867693930e66846754d97dbe93c5f650ed706609f37227ed57cafc9ba5b333216cfbd4b315c4d093792298039a43864ffeac9d632e3
+EBUILD enlightenment-0.24.0.ebuild 2757 BLAKE2B ee6d4c0606c7c2261283f2dca1e80e84153328f685aee5c6ad32e85c25a4f327c644744ba15b3e392990b0eb970a49716bb5c77b0d3ba6360f15c495da4b82fc SHA512 81bb49b5fad553a70d8502e5f8a96532c360035b1e57f640a2317b208b1fe276f12a05710a6014719f4133e8725fdacc49fba1850c38ff9155889eaf3199b728
 MISC metadata.xml 721 BLAKE2B 85587a677b7e22cd1dbfe187c367574ccef7ad88a1bdde00acecc9fc5f62d48adb9e14c2086953287efc728cc616d6d286fde1b659a44404086fef5e6bde90b1 SHA512 6d22a2f8639b3b75fd1113c0b381edc2869d91e5d3d04d6c67c845c15fae9ba0e370918e30b45e89e91c695f873f1d0ef5966f7720ab5e9cd270c6254c792dc5
diff --git a/x11-wm/enlightenment/enlightenment-0.24.0.ebuild b/x11-wm/enlightenment/enlightenment-0.24.0.ebuild
new file mode 100644
index 000000000000..bf3eeb20a1d2
--- /dev/null
+++ b/x11-wm/enlightenment/enlightenment-0.24.0.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils meson xdg-utils
+
+DESCRIPTION="Enlightenment window manager"
+HOMEPAGE="https://www.enlightenment.org"
+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"
+IUSE="acpi bluetooth connman doc geolocation nls pam policykit systemd udisks wayland wifi xwayland"
+
+REQUIRED_USE="xwayland? ( wayland )"
+
+RDEPEND=">=dev-libs/efl-1.24.1[eet,fontconfig,X]
+	virtual/udev
+	x11-libs/libXext
+	x11-libs/libxcb
+	x11-libs/xcb-util-keysyms
+	x11-misc/xkeyboard-config
+	acpi? ( sys-power/acpid )
+	bluetooth? ( net-wireless/bluez )
+	connman? ( dev-libs/efl[connman] )
+	geolocation? ( app-misc/geoclue:2.0 )
+	pam? ( sys-libs/pam )
+	policykit? ( sys-auth/polkit )
+	systemd? ( sys-apps/systemd )
+	udisks? ( sys-fs/udisks:2 )
+	wayland? (
+		>=dev-libs/efl-1.22.0[drm,wayland]
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+		x11-libs/pixman
+	)
+	xwayland? (
+		dev-libs/efl[X,wayland]
+		x11-base/xorg-server[wayland]
+	)"
+BDEPEND="virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local emesonargs=(
+		-D device-udev=true
+		-D install-enlightenment-menu=true
+
+		-D install-sysactions=true
+		-D install-system=true
+		-D mount-eeze=false
+
+		-D packagekit=false
+
+		$(meson_use udisks mount-udisks)
+		$(meson_use bluetooth bluez5)
+		$(meson_use connman)
+		$(meson_use geolocation)
+		$(meson_use nls)
+		$(meson_use pam)
+		$(meson_use policykit polkit)
+		$(meson_use systemd)
+		$(meson_use wayland wl)
+		$(meson_use wifi wireless)
+		$(meson_use xwayland)
+	)
+
+	if ! use wayland; then
+		emesonargs+=(
+			-D wl-buffer=false
+			-D wl-desktop-shell=false
+			-D wl-drm=false
+			-D wl-text-input=false
+			-D wl-weekeyboard=false
+			-D wl-wl=false
+			-D wl-x11=false
+		)
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( doc/. )
+	meson_src_install
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+
+	einfo "Additional programs to complete full EFL suite: "
+	optfeature "office file thumbnails" app-office/libreoffice app-office/libreoffice-bin
+	optfeature "an EFL-based IDE" dev-util/edi
+	optfeature "image viewer" media-gfx/ephoto
+	optfeature "ConnMan user interface for Enlightenment" net-misc/econnman
+	optfeature "system and process monitor" sys-process/evisum
+	optfeature "feature rich terminal emulator" x11-terms/terminology
+	optfeature "a modern flat enlightenment WM theme" x11-themes/e-flat-theme
+	optfeature "a matching GTK theme" x11-themes/e-gtk-theme
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index bd47466bebbc..77204d3d2543 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -11,6 +11,6 @@ EBUILD i3-4.15-r1.ebuild 2323 BLAKE2B cc8f7d2d4565bcf7c8ddea111223fb357326e9012e
 EBUILD i3-4.16-r1.ebuild 2318 BLAKE2B cf613187d4105fbb66ab77ccf1d7dc7d6aff2171e0509b7cc99e72b5b93353583847bb07f994c432bc33f0cb38b3448367c4cb8f063daf5cdb0eaf0803bd2455 SHA512 335cc3cea82d35055c322bef7cdd141ddd51ea96ccacd27bf2ac431dd03691047711d6679aa7b74cb529ffa732a3e337e7d3f6676d899ef453faf24416514227
 EBUILD i3-4.16.1-r1.ebuild 2328 BLAKE2B ad26677f4353183174614bfa92361f4752c5e9acb4c0a6bf7328a65e8e63e3ccdc4afc1b7fa83eda96144a9bed72d6a62edf74da41300aba4639cf75dfbd54d5 SHA512 8078b647012fa62baccd4536c5b6e6925adbef228fcd0f274786a45820a1dcfa01402c2b58b3cb0b684114cc57a1bf4e049ca0ccdc23d60dcd047e954f104943
 EBUILD i3-4.17.1-r1.ebuild 2327 BLAKE2B 8f307ab43874156d97b3db51ac68fef7ca58f3f2381c495d815326076c1368473974143f00f0909ef66b1efb6e0ff2fda4ccfd7161d336e4d80ae6f6f9da5be0 SHA512 9405eaafba8cac4c6918cdd8343f61c558f58460c2a8dcda2321b1ad38e7318f8a7f6a51d4a3afcc450dcdc9a139d8baf158179c9bf6165c421288e1dc99b1e9
-EBUILD i3-4.18.ebuild 2128 BLAKE2B 99d9309ce3cf1673708ebdc5830db5c67c467df78295963d19c920e26704510dfa694762f74b638ebeb4fc937e964409c8332e00e2f1da6af1316dfb629eec65 SHA512 cd8e635c5c60b4d1e8372e8bfe597bff93c5449154842ae5b9bc966900105ed948eae98f965cac20740870d5e092318cea0218a6ace8ad87c0f5cc04eff844fa
+EBUILD i3-4.18.ebuild 2127 BLAKE2B 76bf8b8a1b3f137aa42ef214db25e712b60c55be7d08caab0f7f4206e906a90ee2ab6b3cb37fc3652ae42e5681c86ec9332a034177f759ce4c18619545e976fa SHA512 172008449211f9344d6aff7cc8210b69edcbde3939c4b1c8d6e3ed296c60036d829d40de08da663c3a17d05d6bad5e4c525db3111af2f3369df9fe7f72a85518
 EBUILD i3-9999.ebuild 1817 BLAKE2B e812d4a04b34d2afb67da16370baace1a3d3376e2a15f73ff77aabbb8a061104f750abd84721266926bcd4d8f05b60d0014f38643c1a706e3ba5126ce68139f5 SHA512 0a31fd5d8ceeeda0c6f8fe06e595be9aa9f0aeca7547c9a8dc24cb2f6c0034255269d256cd88f265d77517da7df0cc8cd116b02404207cc4163df8e27132e086
 MISC metadata.xml 470 BLAKE2B 1c4fd7b44860934e88fb5165254fe0e8ca7e647c11af9af7d959f240e51002e6a454d9b93b30da8944891a1aa6a989f7a3e2a8af44ba41de174e78745393dd79 SHA512 52eddb56541d1172b04ca3ae646d01e52fb300dd62f5dfeaf2abe9d791965813e87b24a1477743797227bf8d407051f79076d54edb599524f89f3cfc716cc47e
diff --git a/x11-wm/i3/i3-4.18.ebuild b/x11-wm/i3/i3-4.18.ebuild
index d7064cfb971e..cce054536ce5 100644
--- a/x11-wm/i3/i3-4.18.ebuild
+++ b/x11-wm/i3/i3-4.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://i3wm.org/downloads/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="doc debug test"
 
 CDEPEND="dev-libs/libev
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index a9f9f108c6d4..a71559bd6ba4 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,8 +1,8 @@
 AUX icewm 33 BLAKE2B 5605658012ad8ed16bbd4cf0c4cb7cbe5204f73c20ef2c3d9fef1011a80b9e68863de64b45e4b043604b147c9d31f3f5d2617d067b694f5ec5329ad895472b0e SHA512 3fe619e59cc5d354242ccd85d3b1982dd7db6d0f6170f46f9d33975872f6d5a342a08d69db763162dc43681eedb96e9ba5075455bf54adf4fb86bf19887bf6e0
 DIST icewm-1.5.5.tar.xz 1707656 BLAKE2B 670ab4d1c1648faa24c848ddb04f3e353a3acd8e9a105837229d00ca344a61b3432d7b23b89dc054e220797cfd56d6504ad233d8793a3a5d95d9943c79017797 SHA512 5d75d33bf6e45ea0b46ace5173d825e9d1a12318cf7a5319b20ea704b019f6c09391f0f199b0fac678ba0f160d8236fc1cfee5d3b47d1895b7ba3721ff62a05e
-DIST icewm-1.6.4.tar.lz 1684348 BLAKE2B 63d2c609277f78ca438720c8f38108cf5b8f82361810773a79f42b161ccfb598f468cb6352ed3e1c7d523869ba6152be09e8f4ee008f300431dbe4fde4dc0325 SHA512 6a8c3b2e561c4471759b0566a4c5dc390f4abd6f266ab738a80a21445dffe9f45b24eca898507ff7c9b84ea12331262b81967b5a76be0b19e737842a66bcb000
 DIST icewm-1.6.5.tar.lz 1681783 BLAKE2B 3b89bfc3a02ff714c4eb5ec81b64dacabccefa39027cc05d0718ef6f4d1d77af503099a4c1e4735e3a4a3122899d7e5ef04c0be3fddcc442c89c8af830ee294a SHA512 7914031fa2df42ed337aa9c65c04f959746210c255dc799361b636042f1614949e1f9a3b9a2357fe39f469f2ed9a75d4c916c7b4c3e61c7b7ab6dc2cf9d3d9be
+DIST icewm-1.6.6.tar.lz 1684639 BLAKE2B 20daba42f19d86ceff6ce31c8df9cb1b9b09cc53d8933f70a9a8e750470c4f485e79f8de5e47ed503c83ac5433931c4ff98b10584566941e6a3bcf22d58e3dbf SHA512 6d9848924253fee5f57be488d2eb0b602767f168ce623b10c768a73197dfc6265daee7e70373d45ff5fae1c15b029d62c77ad13f0f631283bbf13aaaa9c6234d
 EBUILD icewm-1.5.5.ebuild 2340 BLAKE2B bc642a3517caf7db6396f0123cc23f266bccb75b4af0c62f0519c98fd0d5ed61f3cbee29b6c48c979986c16bad87eed0cfe64aadcc345ef40b82feec02d56f5b SHA512 fd19bd04c7fc3b475af8b3915563e37be1939aecadf08f89f0b69c0a566f7b9adef413a8c4f35b17302a71da72a972f1e034c6f509b306fb32e17a5bc3e5df81
-EBUILD icewm-1.6.4.ebuild 2674 BLAKE2B 527d266c70c5a81b2664778a828f6d73156e64a03da93d0b33499fe83f9b2036e75f19ac4f687b069f834d72d0ba8503f27692c5d9c7a4d39365433ed6fd64eb SHA512 7497f2c29f337623c803fbb30ca1df6b0019a3ca76b143d0b320ca7a923ccc84389895797a1bce5382c6d2671e3c27f7ad73a554320d8ef0495e270228f0980a
 EBUILD icewm-1.6.5.ebuild 2674 BLAKE2B 527d266c70c5a81b2664778a828f6d73156e64a03da93d0b33499fe83f9b2036e75f19ac4f687b069f834d72d0ba8503f27692c5d9c7a4d39365433ed6fd64eb SHA512 7497f2c29f337623c803fbb30ca1df6b0019a3ca76b143d0b320ca7a923ccc84389895797a1bce5382c6d2671e3c27f7ad73a554320d8ef0495e270228f0980a
+EBUILD icewm-1.6.6.ebuild 2674 BLAKE2B 527d266c70c5a81b2664778a828f6d73156e64a03da93d0b33499fe83f9b2036e75f19ac4f687b069f834d72d0ba8503f27692c5d9c7a4d39365433ed6fd64eb SHA512 7497f2c29f337623c803fbb30ca1df6b0019a3ca76b143d0b320ca7a923ccc84389895797a1bce5382c6d2671e3c27f7ad73a554320d8ef0495e270228f0980a
 MISC metadata.xml 747 BLAKE2B a986dc65f9b603519ef92fecc63cadd2921d6569e8735956a55ce91673426082e367664cce23c2b80cec19e0d997da357ac8f9d3d78c738ad92f42f6f426c225 SHA512 f9b84c60b780b5999c8a295b64bdf1bdb734108984e48f1271257cb35602df024a347560526de52f43ede16f67031551f4ae3f37401d3320e4dbdfb913e557fe
diff --git a/x11-wm/icewm/icewm-1.6.4.ebuild b/x11-wm/icewm/icewm-1.6.6.ebuild
index f3a5bab3c272..f3a5bab3c272 100644
--- a/x11-wm/icewm/icewm-1.6.4.ebuild
+++ b/x11-wm/icewm/icewm-1.6.6.ebuild
diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index c36339acc6dd..1aa367d4ea48 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -1,5 +1,9 @@
 AUX muffin-4.0-clutter-configure.patch 456 BLAKE2B f3f855dbc5fa8cdf85c87fc1ae2dc2d88c348bc9a53872d4f953a816c78a330a036a6e6f16a409f96e096654ea220a93d95b6f7ae57a9ed81f7b4d91280f6aff SHA512 168648d3ee94d3ebecf0b85fd943885af118c0939881a18ceaf7283b59ba34eedc1fbae735f4c589e671e1f0b60fbf94ac6e1009a92d2da2a26881cda40b2e5f
 AUX muffin-4.0-cogl-configure.patch 717 BLAKE2B bf55437c4a3c5b41fe4c9dc4bb0a7e58def0cc5263826f924dd6b35f19e0fc662b9b20c80dce97b92532ab3798b54cfa4cf1851c4d44e05a099bffa5f895b44e SHA512 f8902b5e777106008f5697b9384462633aa07d70ae66eb8a7ad9bc5f1c757a14aa614711614cdd4aec969120ceaf98bec07b91a42ecba4b696ebcf9f63dcba11
+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.0.3.tar.gz 5194156 BLAKE2B 8d58d37f8410ad5384c09a4edabd3ca5bd8a3a612825ded55bf625a9a8c2ba8aba295187e3eb727fc248716b3efe84e9a567a49f95635150c4bda5f309545ed2 SHA512 34a3f152d2701e06498f2de28639af656bd4efa6c7d5c56244fe9002cf769e929fc2360bd036509318fab9c4fe73c976605c3fdb444c9280f52e6db27867a14c
+DIST muffin-4.4.3.tar.gz 5194631 BLAKE2B 10221560daed72f776f6543b8d044442fe8f501ec42cc2f6ce15f0d00f26fe74d3dbe763145c48ecf18d0f821277753a71a607e8c705e6dc624c16d7f17b9785 SHA512 a11418f9ab6f6dee0f4df45f06ec6df5666490effec7468fd4c1e9cb6b537448f1aaf0fe743b208194488b86de0b269ffdc442ee677b45940761bbdfa4fafed3
 EBUILD muffin-4.0.3.ebuild 2026 BLAKE2B cc032e3a46a86e52a9b235a6df018cb50028987de9e91d40fa92fb240011eb322fa6b265dd4b79290874430d61bbcb9e0df1cb57b953557e6fd332debc4c2d90 SHA512 80d397c253b6ffe00b9420b99a650df2f6e77b1e150d083828e99b68ca8a88c8a0c30fa41ec81b3b80b04ac4e112a047c406e60ee219a79b673a5b915e3adc14
-MISC metadata.xml 333 BLAKE2B d29a873cc8702d8251ff425eca5ec16b4ea2a75f4e512c05513c3a6a61e38e0fde4450158503cdb2e71b324c86a7e66e03c1eecba8bff6a6be81244f040ceaad SHA512 42c7d8e82dd95e76e6b72973d53a0a27de2562108b5989092c34804140d336dcb20b331a4c70b1fcf6730ef5f377f366f480271597c63f7ce3e8f7aa8d359555
+EBUILD muffin-4.4.3.ebuild 2059 BLAKE2B 95ad8ac24d78556542cbdc537e7826184fcc169238b95d6fd78e7de280d984d13fe98c13f4bc889abf937945be6f1626e521109d54bd19d702d8ef2c3b972a01 SHA512 aec02f556eca9b4325c4177eb4ad12baca81c2b88c6ae8c1d80dd2c3f8e8e885c997f61e4e82d7c3bb2309f3df314c01afc972049a7d3c1ce0db81175a8ab5c0
+MISC metadata.xml 568 BLAKE2B 508383c07145ee7f1d2e24749a32499ac1786a26af8034eb87f0fd1ddcd0c4a27572fbeb8e4a288ad1122348162dbaa34063ec268e0b90aa56e1f2f9ee097067 SHA512 ae69e0756469ba11a738248b601489de534b54d5e7f5f6765f77be3fb4437ec7c42f85c5b8ae19d52cdc9a2cf664bffbe0d65ba7b90a49be48448e97606629db
diff --git a/x11-wm/muffin/files/muffin-4.4-gir-fixes.patch b/x11-wm/muffin/files/muffin-4.4-gir-fixes.patch
new file mode 100644
index 000000000000..46613194be15
--- /dev/null
+++ b/x11-wm/muffin/files/muffin-4.4-gir-fixes.patch
@@ -0,0 +1,65 @@
+From eaacd664855b03517a0406024b18eb9f5a597a9d Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Tue, 14 Jan 2020 12:12:13 -0500
+Subject: [PATCH] display.c: Remove meta_display_get_atom() - it is unused, and
+ breaks the build when g-ir-scanner (with gobject-introspection ~1.62)
+
+ref:
+https://gitlab.gnome.org/GNOME/mutter/commit/edeac1de09473809debc4d0b8c416f79dde8f500
+---
+ src/core/display.c | 14 --------------
+ src/meta/display.h |  9 ---------
+ 2 files changed, 23 deletions(-)
+
+diff --git a/src/core/display.c b/src/core/display.c
+index 6c186e87..6baf2cc2 100644
+--- a/src/core/display.c
++++ b/src/core/display.c
+@@ -5640,20 +5640,6 @@ meta_display_get_shape_event_base (MetaDisplay *display)
+ }
+ #endif
+ 
+-/**
+- * meta_display_get_atom: (skip)
+- *
+- * Gets up an X atom that Muffin prefetched at startup.
+- *
+- * Return value: the X atom corresponding to the given atom enumeration
+- */
+-Atom meta_display_get_atom (MetaDisplay *display, MetaAtom meta_atom)
+-{
+-  Atom *atoms = & display->atom_WM_PROTOCOLS;
+-
+-  return atoms[meta_atom - 1];
+-}
+-
+ /**
+  * meta_display_get_leader_window:
+  * @display: a #MetaDisplay
+diff --git a/src/meta/display.h b/src/meta/display.h
+index 3f82c32b..434296f1 100644
+--- a/src/meta/display.h
++++ b/src/meta/display.h
+@@ -56,14 +56,6 @@ GType meta_display_get_type (void) G_GNUC_CONST;
+ 
+ #define meta_XFree(p) do { if ((p)) XFree ((p)); } while (0)
+ 
+-typedef enum
+-{
+-  META_ATOM_FIRST = 0,
+-#define item(x) META_ATOM_##x,
+-#include "atomnames.h"
+-#undef item
+-}MetaAtom;
+-
+ typedef enum {
+   META_LIST_DEFAULT                   = 0,      /* normal windows */
+   META_LIST_INCLUDE_OVERRIDE_REDIRECT = 1 << 0, /* normal and O-R */
+@@ -90,7 +82,6 @@ gboolean  meta_display_xwindow_is_a_no_focus_window (MetaDisplay *display,
+ 
+ int meta_display_get_damage_event_base (MetaDisplay *display);
+ int meta_display_get_shape_event_base (MetaDisplay *display);
+-Atom meta_display_get_atom (MetaDisplay *display, MetaAtom meta_atom);
+ 
+ gboolean meta_display_xserver_time_is_before (MetaDisplay *display,
+                                               guint32      time1,
diff --git a/x11-wm/muffin/files/muffin-4.4-gobject-introspection-fixes.patch b/x11-wm/muffin/files/muffin-4.4-gobject-introspection-fixes.patch
new file mode 100644
index 000000000000..053319d5c42f
--- /dev/null
+++ b/x11-wm/muffin/files/muffin-4.4-gobject-introspection-fixes.patch
@@ -0,0 +1,529 @@
+From a452ec976f22b1ffba51e934f2d771d0680f6cca Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Tue, 14 Jan 2020 11:29:54 -0500
+Subject: [PATCH] muffin: Use glib for gettext
+
+This was also breaking the build under gobject-introspection ~1.62
+
+ref:
+https://gitlab.gnome.org/GNOME/mutter/commit/6ceddd626a20f5c3d92ddd9318338626f4be4a4d
+https://gitlab.gnome.org/GNOME/mutter/commit/5298a834efef5eeacaea24a9752468277782cb04
+---
+ ChangeLog                        |  2 +-
+ src/Makefile.am                  |  3 ++-
+ src/compositor/compositor.c      |  1 +
+ src/compositor/meta-background.c |  1 +
+ src/compositor/plugins/default.c |  8 +++----
+ src/core/core.c                  |  1 +
+ src/core/delete.c                |  2 +-
+ src/core/display.c               |  4 ++--
+ src/core/keybindings.c           |  2 +-
+ src/core/main.c                  |  2 +-
+ src/core/muffin.c                |  1 +
+ src/core/prefs.c                 |  2 +-
+ src/core/screen.c                |  2 +-
+ src/core/session.c               |  1 +
+ src/core/stack.c                 |  2 +-
+ src/core/util-private.h          | 36 ++++++++++++++++++++++++++++++++
+ src/core/util.c                  |  2 +-
+ src/core/window-props.c          |  1 +
+ src/core/window.c                |  2 +-
+ src/core/xprops.c                |  2 +-
+ src/meta/common.h                |  2 +-
+ src/meta/util.h                  |  5 -----
+ src/ui/frames.c                  | 24 ++++++++++-----------
+ src/ui/menu.c                    |  2 +-
+ src/ui/metaaccellabel.c          |  2 +-
+ src/ui/resizepopup.c             |  2 +-
+ src/ui/theme-parser.c            |  2 +-
+ src/ui/theme.c                   |  2 +-
+ 28 files changed, 77 insertions(+), 41 deletions(-)
+ create mode 100644 src/core/util-private.h
+
+diff --git a/ChangeLog b/ChangeLog
+index e68822de..7123e9cf 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -13015,7 +13015,7 @@ Mon Jun  3 15:12:11 2002  HideToshi Tajima  <hidetoshi.tajima@sun.com>
+ 
+         Patch from Erwann Chenede for raise_or_lower keybinding
+ 	
+-	* src/display.c, src/common.h: POINT_IN_RECT moved to a common
++	* src/display.c, src/common.h: META_POINT_IN_RECT moved to a common
+ 	location, removed from here
+ 	(meta_rectangle_intersect): move here and make it public
+ 
+diff --git a/src/Makefile.am b/src/Makefile.am
+index cbb5b3af..9cb3af14 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -142,6 +142,7 @@ libmuffin_la_SOURCES =				\
+ 	core/stack-tracker.h			\
+ 	core/util.c				\
+ 	meta/util.h				\
++	meta/util-private.h		\
+ 	core/window-props.c			\
+ 	core/window-props.h			\
+ 	core/window.c				\
+@@ -281,7 +282,7 @@ Meta-$(api_version).gir: libmuffin.la
+ 	muffin-enum-types.h			\
+ 	$(libmuffininclude_base_headers)	\
+ 	$(filter %.c,$(libmuffin_la_SOURCES))
+-@META_GIR@_SCANNERFLAGS = $(WARN_SCANNERFLAGS) --warn-all --warn-error
++@META_GIR@_SCANNERFLAGS = $(WARN_SCANNERFLAGS) --warn-all --warn-error --identifier-prefix=Meta
+ 
+ endif
+ 
+diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c
+index 0556f743..a8bc6db8 100644
+--- a/src/compositor/compositor.c
++++ b/src/compositor/compositor.c
+@@ -74,6 +74,7 @@
+ #include "meta-background-actor-private.h"
+ #include "window-private.h" /* to check window->hidden */
+ #include "display-private.h" /* for meta_display_lookup_x_window() */
++#include "util-private.h"
+ #include <X11/extensions/shape.h>
+ #include <X11/extensions/Xcomposite.h>
+ #include "meta-sync-ring.h"
+diff --git a/src/compositor/meta-background.c b/src/compositor/meta-background.c
+index 95917429..33bce084 100644
+--- a/src/compositor/meta-background.c
++++ b/src/compositor/meta-background.c
+@@ -28,6 +28,7 @@
+ #include <clutter/clutter.h>
+ #include "cogl-utils.h"
+ #include <meta/errors.h>
++// #include "util-private.h"
+ #include "meta-background-actor-private.h"
+ 
+ struct _MetaBackgroundPrivate
+diff --git a/src/compositor/plugins/default.c b/src/compositor/plugins/default.c
+index 1d223465..f69563bc 100644
+--- a/src/compositor/plugins/default.c
++++ b/src/compositor/plugins/default.c
+@@ -20,14 +20,12 @@
+  * Foundation, Inc., 51 Franklin Street - Suite 500, Boston, MA
+  * 02110-1335, USA.
+  */
+-
++#include <config.h>
+ #include <meta/meta-plugin.h>
+ #include <meta/window.h>
+ 
+-#include <libintl.h>
+-#define _(x) dgettext (GETTEXT_PACKAGE, x)
+-#define N_(x) x
+-
++#include <meta/util.h>
++#include <glib/gi18n-lib.h>
+ #include <clutter/clutter.h>
+ #include <gmodule.h>
+ #include <string.h>
+diff --git a/src/core/core.c b/src/core/core.c
+index 43962825..77228aac 100644
+--- a/src/core/core.c
++++ b/src/core/core.c
+@@ -29,6 +29,7 @@
+ #include "workspace-private.h"
+ #include <meta/prefs.h>
+ #include <meta/errors.h>
++#include "util-private.h"
+ 
+ /* Looks up the MetaWindow representing the frame of the given X window.
+  * Used as a helper function by a bunch of the functions below.
+diff --git a/src/core/delete.c b/src/core/delete.c
+index 5c1e4bb6..5ef767c2 100644
+--- a/src/core/delete.c
++++ b/src/core/delete.c
+@@ -25,7 +25,7 @@
+ #define _XOPEN_SOURCE /* for kill() */
+ 
+ #include <config.h>
+-#include <meta/util.h>
++#include "util-private.h"
+ #include "window-private.h"
+ #include <meta/errors.h>
+ #include <meta/workspace.h>
+diff --git a/src/core/display.c b/src/core/display.c
+index 691a8ed1..6c186e87 100644
+--- a/src/core/display.c
++++ b/src/core/display.c
+@@ -1568,8 +1568,8 @@ window_raise_with_delay_callback (void *data)
+       meta_error_trap_pop (window->display);
+ 
+       point_in_window =
+-        (window->frame && POINT_IN_RECT (root_x, root_y, window->frame->rect)) ||
+-        (window->frame == NULL && POINT_IN_RECT (root_x, root_y, window->rect));
++        (window->frame && META_POINT_IN_RECT (root_x, root_y, window->frame->rect)) ||
++        (window->frame == NULL && META_POINT_IN_RECT (root_x, root_y, window->rect));
+       if (same_screen && point_in_window)
+ 	meta_window_raise (window);
+ #ifdef WITH_VERBOSE_MODE
+diff --git a/src/core/keybindings.c b/src/core/keybindings.c
+index 6b1c1cdf..50658880 100644
+--- a/src/core/keybindings.c
++++ b/src/core/keybindings.c
+@@ -44,7 +44,7 @@
+ #include "frame.h"
+ #include "place.h"
+ #include <meta/prefs.h>
+-#include <meta/util.h>
++#include "util-private.h"
+ 
+ #include <X11/keysym.h>
+ #include <string.h>
+diff --git a/src/core/main.c b/src/core/main.c
+index 71c78526..a16bee1e 100644
+--- a/src/core/main.c
++++ b/src/core/main.c
+@@ -49,7 +49,7 @@
+ 
+ #include <config.h>
+ #include <meta/main.h>
+-#include <meta/util.h>
++#include "util-private.h"
+ #include "display-private.h"
+ #include <meta/errors.h>
+ #include "ui.h"
+diff --git a/src/core/muffin.c b/src/core/muffin.c
+index 26d98f02..8665797a 100644
+--- a/src/core/muffin.c
++++ b/src/core/muffin.c
+@@ -26,6 +26,7 @@
+ #include <meta/main.h>
+ #include <meta/util.h>
+ #include "meta-plugin-manager.h"
++#include <glib/gi18n-lib.h>
+ 
+ #include <glib.h>
+ 
+diff --git a/src/core/prefs.c b/src/core/prefs.c
+index d146902d..d92826a1 100644
+--- a/src/core/prefs.c
++++ b/src/core/prefs.c
+@@ -33,7 +33,7 @@
+ #include <config.h>
+ #include <meta/prefs.h>
+ #include "ui.h"
+-#include <meta/util.h>
++#include "util-private.h"
+ #include "meta-plugin-manager.h"
+ #include <glib.h>
+ #include <gio/gio.h>
+diff --git a/src/core/screen.c b/src/core/screen.c
+index 8ba26a06..cdcbcab9 100644
+--- a/src/core/screen.c
++++ b/src/core/screen.c
+@@ -33,7 +33,7 @@
+ #include <config.h>
+ #include "screen-private.h"
+ #include <meta/main.h>
+-#include <meta/util.h>
++#include "util-private.h"
+ #include <meta/errors.h>
+ #include "window-private.h"
+ #include "frame.h"
+diff --git a/src/core/session.c b/src/core/session.c
+index 8e0ded3a..f45e1a63 100644
+--- a/src/core/session.c
++++ b/src/core/session.c
+@@ -25,6 +25,7 @@
+ 
+ #include <config.h>
+ 
++#include "util-private.h"
+ #include "session.h"
+ #include <X11/Xatom.h>
+ 
+diff --git a/src/core/stack.c b/src/core/stack.c
+index 7404a59e..49ff24b4 100644
+--- a/src/core/stack.c
++++ b/src/core/stack.c
+@@ -1424,7 +1424,7 @@ window_contains_point (MetaWindow *window,
+ 
+   meta_window_get_outer_rect (window, &rect);
+ 
+-  return POINT_IN_RECT (root_x, root_y, rect);
++  return META_POINT_IN_RECT (root_x, root_y, rect);
+ }
+ 
+ static MetaWindow*
+diff --git a/src/core/util-private.h b/src/core/util-private.h
+new file mode 100644
+index 00000000..8e51b42f
+--- /dev/null
++++ b/src/core/util-private.h
+@@ -0,0 +1,36 @@
++/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
++
++/* Mutter utilities */
++
++/* 
++ * Copyright (C) 2001 Havoc Pennington
++ * Copyright (C) 2005 Elijah Newren
++ * 
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of the
++ * License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ * 
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++ * 02111-1307, USA.
++ */
++
++#ifndef META_UTIL_PRIVATE_H
++#define META_UTIL_PRIVATE_H
++
++#include <meta/util.h>
++#include <glib/gi18n-lib.h>
++
++void     meta_set_verbose (gboolean setting);
++void     meta_set_debugging (gboolean setting);
++void     meta_set_syncing (gboolean setting);
++void     meta_set_replace_current_wm (gboolean setting);
++
++#endif
+diff --git a/src/core/util.c b/src/core/util.c
+index c1d84520..896c7195 100644
+--- a/src/core/util.c
++++ b/src/core/util.c
+@@ -35,7 +35,7 @@
+ 
+ #include <config.h>
+ #include <meta/common.h>
+-#include <meta/util.h>
++#include "util-private.h"
+ #include <meta/main.h>
+ 
+ #include <clutter/clutter.h> /* For clutter_threads_add_repaint_func() */
+diff --git a/src/core/window-props.c b/src/core/window-props.c
+index 911b9a10..e5306838 100644
+--- a/src/core/window-props.c
++++ b/src/core/window-props.c
+@@ -50,6 +50,7 @@
+ #include <X11/Xatom.h>
+ #include <unistd.h>
+ #include <string.h>
++#include "util-private.h"
+ #ifndef HOST_NAME_MAX
+ /* Solaris headers apparently don't define this so do so manually; #326745 */
+ #define HOST_NAME_MAX 255
+diff --git a/src/core/window.c b/src/core/window.c
+index 500eaac0..1a080887 100644
+--- a/src/core/window.c
++++ b/src/core/window.c
+@@ -32,7 +32,7 @@
+ #include "window-private.h"
+ #include "boxes-private.h"
+ #include "edge-resistance.h"
+-#include <meta/util.h>
++#include "util-private.h"
+ #include "frame.h"
+ #include <meta/errors.h>
+ #include "workspace-private.h"
+diff --git a/src/core/xprops.c b/src/core/xprops.c
+index 01df70a6..bcf11f21 100644
+--- a/src/core/xprops.c
++++ b/src/core/xprops.c
+@@ -83,7 +83,7 @@ from The Open Group.
+ #include <config.h>
+ #include "xprops.h"
+ #include <meta/errors.h>
+-#include <meta/util.h>
++#include "util-private.h"
+ #include "async-getprop.h"
+ #include "ui.h"
+ #include "muffin-Xatomtype.h"
+diff --git a/src/meta/common.h b/src/meta/common.h
+index 46bf3461..55426589 100644
+--- a/src/meta/common.h
++++ b/src/meta/common.h
+@@ -398,7 +398,7 @@ void meta_frame_borders_clear (MetaFrameBorders *self);
+ 
+ /************************************************************/
+ 
+-#define POINT_IN_RECT(xcoord, ycoord, rect) \
++#define META_POINT_IN_RECT(xcoord, ycoord, rect) \
+  ((xcoord) >= (rect).x &&                   \
+   (xcoord) <  ((rect).x + (rect).width) &&  \
+   (ycoord) >= (rect).y &&                   \
+diff --git a/src/meta/util.h b/src/meta/util.h
+index cce79ed5..ea10f16a 100644
+--- a/src/meta/util.h
++++ b/src/meta/util.h
+@@ -31,12 +31,8 @@
+ #include <meta/common.h>
+ 
+ gboolean meta_is_verbose  (void);
+-void     meta_set_verbose (gboolean setting);
+ gboolean meta_is_debugging (void);
+-void     meta_set_debugging (gboolean setting);
+ gboolean meta_is_syncing (void);
+-void     meta_set_syncing (gboolean setting);
+-void     meta_set_replace_current_wm (gboolean setting);
+ 
+ void meta_debug_spew_real (const char *format,
+                            ...) G_GNUC_PRINTF (1, 2);
+@@ -97,7 +93,6 @@ const char* meta_gravity_to_string (int gravity);
+ 
+ #include <libintl.h>
+ #define _(x) dgettext (GETTEXT_PACKAGE, x)
+-#define N_(x) x
+ 
+ char* meta_g_utf8_strndup (const gchar *src, gsize n);
+ 
+diff --git a/src/ui/frames.c b/src/ui/frames.c
+index c1ae7a1d..be075134 100644
+--- a/src/ui/frames.c
++++ b/src/ui/frames.c
+@@ -2495,16 +2495,16 @@ get_control (MetaFrames *frames,
+   meta_frames_calc_geometry (frames, frame, &fgeom);
+   get_client_rect (&fgeom, fgeom.width, fgeom.height, &client);
+ 
+-  if (POINT_IN_RECT (x, y, client))
++  if (META_POINT_IN_RECT (x, y, client))
+     return META_FRAME_CONTROL_CLIENT_AREA;
+   
+-  if (POINT_IN_RECT (x, y, fgeom.close_rect.clickable))
++  if (META_POINT_IN_RECT (x, y, fgeom.close_rect.clickable))
+     return META_FRAME_CONTROL_DELETE;
+ 
+-  if (POINT_IN_RECT (x, y, fgeom.min_rect.clickable))
++  if (META_POINT_IN_RECT (x, y, fgeom.min_rect.clickable))
+     return META_FRAME_CONTROL_MINIMIZE;
+ 
+-  if (POINT_IN_RECT (x, y, fgeom.menu_rect.clickable))
++  if (META_POINT_IN_RECT (x, y, fgeom.menu_rect.clickable))
+     return META_FRAME_CONTROL_MENU;
+ 
+   meta_core_get (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
+@@ -2521,7 +2521,7 @@ get_control (MetaFrames *frames,
+   has_right = (flags & META_FRAME_ALLOWS_RIGHT_RESIZE) != 0;
+   has_bottom = (flags & META_FRAME_ALLOWS_BOTTOM_RESIZE) != 0;
+ 
+-  if (POINT_IN_RECT (x, y, fgeom.title_rect))
++  if (META_POINT_IN_RECT (x, y, fgeom.title_rect))
+     {
+       if (has_vert && y <= TOP_RESIZE_HEIGHT && has_north_resize)
+         return META_FRAME_CONTROL_RESIZE_N;
+@@ -2529,7 +2529,7 @@ get_control (MetaFrames *frames,
+         return META_FRAME_CONTROL_TITLE;
+     }
+ 
+-  if (POINT_IN_RECT (x, y, fgeom.max_rect.clickable))
++  if (META_POINT_IN_RECT (x, y, fgeom.max_rect.clickable))
+     {
+       if (flags & META_FRAME_MAXIMIZED &&
+           (META_WINDOW_TILED_TOP (window) ||
+@@ -2542,32 +2542,32 @@ get_control (MetaFrames *frames,
+         return META_FRAME_CONTROL_MAXIMIZE;
+     }
+       
+-  if (POINT_IN_RECT (x, y, fgeom.shade_rect.clickable))
++  if (META_POINT_IN_RECT (x, y, fgeom.shade_rect.clickable))
+     {
+       return META_FRAME_CONTROL_SHADE;
+     }
+ 
+-  if (POINT_IN_RECT (x, y, fgeom.unshade_rect.clickable))
++  if (META_POINT_IN_RECT (x, y, fgeom.unshade_rect.clickable))
+     {
+       return META_FRAME_CONTROL_UNSHADE;
+     }
+ 
+-  if (POINT_IN_RECT (x, y, fgeom.above_rect.clickable))
++  if (META_POINT_IN_RECT (x, y, fgeom.above_rect.clickable))
+     {
+       return META_FRAME_CONTROL_ABOVE;
+     }
+ 
+-  if (POINT_IN_RECT (x, y, fgeom.unabove_rect.clickable))
++  if (META_POINT_IN_RECT (x, y, fgeom.unabove_rect.clickable))
+     {
+       return META_FRAME_CONTROL_UNABOVE;
+     }
+ 
+-  if (POINT_IN_RECT (x, y, fgeom.stick_rect.clickable))
++  if (META_POINT_IN_RECT (x, y, fgeom.stick_rect.clickable))
+     {
+       return META_FRAME_CONTROL_STICK;
+     }
+ 
+-  if (POINT_IN_RECT (x, y, fgeom.unstick_rect.clickable))
++  if (META_POINT_IN_RECT (x, y, fgeom.unstick_rect.clickable))
+     {
+       return META_FRAME_CONTROL_UNSTICK;
+     }
+diff --git a/src/ui/menu.c b/src/ui/menu.c
+index c0b94a1e..5d1155e7 100644
+--- a/src/ui/menu.c
++++ b/src/ui/menu.c
+@@ -28,7 +28,7 @@
+ #include <string.h>
+ #include "menu.h"
+ #include <meta/main.h>
+-#include <meta/util.h>
++#include "util-private.h"
+ #include "core.h"
+ #include "metaaccellabel.h"
+ #include "ui.h"
+diff --git a/src/ui/metaaccellabel.c b/src/ui/metaaccellabel.c
+index fd5c6e6c..097b45b4 100644
+--- a/src/ui/metaaccellabel.c
++++ b/src/ui/metaaccellabel.c
+@@ -35,7 +35,7 @@
+ #include "metaaccellabel.h"
+ #include <gtk/gtk.h>
+ #include <string.h>
+-#include <meta/util.h>
++#include "util-private.h"
+ 
+ static void     meta_accel_label_destroy      (GtkWidget           *object);
+ static void     meta_accel_label_finalize     (GObject             *object);
+diff --git a/src/ui/resizepopup.c b/src/ui/resizepopup.c
+index 18c395d2..56742fd7 100644
+--- a/src/ui/resizepopup.c
++++ b/src/ui/resizepopup.c
+@@ -23,7 +23,7 @@
+ 
+ #include <config.h>
+ #include "resizepopup.h"
+-#include <meta/util.h>
++#include "util-private.h"
+ #include <gtk/gtk.h>
+ #include <gdk/gdkx.h>
+ 
+diff --git a/src/ui/theme-parser.c b/src/ui/theme-parser.c
+index 0151f362..628bf73e 100644
+--- a/src/ui/theme-parser.c
++++ b/src/ui/theme-parser.c
+@@ -23,7 +23,7 @@
+ 
+ #include <config.h>
+ #include "theme-private.h"
+-#include <meta/util.h>
++#include "util-private.h"
+ #include <meta/prefs.h>
+ #include <string.h>
+ #include <stdlib.h>
+diff --git a/src/ui/theme.c b/src/ui/theme.c
+index cb717bbb..99ea519c 100644
+--- a/src/ui/theme.c
++++ b/src/ui/theme.c
+@@ -55,7 +55,7 @@
+ 
+ #include <config.h>
+ #include "theme-private.h"
+-#include <meta/util.h>
++#include "util-private.h"
+ #include <meta/gradient.h>
+ #include <meta/prefs.h>
+ #include <gtk/gtk.h>
diff --git a/x11-wm/muffin/metadata.xml b/x11-wm/muffin/metadata.xml
index 7b5976166a10..34a28b9277af 100644
--- a/x11-wm/muffin/metadata.xml
+++ b/x11-wm/muffin/metadata.xml
@@ -5,6 +5,14 @@
 		<email>cinnamon@gentoo.org</email>
 		<name>Cinnamon Project</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
new file mode 100644
index 000000000000..f8d8c2d3a9c7
--- /dev/null
+++ b/x11-wm/muffin/muffin-4.4.3.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils gnome2
+
+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"
+
+COMMON_DEPEND="
+	>=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]
+	>=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
+	virtual/opengl
+
+	gnome-extra/zenity
+
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+	xinerama? ( x11-libs/libXinerama )
+"
+# needs gtk-doc, not just -am, for gtk-doc.make
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	>=app-text/gnome-doc-utils-0.8
+	sys-devel/gettext
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	test? ( app-text/docbook-xml-dtd:4.5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!x11-misc/expocity
+"
+
+src_prepare() {
+	# Fixes from 4.6.0.
+	eapply "${FILESDIR}"/muffin-4.4-{gobject-introspection,gir}-fixes.patch
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+# Wayland is not supported upstream. Disabled by default in 4.6.0.
+src_configure() {
+	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* *.txt doc/*.txt"
+	gnome2_src_configure \
+		--disable-static \
+		--disable-wayland-egl-server \
+		--enable-shape \
+		--enable-sm \
+		--enable-startup-notification \
+		--enable-xsync \
+		--enable-verbose-mode \
+		--with-libcanberra \
+		$(use_enable introspection) \
+		$(use_enable xinerama)
+}
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index ac673277a42b..dd8043c02160 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,6 +1,8 @@
 AUX 3.32-eglmesaext-include.patch 2078 BLAKE2B cea9ba1a8d2749eb3590dd17a598aace69ad96897cbc5a6c1061c4041a8fe3809ff9f5bcc99cbdc33611a3a3319cda20f74f88434e71f03f2a1cac108185f3fb SHA512 23296f0e0b6ffd4610be3f0c6e1d524d15a5d259c5607a7ded4a8c39846f555dee92e5a8bb9c766211b758f8bc7483715a9640718bb9b7daa42905d802b2ee71
+AUX 3.34.6-XInitThreads.patch 1625 BLAKE2B 5b9ff02d96643105d0b865da0821ed6d4a849c8a42d5787c0eadbee4f7943ba5028471bb8424b87ee716d7ae9581b29f6f219c65371a6307da8eb04e0a5a94a2 SHA512 b223845da63ddbba5eaffa9b2a85e1cdaaee9126707d10c902814d35596857fca733ac290b86648ec506cc7bea2432b95ed5c5ea18dd598e539fcd0670620065
 DIST mutter-3.34.5.tar.xz 2804640 BLAKE2B b73a34f4e064b74b321b7ac54749170663c10874a82c0e4f6b20b1f9d97662af0ba188e5ac13a187117765b8aee820fc7367dfbeecc26002942151e77433012c SHA512 4199cf66e6551ebf80b9d2217e3164b1de30b055c58a64bc2d88961aad3a35c137174f6aea96f0250fa3efb2bf4676aa409fefb1a9237bbc7acf438aeed2e78a
 DIST mutter-3.34.6.tar.xz 2805328 BLAKE2B bba0e062ab81f8e88e7e59b6dbf51226b6e2d43932c7d61aca5a3e709119f909e30acea67a5444c95205ddf929a1f5bf7785eec7aed4f2da743c19543aa79962 SHA512 dd240fdcfc8ba0c62c0ff423a40ec6e0007d154f0be39e18cea543da7ff548e10a9b712f9b2cc09c58ad342b1e7eb50fb2a8790c55d284846bb6f1a76f8c6d6b
 EBUILD mutter-3.34.5.ebuild 4566 BLAKE2B a4550c12085dd8dedbe1d3652ab06475adee962d6006ded1506ff491773dacec9c50e1568e851418d2a95dbbcfbc104b50c771b1c2075190eab57c52f4fc473b SHA512 f5c4f35cbce4916d564e15d11a1a420c87cc695d24046d808e499916f01170709a546594e0ab1da2447ab1165d9bce287608644a24486897febe16135d781fda
+EBUILD mutter-3.34.6-r1.ebuild 4608 BLAKE2B 58efbebcb5ac65a7322a4e8a937dffd81cab1e990107098a5513c9208860990f68a1bee76391a874e15bc83f1bd407fddf79e1cd1df9f78de9cbb53525ae649e SHA512 409eaed8766d29cb8ba588eaaf1faf9c904a3548f68516606319a2365d88766ebf31466a9176868b994c89fb17447d632e2e37b6b0065e473aca60f6fd17be89
 EBUILD mutter-3.34.6.ebuild 4568 BLAKE2B d8cf3267696b61193efbe0189e45bf2c5e96e5d6f44e727c630a19b4b33b6796a23596b51171cb8bdbe40879d05a73f66a1438c828067086e279bc87a01e560c SHA512 b47cc0637b4a59e7a680dace7f3ca95b32c6ef9b903cfffcd34395dca037f88b859ac2905fb97d4ca6e91e4277d035d781cd257d471ccc9b25dfb9d71af15bf6
 MISC metadata.xml 605 BLAKE2B 5dc68fbf8b85c2bf75ea435abe116a9ed7072ec40a45bda28de9cb277a03e5c363487f1c3aa5c60cab5f710e06f15d966790684cac1573676af635e59b3cdfbd SHA512 440e7a33404e218da15c127614d843edcd42c469aced4609c2e7d7d8ec1281c9eceb64aebe406a75e9ba0a05b6be18bbb721257e140f6d334aff6143b1233fb8
diff --git a/x11-wm/mutter/files/3.34.6-XInitThreads.patch b/x11-wm/mutter/files/3.34.6-XInitThreads.patch
new file mode 100644
index 000000000000..f53f6ba93970
--- /dev/null
+++ b/x11-wm/mutter/files/3.34.6-XInitThreads.patch
@@ -0,0 +1,50 @@
+From 8b3f1117be1e90866747fa9c9e7ae1c5812ba918 Mon Sep 17 00:00:00 2001
+From: Daniel van Vugt <daniel.van.vugt@canonical.com>
+Date: Thu, 14 May 2020 18:13:56 +0800
+Subject: [PATCH] backend-x11: Reintroduce XInitThreads
+
+It was removed in 3.34 as part of 6ed5d2e2. And we thought that was the
+only thread that might exist and use X11. But the top gnome-shell crasher
+in 3.36 seems to suggest otherwise.
+
+We don't know what or where the offending thread is, but since:
+
+ 1. We used XInitThreads for years already prior to 3.34; and
+
+ 2. Extensions or any change to mutter/gnome-shell could conceivably use
+    threads to make X calls, directly or indirectly,
+
+it's probably a good idea to reintroduce XInitThreads. The failing assertion
+in libx11 is also accompanied by a strong hint:
+
+```
+fprintf(stderr, "[xcb] Most likely this is a multi-threaded client " \
+                "and XInitThreads has not been called\n");
+```
+
+https://bugs.launchpad.net/bugs/1877075
+
+Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/1252
+
+https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1256
+
+(cherry picked from commit 1d5f9b6917517d6e777a652cfa5e648794dc632a)
+---
+ src/backends/x11/meta-backend-x11.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/backends/x11/meta-backend-x11.c b/src/backends/x11/meta-backend-x11.c
+index 225d14d33..539ca5348 100644
+--- a/src/backends/x11/meta-backend-x11.c
++++ b/src/backends/x11/meta-backend-x11.c
+@@ -859,6 +859,7 @@ meta_backend_x11_class_init (MetaBackendX11Class *klass)
+ static void
+ meta_backend_x11_init (MetaBackendX11 *x11)
+ {
++  XInitThreads ();
+ }
+ 
+ Display *
+-- 
+2.20.1
+
diff --git a/x11-wm/mutter/mutter-3.34.6-r1.ebuild b/x11-wm/mutter/mutter-3.34.6-r1.ebuild
new file mode 100644
index 000000000000..722e7bb3d139
--- /dev/null
+++ b/x11-wm/mutter/mutter-3.34.6-r1.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson virtualx xdg
+
+DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
+
+LICENSE="GPL-2+"
+SLOT="0/5" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
+
+IUSE="elogind input_devices_wacom +introspection screencast +sysprof systemd test udev wayland"
+# native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider
+REQUIRED_USE="
+	wayland? ( ^^ ( elogind systemd ) udev )
+	test? ( wayland )"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema
+# xorg-server is needed at build and runtime with USE=wayland for Xwayland
+# v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order
+DEPEND="
+	x11-libs/libX11
+	>=x11-libs/gtk+-3.19.8:3[X,introspection?]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/pango-1.30[introspection?]
+	>=dev-libs/fribidi-1.0.0
+	>=x11-libs/cairo-1.14[X]
+	>=gnome-base/gsettings-desktop-schemas-3.33.0[introspection?]
+	>=dev-libs/glib-2.61.1:2
+	gnome-base/gnome-settings-daemon
+	>=dev-libs/json-glib-0.12.0[introspection?]
+	gnome-base/gnome-desktop:3=
+	>=x11-libs/libXcomposite-0.4
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	>=x11-libs/libXfixes-3
+	>=x11-libs/libXi-1.7.4
+	x11-libs/libXtst
+	x11-libs/libxkbfile
+	x11-misc/xkeyboard-config
+	>=x11-libs/libxkbcommon-0.4.3[X]
+	x11-libs/libXrender
+	>=x11-libs/libXrandr-1.5.0
+	x11-libs/libxcb
+	x11-libs/libXinerama
+	x11-libs/libXau
+	x11-libs/libICE
+	>=dev-libs/atk-2.5.3[introspection?]
+	>=media-libs/libcanberra-0.26
+	media-libs/mesa[X(+),egl]
+	wayland? (
+		>=dev-libs/wayland-protocols-1.18
+		>=dev-libs/wayland-1.13.0
+		x11-libs/libdrm:=
+		>=media-libs/mesa-10.3[egl,gbm,wayland,gles2]
+		>=dev-libs/libinput-1.4
+		systemd? ( sys-apps/systemd )
+		elogind? ( sys-auth/elogind )
+		x11-base/xorg-server[wayland]
+	)
+	udev? ( >=dev-libs/libgudev-232:=
+		>=virtual/libudev-232-r1:= )
+	x11-libs/libSM
+	input_devices_wacom? ( >=dev-libs/libwacom-0.13 )
+	>=x11-libs/startup-notification-0.7
+	screencast? ( >=media-video/pipewire-0.2.2:0/0.2 )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}
+	gnome-extra/zenity
+"
+DEPEND="${DEPEND}
+	x11-base/xorg-proto
+	sysprof? ( >=dev-util/sysprof-capture-3.34.1-r1:3 )
+"
+# wayland bdepend for wayland-scanner, xorg-server for cvt utility
+BDEPEND="
+	dev-libs/wayland
+	>=dev-util/meson-0.50.0
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( app-text/docbook-xml-dtd:4.5 )
+	wayland? ( >=sys-kernel/linux-headers-4.4
+		x11-base/xorg-server )
+"
+
+PATCHES=(
+	"${FILESDIR}"/3.32-eglmesaext-include.patch
+	"${FILESDIR}"/${PV}-XInitThreads.patch
+)
+
+src_configure() {
+	# TODO: Replicate debug vs release meson build type behaviour under our buildtype=plain
+	local emesonargs=(
+		-Dopengl=true
+		#opengl_libname
+		#gles2_libname
+		$(meson_use wayland gles2)
+		-Degl=true
+		-Dglx=true
+		$(meson_use wayland)
+		$(meson_use wayland native_backend)
+		$(meson_use screencast remote_desktop)
+		-Degl_device=false # This should be dependent on wayland,video_drivers_nvidia, once eglstream support is there
+		-Dwayland_eglstream=false # requires packages egl-wayland for wayland-eglstream-protocols.pc
+		$(meson_use udev)
+		$(meson_use input_devices_wacom libwacom)
+		-Dpango_ft2=true
+		-Dstartup_notification=true
+		-Dsm=true
+		$(meson_use introspection)
+		$(meson_use test cogl_tests)
+		$(meson_use wayland core_tests) # core tests require wayland; overall -Dtests option is honored on top, so no extra conditional needed
+		$(meson_use test clutter_tests)
+		$(meson_use test tests)
+		$(meson_use sysprof profiler)
+		-Dinstalled_tests=false
+		#verbose # Let upstream choose default for verbose mode
+		#xwayland_path
+		# TODO: relies on default settings, but in Gentoo we might have some more packages we want to give Xgrab access (mostly virtual managers and remote desktops)
+		#xwayland_grab_default_access_rules
+	)
+	meson_src_configure
+}
+
+src_test() {
+	glib-compile-schemas "${BUILD_DIR}"/data
+	GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/x11-wm/openbox/Manifest b/x11-wm/openbox/Manifest
index 255310bb52c3..41101e863b37 100644
--- a/x11-wm/openbox/Manifest
+++ b/x11-wm/openbox/Manifest
@@ -2,7 +2,7 @@ AUX openbox-3.5.2-gnome-session.patch 574 BLAKE2B 64d1d141245172140c16e7d4bee919
 AUX openbox-3.6.1-py3-xdg.patch 4702 BLAKE2B 52e8f35626bf71a10327efe99d518994aece46561f4cb4d26d71412f8f5e1528efbd17c48b38a902053b6d3eefbaa9b79f79c06783d669b0c76cbdf256300463 SHA512 7079cf38a79e2fe7e35c07a5600de8a4678961239d3990596378239f064522204ca40522861f1d403d6e621bca92ca14b06873645ba60fda2c86a4132a9aa16a
 DIST openbox-3.6.1.tar.gz 962665 BLAKE2B 1c0288137d7b02d443c384f970cd9a3f4d5d5585989917ac6ae8cf492e045dc086650c245907e168bc7b6d0ce701339854a5d94ad510823141cc78e28c1e13c5 SHA512 5e6f4a214005bea8b26bc8959fe5bb67356a387ddd317e014f43cb5b5bf263ec617a5973e2982eb76a08dc7d3ca5ec9e72e64c9b5efd751001a8999b420b1ad0
 DIST surreal-gentoo.tar.gz 13410 BLAKE2B e7d902278004785c68a2e5aa02aa326cee1ef04fe964fce283afde00cb668b06d5d8461207ef9571aa402b960ec16bdff6bf11cf38ca9a76335ced173592ffce SHA512 dd43cb78e5e33345767edad22d0470765ac9eeae02bbad0acd8098bc096c15a166bf651493d12a5953bc043c9be92e9b160607eafb4723a6bcfc5d1d6fae235e
-EBUILD openbox-3.6.1-r3.ebuild 2715 BLAKE2B e1202e54c1d6c963fa6f44c86e33232ed13631528f567f10ca600c2c87e7b39b199b72b0f417e94d6b110a984efd45799b8cfe9a4b9ed0b1dc63fb1a370525c2 SHA512 b7f176fc34e07ce6ca1f91901ca36fd3781bc9c15a48adc96e83f68c358ade496f3d3032f03b600b1e0ce817a65f39d8f7ec6557fcbd19c0ad4064389edabab5
+EBUILD openbox-3.6.1-r3.ebuild 2714 BLAKE2B 735fbe7b73f32fbd7c803fbc680d0477d02de029352a0221696d8037bf57d2a59b8c806193ae3f0a87310180e3a1ed3e9be5d3f88de84ca62227d3f02687000a SHA512 9f12c32c065eb54b9b50aa0444ea1d1e291e7a99c0b0b121c8940417c0ad99c2d1767dc2a2bdad786048882ce45356d97fa7da2d4711290153a3d94fe001f8d1
 EBUILD openbox-3.6.1.ebuild 2608 BLAKE2B 310fb7279464260f025ece227bad2a3481ce1fbe3f841d212949ed6a6d4ed2143789092b6c702628dea66569f03fa5a716442a0a7b686c437f707f15a0e06290 SHA512 a915e92e485f840e864280a1d633d7d75de916ca812158544a7561254d1335727f996ca0bd7724ea3b2ac4f4624d90a3a33ee800a39f9ffb747d11257b2d1612
 EBUILD openbox-9999.ebuild 2722 BLAKE2B 64238c8c479fdf98589cfa021d4bbd1e1962705f83baadb53a942a1f8220a598802b11d9dc8ce124f3384022a991e97a05751a320ca2875ee6bd56be20895d89 SHA512 78a05754f7dea9ef8d3be428b03ac286305b1fda2b19211233e569c46a94b433942964daae33ff323d6ba7bfe3a591522c4ed74f19e9b48239d6f1d789c8fac8
 MISC metadata.xml 704 BLAKE2B 6a8354358ddaa1b4af8e662aa43800168e49aecc074ec4e9c353813e70650e5e44c6647a1848f465e74571367d873a5d32ead3a340e4da730432524adfc4eec5 SHA512 f232879857441d09e1a0b7251849ab466e0a1a5c75e035ab28aa5bc91a7d11e962cd618672aaa65746ec019fb5cd08a190a28e001a89b9e6a82f9afc11d5c207
diff --git a/x11-wm/openbox/openbox-3.6.1-r3.ebuild b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
index 68f72a7a3c55..a5c37f022d90 100644
--- a/x11-wm/openbox/openbox-3.6.1-r3.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="git://git.openbox.org/dana/openbox"
 else
 	SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86 ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 sparc x86 ~x86-linux"
 fi
 
 SRC_URI+=" branding? ( https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
diff --git a/x11-wm/sawfish/Manifest b/x11-wm/sawfish/Manifest
index d6e51176080c..45a1e612f5bb 100644
--- a/x11-wm/sawfish/Manifest
+++ b/x11-wm/sawfish/Manifest
@@ -1,5 +1,8 @@
 AUX 50sawfish-gentoo.el 366 BLAKE2B 5d068cfae8fd522037656d009a2007188ab272d4ea0c541d6b389b1f87cf7b209bfd54cbdb0677e80ae34c31fb3fadb767f4f890fc51fb0412aebac308429dca SHA512 a05fe8328ed42c11fcf7ce43eac8278e53d69610a53118283d1292c89c690aa85b43090cbcfd0995a9e2e92cb61277848404a27b1797e33c80ad09db752d8ba5
 AUX sawfish-1.12.0-desktop.patch 839 BLAKE2B cbc68895b979d5d0eb794f95a6e002f4807cd7712be992bdfe7d20bfc5fe6bfcf8a1c0407f8a1394ad2bfed8fe5663745edd761a7d41c0ced226f400c414a7d1 SHA512 ab96ea42c01e1fb2bde192f55273fc647a6fd9904c6bcd05303eea03dc306dde90c152ab7dfea003a50441dcd344f37478e184d9a9c1124961b96556e3aab40d
+AUX sawfish-1.12.0-fno-common.patch 987 BLAKE2B 9f5a94a226453b831efab89b46dc0022585712af26153ba87187da629ffb662f89eeee9529322ab810809fa352bba0eaca314e1cfef507d8735086075b9c29bd SHA512 89d2f547b6fe100815763c4b1ab9fcb2cb67613c35bdda6de7d6be297c2871909c70c6d352debea04fa4627aca6e195ea44a1d402a4cd01137d80ff96b5040be
 DIST sawfish_1.12.0.tar.xz 2814340 BLAKE2B 58901cf62d10641ef32756a3283c6d53b27a68a4af7c578c49e6968045f5993f744eb0b6c7b81da08b91774f1fb8faec467a6a22cd046a2fea135f749ac24319 SHA512 e8f831a9f6206ccf4e2a823bc3464c11b9d2d38a72ada4a142f952813a56c620b511f9cd8912bbf06e38976e54f1d9445f68d6dd24ee5ed59918c18de379e71f
-EBUILD sawfish-1.12.0-r1.ebuild 1979 BLAKE2B 2863b90066e24ffdd94413b06988418fed6a645453c948ec584ca49707f176461cfc0debacc2c52b93dce69ca89380a0ed301c5ac707a963597bcefc74453db5 SHA512 daade87efb6433bdac2ca3bc87c6a6418fc812ae07717a64fea97f6e88fdc58b8c29a4229e3a8708c4207b63d308242f47f1dac39757b15711358fd179fdb6f6
+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 2212 BLAKE2B 84693e0db216ccf54a672c06541e5b7ec18debd313fd9bb6549642c7c25206f69828f652890dc9fc9b496785cbe1a7642b51b3003286d992e0b60a2e55a0ae08 SHA512 b8cec5c9ed88049b4d1fb2889bb873053320a462771895aec0c107a1ff7cca726eca67c1caabd11ba740d32a3dfbc4aa02c04d8b4f322737c2e102e748f72f37
 MISC metadata.xml 357 BLAKE2B 7ff08550d41c65ecf933abf4a3c1932a06f9462016ea8cff09145c713e7017dd68dd5e6473845eac654e0ae1fdded17e6b92b36a4f97db539524dfb67b5aec4f SHA512 ab28ed64d52513cf76bea32b2f289dedab2420e91592ba31d2917efc2d7868a4bf949067562594254a601e62885cf530d7ec00404cf62dd4705b7ac1a892ba9b
diff --git a/x11-wm/sawfish/files/sawfish-1.12.0-fno-common.patch b/x11-wm/sawfish/files/sawfish-1.12.0-fno-common.patch
new file mode 100644
index 000000000000..73f58be99eea
--- /dev/null
+++ b/x11-wm/sawfish/files/sawfish-1.12.0-fno-common.patch
@@ -0,0 +1,39 @@
+--- a/src/functions.c
++++ b/src/functions.c
+@@ -65,7 +65,7 @@
+ # endif
+ #endif
+ 
+-DEFSYM(root, "root");
++extern DEFSYM(root, "root");
+ DEFSYM(after_restacking_hook, "after-restacking-hook");
+ DEFSYM(position, "position");
+ DEFSYM(spacing, "spacing");
+--- a/src/flippers.c
++++ b/src/flippers.c
+@@ -22,10 +22,10 @@
+ 
+ static Window edge_left, edge_right, edge_top, edge_bottom;
+ 
+-DEFSYM(left, "left");
+-DEFSYM(right, "right");
+-DEFSYM(top, "top");
+-DEFSYM(bottom, "bottom");
++extern DEFSYM(left, "left");
++extern DEFSYM(right, "right");
++extern DEFSYM(top, "top");
++extern DEFSYM(bottom, "bottom");
+ DEFSYM(enter_flipper_hook, "enter-flipper-hook");
+ DEFSYM(leave_flipper_hook, "leave-flipper-hook");
+ 
+--- a/src/windows.c
++++ b/src/windows.c
+@@ -75,7 +75,7 @@
+ DEFSYM(north, "north");
+ DEFSYM(north_east, "north-east");
+ DEFSYM(west, "west");
+-DEFSYM(center, "center");
++extern DEFSYM(center, "center");
+ DEFSYM(east, "east");
+ DEFSYM(south_west, "south-west");
+ DEFSYM(south, "south");
diff --git a/x11-wm/sawfish/sawfish-1.12.0-r1.ebuild b/x11-wm/sawfish/sawfish-1.12.0-r1.ebuild
index 2cc5b3ad24c2..726c0ecafee0 100644
--- a/x11-wm/sawfish/sawfish-1.12.0-r1.ebuild
+++ b/x11-wm/sawfish/sawfish-1.12.0-r1.ebuild
@@ -34,7 +34,8 @@ S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
 	# From Fedora
-	"${FILESDIR}"/${P}-desktop.patch
+	"${FILESDIR}"/${PN}-1.12.0-desktop.patch
+	"${FILESDIR}"/${PN}-1.12.0-fno-common.patch
 )
 
 DOCS=( AUTHORS ChangeLog CONTRIBUTING doc/AUTOSTART doc/KEYBINDINGS doc/OPTIONS doc/XSettings MAINTAINERS NEWS README README.IMPORTANT TODO )
diff --git a/x11-wm/sawfish/sawfish-1.12.90.ebuild b/x11-wm/sawfish/sawfish-1.12.90.ebuild
new file mode 100644
index 000000000000..62df528557df
--- /dev/null
+++ b/x11-wm/sawfish/sawfish-1.12.90.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="${P/-/_}"
+inherit autotools elisp-common eutils xdg-utils
+
+DESCRIPTION="Extensible window manager using a Lisp-based scripting language"
+HOMEPAGE="https://sawfish.fandom.com/wiki/Main_Page"
+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"
+IUSE="emacs kde nls xinerama"
+
+RDEPEND="
+	emacs? ( >=app-editors/emacs-23.1:* )
+	>=dev-libs/librep-0.92.1
+	>=x11-libs/rep-gtk-0.90.7
+	x11-libs/gdk-pixbuf:2[X]
+	>=x11-libs/gtk+-2.24.0:2
+	x11-libs/libXtst
+	kde? ( kde-frameworks/kdelibs4support )
+	nls? ( sys-devel/gettext )
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+S="${WORKDIR}/${MY_P}"
+PATCHES=(
+	# From Fedora
+	"${FILESDIR}"/${PN}-1.12.0-desktop.patch
+	"${FILESDIR}"/${PN}-1.12.0-fno-common.patch
+)
+DOCS=(
+	AUTHORS ChangeLog CONTRIBUTING doc/AUTOSTART doc/KEYBINDINGS doc/OPTIONS
+	doc/XSettings MAINTAINERS NEWS README README.IMPORTANT TODO
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	set -- \
+		$(use_with kde kde5session) \
+		$(use_with xinerama) \
+		--with-gdk-pixbuf \
+		--without-kde4session \
+		--disable-static
+
+	if ! use nls; then
+		# Use a space because configure script reads --enable-linguas=""
+		# as "install everything". Don't use --disable-linguas, because
+		# that means --enable-linguas="no", which means "install
+		# Norwegian translations".
+		set -- "$@" --enable-linguas=" "
+	elif [[ "${LINGUAS+set}" == "set" ]]; then
+		strip-linguas -i po
+		set -- "$@" --enable-linguas=" ${LINGUAS} "
+	else
+		set -- "$@" --enable-linguas=""
+	fi
+
+	econf "$@"
+}
+
+src_compile() {
+	default
+	use emacs && elisp-compile sawfish.el
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+
+	find "${D}/usr/share/man" -name '*.gz' -exec gunzip {} \; || die
+
+	if use emacs; then
+		elisp-install ${PN} sawfish.{el,elc}
+		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	xdg_icon_cache_update
+}
diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest
index 07fcf1e1d0af..44468adedd82 100644
--- a/x11-wm/windowmaker/Manifest
+++ b/x11-wm/windowmaker/Manifest
@@ -4,7 +4,7 @@ AUX wmaker.desktop 206 BLAKE2B 62fe60afde032c1f37c5c818bc37a97d70605e041e539e922
 DIST WindowMaker-0.95.8.tar.gz 3253515 BLAKE2B 225dae9eb10f913931e129fdf78860123a14406ad8e61ba42fe4eadcf5d3f03c88040a2b982e74abaf79088f4a063291ccfb7b7d42f1bf211adb7b02c765a664 SHA512 6ab16ed4304aba20f0f3a4083adf63a47fa674ade7bc39aaa8aa6466c7842e3f10ab73af96e2afce0842b11c57a35eb69f43183a4044d8cd95d4e2a4d2c079a2
 DIST WindowMaker-0.95.9.tar.gz 3397167 BLAKE2B ec751fe0139b359933f4388f8dac3f2bf18db1f28fb4cb290d86db1ded9ffdab0cf51b451e28475bc51ee2735cb71c7fd2b01fa7472f5f0f4f1a1e00e1509339 SHA512 ca3ddc863f5b5b782e90f38c0019fe14d1109d6b11d0a3d5d6c728ddc1817747eea92e22e36933d445e72c70661e039ee56efa70f2654657c8980269fd5b4584
 DIST WindowMaker-extra-0.1.tar.gz 238018 BLAKE2B 865b12975d0cdefc1f05a76344b449fdcf8a2841d6a7adf1ab6435857d89cbc4fda22bb62432a1bbba921267380d00a0cded718bfbd344bbb5e6207e59b76096 SHA512 0fe9b3ffc093942db167d8a01e15c0f6741f3a40959d1434ea4f23e7b9d4a9c13935a61eabef9691e5fdfd4e407564caafce15c2d65d66499960a6764a874ab8
-EBUILD windowmaker-0.95.8-r1.ebuild 3118 BLAKE2B 926737c20e39924f58245ee7c57d10312f3b1aab784c4a70ff3e8a528bbc43fb2b1f109844a4e3c0ea47e26638d688ebbfa5cddcfa63879d9dea5a290f5ffc5e SHA512 7a3f9ff5e20a249c17213f22e11557b8118c00711bd26d50b37e36952939fd456cabb7a7fdafce300ee8f958c111ad87f077b60a733f6ca72caebdb98b23dd83
-EBUILD windowmaker-0.95.9.ebuild 3079 BLAKE2B 44d62a6356f6e425ca381793ef388fb951a7fcd0d033050a840e403a4d419b3e5713d756971515cf7abc4aa21fd9a4d17a2a0b197e62c1a80d142da372239a51 SHA512 71e9c3bbe2279c7e22b906948ff0b36411a64116ddc61a6330feb6efe32fcb32e6fb9711ad3aeb963ae365befae7a5bd03bf54a70704c0b6fd433433b9066cb9
-EBUILD windowmaker-9999.ebuild 2896 BLAKE2B 04ac8a74266ab5129c592d8d6c3dc38d6c7ccc44c9de34e114d1f4e58111aee1e8da8f81c3e925262aad73b9be0cefee924350becea138da270843b0cdbe39a7 SHA512 28e6eab40456ae307df2f92c08b23d6cfcf6baa1d230cc5f2c26d5db0294f48d1e500cf7955b85a9e6054fe0202a6f32688931067a9b69e2e8c99a29dc5d3428
+EBUILD windowmaker-0.95.8-r1.ebuild 3126 BLAKE2B 1a942fafd5c8e608492ef9ae5d89a687b14d526d60d65668911844d662d352e33f3f6b53798bc5f9e3cc4cebeff2b9f8a90a69816a14badddad7215ddb28c62b SHA512 7f663b33b5b7f10385fa41ff97c7146f649fb24109e293441ada420b6a5672d07fc55e482f82d81f6d5f299513c6866efad9441f4f358007b69c24d09c3d0a60
+EBUILD windowmaker-0.95.9-r1.ebuild 3087 BLAKE2B a3f3ffb6b53883167bb32d57ff1e471c4f38b1aef650b43ac37f69423e73e2af24edb773439557616756eb0d0b72c261e299cced9bf4f0ae42a4fb713e5de50f SHA512 fe257a39f719e6ecc67f3f5ebc381cac13761b11587bc95e9da6e0264e6b0031f4bb2f0d1f97b18a77adc63ca42cc30471f1394975f00b8487b70864bdea3ca4
+EBUILD windowmaker-9999.ebuild 2904 BLAKE2B 0a9a4babd8cb1f542316efd863608c4aed84dd98a2a44027af9ad9ca09a295e83501d23311f732cc113f91152eb5e08988b2b76921059391ce6cc46390903369 SHA512 6d932f8fcdbc1180fdd2a1337935a651f2f8408b7c2377b300c9bf5e0a64be2c81f48536d214a55a55044455b98d6d1885751c671b3db872f512d6f1fdbc36e3
 MISC metadata.xml 490 BLAKE2B a74e46dfe5b90558720726c3a18b9c9cf2752fb90ade60450ae568547c52b807e9dee74d1deb842c11cc3e6f564c0793adc5f8e24686893138808669f6fc9766 SHA512 ae731acb1fe00cfbda949fc9cafad9f861b83fb37103a699157256840c67e4a2cd0023114d30eab0b25f6dcb154c00e2a659a4feffaabad97e8ed7aa2a03e3ca
diff --git a/x11-wm/windowmaker/windowmaker-0.95.8-r1.ebuild b/x11-wm/windowmaker/windowmaker-0.95.8-r1.ebuild
index 8b2e811ea5bb..759d0ce688c5 100644
--- a/x11-wm/windowmaker/windowmaker-0.95.8-r1.ebuild
+++ b/x11-wm/windowmaker/windowmaker-0.95.8-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools eutils
+inherit autotools desktop eutils
 
 DESCRIPTION="The fast and light GNUstep window manager"
 HOMEPAGE="http://www.windowmaker.org/"
diff --git a/x11-wm/windowmaker/windowmaker-0.95.9.ebuild b/x11-wm/windowmaker/windowmaker-0.95.9-r1.ebuild
index a11fcfdcd365..c33eb6226490 100644
--- a/x11-wm/windowmaker/windowmaker-0.95.9.ebuild
+++ b/x11-wm/windowmaker/windowmaker-0.95.9-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools eutils
+inherit autotools desktop eutils
 
 DESCRIPTION="The fast and light GNUstep window manager"
 HOMEPAGE="http://www.windowmaker.org/"
diff --git a/x11-wm/windowmaker/windowmaker-9999.ebuild b/x11-wm/windowmaker/windowmaker-9999.ebuild
index 7078f87e0428..3ce59498cbfa 100644
--- a/x11-wm/windowmaker/windowmaker-9999.ebuild
+++ b/x11-wm/windowmaker/windowmaker-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools eutils git-r3
+inherit autotools desktop eutils git-r3
 
 DESCRIPTION="The fast and light GNUstep window manager"
 HOMEPAGE="http://www.windowmaker.org/"
diff --git a/x11-wm/wmfs/Manifest b/x11-wm/wmfs/Manifest
index a145776f9314..988bb50cb1fc 100644
--- a/x11-wm/wmfs/Manifest
+++ b/x11-wm/wmfs/Manifest
@@ -5,6 +5,6 @@ AUX wmfs-99999999-desktop.patch 153 BLAKE2B e9a3f1039bddd76ddc05955e843e89c1ab81
 AUX wmfs-99999999-fno-common.patch 1986 BLAKE2B 096becca88a23b15e3fee115640b50baca0f1f3ba58c15903a74fd4da75bc2e1662d672982940ac55c506f79f3820ffa9e851981008f82d9163eaf291e4339cf SHA512 b7593e0c0c0e3e73421a1636cdc2b3cebd6c51896e404bad9bec378e733b54cb0168a53dea40466128210f47459a2bb5e04074d588d33b07908efd1581472eaf
 AUX wmfs-99999999-strncat.patch 598 BLAKE2B e80fd233e895162e24f7264cf152c9a570665d5f6ff48ea1ec9212963c2b786b5707c8052d33a1a354b283042af0c2b7d5ac45f34e8dc57a68abd517d7e410aa SHA512 9141bd044a122fbe0aa10189f38d02e127c453665ae7d926dee852bb16ec7812450357e86ab6dfc8f48a41ce16891759a8229bb4a67f1bb5a970c7e6452298fd
 DIST wmfs-201003.tar.gz 59593 BLAKE2B b2e1f2cf73ca3d8881fa8de7b52fb6cae947a6006549f05dd06179b8b44b10fd1157a8e180b2b3177177fe0edf4c39b9a3fbf36ebb2b6470f1ed802a641a4c89 SHA512 117a238d6a8d8d147291ec9fb4e0aaf2bf8bab8ea794cf00deeaeaac1df15f0122bc705cb1bff54abe80d7228a19e67a79e4b3e0de0ced82abaf98fab3778a90
-EBUILD wmfs-201003.ebuild 786 BLAKE2B cbe20f3523d998bb2e0f1adf1b72276301189d461b895a7c48b7a42ea3788eb3fcbce61aa50d587b87ccd8cedf746a65b9dbbb1478807944b1ed3bab290a8bc5 SHA512 54d0625b2f37d04498217adb131bd0bc92425bf44d74f42ac22efa067e4d2f5b1eec71fc6b5f5ddefb2f65b2845126d5c9af596318d54a221606598f9247dc24
+EBUILD wmfs-201003.ebuild 968 BLAKE2B 89d8b905ba1c0a6c0016e9b0b40e0f3bd5ef538134e72b7b560dac4547a5f875081d3275604fc66a274ebb118556295433516ee884aa815fe8572cb2a766fc24 SHA512 4afaf1556dd33aa42c749a22929a815ec7970156963e39cc6e78e2d56dbbf465554889e4bb1ed1534e92ee0fbdc00803cf873408d8a014d197702c82ac803bc2
 EBUILD wmfs-99999999.ebuild 1097 BLAKE2B 1f3d48ce2f4b5477872bd4e307ed35daac2e4163406481b55c7a169c681505bfdcc6e859925977d6f141ba29e066b41c4fd65c23464ed34ff950f03501d24e83 SHA512 7fe78bc7ab800d3a4a6f6411a7f0155d83a75aa528a8511ca7539b4744ebf892e63304305df6fbad87360f26332b339112ed34e8032ceda041a94d114b522a96
 MISC metadata.xml 380 BLAKE2B 318de05f3f531b8c35e71a0563525f7c8a1397e0ba4adbd086b768c93d792d8c336da47bc7582dfc7b0f4ce2917dcccb21191f46c064b02317477ef3a568ee17 SHA512 644e88ac0ca2d999cd273f807d45400a8438a9800b3b744f764c914fa41d819efd55ecaa27de6cbcf4403491f2986299fc1c032afd26fee67822cfc2c6368359
diff --git a/x11-wm/wmfs/wmfs-201003.ebuild b/x11-wm/wmfs/wmfs-201003.ebuild
index 14da5d0b9158..27bdfa3ef564 100644
--- a/x11-wm/wmfs/wmfs-201003.ebuild
+++ b/x11-wm/wmfs/wmfs-201003.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit cmake-utils eutils
+EAPI=7
+inherit cmake
 
 DESCRIPTION="Window Manager From Scratch, A tiling window manager highly configurable"
 HOMEPAGE="https://github.com/xorg62/wmfs"
@@ -31,8 +31,17 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-201003-pthread.patch
 )
 
+src_prepare() {
+	cmake_src_prepare
+	sed -i \
+		-e '/set(CFLAGS/d' \
+		-e '/set(LDFLAGS/s#)# ${LDFLAGS}&#' \
+		CMakeLists.txt || die
+}
+
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	rm -r "${D}"/usr/share/${PN}
+	find "${D}"/usr/share/man -name '*.gz' -exec gunzip {} \; || die
 	dodoc README TODO rc/status.sh
 }
diff --git a/x11-wm/xmonad-contrib/Manifest b/x11-wm/xmonad-contrib/Manifest
index 508ab86e84fc..2a5dd46a53c9 100644
--- a/x11-wm/xmonad-contrib/Manifest
+++ b/x11-wm/xmonad-contrib/Manifest
@@ -5,9 +5,9 @@ DIST xmonad-contrib-0.11.4.tar.gz 401743 BLAKE2B f6962bcb88e88ebf620ef037c08de8c
 DIST xmonad-contrib-0.12.tar.gz 464978 BLAKE2B 72b08d01a24e1a878bc1d7175755b45d0751236f01c276f3b5baaf332f3baf5c81b2c75c8ab88e221f1cabde0f3ed3f7a613b672b038da95de0ef4d69f249307 SHA512 5bb145fc7d07ebc8e4dde5ba83b5340913fb089581d22e993663402fc6728eab9f6939466b7a262827c0098599073a928700e0acb8245b943b23e6cd01e63056
 DIST xmonad-contrib-0.13.tar.gz 485351 BLAKE2B ef42ad08bf5878046abfbc0c2cbb79853c01e2e0ba0e6ab0723e575531dc106c32dce58fe9e6e35b5e84f18b04456aec03ef838a9cb6fc34396415a311e1b2d5 SHA512 40b8a8fc8a1fa134f2726c273ff75eee26a43c9f18095bad9251e4b37b0cca5ee6c32eec5c42aa00c9e0c5c90ae54e6414739a2cee5b5d2917814358449d55f5
 DIST xmonad-contrib-0.15.tar.gz 524285 BLAKE2B e34b32a4899e98b00ae5ea4539a8566f056f794adb672df035d140532faf0996ef4bcf078998a1a6bd93320c5ebd41d51babf98a5332142c3a8644d3eb0e007d SHA512 c4669a51f6c1fbb50f5d484ae4a24b608d2b03c2e6814fa2ae079fe57a4b599e3072ae23c29b22fe2cf86a04840b4262a646ee4c7ba7c9a859ee78a31f99bc8a
-EBUILD xmonad-contrib-0.11.2.ebuild 1066 BLAKE2B c0626aa497fd0e5d178d24a37a36584a287a7f4cb7509f1a206b8387c65e71b936fbef0dcb093462a3840005aca2531b0e736881e0ecfba93978c589d5860ee6 SHA512 b5941ea7f9852720be3945f0ea7060a59ab1b4f180f181a9eef62ac1d0611263bcc160a466ae5ff26927037e981f4d160b07383012a9160df713bba59d32efda
-EBUILD xmonad-contrib-0.11.4.ebuild 1466 BLAKE2B e267fbbb931d6d17f0435b444d82b38e8ddc9d0269c5e46ffc4c2d4c84080d5834063fe05b6d81bf7b9b79a9cdb5416fe051a824ec00ebb963600f9036fa33cf SHA512 19e974f834153d114399cf5f3c68aba796e4dcb2bcd88878b706ca689107a750f0b188f9b54d8166dbca9c15719c7154aa54ffe95358c88eb28ef24a47ff2fd5
-EBUILD xmonad-contrib-0.12.ebuild 1102 BLAKE2B b1ff3175e714548ad22260fdd94a32b8409528d85f01635c215c5e05a20725dfc2afbbc1d04baacc305909e2b93f6cdf8209cd8b6af1ad366ba764ebe91a774e SHA512 3251a64dffb11da9d9657d1c66fbf5beb2731568d118809193616750ac883115466d9162ef2de7991a4550a05d9ca09c7b418907355d1606f52c6bbd32cae2de
-EBUILD xmonad-contrib-0.13.ebuild 1095 BLAKE2B bee87fa09618ee835520acb1bffeb4b593d1c23b9860272831631980ada4b6d27f155100190b37477f3c72cf8b960c97b7417465475c69261efccffcb6760d37 SHA512 091f7d8d9af565b94ed21bbd8d797558c04756f6b2509343ebc86a556b752620546d4e99931eccc0679f4b2a49f15f5acd7a809007707be2183343799acf465d
-EBUILD xmonad-contrib-0.15.ebuild 1132 BLAKE2B 50ceb10dafa6d9c42a2a2e12c289ef96c000a63461674b7f0a6de43a6ba8cd19f72d3fdb0d8bcf6b6a979690bfd64851a19caed7255c5922c552a4c9555b8451 SHA512 d0e151c2905c1890239362d443aed12b477c221ed3a95fc0fcfc7361912dfd825f4758253559f576a68a8017afae86c9f6b0d62950b4d2324b2ef40a9bf79d6d
+EBUILD xmonad-contrib-0.11.2.ebuild 1067 BLAKE2B a6fbccac4def0e616180b3a56d77a988d829451c8911d6cb4897a5576fbe05c270f82722b5790754ca55bfe4bb39fb4313d4ab7c5e3bb10c6c20b3a0ed52a520 SHA512 a252e5628979ee18d8e4674e7029a85eed5bef3012344fb6b427eef3dec9813ddd7f0a178aa4bd97b61c184634953330cde0221cdd1df982d0f6bb0efa171e83
+EBUILD xmonad-contrib-0.11.4.ebuild 1467 BLAKE2B 7e5788e4b64d656a63868e68157443e79cc1965fdf16a12fcfb32b3ad2061707582606775efb4fe8a4f9b069a3036af9faa3ab705267e15df95867f9b99d26bf SHA512 f7357f6b08fc9a68a94b8e23f73b7189b2361dc370cc98500e2c9c2101e06b4d27b106b23f656febd4bba00e7e7bbdf5e0aac7f9a73e4eb483098d1dd634d892
+EBUILD xmonad-contrib-0.12.ebuild 1103 BLAKE2B 59f8ffb2844cd05c2b2727101c7e0c4f64fab5bc34046d1a9daffbd8ce26f00c1593abf2840a34528ba370f5303af2d73d097e53163a4b42f55da08842cc31e2 SHA512 791a9f0597e7921d9992a46c961c54adc361fc9dd85ed9a45cb1050e6ba3d0f10935328f0dac8b507508eea01ac0a9cf1b08727c9d7c5bb2e30e2d0483c46bb6
+EBUILD xmonad-contrib-0.13.ebuild 1096 BLAKE2B de5ba1ec0213ec62b053820a35c3d7e632125a02c2441b3105eb99749ab77c336d6296da22980047b992601f90f0878ceaa2bb6887fda98e3429158f9a5edaa1 SHA512 243ef681db68e135cc9afb86bf023191ebcc2d6abfc25df51087482a54308df13bf73231a999bca83052e0fce046ef77738d8b243a415ee6a46601be6efa470e
+EBUILD xmonad-contrib-0.15.ebuild 1133 BLAKE2B 70747051a40bd68bc16f85f34647f45ce2630fa359c131c22fb7f08b22dff28700d7dc8b9f7fb6ea76de79dc10a632621802b16f969ffbee0f94cfd3472e4dbd SHA512 9c32f3ad4f2016d53ae5288fa7a272b7d9e1457c26b958def381c013ccb1565f66921f6ceca994c14a169f83fe57acb92c6bf2ed1227ee182907da17e607a301
 MISC metadata.xml 708 BLAKE2B 0aae3704519ca0ffba4e25ae3236ebd02ecb6a9e7bef7d23a32107ad6e6826f09613dc6206fd1e350a8e3536061136cfdd463f7e2a80b16e7f38b30db14c4fc4 SHA512 570916b2bcf06efaeccb486d3161d0b751c675955abae7efc57d471961e2c1649075bc155e75849cd1b56c0a5917341f7ef2cbb12e81255787cfb282a6ea1fb7
diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-0.11.2.ebuild b/x11-wm/xmonad-contrib/xmonad-contrib-0.11.2.ebuild
index 7abe17884f5c..c8eea5244c0c 100644
--- a/x11-wm/xmonad-contrib/xmonad-contrib-0.11.2.ebuild
+++ b/x11-wm/xmonad-contrib/xmonad-contrib-0.11.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit base 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"
diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-0.11.4.ebuild b/x11-wm/xmonad-contrib/xmonad-contrib-0.11.4.ebuild
index da34f1cb9690..041f35dabc3a 100644
--- a/x11-wm/xmonad-contrib/xmonad-contrib-0.11.4.ebuild
+++ b/x11-wm/xmonad-contrib/xmonad-contrib-0.11.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit eutils 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"
diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-0.12.ebuild b/x11-wm/xmonad-contrib/xmonad-contrib-0.12.ebuild
index 0edc96785bb8..c0f110a39125 100644
--- a/x11-wm/xmonad-contrib/xmonad-contrib-0.12.ebuild
+++ b/x11-wm/xmonad-contrib/xmonad-contrib-0.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -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"
diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-0.13.ebuild b/x11-wm/xmonad-contrib/xmonad-contrib-0.13.ebuild
index f0d151ea4912..7d6c1775bc74 100644
--- a/x11-wm/xmonad-contrib/xmonad-contrib-0.13.ebuild
+++ b/x11-wm/xmonad-contrib/xmonad-contrib-0.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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"
diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-0.15.ebuild b/x11-wm/xmonad-contrib/xmonad-contrib-0.15.ebuild
index 87526cada637..a0ba3e779d74 100644
--- a/x11-wm/xmonad-contrib/xmonad-contrib-0.15.ebuild
+++ b/x11-wm/xmonad-contrib/xmonad-contrib-0.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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"
diff --git a/x11-wm/xmonad/Manifest b/x11-wm/xmonad/Manifest
index 0553aeda7e30..da6789851b11 100644
--- a/x11-wm/xmonad/Manifest
+++ b/x11-wm/xmonad/Manifest
@@ -14,5 +14,5 @@ EBUILD xmonad-0.11-r3.ebuild 2203 BLAKE2B c04791210566c32048c34b3d77e05bbc2a39f4
 EBUILD xmonad-0.11.1.ebuild 2168 BLAKE2B 47b506dcb73675d7e3450394ab41a497df25a72567d79ff0dde905e63d17ee9fa5186cb968098c19409757999cfa7e4e99483f9b4b3b94c2c01730b5c20b6fcc SHA512 a1d7a81a25b2b74037e1bf992b778f8435e709d5fdb7d249c155e6af628c6db74453cd8d469efe8e438cd376b77767de34aa151edb0be55df6c1c3dc884e4ec5
 EBUILD xmonad-0.12.ebuild 2447 BLAKE2B 0d3638eedf0ae42e7116c7c0a0143f46eb14012bf9c52569d60656fe1032f735122ae834639015463c5e962853e40c9ff0d3c069d60649bd335609475c5277d0 SHA512 662c4714b23eb1f212817cbc16e57e6a296658733fb8102410469bb887ee0faa46678be6a4649af667d60a0f9d3cc44effc5ae4a5e6864880fcd5b765d672245
 EBUILD xmonad-0.13.ebuild 2189 BLAKE2B 9999b6fd78531ddb7f0553c538143ba37c8edfa238cea8058085f4959620662ba19dde37fcd200fc5008d8db1ed9910089aca73d2d9553974d1b99263ebc2582 SHA512 f3147b417b085b582df296656d9d361726af34910a93de786a1c3e1ead5a9b5a428cd59d534d5146c51703b3768c03cdedc7e1f415691cc9d114834b52e40427
-EBUILD xmonad-0.15.ebuild 2339 BLAKE2B 6bc74b2d2eb204f9045be0a17046eceb068aeceae8ac8598246647a95a5e81e78e930c0953ab14415732fc2078ffedccfaaf38554a7284d9b2bed90162b14488 SHA512 c6d2b3617828d854816db057a5b1d1163c7794ed8e6a154640a155c9f250814062f10a05501f34e4ea49230b77abf9b1bec2f87cf49dcf62871af50c6b445536
+EBUILD xmonad-0.15.ebuild 2340 BLAKE2B 846657af5db706832ea4adcff0126ff386dea3f1f2d46d830602ad75ef0c2f0be6837825403ed3904e72ea9e9cae40a06991ee3275abacfd20c98593896f2585 SHA512 c68f2b8da62c8314b3cf35f048754d3fd2e018be4e1761c105f2c01a46434f4435636cd36a4d02851502692fd50a2e08c2506aeb95eff304b3494f5deb797ab2
 MISC metadata.xml 1068 BLAKE2B 7ca1c1c62c82e0ecc3352798f8b78bf87787534ef1830bde94b08ecca74a51606c05905903c0ad4b0728282669bcfa532ef798ae2c13148fdef55b259c3168fe SHA512 96efc16a7a57b188e72f2db9fdd90c06cc6460e9a596ac68ca5a8187fd7fbb88feb9ab9ff4e9d8436df014a6c6203c459da317cda0f5ada779096ee0806da8d8
diff --git a/x11-wm/xmonad/xmonad-0.15.ebuild b/x11-wm/xmonad/xmonad-0.15.ebuild
index e9e81336a298..fbda12b17d62 100644
--- a/x11-wm/xmonad/xmonad-0.15.ebuild
+++ b/x11-wm/xmonad/xmonad-0.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="A tiling window manager"
-HOMEPAGE="http://xmonad.org"
+HOMEPAGE="https://xmonad.org"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"