13 files changed, 189 insertions, 134 deletions
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 140b763d2081..6341720f680f 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
index b12efc259818..7243de2e88d3 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 2838 BLAKE2B 3beb5dde2734c53a3647e7b8ae7c70698030d7c933c66acf290f98037541d2b6225ab0b36e97711122440b9e22a2a1366b3853dc1fbcdfa386ff47d630298d9b SHA512 d863b7bdebe49c476368c00b9eb4022a859cdbea32873bfd692c2f2d4d9af1eb23bddc34f9262c9ff7e2f29aee47788ce5fa977fba80ffa2450f51c1fdf58f9e
-EBUILD enlightenment-0.24.2.ebuild 2838 BLAKE2B 3beb5dde2734c53a3647e7b8ae7c70698030d7c933c66acf290f98037541d2b6225ab0b36e97711122440b9e22a2a1366b3853dc1fbcdfa386ff47d630298d9b SHA512 d863b7bdebe49c476368c00b9eb4022a859cdbea32873bfd692c2f2d4d9af1eb23bddc34f9262c9ff7e2f29aee47788ce5fa977fba80ffa2450f51c1fdf58f9e
+EBUILD enlightenment-0.24.2.ebuild 2845 BLAKE2B d347d2f36eda1ff9a2a5026c4db8f6e4ccd7f198dbfdcae6f73b6c2af99c96ab7d390c7bedb4af599954e4e9d69cc01e7223f96989542bfa62d4e93476a4ff52 SHA512 baf8290219fc7b560ea9c31565c3bc5ab0e5236b670dd575bbb61bdd548672f48b9b37b3d3bca7d0cdf6c31953ea949c8f8d329a905fa6dcf5ddf666670ee4a3
 MISC metadata.xml 721 BLAKE2B 85587a677b7e22cd1dbfe187c367574ccef7ad88a1bdde00acecc9fc5f62d48adb9e14c2086953287efc728cc616d6d286fde1b659a44404086fef5e6bde90b1 SHA512 6d22a2f8639b3b75fd1113c0b381edc2869d91e5d3d04d6c67c845c15fae9ba0e370918e30b45e89e91c695f873f1d0ef5966f7720ab5e9cd270c6254c792dc5
diff --git a/x11-wm/enlightenment/enlightenment-0.24.2.ebuild b/x11-wm/enlightenment/enlightenment-0.24.2.ebuild
index cbc938e2391a..6120d4f829f3 100644
--- a/x11-wm/enlightenment/enlightenment-0.24.2.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.24.2.ebuild
@@ -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 ~arm64 ~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/lumina/Manifest b/x11-wm/lumina/Manifest
index 1e62d9a004c5..caf7083ab85d 100644
--- a/x11-wm/lumina/Manifest
+++ b/x11-wm/lumina/Manifest
@@ -3,6 +3,6 @@ AUX lumina-session 2011 BLAKE2B bec6e1161c89ef0ae5f6506d57b6deff09f907b2c16b0d34
 DIST lumina-1.5.0.tar.gz 20657364 BLAKE2B 62b064e1be3ce69c078e68524e011a8ce4d61c680a4732da7992a7b72833363fceb0a0895a228ec9de7921d989253c70c518810b91c23226aded1f54b23b1aea SHA512 37106d71a9ba7188c4ded0614d2d4424f732519e11288ae312dfcd9a0b5b26dd31dfa812e74a96c0e3e0fb99fae4dc00806fd7a24183746688c72d997054af7d
 DIST lumina-1.6.0.tar.gz 20662000 BLAKE2B c016f07fb86333e792d6a0a0ddaa9ea09f322d6de69d099abf9340d7db6cb9e23624b62882579ba6c13eec71fcf663f1688424fd940cd7e09e625f6fcc4b281f SHA512 e923961568ab9cc32206386066daef8cd1fd2db2d5c3e260e5c1da1dcda39a516576418f607cefbe5a1c47d8684591d0e595fb344e7d6aa2859fc3b326e73e30
 EBUILD lumina-1.5.0-r1.ebuild 2416 BLAKE2B 3ac8557090047e11dc95cb497549767d2bd9d8b222faa4ee8ee1ca978d6fefd259070347f1194f8dbea6b619fdacb14d2e4d261d2c59acf8b1f95d25db56c956 SHA512 6ffdee6ef07be2f20b50e63bf8b49ad99b0a38ec28897fafd98c0be4029c35d2187ef1f52b7e97ce45a120041742cbab65e1871e86ea825f167b93cf37d502fd
-EBUILD lumina-1.6.0.ebuild 2416 BLAKE2B 3ac8557090047e11dc95cb497549767d2bd9d8b222faa4ee8ee1ca978d6fefd259070347f1194f8dbea6b619fdacb14d2e4d261d2c59acf8b1f95d25db56c956 SHA512 6ffdee6ef07be2f20b50e63bf8b49ad99b0a38ec28897fafd98c0be4029c35d2187ef1f52b7e97ce45a120041742cbab65e1871e86ea825f167b93cf37d502fd
-EBUILD lumina-9999.ebuild 1389 BLAKE2B f38168a489101f25833660e2de3ff1666d69b47b620469376cde8825ca4d0a6f6ded5739be7f791df80d94a950e86cd3d8bbd1bb018712e94956df80ac8dfc81 SHA512 30168658fccea7521658148c795202513fbe07e089d1207b895270b0e28002a7a77f450c1af27e5c0e0f3e707f81cd6a46f966010239d457cedf43ee14b58ac1
+EBUILD lumina-1.6.0.ebuild 2396 BLAKE2B 015adabd82ff9b479e7e3f69519ab4f80f58f233df88b1f0462ee9956e8af5bc34e4197b0c18237390cbcf23a4c9950d91e277263d60069a3d115c4f30324e47 SHA512 7e7244aab8a0ab934523fb5714ec67a70e66fe62c4f3cb2abfe6345af6d6697f3b91fb89dfb81706045c956cb97e8c14c3941701f07979d0db5c87e7ab399db6
+EBUILD lumina-9999.ebuild 1366 BLAKE2B 0da2fd0940f6ebdb0dcbe0424b81458f90b20fe66cfb3c65f3bc1164c45deb5293981eb30886bdcc40d56e1ffe0ffc79660c91c62531fb038c56b5fa584d45be SHA512 758c5ac50e8673155abf452dbe28ba54d5f59ff5f1b91f59dcb061d5ed1c979aab7c8101dab4b928e24ca79491c9bf5b8c27a83a7277ba9d10b7f016c8674d13
 MISC metadata.xml 1981 BLAKE2B 260d71ea029aa07a26cc0af9d937c51253029b0bc4c70f11d4330da3a10d371be15959c93f4b1af1436b7a3c5a8a1ecb2a8f3cdea2078133384bcec3015f9940 SHA512 a55aba75dcdfc78363be5a59ebbcb7760fb1370685d7a893b976aba9497094f9674e7493ed0df3899ad917165967c3a58984bc04f3651b46416fa91fcb29de6c
diff --git a/x11-wm/lumina/lumina-1.6.0.ebuild b/x11-wm/lumina/lumina-1.6.0.ebuild
index a55056735a3b..1c86507bdd95 100644
--- a/x11-wm/lumina/lumina-1.6.0.ebuild
+++ b/x11-wm/lumina/lumina-1.6.0.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PLOCALES="af ar az bg bn bs ca cs cy da de el en_AU en_GB en_ZA es et eu fa fi fr fr_CA fur gl he hi hr hu id is it ja ka ko lt lv mk mn ms mt nb ne nl pa pl pt pt_BR ro ru sa sk sl sr sv sw ta tg th tr uk ur uz vi zh_CN zh_HK zh_TW zu"
+EAPI=7
 
+PLOCALES="af ar az bg bn bs ca cs cy da de el en_AU en_GB en_ZA es et eu fa fi fr fr_CA fur gl he hi hr hu id is it ja ka ko lt lv mk mn ms mt nb ne nl pa pl pt pt_BR ro ru sa sk sl sr sv sw ta tg th tr uk ur uz vi zh_CN zh_HK zh_TW zu"
 inherit qmake-utils l10n xdg-utils
+
 DESCRIPTION="Lumina desktop environment"
 HOMEPAGE="https://lumina-desktop.org/"
 SRC_URI="https://github.com/trueos/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
@@ -14,35 +15,38 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="desktop-utils"
 
-COMMON_DEPEND="dev-qt/qtcore:5
+DEPEND="
 	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
 	dev-qt/qtmultimedia:5[widgets]
-	dev-qt/qtsvg:5
 	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
-	dev-qt/qtgui:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtdbus:5
 	x11-libs/libxcb:0
 	x11-libs/xcb-util
 	x11-libs/xcb-util-image
 	x11-libs/xcb-util-wm
 	desktop-utils? ( app-text/poppler[qt5] )"
 
-DEPEND="$COMMON_DEPEND
-	dev-qt/linguist-tools:5"
-
-RDEPEND="$COMMON_DEPEND
-	sys-fs/inotify-tools
-	x11-misc/numlockx
-	x11-wm/fluxbox
-	|| ( x11-apps/xbacklight
-		sys-power/acpilight )
+RDEPEND="${DEPEND}
+	app-admin/sysstat
 	media-sound/alsa-utils
+	sys-fs/inotify-tools
 	sys-power/acpi
-	app-admin/sysstat"
+	|| (
+		x11-apps/xbacklight
+		sys-power/acpilight
+	)
+	x11-misc/numlockx
+	x11-wm/fluxbox"
+
+BDEPEND="
+	dev-qt/linguist-tools:5"
 
 S="${WORKDIR}/${P/_/-}"
 
@@ -55,7 +59,7 @@ DOCS=( README.md )
 src_prepare() {
 	default
 
-	if use !desktop-utils ; then
+	if ! use desktop-utils ; then
 		rm -rf src-qt5/desktop-utils || die
 		sed -e "/desktop-utils/d" -i src-qt5/src-qt5.pro || die
 	fi
@@ -77,7 +81,7 @@ src_install() {
 	newexe "${FILESDIR}/lumina-session" lumina ||die
 
 	remove_locale() {
-		rm -f "${ED%/}"/usr/share/${PN}-desktop/i18n/l*_${1}.qm
+		rm -f "${ED}"/usr/share/${PN}-desktop/i18n/l*_${1}.qm
 
 	}
 	l10n_for_each_disabled_locale_do remove_locale
diff --git a/x11-wm/lumina/lumina-9999.ebuild b/x11-wm/lumina/lumina-9999.ebuild
index 6881413499cb..8e1fb965a9a2 100644
--- a/x11-wm/lumina/lumina-9999.ebuild
+++ b/x11-wm/lumina/lumina-9999.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit git-r3 qmake-utils
+
 DESCRIPTION="Lumina desktop environment"
 HOMEPAGE="https://lumina-desktop.org/"
 EGIT_REPO_URI="https://github.com/trueos/lumina"
@@ -13,32 +14,35 @@ SLOT="0"
 KEYWORDS=""
 IUSE="desktop-utils"
 
-COMMON_DEPEND="dev-qt/qtcore:5
+DEPEND="
 	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
 	dev-qt/qtmultimedia:5[widgets]
-	dev-qt/qtsvg:5
 	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
-	dev-qt/qtgui:5
-	dev-qt/qtdeclarative:5
 	x11-libs/libxcb:0
 	x11-libs/xcb-util
 	x11-libs/xcb-util-image
 	x11-libs/xcb-util-wm"
 
-DEPEND="$COMMON_DEPEND
-	dev-qt/linguist-tools:5"
-
-RDEPEND="$COMMON_DEPEND
-	sys-fs/inotify-tools
-	x11-misc/numlockx
-	x11-wm/fluxbox
-	|| ( x11-apps/xbacklight
-	sys-power/acpilight )
+RDEPEND="${DEPEND}
+	app-admin/sysstat
 	media-sound/alsa-utils
+	sys-fs/inotify-tools
 	sys-power/acpi
-	app-admin/sysstat"
+	|| (
+		x11-apps/xbacklight
+		sys-power/acpilight
+	)
+	x11-misc/numlockx
+	x11-wm/fluxbox"
+
+BDEPEND="
+	dev-qt/linguist-tools:5"
 
 S="${WORKDIR}/${P/_/-}"
 
@@ -49,7 +53,7 @@ PATCHES=(
 src_prepare() {
 	default
 
-	if use !desktop-utils ; then
+	if ! use desktop-utils ; then
 		rm -rf src-qt5/desktop-utils || die
 		sed -e "/desktop-utils/d" -i src-qt5/src-qt5.pro || die
 	fi
@@ -62,6 +66,6 @@ src_configure() {
 
 src_install() {
 	default
-	mv "${ED%/}"/etc/luminaDesktop.conf{.dist,} || die
-	rm "${ED%/}"/${PN}-* "${ED%/}"/start-${PN}-desktop || die
+	mv "${ED}"/etc/luminaDesktop.conf{.dist,} || die
+	rm "${ED}"/${PN}-* "${ED}"/start-${PN}-desktop || die
 }
diff --git a/x11-wm/marco/Manifest b/x11-wm/marco/Manifest
index f4d7b133dc71..bbf1abcd66c5 100644
--- a/x11-wm/marco/Manifest
+++ b/x11-wm/marco/Manifest
@@ -1,5 +1,6 @@
 DIST marco-1.24.0.tar.xz 1827076 BLAKE2B e4bcf8584199cbe4f9f813c7512176dd9b84a39ed162cd051f1f174c428828d1d73d6ab64c19ca681f0aea966742e0474256935f2a7c0c490b77dda91147162c SHA512 b257994c097f174fe83f3f0f4d6b6991e8c0f402daffd99f8a9521d588b609c56953e73dd4d143be64f5c9a4caa8d890ff30a120e18a9d5b36c6f856a7190428
 DIST marco-1.24.1.tar.xz 1860008 BLAKE2B b147e6ce8aad9382b2e8d96eec2da0356cce91977f4387776359ffb1f26903d7f0b9d9a1d43a436d1a64033f545600e7f810a29e3ae6ecdfb0d73ef8073b782c SHA512 55607898b64f0da3a85dd8d7fd092d847c8f67cefa096a63dbe074c197157a3d661fcb3f2a495b4425340b583b600cda3d1c92ac08b7327904dbd4aab8e92c85
 EBUILD marco-1.24.0-r2.ebuild 1504 BLAKE2B 58da594bf9ce3e1930ccfd1f43b64cdddd5c74ce54d9fb4199aa5c99fa96961640c40bd1b67cabb306a5c72a4780d77d9eea078e488d8d133d7fef657a9ef98b SHA512 506253ae98268e699848c937f826b1072f13e41868a4057f30b6090f9ae2cea30ad319183a3ec2ff709a9bf5767d25a3f503eed281242b836e8c83095b5ae5b6
+EBUILD marco-1.24.1-r1.ebuild 1483 BLAKE2B e03106fde2cd93d6f26c25a58ed3984d38b4968cef4e4c52c076622586e16053575227b06cb78d00f71af25ca7cef06094b51fe5b239fe2a330f5f49570290fe SHA512 d5a15bdd165f326ad3782a2e77f5fcf3020b16c54aa1a9f6fe2fc029cf7ee38c9efd951e6a9f5e454827abf7c9824bc21cc94840d803ec7e5ebecb3655460eea
 EBUILD marco-1.24.1.ebuild 1506 BLAKE2B 23a2e5ed1605eb0457fe6ec558374aaea77775b9cc0aa9321209da72b4ac509ef896efed15b9665e7c50490b9f0b84f1f24a7e2f271a46e18f0282861f8e466d SHA512 aa40eae15416b859fc2c9c23b16c46b97763908325709743c14ef24596bae37a35e407f28ff7b876481df8586f8bc320c518a08df638ef734ff55916afd4dbfd
 MISC metadata.xml 334 BLAKE2B 4a521e1c77d597f68a11cdaa695afcb40a5a2670a7fd643db0999362884a0bad7fb8106b7ba479a939930fbf0323c7f22186cf3fca5583210227a819631ead5d SHA512 f55f007780c371bc133eb3b8eed1bb4f930cab1e29c9ff0ab2dd99cd2e1458058dc86bf3fd70e9f4e9f1db259a7b8a5a247b04282ca08e88d767ee2f1878a451
diff --git a/x11-wm/marco/marco-1.24.1-r1.ebuild b/x11-wm/marco/marco-1.24.1-r1.ebuild
new file mode 100644
index 000000000000..cd92c1853eea
--- /dev/null
+++ b/x11-wm/marco/marco-1.24.1-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE2_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="MATE default window manager"
+LICENSE="FDL-1.2+ GPL-2+ LGPL-2+ MIT"
+SLOT="0/2"
+
+IUSE="startup-notification test xinerama"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dev-libs/atk
+	>=dev-libs/glib-2.58:2
+	>=gnome-base/libgtop-2:2=
+	media-libs/libcanberra[gtk3]
+	x11-libs/cairo
+	>=x11-libs/pango-1.2[X]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	>=x11-libs/libXcomposite-0.3
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXpresent
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	>=x11-libs/startup-notification-0.7
+	xinerama? ( x11-libs/libXinerama )
+	!!x11-wm/mate-window-manager
+"
+
+RDEPEND="${COMMON_DEPEND}
+	gnome-extra/zenity
+	>=mate-base/mate-desktop-1.20.0
+	virtual/libintl
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	>=sys-devel/gettext-0.19.8
+	>=sys-devel/libtool-2.0.0
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	test? ( app-text/docbook-xml-dtd:4.5 )
+	xinerama? ( x11-base/xorg-proto )
+"
+
+src_configure() {
+	mate_src_configure \
+		--enable-compositor \
+		--enable-render \
+		--enable-shape \
+		--enable-sm \
+		--enable-xsync \
+		$(use_enable startup-notification) \
+		$(use_enable xinerama)
+}
+
+src_install() {
+	mate_src_install
+	dodoc doc/*.txt
+}
diff --git a/x11-wm/notion/Manifest b/x11-wm/notion/Manifest
index 793a44d750d5..d14267dd0f1e 100644
--- a/x11-wm/notion/Manifest
+++ b/x11-wm/notion/Manifest
@@ -1,9 +1,7 @@
 AUX notion 26 BLAKE2B b39f9f65f79f85b8af02c52334f71f0eb171abf2e48af8698b4eb51929a718d1aa24cce3b0c76b5d2c05843a4e6c1485b76081704004b03f0dfb92049aad252c SHA512 4d5aa2efb7ff7c9927ec6c2d8b0e5fd9ad1fcd10c7c40b20312342cb5a01ea9a835bbdfa88a054fb639f4a1a94dd4e05cb5f77a47d46ff43326086aba0cd69d8
 AUX notion-3_p2015061300-pkg-config.patch 2533 BLAKE2B 98b1c54fc92067702b77a6f4d51b87d829e124135e4004bec32ab71eaefc39c69c944810730bba8defb7e082138f12e2169cd48879177671c149a86407eef49c SHA512 7fb084b35dc274e8d943a4801f2a38d43bead5eb94d33282903416120e5116d37811b6388b61f4f402d1efeed01cf36606537cb7c0aaf8a3362e99d05c9c3fda
 AUX notion.desktop 208 BLAKE2B 7d138a583a49325901e3c1682c22dbdc1da02b4dcaa2ae6581c66e2676277de1a7b5a87e1c25465cb4ae6beebd7e93ab473e92b3ad6949ad97c833f2293e40da SHA512 3c0a0c5787d77afc94b0f0f9187be5c32374c2dbc51d2d9de3729b2c4e18572d6d8d79a554b017ba33c7276bc2aca8182f93b2d7268f92101385ab6a06f8191f
-DIST notion-3-2013030200-src.tar.bz2 625211 BLAKE2B c3909bb0d9e3eba582c1adc2a275c1ab9b7d23c9a2c172be526fe96de1f76165f131857e7ff5b549c8452ef0b7e6157c71377dd4bf28a2b4ecc5261e3866a59f SHA512 266df9ca2f3613c7138a3bfe7bab1fadd27c1ad40078d134be827167b9407b900bc240780cb5375e6996777978bb8a3bc12fbfa45bb4d8d619ee93335c6039b2
 DIST notion-3_p2015061300.tar.gz 797057 BLAKE2B 55258bb1d47a1c2506e9cb6654e5d68d69494a749174eaace2a53416ae40cac908b0398400a5a377dbb07618aa800529cbdfc0c7ef946d285681e1dfccfd9c48 SHA512 254be12a8ece555d9f6253d99891bb51214379d0c04b6bf9595b7e5bf9493cb5d2fada37438f89621e7157f9e3647e446b5e173847498ee3608081f006b86679
-EBUILD notion-3_p2013030200.ebuild 1994 BLAKE2B b68456398a5d19f9e729b44d17becccea5fbb0024634aa0c47eb7b76b648e0623632f7f09932e21ef55fbc676c25bd10347b1857eb45ce20cd64b6acf8e618c0 SHA512 27f747f5b25e9e8f79b267843ac5ec6d9d17af66110352d14c1e288bf388ab1eb01bc643d5891d7038c7d719d2fb729fa438cd310dae7070e8e36a06a3e1efe2
 EBUILD notion-3_p2015061300-r1.ebuild 2234 BLAKE2B 3ce2236197618615e6f1bc1ce86d964aa855996ef2739c9b357a2c2e5023aec69239ac3a20fd42f7d311777bbb3958910387077c0bb4b89df46a37933d8d4c53 SHA512 ba7058f9a713c7b89d11857614e012ccd69ffe953a7a1f5b0c361cfc93ff4be4c916322a9443d5c09d92766832e09e070baca0f7db24a2e9472363b7f61ef487
 EBUILD notion-9999.ebuild 2190 BLAKE2B 74d2802871b888c0bae7c9a6d90f257847ff1468790d6d74ac1b4b360ed8b422c61418bdf5247e1c91dcc41a4cfd858d414b208b179651464d1dbbdb6bb3f849 SHA512 fb09070ca7e4a0d479e4d539919360073dda1112e6a117aef2b8a3f8735f806de0cd91b9cfad45c9c4635e80d60865bfec8452a45e11fcfb6f9c1e7f3e466c46
 MISC metadata.xml 440 BLAKE2B a967115c8e255bb279de1a7a231ea2c45209383ae50bb03ee5e0aeea428e71afdb32ae027286e82820ce3f67849bba51a35ad263c32961de5191d4e053af782e SHA512 e113a6d332d785d2f6fb25d55796d499ccb67978b40130b06be408ae4ba4b9551e35ee928c43c95962e202f12f11ab152073f9d5cbfc16067385c7b34e25dcba
diff --git a/x11-wm/notion/notion-3_p2013030200.ebuild b/x11-wm/notion/notion-3_p2013030200.ebuild
deleted file mode 100644
index 743153bd4a20..000000000000
--- a/x11-wm/notion/notion-3_p2013030200.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Notion is a tiling, tabbed window manager for the X window system"
-HOMEPAGE="https://notionwm.net/"
-SRC_URI="mirror://sourceforge/${PN}/files/${P/_p/-}-src.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls xinerama +xrandr"
-
-RDEPEND=">=dev-lang/lua-5.1:0=
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	nls? ( sys-devel/gettext )
-	xinerama? ( x11-libs/libXinerama )
-	xrandr? ( x11-libs/libXrandr )"
-
-DEPEND="${RDEPEND}
-		virtual/pkgconfig"
-
-# needs luaposix,slingshot,... not in tree
-RESTRICT=test
-
-S=${WORKDIR}/${P/_p/-}
-
-src_prepare() {
-	sed -e "/^CFLAGS=/s:=:+=:" \
-		-e "/^CFLAGS/{s:-Os:: ; s:-g::}" \
-		-e "/^LDFLAGS=/{s:=:+=: ; s:-Wl,--as-needed::}" \
-		-e "/^CC=/s:=:?=:" \
-		-e "s:^\(PREFIX=\).*$:\1${ROOT}usr:" \
-		-e "s:^\(ETCDIR=\).*$:\1${ROOT}etc/notion:" \
-		-e "s:^\(LIBDIR=\).*:\1\$(PREFIX)/$(get_libdir):" \
-		-e "s:^\(DOCDIR=\).*:\1\$(PREFIX)/share/doc/${PF}:" \
-		-e "s:^\(LUA_DIR=\).*$:\1\$(PREFIX)/usr:" \
-		-e "s:^\(VARDIR=\).*$:\1${ROOT}var/cache/${PN}:" \
-		-e "s:^\(X11_PREFIX=\).*:\1\$(PREFIX)/usr:" \
-		-i system-autodetect.mk || die
-	sed -e 's/gcc/$(CC)/g' \
-		-i ioncore/Makefile || die
-	export STRIPPROG=true
-
-	tc-export CC
-}
-
-src_configure() {
-	use nls || export DEFINES=" -DCF_NO_LOCALE -DCF_NO_GETTEXT"
-
-	if ! use xinerama ; then
-		sed -e 's/mod_xinerama//g' -i modulelist.mk || die
-	fi
-
-	if ! use xrandr ; then
-		sed -e 's/mod_xrandr//g' -i modulelist.mk || die
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)"
-}
-
-src_install() {
-	default
-
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}"/notion
-
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}"/notion.desktop
-}
-
-pkg_postinst() {
-	elog "If you want notion to have an ability to view a file based on its"
-	elog "guessed MIME type you should emerge app-misc/run-mailcap."
-}
diff --git a/x11-wm/wmfs/Manifest b/x11-wm/wmfs/Manifest
index ca407acbf9a3..9dc242b15757 100644
--- a/x11-wm/wmfs/Manifest
+++ b/x11-wm/wmfs/Manifest
@@ -5,6 +5,8 @@ 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
+DIST wmfs-20180520.tar.xz 56364 BLAKE2B 23530193ba2c37ae4129fd23dda2ff8cd301b0bd92d32e06b264efd990b7957b38170de31f04afca6fd9875d2e0450c8bede416e5f49d6e19962718fe2e240a3 SHA512 bcff251397d8483db49c037c51eef7b3dcc87a6d94650ae9e9cabc7104177216e0efa7e67bfb34978bae67dc4853884673ce288bb8087e95cb2993d519ab4f2f
 EBUILD wmfs-201003.ebuild 968 BLAKE2B 89d8b905ba1c0a6c0016e9b0b40e0f3bd5ef538134e72b7b560dac4547a5f875081d3275604fc66a274ebb118556295433516ee884aa815fe8572cb2a766fc24 SHA512 4afaf1556dd33aa42c749a22929a815ec7970156963e39cc6e78e2d56dbbf465554889e4bb1ed1534e92ee0fbdc00803cf873408d8a014d197702c82ac803bc2
-EBUILD wmfs-99999999.ebuild 1141 BLAKE2B 29ab0a030dafb7f482dda9c06ae49c26bad2c5a77099e58b4148ee635a003d03e5a9a21c265800319a4a467c4d07a831e874c0279e6ac6adfd1f8de78065fb15 SHA512 e68aacf763356986ada1101eb77226c9efb94a23a7e1e619110f8e5f954a9b73168aa997c39a88c8c9744c5365a8709d9fbef0a3c176c9b65b2d8b47155eb823
+EBUILD wmfs-20180520.ebuild 1132 BLAKE2B cb7e3aebeb66a9c09f0984f6ef7d3b1971e1365c12af12a2ba33484aa05b67bbe62f24a586b04c3d0000a69941378868c2104813ea5a43618617c1a48f4a88ba SHA512 49d7081c5c0f5cf9177b898b3eb81e9275fa06aa9a45afeb235b5c3742e92f28edbc80fca9310fc1c4172fa5ab8eac3d90b2822afb5f331e88d82b8aee380dc0
+EBUILD wmfs-99999999.ebuild 1130 BLAKE2B d0e2ae315de0ce2a810b0ff2b7bfb5dcd0ea6f2e98201ade65e7f4154c61a421a1c642c541078379ef3ff6d31ce2aa78f50423454251bba4649286b3cef38d46 SHA512 b52a4cbb7ef9268c7e3da454d08ea38df0d1f585ea94ca71f4dc7da157f19b85f50749b9ef7f71226c2ec0304c23c3de1ca8b07bbfb4961a7a85a7c517bff2ad
 MISC metadata.xml 380 BLAKE2B 318de05f3f531b8c35e71a0563525f7c8a1397e0ba4adbd086b768c93d792d8c336da47bc7582dfc7b0f4ce2917dcccb21191f46c064b02317477ef3a568ee17 SHA512 644e88ac0ca2d999cd273f807d45400a8438a9800b3b744f764c914fa41d819efd55ecaa27de6cbcf4403491f2986299fc1c032afd26fee67822cfc2c6368359
diff --git a/x11-wm/wmfs/wmfs-20180520.ebuild b/x11-wm/wmfs/wmfs-20180520.ebuild
new file mode 100644
index 000000000000..f01f6ce2129b
--- /dev/null
+++ b/x11-wm/wmfs/wmfs-20180520.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="Window Manager From Scratch, A tiling window manager highly configurable"
+HOMEPAGE="https://github.com/xorg62/wmfs"
+SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+imlib2 +xinerama"
+
+RDEPEND="
+	media-libs/freetype
+	media-libs/imlib2[X]
+	x11-libs/libX11
+	x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-99999999-Debian.patch
+	"${FILESDIR}"/${PN}-99999999-desktop.patch
+	"${FILESDIR}"/${PN}-99999999-fno-common.patch
+	"${FILESDIR}"/${PN}-99999999-strncat.patch
+)
+DOCS=(
+	README
+	scripts/keybind_help.sh
+	scripts/status.sh
+)
+
+src_configure() {
+	tc-export CC
+	# not autotools based
+	local ECHO
+	for ECHO in echo ''; do
+		${ECHO} sh configure \
+			$(usex xinerama '' --without-xinerama) \
+			$(usex imlib2 '' --without-imlib2) \
+			--prefix /usr \
+			--man-prefix /usr/share/man \
+			--xdg-config-dir /etc/xdg \
+			|| die
+	done
+}
diff --git a/x11-wm/wmfs/wmfs-99999999.ebuild b/x11-wm/wmfs/wmfs-99999999.ebuild
index 416f8f678db2..286281b6f1f6 100644
--- a/x11-wm/wmfs/wmfs-99999999.ebuild
+++ b/x11-wm/wmfs/wmfs-99999999.ebuild
@@ -32,6 +32,11 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-99999999-fno-common.patch
 	"${FILESDIR}"/${PN}-99999999-strncat.patch
 )
+DOCS=(
+	README
+	scripts/keybind_help.sh
+	scripts/status.sh
+)
 
 src_configure() {
 	tc-export CC
@@ -47,9 +52,3 @@ src_configure() {
 			|| die
 	done
 }
-
-src_install() {
-	default
-	rm -r "${D}"/usr/share/${PN}
-	dodoc README
-}