gentoo resync : 06.08.2019

26 files changed, 327 insertions, 300 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 77cb5fee67a0..0bf020a76805 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/bspwm/Manifest b/x11-wm/bspwm/Manifest
index 7d71858bb4de..2fd1bb0ca35a 100644
--- a/x11-wm/bspwm/Manifest
+++ b/x11-wm/bspwm/Manifest
@@ -1,7 +1,6 @@
 AUX bspwm-session 1876 BLAKE2B 8e1a9eaf2a1721d2b6272b6f0e1f9692fbab8b94aacf2dd52db7dc4ebd97189d36f6d464e588c06084fd433f16901576ea9f682dd54858b7780a9c8732767fdd SHA512 04d89bdd5ca5a9163e576c41dee9420fff8c51ab4a53aca179060b9f6b348537ad96d4257964e7bc4422d836a21c52f82fdc30a6b7b07c229c9934d7620d90ee
-DIST bspwm-0.9.5.tar.gz 106893 BLAKE2B 6059fd31cb4d4ee262f5a60bac9d21efb61b55e2f47785310e5101abb77023307ff0b9e858701f9558e1e8980905bf323fb310e426c714cf05f09251947c19a3 SHA512 7f50caca3b049f7401f4db8c9d1a9a2d098a3d67a3f8fe87d433c14ad1d0443be9ed4296163628fd7180614d340b672350e02538f36d0e812418aafaef16ba09
 DIST bspwm-0.9.7.tar.gz 110956 BLAKE2B 75fb711d9c2fa519ff88faea20b1e74f562c1fa207dfe18990d6131b859ad06c15c92f2352e9e045d8b634fd8f15c3758501044107be6aa4d09bba5c3ab4ee2f SHA512 57115cd3ea9eea7a50a3dc26497354355c86b6dd86136c1899cc58bbefa228104eb292bdecf5f9eac5203d3eb326457e35dc9bedc5f18ec3e3c178dd3ca9926a
-EBUILD bspwm-0.9.5.ebuild 956 BLAKE2B b3f3a540952e78128abffcf7e58185e5816706918027e98fc204490388fb6418ef24ee575c5246140e11c608ef364e6c9a0827effa3a7eb8c859337efafdfbe1 SHA512 962e64f7418f45264cc295cc08dc59d21f9d87b05a4c0ef4d17d6d7c8475fea32af1c83a04060b9befb66feaa5a72f12a9ec0e09690bd84e0f5a416a5242db11
+DIST bspwm-0.9.9.tar.gz 111119 BLAKE2B b4f80f090582c48ff5322bf6b03db5aee5bab1868b39ee3c4a3ca9f46f0f5d243a94bd869f2c91dcfbca22136c632b4fa0a2dee0e5fd2f27bd170b1f85c69545 SHA512 17f70e44667813fafcf0df144ed211df5a4479af6dfaf6e0a6bb7154a7380fa48d6135e8c440b6202d07012b76ac7372f73d4bf2f0c3a6716ed998d2ee4e59a2
 EBUILD bspwm-0.9.7-r1.ebuild 947 BLAKE2B 6056a3e0a90d66d4e9a33d2e52eda3f106deba13ab40acc6598981e6822938e694321fe1cc9fd70eb2d7ba9744b96b9f6fabbbaefdf25979dc27c46d1c4cafbd SHA512 20a3df368a673ed89a8acd7906777d154ef73767cb76a729967e2e9839ec5374407094fc6be9b6dfbf7e825c84d5289ec2f81d35be5422e2de9bb24c4a79b785
-EBUILD bspwm-0.9.7.ebuild 953 BLAKE2B f2a039d7f2eb2d7e5f15bb3bcaef272f7651541800d0424fe9807b2e7614be0d5ceceb6e70e8106cee176b4c97a98a8436508e66f6f5a438e42127eedd94a58c SHA512 916613740a14267e5f94101268ca447bac8c8c25c298ca78b9429fb4dab8adc0d8541a181680b5e8d55e7c4aa8f6568baa23967d81f460092e2bd9967886b961
+EBUILD bspwm-0.9.9.ebuild 947 BLAKE2B 6056a3e0a90d66d4e9a33d2e52eda3f106deba13ab40acc6598981e6822938e694321fe1cc9fd70eb2d7ba9744b96b9f6fabbbaefdf25979dc27c46d1c4cafbd SHA512 20a3df368a673ed89a8acd7906777d154ef73767cb76a729967e2e9839ec5374407094fc6be9b6dfbf7e825c84d5289ec2f81d35be5422e2de9bb24c4a79b785
 MISC metadata.xml 328 BLAKE2B 1c5c86ed67692883d5ed15aad9fb2c773ebe1aab0419c49328630b37577fbf40e7c2cbbecd39551fd702b38fdbfa8c937d78abf6ab4eaf467649ee0af3f52cd3 SHA512 8dccf071f4e82f331d91713b0062c56161b945202da88386c1c21d7f4bb8363ad4b8c164542ad9b68c89b2eb408b8d67a88a322554ccdcc99ccdc046448eba8b
diff --git a/x11-wm/bspwm/bspwm-0.9.5.ebuild b/x11-wm/bspwm/bspwm-0.9.5.ebuild
deleted file mode 100644
index db690abde824..000000000000
--- a/x11-wm/bspwm/bspwm-0.9.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="Tiling window manager based on binary space partitioning"
-HOMEPAGE="https://github.com/baskerville/bspwm/"
-SRC_URI="https://github.com/baskerville/bspwm/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-DEPEND="
-	x11-libs/libxcb
-	x11-libs/xcb-util
-	x11-libs/xcb-util-wm
-"
-RDEPEND="${DEPEND}
-	x11-misc/sxhkd
-"
-
-src_compile() {
-	emake PREFIX=/usr CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install
-	dodoc doc/{CONTRIBUTING,MISC,TODO}.md
-
-	exeinto /etc/X11/Sessions
-	newexe "${FILESDIR}"/${PN}-session ${PN}
-
-	insinto /usr/share/xsessions
-	doins contrib/freedesktop/bspwm.desktop
-
-	insinto /etc/xdg/sxhkd
-	doins examples/sxhkdrc
-
-	if use examples ; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/x11-wm/bspwm/bspwm-0.9.7.ebuild b/x11-wm/bspwm/bspwm-0.9.9.ebuild
index 8b132d0fe0a7..484d61f26f28 100644
--- a/x11-wm/bspwm/bspwm-0.9.7.ebuild
+++ b/x11-wm/bspwm/bspwm-0.9.9.ebuild
@@ -27,8 +27,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install
-	dodoc doc/{CONTRIBUTING,MISC,TODO}.md
+	emake DESTDIR="${D}" PREFIX=/usr DOCPREFIX="/usr/share/doc/${PF}" install
 
 	exeinto /etc/X11/Sessions
 	newexe "${FILESDIR}"/${PN}-session ${PN}
diff --git a/x11-wm/e16/Manifest b/x11-wm/e16/Manifest
index 3155340b0371..c2183ece815d 100644
--- a/x11-wm/e16/Manifest
+++ b/x11-wm/e16/Manifest
@@ -1,4 +1,6 @@
 AUX e16-user-fonts.patch 412 BLAKE2B c3b7e6b0599eb511afe9c6f969f5c529313be2732e4cad2a772c9860427eaf84eb1083fb10ff28853c19a972f734f0b231e78d4862ce5246d9d3bdde6e532c96 SHA512 6fdcbe6191d93cc5c64efb6039cbe9409fd08734a4c99c29482bde06f044b1e6b88c35ef34dc65ce384ecdfb78883022a18885dde6e1bac8ca8192d5f6901c42
 DIST e16-1.0.19.tar.xz 1433016 BLAKE2B 9c27dd6a8d78d2f765b495e5398041a30bf939a5d3926f9f07e022c9bbbc70716b072e40beb6592159f896cc7a15e2fd4e25c8a07db333a80fc8156a82dce357 SHA512 9dc66a4224eacde92c567f9f5b029f21543675207b782077e25f3082ef2133a547eb955fc877b01b2200d99c26148f54a6b59f1ba191163760ecf3b32d5dd374
+DIST e16-1.0.20.tar.xz 1438516 BLAKE2B 32800ed079eb3c51c34277fa5d49ef7a892c0ccd5956f5f7eb7c34ab2e223fe7a5033b35d53402fa4a18283261a767ac692a5bfa08b46d5ea2a4e5195c656fed SHA512 798225dcfad266febe0911aeeac1a57256c45071e72ed326ae2081efdcf0d110e951f41badf5ece92dd0a40f5e342f80035e46d3c2435eb2f32a08c556893612
 EBUILD e16-1.0.19.ebuild 2890 BLAKE2B bbabc819922d8f4174e44bb53d3e7c68cf3fcd390f08c276a8b06f8506ebdf4b7b3b05334096343c8797acd235222e9de93bf32dc69dd7876f873ed93e6fe841 SHA512 de0d6644a1a998df765d6e827a48c24041eb3d460ddd8a453b1b043ab8fa9e9337e3e2bd8e3a7ec0466bf8efcc637c3ff0f4d4f87c72e026140186b6d44ce6d4
+EBUILD e16-1.0.20.ebuild 2934 BLAKE2B 74bb369190c166513dbb7d918ed657f840a21dd1f849b71e1d7b1bed716d9052cc921edf9b052984c42253889d222c3c8dbdd6856a08e4eec6b495bcd0f0193d SHA512 307eb6d0b721a77eb790475f1da9fbdc72829f9c0efe9bb9701b5add6842e2c869ce01a31c9bfa489805c7ba1c04626a3fe2040642e926ddcc46faad8de879ea
 MISC metadata.xml 1752 BLAKE2B 49a4d0adb7affcaf5d0f5156bc89057b701ea2ed9c469e3e3ff37720624e5d4f3740934b52537902148e7bde019c04d9b5b41ab341a24447fc3caf1394da4459 SHA512 dc40df2c5cc12d8d59d8446f3cb3195ce9f0ec988ba913f6fb6e3cac429fbe1151432226e170e260aa8e61d08cac13d7bf7f191a1fa845c101e0124df82b9ebd
diff --git a/x11-wm/e16/e16-1.0.20.ebuild b/x11-wm/e16/e16-1.0.20.ebuild
new file mode 100644
index 000000000000..5d940a12f3f6
--- /dev/null
+++ b/x11-wm/e16/e16-1.0.20.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Enlightenment Window Manager (E16)"
+HOMEPAGE="https://www.enlightenment.org https://sourceforge.net/projects/enlightenment/"
+SRC_URI="mirror://sourceforge/enlightenment/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="audiofile container dbus debug +dialogs doc examples gnome
+libhack modules nls opengl +pango sndfile sound +themes xcomposite
++xft xi2 xinerama xpresent +xrandr +xrender +xsm +xsync zoom"
+
+REQUIRED_USE="
+	audiofile? ( sound )
+	opengl? ( xcomposite )
+	sndfile? ( sound )
+	sound? ( ^^ ( sndfile audiofile ) )
+"
+
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig
+"
+COMMON_DEPEND="
+	media-libs/freetype:2
+	media-libs/imlib2[X]
+	virtual/libiconv
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-misc/xbitmaps
+	dbus? ( sys-apps/dbus )
+	opengl? (
+		media-libs/glu
+		media-libs/mesa
+	)
+	pango? (
+		dev-libs/glib:2
+		x11-libs/pango[X]
+	)
+	sound? (
+		|| (
+			media-sound/apulse[sdk]
+			media-sound/pulseaudio
+		)
+		sndfile? ( media-libs/libsndfile )
+		audiofile? ( media-libs/audiofile:= )
+	)
+	xcomposite? (
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXfixes
+	)
+	xft? ( x11-libs/libXft )
+	xinerama? ( x11-libs/libXinerama )
+	xpresent? ( x11-libs/libXpresent )
+	xrandr? ( x11-libs/libXrandr )
+	xrender? ( x11-libs/libXrender )
+	xsm? (
+		x11-libs/libICE
+		x11-libs/libSM
+	)
+	zoom? ( x11-libs/libXxf86vm )
+"
+RDEPEND="${COMMON_DEPEND}
+	doc? ( app-doc/e16-docs )
+	nls? ( virtual/libintl )
+	themes? ( x11-themes/e16-themes )
+	!x11-wm/enlightenment:0
+"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+
+PATCHES=( "${FILESDIR}/${PN}-user-fonts.patch" )
+
+src_configure() {
+	local myconf=(
+		$(use_enable container)
+		$(use_enable dbus)
+		$(use_enable debug libtrip)
+		$(use_enable dialogs)
+		$(use_enable doc docs)
+		$(use_enable libhack)
+		$(use_enable modules)
+		$(use_enable nls)
+		$(use_enable opengl glx)
+		$(use_enable pango)
+		$(use_enable sound sound pulseaudio)
+		$(use_enable xcomposite composite)
+		$(use_enable xft)
+		$(use_enable xi2)
+		$(use_enable xinerama)
+		$(use_enable xpresent)
+		$(use_enable xrandr)
+		$(use_enable xrender)
+		$(use_enable xsm sm)
+		$(use_enable xsync)
+		$(use_enable zoom)
+		$(use_with audiofile sndldr audiofile)
+		$(use_with gnome gnome gnome3)
+		$(use_with sndfile sndldr sndfile)
+		--enable-mans
+		--disable-docs
+		--disable-esdtest
+		--disable-gcc-cpp
+		--disable-hints-gnome
+		--disable-werror
+		--disable-xscrnsaver
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	docompress -x /usr/share/doc/${PF}/e16.html
+	dodoc COMPLIANCE docs/e16.html
+	use examples && dodoc -r sample-scripts
+}
+
+pkg_postinst() {
+	einfo "In order to use custom fonts, put them into ~/.e16/fonts/ and use"
+	einfo "appropriate names in ~/.e16/fonts.cfg. \"Use theme font configuration\""
+	einfo "in the Theme setting should be disabled for this to work."
+}
diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
index 7152fed362f1..c43edabaef77 100644
--- a/x11-wm/enlightenment/Manifest
+++ b/x11-wm/enlightenment/Manifest
@@ -1,6 +1,7 @@
 AUX enlightenment-0.22.4-efl-1.22-wayland.patch 2288 BLAKE2B 6e8a9f4d47318372c06a74bb6e3c233c36f9e57332519e706602a0472285e0b249c45d3d6fbd3074d6d720f157b6ddcf1a37da60b60f52908ee0f006a9e11239 SHA512 7ba3e501d7df99aa3f0336c1db09edaf5b2acd9eb6d2ad4f8465d92c595edd2b85e6a16c1408dc75502d73778cd2634ce2f409319887f6e53707208cd4128335
 AUX gentoo-sysactions.conf 3056 BLAKE2B 155b0826c544a5a4829214b4b43d49e2dad455d041f0afc7077dc44780d12bd1a99a1bc94bb5a4a9ba21f59f679e1d4c82609791ee5a5e9828543b1e9154fae5 SHA512 688f02cbff0d50a847eb08ca7832699b836adca9b22e15a780943a8e5a8213aac04b335cfdf3cb96adbff238f681ae8954a720153e8e35b2afaba3225d53206a
 DIST enlightenment-0.22.4.tar.xz 25656972 BLAKE2B 5e24e226e5f9295d27658656aefaf39cc80ad3634ba1937ef1a3c8e1adeba8cf3cbab2c43cb9e80ac298107a7a64e248ff252084b19c26a974ffff9eb9e6c3fa SHA512 9f4366bfed4d65e7baaeffd4f5b8ba6febf6f9888e6156dd3e100c9fca42c377f76f156f3dd1f6ab97745ffcb69e1e8d320937e41333797580624a9b74d298ba
-EBUILD enlightenment-0.22.4-r1.ebuild 2202 BLAKE2B 452b356c54a8f77a1cc81b8ec7cd9417f62c19a836c7ca2e1c3896ecdce46134c866c50d7ac033fa335a80f9622318fcf8c90185705292124eed3562dd8029f2 SHA512 b2388a95bb84e8e63ba500514360d144549816125465a33b1494f1f6a3ac6a4804d41672017d6df9dae440e37f4c38e030214254447167c5edf30001a6cca1a3
-EBUILD enlightenment-0.22.4.ebuild 2188 BLAKE2B e5edf01ab49f61a0318e0669f9193482bd713e3bdae5167f73d69d1eedfd3f233dec84f02711fbc39f59d3ef592ff1c1406ea605ed2f541e55a913c35f6ff8b6 SHA512 6082de94db744272db7ea7f767b6c3ef5d4320cabdd65c724248f17ba995c4ca9d914374101b6449a201275adc20ad4d580d59f40b3bdab4e853559467869a78
+DIST enlightenment-0.23.0.tar.xz 26425732 BLAKE2B 2b0bd2f27f5589eb4fa9e1cdd0f2713db26eef36ac204f666dded8a07e91edd260192d413b88e82609c700a71a3459defe8dcae6b778601473c32565799c15c8 SHA512 e49ed9d1d1725cbfd488eb654c3fbe60700382e26136d568b23452cff0112c49953633fd7ac9df7b64f910d37679681b2b9b417d710f46608e97c4060362c7d8
+EBUILD enlightenment-0.22.4-r1.ebuild 2200 BLAKE2B ec7e475f9a23d34b0505fd4e17d105e46f5ff678c9f886458a7b80cfa04e40545435105c495e6d8842a5d89b26babf6ae4d29215d99386d8870eb06952a668b0 SHA512 d538a3ebe011b66d0c81c0f18a3614a418d39f19c43ae30d1991af447eda682a1198437589914561c7367c60b3239e0f7b3504277cad4c770bb1172e152e9fbb
+EBUILD enlightenment-0.23.0.ebuild 2714 BLAKE2B f48e6fdccc7aa0059aad47a0c2f97c59c0e31f56b51b6d7ad2b8f0bf8d5e3f8d63899ffd17e87bbc9eb33f8e115a1c9b7ec2b33a8585e642ab4ec1a5aa760b95 SHA512 7da0ee6376955274ca05abb0717f43371056a387d563614a59de457b4db99cbc12e9935327dddf0293e2cca64edeb9e1eb25316a9110082ce1097b759fafc290
 MISC metadata.xml 802 BLAKE2B b7b4f3531b89d5aa743c0153171fc9c36e732ba609eb7703961fd65780c59662ebf796cd7c822ab3cfeed7198fbf4fe8f9b481755f6ac5792729f30e4cc13c6c SHA512 4634f5d13c9f6ae6a7ddeb2c50e8882fac00ac17de37e8eabc24d5edd2470a5e35ffcf21a885be572d1d55f12610eb7496b39a29aad5b3d5f48e67ec26be884b
diff --git a/x11-wm/enlightenment/enlightenment-0.22.4-r1.ebuild b/x11-wm/enlightenment/enlightenment-0.22.4-r1.ebuild
index 99d2165d2e07..f94da2d87cbc 100644
--- a/x11-wm/enlightenment/enlightenment-0.22.4-r1.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.22.4-r1.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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86"
 IUSE="acpi bluetooth connman doc geolocation nls packagekit pam systemd udisks wayland wifi xwayland"
 
 REQUIRED_USE="xwayland? ( wayland )"
diff --git a/x11-wm/enlightenment/enlightenment-0.22.4.ebuild b/x11-wm/enlightenment/enlightenment-0.23.0.ebuild
index 61ce22391698..d3c781b0cb83 100644
--- a/x11-wm/enlightenment/enlightenment-0.22.4.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.23.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit meson xdg-utils
+inherit eutils meson xdg-utils
 
 DESCRIPTION="Enlightenment window manager"
 HOMEPAGE="https://www.enlightenment.org"
@@ -11,11 +11,13 @@ SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0.17/${PV%%_*}"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="acpi bluetooth connman doc geolocation nls packagekit pam systemd udisks wayland wifi"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="acpi bluetooth connman doc geolocation nls packagekit pam systemd udisks wayland wifi xwayland"
+
+REQUIRED_USE="xwayland? ( wayland )"
 
 RDEPEND="
-	>=dev-libs/efl-1.20.5[eet,X]
+	>=dev-libs/efl-1.22.3[eet,X]
 	virtual/udev
 	x11-libs/libXext
 	x11-libs/libxcb
@@ -30,11 +32,15 @@ RDEPEND="
 	systemd? ( sys-apps/systemd )
 	udisks? ( sys-fs/udisks:2 )
 	wayland? (
-		>=dev-libs/efl-1.21.0[drm,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
@@ -42,25 +48,26 @@ BDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	default
-	xdg_environment_reset
-}
-
 src_configure() {
 	local emesonargs=(
 		-D device-udev=true
+		-D install-enlightenment-menu=true
+
+		-D bluez4=false
 		-D install-sysactions=false
-		-D mount-udisks=$(usex udisks true false)
-		-D bluez4=$(usex bluetooth true false)
-		-D connman=$(usex connman true false)
-		-D geolocation=$(usex geolocation true false)
-		-D nls=$(usex nls true false)
-		-D packagekit=$(usex packagekit true false)
-		-D pam=$(usex pam true false)
-		-D systemd=$(usex systemd true false)
-		-D wayland=$(usex wayland true false)
-		-D wireless=$(usex wifi true false)
+		-D mount-eeze=false
+
+		$(meson_use udisks mount-udisks)
+		$(meson_use bluetooth bluez5)
+		$(meson_use connman)
+		$(meson_use geolocation)
+		$(meson_use nls)
+		$(meson_use packagekit)
+		$(meson_use pam)
+		$(meson_use systemd)
+		$(meson_use wayland wl)
+		$(meson_use wifi wireless)
+		$(meson_use xwayland)
 	)
 
 	if ! use wayland; then
@@ -72,7 +79,6 @@ src_configure() {
 			-D wl-weekeyboard=false
 			-D wl-wl=false
 			-D wl-x11=false
-			-D xwayland=false
 		)
 	fi
 
@@ -83,16 +89,22 @@ src_install() {
 	insinto /etc/enlightenment
 	newins "${FILESDIR}"/gentoo-sysactions.conf sysactions.conf
 
-	if use doc; then
-		local HTML_DOCS=( doc/. )
-	fi
-
+	use doc && local HTML_DOCS=( doc/. )
 	meson_src_install
 }
 
 pkg_postinst() {
 	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
+
+	einfo "Additional programs to complete full EFL suite: "
+	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 "downloading themes and add-ons" x11-misc/enlightenment-extra
+	optfeature "feature rich terminal emulator" x11-terms/terminology
+	optfeature "a matching GTK theme" x11-themes/e-gtk-theme
 }
 
 pkg_postrm() {
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index dd8f813de976..e2076ef794e2 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,10 +1,6 @@
 AUX icewm 33 BLAKE2B 5605658012ad8ed16bbd4cf0c4cb7cbe5204f73c20ef2c3d9fef1011a80b9e68863de64b45e4b043604b147c9d31f3f5d2617d067b694f5ec5329ad895472b0e SHA512 3fe619e59cc5d354242ccd85d3b1982dd7db6d0f6170f46f9d33975872f6d5a342a08d69db763162dc43681eedb96e9ba5075455bf54adf4fb86bf19887bf6e0
-AUX icewm-1.3.10-menu.patch 821 BLAKE2B 2274136f91b891c971a84f80c3ace49f4c3e5245ae0de83408219575a25dc1cb42523459a923634ab25565fdafe1b5320b955adbb1de4b3fda3c7613ba93d7ad SHA512 15ad0cd80fa358ef823ad747b873afab7ce07114590cba90710b91daa6421a8b8030c7ce7bd8af245c85983d75583c2701de85809de3059fe3e838e2f88f016e
-AUX icewm-1.3.8-uclibc.patch 1830 BLAKE2B 36037fcdadb7d70d1cc4125170c05e9800a2acca930148eeb091d084a4aca7f4813f452e3565aece03aca7d441755e958cd75a83c875f684beec335355ee7a16 SHA512 ed3abce7aabb21e5fb516f02a6860d140b2d74f288daf8a7edd14f8d70cd377f5bcf9b4172da4c8ca30b176c79e7500ba2c253004ca59a1ab6e9258b6b8a6f2e
-DIST icewm-1.4.2.tar.gz 1709850 BLAKE2B 1a9dde495345f1601b3ae901b3e98554b60a9b9a8e94b7079f3c766971eb31bde5a3cd3972f5c96d86b5e02e413811df2a0689efc15a461bca39a70842f3df69 SHA512 c01661a7b07b4f42a32b20ecc9e45fb1e9c84c27d33105ec165e75aa9ac84129d55e992cac0d53fb10298bae28bc93ef07f68e874c1c2fccd9adecceb987a872
-DIST icewm-1.5.4.tar.xz 1689668 BLAKE2B 19779e0b80da89ca5cdce3525a0f612b126e0e3d4c7569fe249ca78af7cc8ad16162361699d0a068f3394a2105f2afc1f7f644a02c7ad883469a9fa8c1fbf416 SHA512 7b5743872d328f937b49e2b79f7d6c0b8404326ef7e7a3b529c80138b36e8c2b30db79593125a8be76abe40282c779f79ca64b504f980ef2c87052448bdc076e
 DIST icewm-1.5.5.tar.xz 1707656 BLAKE2B 670ab4d1c1648faa24c848ddb04f3e353a3acd8e9a105837229d00ca344a61b3432d7b23b89dc054e220797cfd56d6504ad233d8793a3a5d95d9943c79017797 SHA512 5d75d33bf6e45ea0b46ace5173d825e9d1a12318cf7a5319b20ea704b019f6c09391f0f199b0fac678ba0f160d8236fc1cfee5d3b47d1895b7ba3721ff62a05e
-EBUILD icewm-1.4.2.ebuild 2438 BLAKE2B de1cc5ef5cf186aa332ebcef371fb562875469b8bbb0f96fe01fb2ac35c5f8272a1eb8ca385ea86210846e79a70eb4dec8911ab8297dc2fe414e7d3ea49e8652 SHA512 6d834977adb9680101d45e2a4cd665cc69f694d1419d1d9133e8ece382d0cfa55299039b12fab2585cf46f1853baa57c252f7f7cea39b3a72c47f7a100cb7894
-EBUILD icewm-1.5.4.ebuild 2343 BLAKE2B 3419d63e8de1b43c5d0560e7d1ad524bdbc7e005bd83c4d0c15b64dec959dcdbbd75c81b28d0396f93f0dc4dac9fff192f0ed52f4879e69330bd71c8e41513cf SHA512 d5d5c3e9d024aad9066fde6ba81fd5fe53dc1cf07f9128cb03bedea1bf1ed9b888d9a6473aac58e9372c4c8045792c1b5334f2dab7b550a3a35221456291485b
-EBUILD icewm-1.5.5.ebuild 2343 BLAKE2B 3419d63e8de1b43c5d0560e7d1ad524bdbc7e005bd83c4d0c15b64dec959dcdbbd75c81b28d0396f93f0dc4dac9fff192f0ed52f4879e69330bd71c8e41513cf SHA512 d5d5c3e9d024aad9066fde6ba81fd5fe53dc1cf07f9128cb03bedea1bf1ed9b888d9a6473aac58e9372c4c8045792c1b5334f2dab7b550a3a35221456291485b
+DIST icewm-1.6.1.tar.lz 1651274 BLAKE2B 85c3bda7bacf8f2e1e6ed250fc1b66d151bb030118c56300fc2ce9ad1a54c8693c3e0f83c81cec1f1878f0c0b300c25ac78bdb6440e235877a18586e07601de3 SHA512 dfc221d9afa6c7949dda983c06bdac5527f8cdb93dd20babdc1de75a7ab6cf9b3b1fe8e8d617cb70bd93ebe9aec70ac419d915b76b564b31dbec42b57d6f6011
+EBUILD icewm-1.5.5.ebuild 2339 BLAKE2B bebb46e2f8508227fa060a88d4afe147fa81c876ed3c615d80080cfec6bcf16ee25592750aa9180073396969e421f5952e84200812e5f7f49d278be46acf01f4 SHA512 bb10e88ae08956a7637d3ce9481c7a48dd64d775723dd1c06f69e44f1fb352f21de655e5bac82ee9a1f2b31132c4e2292169493c6b7dc9846cf7538af4801403
+EBUILD icewm-1.6.1.ebuild 2358 BLAKE2B eee40d6e1337a04b341e597f499575186d2384c70962153dd7845d24e79ea05014fa73e8ce2c089ed4120d3edabae93c4158e71d91bfa4a77d7b603f9511be60 SHA512 ce7fae5d81b38c904b5f3b67636f69c42e251fcf62bee1a776c8ed706efd4f64ce458d6e2735369a9346763d026919124fc5a3566a6f422538946be008186e5c
 MISC metadata.xml 671 BLAKE2B f58cf53a373b1ba887cf376f5fc676b6d533348f186550a55961ac3d77a1867d8302759a83f69a3c8d757d16dcd2b0e4e7fdf52f485575d92a9d3b93fab3c463 SHA512 ea3df07996cdff6f369609a827cb4b23a6d2e3858fabc7fd9e85e382db7a53e0ca3dbe4ca50359c333b93372671e7c8753d2e7f40d1dfe6cd06c4714acf4ab9e
diff --git a/x11-wm/icewm/files/icewm-1.3.10-menu.patch b/x11-wm/icewm/files/icewm-1.3.10-menu.patch
deleted file mode 100644
index 721a15d25ee3..000000000000
--- a/x11-wm/icewm/files/icewm-1.3.10-menu.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- icewm-1.3.10/lib/menu.in
-+++ icewm-1.3.10/lib/menu.in
-@@ -4,14 +4,9 @@
- # since modifications to this file will be discarded when you
- # (re)install icewm.
- #
--prog xterm xterm xterm
--prog rxvt xterm rxvt -bg black -cr green -fg white -C -fn 9x15 -sl 500
--prog fte fte fte
--prog NEdit nedit nedit
--prog Mozilla mozilla mozilla
--prog XChat xchat xchat
--prog Gimp gimp gimp
-+prog xterm /usr/share/icons/gnome/16x16/apps/terminal.png xterm
-+"Web browser" /usr/share/icons/gnome/16x16/apps/web-browser.png xdg-open about:blank
- separator
--menuprog "Desktop Apps" folder icewm-menu-fdo
--menufile Programs folder programs
--menufile Tool_bar folder toolbar
-+prog "Rebuild program menu" /usr/share/icons/gnome/16x16/actions/edit-find-replace.png /usr/share/icewm/startup
-+separator
-+menufile Programs folder programs.autogen
diff --git a/x11-wm/icewm/files/icewm-1.3.8-uclibc.patch b/x11-wm/icewm/files/icewm-1.3.8-uclibc.patch
deleted file mode 100644
index e790842faed8..000000000000
--- a/x11-wm/icewm/files/icewm-1.3.8-uclibc.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -Naur icewm-1.3.7.orig/configure.in icewm-1.3.7/configure.in
---- icewm-1.3.7.orig/configure.in	2010-10-31 10:09:37.000000000 -0400
-+++ icewm-1.3.7/configure.in	2013-10-19 06:20:22.947520430 -0400
-@@ -113,6 +113,7 @@
- AC_CHECK_HEADERS(libgen.h)	dnl --  basename() for FreeBSD
- AC_CHECK_HEADERS(machine/apmvar.h)
- AC_CHECK_HEADERS(machine/apm_bios.h)
-+AC_CHECK_HEADERS(execinfo.h)
- 
- AC_CHECK_HEADERS(kstat.h,
-   [ CORE_LIBS="${CORE_LIBS} -lkstat"
-diff -Naur icewm-1.3.7.orig/src/acpustatus.cc icewm-1.3.7/src/acpustatus.cc
---- icewm-1.3.7.orig/src/acpustatus.cc	2010-10-31 10:09:36.000000000 -0400
-+++ icewm-1.3.7/src/acpustatus.cc	2013-10-19 06:20:18.355519888 -0400
-@@ -25,17 +25,12 @@
- #include "sysdep.h"
- #include "default.h"
- 
--#if defined(linux)
--//#include <linux/kernel.h>
--#include <sys/sysinfo.h>
--#endif
- #if defined(sun) && defined(SVR4)
- #include <sys/loadavg.h>
- #endif
- #ifdef HAVE_KSTAT_H
- #include <sys/resource.h>
- #include <kstat.h>
--#include <sys/sysinfo.h>
- #endif
- 
- #ifdef HAVE_SYS_PARAM_H
-@@ -56,6 +51,10 @@
- #include <dirent.h>
- #include "intl.h"
- 
-+#if defined(linux) || defined(HAVE_KSTAT_H)
-+#include <sys/sysinfo.h>
-+#endif
-+
- #if (defined(linux) || defined(HAVE_KSTAT_H)) || defined(HAVE_SYSCTL_CP_TIME)
- 
- extern ref<YPixmap> taskbackPixmap;
-diff -Naur icewm-1.3.7.orig/src/misc.cc icewm-1.3.7/src/misc.cc
---- icewm-1.3.7.orig/src/misc.cc	2010-10-31 10:09:36.000000000 -0400
-+++ icewm-1.3.7/src/misc.cc	2013-10-19 06:20:22.947520430 -0400
-@@ -15,7 +15,7 @@
- #include <libgen.h>
- #endif
- 
--#ifdef linux
-+#if defined(linux) && defined(HAVE_EXECINFO_H)
- #include <execinfo.h>
- #endif
- 
-@@ -503,7 +503,7 @@
- }
- 
- void show_backtrace() {
--#ifdef linux
-+#if defined(linux) && defined(HAVE_EXECINFO_H)
-     const char head[] = "\nbacktrace:\n";
-     const char tail[] = "end\n";
-     void *array[20];
diff --git a/x11-wm/icewm/icewm-1.4.2.ebuild b/x11-wm/icewm/icewm-1.4.2.ebuild
deleted file mode 100644
index e3ae5642b7ff..000000000000
--- a/x11-wm/icewm/icewm-1.4.2.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils
-
-DESCRIPTION="Ice Window Manager with Themes"
-HOMEPAGE="https://ice-wm.org/ https://github.com/bbidulock/icewm"
-LICENSE="GPL-2"
-SRC_URI="https://github.com/bbidulock/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE="bidi debug doc minimal nls truetype uclibc xinerama"
-
-# Tests broken in all versions, patches welcome, bug #323907, #389533
-RESTRICT="test"
-
-#fix for icewm preversion package names
-S="${WORKDIR}/${P/_}"
-
-RDEPEND="
-	media-libs/fontconfig
-	x11-libs/gdk-pixbuf:2[X]
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXpm
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	bidi? ( dev-libs/fribidi )
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-	doc? ( app-text/linuxdoc-tools )
-	nls? ( >=sys-devel/gettext-0.19.6 )
-	truetype? ( >=media-libs/freetype-2.0.9 )
-"
-
-pkg_setup() {
-	if use truetype && use minimal ; then
-		ewarn "You have both 'truetype' and 'minimal' use flags enabled."
-		ewarn "If you really want a minimal install, you will have to turn off"
-		ewarn "the truetype flag for this package."
-	fi
-}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.10-menu.patch
-)
-
-src_prepare() {
-	# Fix bug #486710
-	use uclibc && PATCHES+=( "${FILESDIR}/${PN}-1.3.8-uclibc.patch" )
-
-	default
-
-	if ! use doc ; then
-		sed '/^SUBDIRS =/s@ doc@@' -i Makefile.am || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--disable-menus-gnome2
-		--with-libdir=/usr/share/icewm
-		--with-cfgdir=/etc/icewm
-		--with-docdir=/usr/share/doc/${PF}/html
-		$(use_enable bidi fribidi)
-		$(use_enable debug)
-		$(use_enable nls i18n)
-		$(use_enable nls)
-		$(use_enable xinerama)
-	)
-	if use truetype ; then
-		myconf+=(
-			--enable-gradients
-			--enable-shape
-			--enable-shaped-decorations
-		)
-	else
-		myconf+=(
-			--disable-xfreetype
-			--enable-corefonts
-			$(use_enable minimal lite)
-		)
-	fi
-
-	CXXFLAGS="${CXXFLAGS}" econf "${myconf[@]}"
-
-	sed -i "s:/icewm-\$(VERSION)::" src/Makefile || die
-	sed -i "s:ungif:gif:" src/Makefile || die "libungif fix failed"
-}
-
-src_install(){
-	local DOCS=( AUTHORS BUGS CHANGES PLATFORMS README.md TODO VERSION )
-
-	default
-
-	if ! use doc ; then
-		cp doc/${PN}.man "${T}"/${PN}.1 || die
-		doman "${T}"/${PN}.1
-	fi
-
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}/icewm"
-}
diff --git a/x11-wm/icewm/icewm-1.5.5.ebuild b/x11-wm/icewm/icewm-1.5.5.ebuild
index 1fb78abeecfd..d38893669b3f 100644
--- a/x11-wm/icewm/icewm-1.5.5.ebuild
+++ b/x11-wm/icewm/icewm-1.5.5.ebuild
@@ -11,7 +11,7 @@ LICENSE="GPL-2"
 SRC_URI="https://github.com/ice-wm/icewm/releases/download/${PV}/${P}.tar.xz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE="+alsa ao bidi debug nls truetype uclibc xinerama"
 
 # Tests broken in all versions, patches welcome, bug #323907, #389533
diff --git a/x11-wm/icewm/icewm-1.5.4.ebuild b/x11-wm/icewm/icewm-1.6.1.ebuild
index 1fb78abeecfd..869277de7f94 100644
--- a/x11-wm/icewm/icewm-1.5.4.ebuild
+++ b/x11-wm/icewm/icewm-1.6.1.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=7
 
-inherit autotools
+inherit autotools unpacker
 
 DESCRIPTION="Ice Window Manager with Themes"
 HOMEPAGE="https://ice-wm.org/ https://github.com/ice-wm/icewm"
 LICENSE="GPL-2"
-SRC_URI="https://github.com/ice-wm/icewm/releases/download/${PV}/${P}.tar.xz"
+SRC_URI="https://github.com/ice-wm/icewm/releases/download/${PV}/${P}.tar.lz"
 
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
@@ -45,6 +45,7 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
+	$(unpacker_src_uri_depends)
 	gnome-base/librsvg
 	x11-base/xorg-proto
 	truetype? ( >=media-libs/freetype-2.0.9 )
@@ -52,6 +53,7 @@ DEPEND="
 
 BDEPEND="
 	app-text/asciidoc
+	virtual/pkgconfig
 	nls? ( >=sys-devel/gettext-0.19.6 )
 "
 
@@ -77,7 +79,6 @@ src_configure() {
 		--enable-gdk-pixbuf
 		--enable-logevents
 		--enable-xrandr
-		--enable-xrender
 		--with-cfgdir=/etc/icewm
 		--with-docdir=/usr/share/doc/${PF}/html
 		--with-icesound="${icesound}"
@@ -99,7 +100,7 @@ src_configure() {
 		)
 	fi
 
-	CXXFLAGS="${CXXFLAGS}" econf "${myconf[@]}"
+	econf "${myconf[@]}"
 
 	sed -i "s:/icewm-\$(VERSION)::" src/Makefile || die
 	sed -i "s:ungif:gif:" src/Makefile || die "libungif fix failed"
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 82dd1419ddf9..f3a57fb7bcdc 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -6,8 +6,8 @@ DIST mutter-3.30.2-r1-patchset.tar.xz 14096 BLAKE2B 83f2e975a4404b878e832a70fe7a
 DIST mutter-3.30.2-r3-patchset.tar.xz 30208 BLAKE2B 502e9c1d005cf268548e2732d4574b0eb7491940531c77c357e73e2da23b60acfbb183f9e818edd86cf0d6abca4e43c2e687db27544bb4fe7e9a33a162df01da SHA512 22b66395ffae07b208efa3a1305c71ea2282470a08300a5c3de23a2a45f03afef7804d5943934028286406adedbb9851dc562f4e57fdff77df22591893f0908b
 DIST mutter-3.30.2-r4-patchset.tar.xz 44820 BLAKE2B 2448dcd6bca338dbe2b87a93ca4374fd5b4cc5d8834dd40739e74a65280b7f00b99d61361082673f5f41e44fb40e36f0889d5ee00fbc034efe87294540fba48e SHA512 a7024b95bc56ab25cfdb27003b4b1fc39925117795c05f78b2d473fdbcf3bb6ce870ee5bc030ec4ce5e10b42d94fa0007bf5870bd2a4e94de3885c9434a39835
 DIST mutter-3.30.2.tar.xz 3725692 BLAKE2B 280b7a6319e5d4705baee965936df6f31ba8ca96ce3812cf640578c6817aaa82b6ff8fde7b2740ecd8edb6c4746f4608f997772a24d67f12fcb0c5c77fc9b29a SHA512 3890270b7eb4b8753274d30ad26693b829a69b31f36501845c59b000deb174be58b5167f6754767dba02ebc44688697fbe7344a327879a073955047b69333a2e
-EBUILD mutter-3.26.2-r1.ebuild 4036 BLAKE2B ac9aba438fa514748247827c3d6eb87b036c36528fad4818292778605de06423cbb9ef1fce00cca51c4a90581f7429079e563416ab656664e5c3a6d7a45d74ad SHA512 d4d168a12dd1fd3b3f32b036808fd55c976a9234d5f4c4d944fd6c88277d72d260c6e23dea57fd86d7e556029c6a5d6619c8af871e06f60598cbf8bc83388373
-EBUILD mutter-3.30.2-r1.ebuild 4735 BLAKE2B 1900763e23cd4ce19d0a6a8cb9784401f69944ebe5ea0d13ac815b648666c4e34fbfd5d0f0b6974cb38ba1fc5f783bc6725009ec648525c8a46d21a28140037c SHA512 03ac658be19c1c085092a88f60172c01d18a9e6af9c0954a78202a6a609909b22a5df08e786ba665387cd8f3581553395dba8b86d74fed624a0f69db3dbbb87a
-EBUILD mutter-3.30.2-r3.ebuild 4744 BLAKE2B a1247e741936b0e620c320818a7c9e2ad445010312e23720837fc6b97631923581d9722d1e6535bc001f34108da17159c366ff2ae7d55bb44dcf3184cf385ec9 SHA512 e9c8e37faf7cfbce738b6f4f6f816133f77be4f658d0de73301f51a2c447e94825cb77c36010c0ac32135095c42ef7f688348e6c964fde26528d6dad3bf1a78f
-EBUILD mutter-3.30.2-r4.ebuild 4822 BLAKE2B 918ddb2cce457d40990fd1dec775a7885535f6acd10397f571d3902ad1a8d3976f9b7f8564e8e2306df3d16d4413b8026734dc800ee7a208d2663ca27aaec731 SHA512 a4cf62fa0ed50b2e051ede44f34883d0adfe03606036713957db3611792480845b0f895e754fad506ad4b654992eb12e6c84f654864b19ca2731507b1a9178bb
+EBUILD mutter-3.26.2-r1.ebuild 4080 BLAKE2B 1d5f4a3124fefcd5ef813fd53fe4a62b6d7aeec3963e2f0719b58accdbe8ac23e768a420e2d1424282dd476b8c544612c9fe0fe9e5aea5c8781705708c5aef5b SHA512 b551ed5ede7d49b489f89f226dccd4a313f94ae2c429c9b572747782df197157cfe961b5d5bc36abe7f160578ecad248c2c213009abac79d68e943f6ab680892
+EBUILD mutter-3.30.2-r1.ebuild 4779 BLAKE2B a074b6bab4ea5005ec421ed8c7c9529da1ecdded81e6d6a9a25b795a784c77defbfcb6af34bf404ca92adc22faea10c786c9566d6ea2194ccf618b888c679f56 SHA512 2e7a7f68c8d8e3d2c185ee9e073a60e7f72639897b48b0f823b4a5ab3f95452595aa501657f7a5953f92e95170766d55dc661724ea616e088b91b7e98622e533
+EBUILD mutter-3.30.2-r3.ebuild 4788 BLAKE2B c369445d8f99380447ec5d9278ce1753f7b8e41c36aaf05836cdd5e05d5516472dd07dcdc0b4241cba08b58417ed1b16c90c350ceba07bdc8a97def8a76ee908 SHA512 9a474d06a0c71306b9ba8c3e81113abd78f44f22a8b62d045d8da83143b9da3f19f20ad3c7cd6fbcfcd467dcd4431409c05680a29cd31e1f3f5033ab3cb6a5a4
+EBUILD mutter-3.30.2-r4.ebuild 4866 BLAKE2B a174de32d79499cfb7e13562056b3bf768e27b3e8a499cc65a4b6a445431339146b986e5121743d5ce020e95c68f172d2c4520d11f58e05047705e01aa70f3b2 SHA512 5527cc326594e06ddf96522e09cb39c1dee1a688b26c2052061ec89525a80fe90b1f6a372dce59dcb3e1484188be6dbc4842c4844e6569a204db198ce946cc21
 MISC metadata.xml 552 BLAKE2B 1e0ae54a432b5f0882ec17726ae8753e0168a8191c57fe204f7dbbd54ead1eb543224a46e42644508b7c69d6969d8849bf80dd16f0af2f5075f1942725851e40 SHA512 cf8d304399b4af16bcfb43c5ba3b1ea94ea9bf92be925fab584b4febf8ede21bb0f95dd590b12e1a5528f48372792da2ca31c5c469ad443c7fd20e5b8f7cc700
diff --git a/x11-wm/mutter/mutter-3.26.2-r1.ebuild b/x11-wm/mutter/mutter-3.26.2-r1.ebuild
index 6ba7697388f3..717de28c38be 100644
--- a/x11-wm/mutter/mutter-3.26.2-r1.ebuild
+++ b/x11-wm/mutter/mutter-3.26.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -30,6 +30,7 @@ RDEPEND="
 	>=x11-libs/startup-notification-0.7
 	>=x11-libs/libXcomposite-0.2
 	>=gnome-base/gsettings-desktop-schemas-3.21.4[introspection?]
+	<gnome-base/gsettings-desktop-schemas-3.31
 	gnome-base/gnome-desktop:3=
 	>sys-power/upower-0.99:=
 
diff --git a/x11-wm/mutter/mutter-3.30.2-r1.ebuild b/x11-wm/mutter/mutter-3.30.2-r1.ebuild
index bd9ea4cb462f..df0e1652d3d7 100644
--- a/x11-wm/mutter/mutter-3.30.2-r1.ebuild
+++ b/x11-wm/mutter/mutter-3.30.2-r1.ebuild
@@ -34,6 +34,7 @@ RDEPEND="
 	>=x11-libs/startup-notification-0.7
 	>=x11-libs/libXcomposite-0.2
 	>=gnome-base/gsettings-desktop-schemas-3.21.4[introspection?]
+	<gnome-base/gsettings-desktop-schemas-3.31
 	gnome-base/gnome-desktop:3=
 
 	x11-libs/libICE
diff --git a/x11-wm/mutter/mutter-3.30.2-r3.ebuild b/x11-wm/mutter/mutter-3.30.2-r3.ebuild
index a6b546ea6ad2..d18e0d664c85 100644
--- a/x11-wm/mutter/mutter-3.30.2-r3.ebuild
+++ b/x11-wm/mutter/mutter-3.30.2-r3.ebuild
@@ -34,6 +34,7 @@ RDEPEND="
 	>=x11-libs/startup-notification-0.7
 	>=x11-libs/libXcomposite-0.2
 	>=gnome-base/gsettings-desktop-schemas-3.21.4[introspection?]
+	<gnome-base/gsettings-desktop-schemas-3.31
 	gnome-base/gnome-desktop:3=
 
 	x11-libs/libICE
diff --git a/x11-wm/mutter/mutter-3.30.2-r4.ebuild b/x11-wm/mutter/mutter-3.30.2-r4.ebuild
index 4a195cee4a18..cb9832016954 100644
--- a/x11-wm/mutter/mutter-3.30.2-r4.ebuild
+++ b/x11-wm/mutter/mutter-3.30.2-r4.ebuild
@@ -34,6 +34,7 @@ RDEPEND="
 	>=x11-libs/startup-notification-0.7
 	>=x11-libs/libXcomposite-0.2
 	>=gnome-base/gsettings-desktop-schemas-3.21.4[introspection?]
+	<gnome-base/gsettings-desktop-schemas-3.31
 	gnome-base/gnome-desktop:3=
 
 	x11-libs/libICE
diff --git a/x11-wm/xmonad-contrib/Manifest b/x11-wm/xmonad-contrib/Manifest
index 89193f125be8..ce1a36c093bc 100644
--- a/x11-wm/xmonad-contrib/Manifest
+++ b/x11-wm/xmonad-contrib/Manifest
@@ -4,8 +4,10 @@ DIST xmonad-contrib-0.11.2.tar.gz 401758 BLAKE2B 06697bac621dabbbc3e066c38efbfc8
 DIST xmonad-contrib-0.11.4.tar.gz 401743 BLAKE2B f6962bcb88e88ebf620ef037c08de8c21ebbb10cb863852f60b5f3ba03d72d00dfb737b57ca0bb5f2fa3364a120fe00377d6c27735abbc8f7eb0b1992ec705b7 SHA512 3d747988baa497475255be4cc96f7eba5cf6fc81658f8f877ca92148fb9a154423ee98ebeb23690de00b186d2e34ad13d94cf1fe332d4ca4f1f4a64790e46ed7
 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 1072 BLAKE2B 5ab63d4b64040716bdd2436e146ba473432cf7fd8bae75f2e388d4dc13bfed36b3b746b787113e01e331943c7c60b7ede442f2b1bc862a434f375dbbc57c4212 SHA512 b5efb5b4b81371e5390f1019721b3bdc66f749de928ef296a7fa31f571ed55fd867403d75864eaad2615052be800c07fe159d6d7ca135f6de82b04e876ecdebc
 EBUILD xmonad-contrib-0.11.4.ebuild 1474 BLAKE2B 9b335ddfc737a8dc66c3d0914464a5101a4b3dfbb2747031c2a5f295b9e7e1e2cc1934951878c6275b6272c910ded22021cd9e71d5a02e97bf5c15e3dee7e525 SHA512 6e6105f7cbee4cf008449bb986ce10801a53b221b1d81d4f39f1aa39d57eb86c0d574318ceb886e0a3f005f28d2373c078c405c6378be7c4f9fa9612e5e5e2dc
 EBUILD xmonad-contrib-0.12.ebuild 1108 BLAKE2B bf64cc37ee269fb1637599da5537797a37f8d65e4aa439cbc3073da3b3e011f375276cef1dec019000788f9758cec7f0f928a3ca2bf8a0b68ac681b000589c70 SHA512 a99c25deb7e097a1f3948a8ae59f301728d9ea34da45b030472507c92802fffc7f4391462443d7f63359bfaa3d52d6f7c2456bbc6d38713ce07643086dd8e1ff
 EBUILD xmonad-contrib-0.13.ebuild 1101 BLAKE2B e080c18024bbfecadce12b38070b999f4f84ef22f1a9f9a2e74b5b4939ea239aa6490d797adc9bb985055a7e483c8c7874ef7711400a5d894248151247ce44d5 SHA512 d6defccc0dac8c6bb7754976f30b024a3ee4ed738eec970a3eee81e8e724592fdf8c455f07171d6d5221888fa27c72c9afe44b7e65497412000321745daf7e76
+EBUILD xmonad-contrib-0.15.ebuild 1137 BLAKE2B e6fd958a9d88fdf01cc2293dd110de03871ec418ed365a13208700edb14df0d935b2f808dcdc600f0d64595088e26d004c3236f6cab8a4f520fc5fc3db7e88e0 SHA512 21c6f57ee35adf2299546aca74bb3227c2315ab28446b0df79f22c0fd70ccf1628f50ea4f446d2ccd10b3e96459a5847a3b661b8ec39bc220a5467aade534fee
 MISC metadata.xml 708 BLAKE2B 0aae3704519ca0ffba4e25ae3236ebd02ecb6a9e7bef7d23a32107ad6e6826f09613dc6206fd1e350a8e3536061136cfdd463f7e2a80b16e7f38b30db14c4fc4 SHA512 570916b2bcf06efaeccb486d3161d0b751c675955abae7efc57d471961e2c1649075bc155e75849cd1b56c0a5917341f7ef2cbb12e81255787cfb282a6ea1fb7
diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-0.15.ebuild b/x11-wm/xmonad-contrib/xmonad-contrib-0.15.ebuild
new file mode 100644
index 000000000000..4d0d9737f401
--- /dev/null
+++ b/x11-wm/xmonad-contrib/xmonad-contrib-0.15.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6.9999
+#hackport: flags: -testing,use_xft:xft
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Third party extensions for xmonad"
+HOMEPAGE="http://xmonad.org/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+xft"
+
+RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
+	>=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?]
+	dev-haskell/old-locale:=[profile?]
+	dev-haskell/old-time:=[profile?]
+	dev-haskell/random:=[profile?]
+	dev-haskell/semigroups:=[profile?]
+	dev-haskell/utf8-string:=[profile?]
+	>=dev-haskell/x11-1.6.1:=[profile?] <dev-haskell/x11-1.10:=[profile?]
+	>=dev-lang/ghc-7.6.1:=
+	>=x11-wm/xmonad-0.15:=[profile?] <x11-wm/xmonad-0.16:=[profile?]
+	xft? ( >=dev-haskell/x11-xft-0.2:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.16.0
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-testing \
+		$(cabal_flag xft use_xft)
+}
diff --git a/x11-wm/xmonad/Manifest b/x11-wm/xmonad/Manifest
index 27a0129813a2..75a35c9148be 100644
--- a/x11-wm/xmonad/Manifest
+++ b/x11-wm/xmonad/Manifest
@@ -7,9 +7,11 @@ DIST xmonad-0.11.1.tar.gz 59307 BLAKE2B 98dc31dd53e933f68dbf00121c6a0b4e4a24a19c
 DIST xmonad-0.11.tar.gz 59119 BLAKE2B 75ae39e2e54d4b5ed14f99d0144d4ee7741c611f18b5692aedce49b0a4dc07a17f613280d93fd715b812a2c22e27ad9f7fe8693dba38739ccf6dde9742fe03b9 SHA512 34740f032508584f34f6b138d21394eca17e8020bccc4d8c6e8b3cb6b7ca64b153077cfd16636a6130768ebd145fe993569f8a229862d7816d0c89c905ee08bc
 DIST xmonad-0.12.tar.gz 61436 BLAKE2B ea42fc105e30be59a2cb0180c05ef88024e51a1a224bdd6bb910d45cddabc2709411e2f0c7aa6c5723f54653db242bda80ab92249204106955be75a4a077f1ea SHA512 e519c038d90db037bc81e7baf7b07cfa53922509e98ffddacfc4a6cc2c7376383be1e721f613057a5febbfcc661807b6382124eb673ac7a7cda23c738d3539ab
 DIST xmonad-0.13.tar.gz 72034 BLAKE2B c95b24ae406268da642168defcc633cf8185f0f2dbcede1122c48c3812bf250df69d917c479f328cca450dec362ae0614d2acaf09d62123d15d646dcae8d98ec SHA512 9d9436f36fe0f6a9732502b0211fc41a224b1320b843d266b6d2dd201e4329b688f7eed5b08597b2edd713cc25f2b88a2a1f1ee43e18615c0a78e97e4716b122
+DIST xmonad-0.15.tar.gz 68822 BLAKE2B 9ee9a070f6743fbab2cffe05ee9e60b64fded0b4916fdec03a550f5d5ec5a34102ab2d4e9586b9a0ca534db284a8058f11ee248072f3f3b312ae30c09873feff SHA512 f881f3faa4f5a0de7a5a37118cd7041083ae3a7569c7094b55dedb9aa858176789aff459d426b237ebae5cc4598b06de790938775a7ac968c2d76be3f0efc8ba
 EBUILD xmonad-0.11-r1.ebuild 1965 BLAKE2B 372045a866c737afc0e782d57507a003acf7d37f9897488390ec03f34e9e2decabbde3bd32252260aeb2b9889dbab6a6fd06cce0cd38d9651c621d069ce287c4 SHA512 492c80d5acc5754ce183f8f916d6cb52e4cb62eeaca064ceca626f7ee874c9821c82228ca7d3dbc68ad8cf5429b397070cbd3b5a7a75cdf474ffc30974d8ca6b
 EBUILD xmonad-0.11-r3.ebuild 2215 BLAKE2B b207cd50e8c547edbb6ec2d5aca8abdc7b87005a3ae8303ce5d850aaab7067bb4472bd7aebba46f1d5078c94c2b4d49abe1e3d12d80ed79d646b6a560fc9e1a7 SHA512 a6d81091312070ebb0d249ea11d4df13c56452404441d8b350ae07817d91946db6c08213f97f60bede4c8262eb2c430d913359b7a28c49994bbb545a9e677279
 EBUILD xmonad-0.11.1.ebuild 2180 BLAKE2B 16928081702afdabb54a56c1e63230132ed394f71fa185bb6c351d7328a1784c1534f2ae77cc616c4dded300fb2ba720e2e3902377bb72e5208f5f3a5bd6f8d7 SHA512 7a2abef771ae04fa73e820c735ab4cc6a3f797ed2dacd1d581404f487612434dc67ec12efafff03df04340c72be14db99bb26f1a759a51f25279433f1dd1a447
 EBUILD xmonad-0.12.ebuild 2457 BLAKE2B 4bf99bc92a8454b2e32c4d1783b1f97ee2199056bc7d3c1bc776fb7be3d73f27efbfd8764e35aeb3f69602f14111da4adfbdeb8dc669eb439a2b3bc142b0d04d SHA512 b3bc1fe747f8db0ba7afe6bffd395e9f4dbe6ee501945ad139145a37d49f129cde09732f42461029745848273d3c7b93ebfedf349c3aafd267322d192222d1c4
 EBUILD xmonad-0.13.ebuild 2192 BLAKE2B 326da365e3d0af7bfb070ad03c99a101e5bada05b30878db19388bd6b64ef371075c92c6b9548ad95151c2b029ed04afb575040989ee40056cb0ade97d65eaaa SHA512 f80c9344470ceb7d888fd007a12123511155a0c32c31cad9ee35951282afa0db757e280ba24916899855b8ab0f70b3a7730f76b1565374259e88b3f5187adf74
+EBUILD xmonad-0.15.ebuild 2344 BLAKE2B cc72ea8319f871356e0180bd5c27c98d1782b257a518efd924c776bd171be90d5785ce4316e3fac6efa514c6e45823b7197a3de2f46c0a1561cd71f357dcee13 SHA512 de104666e778847e6a51e3fcb9c0c2459532b5fa714b6fe2b140e612114c2b2e77fabf353aa941fd4dab9e894c0ce06c6eeaac3d846ddd354f6208a52159d207
 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
new file mode 100644
index 000000000000..a65b517e3950
--- /dev/null
+++ b/x11-wm/xmonad/xmonad-0.15.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6.9999
+#hackport: flags: -generatemanpage,-testing,-profiling
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A tiling window manager"
+HOMEPAGE="http://xmonad.org"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="no-autorepeat-keys"
+
+RDEPEND="dev-haskell/data-default:=[profile?]
+	dev-haskell/extensible-exceptions:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	dev-haskell/setlocale:=[profile?]
+	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+	>=dev-haskell/x11-1.8:=[profile?] <dev-haskell/x11-1.10:=[profile?]
+	>=dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.0.0
+	test? ( >=dev-haskell/quickcheck-2 )
+"
+
+DOCS=( CONFIG README.md CHANGES.md )
+HTML_DOCS=( man/${PN}.1.html )
+
+SAMPLE_CONFIG="${PN}.hs"
+
+src_prepare() {
+	default
+	use no-autorepeat-keys && eapply "${FILESDIR}"/${PN}-0.14-check-repeat.patch
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-generatemanpage \
+		--flag=-profiling \
+		--flag=-testing
+}
+
+src_install() {
+	default
+
+	cabal_src_install
+
+	echo -e "#!/bin/sh\n/usr/bin/${PN}" > "${T}/${PN}"
+	exeinto /etc/X11/Sessions
+	doexe "${T}/${PN}"
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}/${PN}.desktop"
+
+	insinto /usr/share/${PF}/ghc-$(ghc-version)/man
+	doins man/${SAMPLE_CONFIG}
+
+	doman man/${PN}.1
+}
+
+pkg_postinst() {
+	haskell-cabal_pkg_postinst
+
+	elog "A sample ${SAMPLE_CONFIG} configuration file can be found here:"
+	elog "    /usr/share/${PF}/ghc-$(ghc-version)/man/${SAMPLE_CONFIG}"
+	elog "The parameters in this file are the defaults used by ${PN}."
+	elog "To customize ${PN}, copy this file to:"
+	elog "    ~/.${PN}/${SAMPLE_CONFIG}"
+	elog "After editing, use 'mod-q' to dynamically restart ${PN} "
+	elog "(where the 'mod' key defaults to 'Alt')."
+	elog ""
+	elog "Read the README or man page for more information, and to see "
+	elog "other possible configurations go to:"
+	elog "    http://haskell.org/haskellwiki/Xmonad/Config_archive"
+	elog "Please note that many of these configurations will require the "
+	elog "x11-wm/xmonad-contrib package to be installed."
+}
diff --git a/x11-wm/xoat/Manifest b/x11-wm/xoat/Manifest
index a3ec16e75489..4458d17b6fe4 100644
--- a/x11-wm/xoat/Manifest
+++ b/x11-wm/xoat/Manifest
@@ -1,2 +1,2 @@
-EBUILD xoat-9999.ebuild 875 BLAKE2B 706794b1ae0a5015cb012264c37518ac57fbc68d5ecb08d0125195baad2254b7e32ed8e99b806ca5ed0dc6b87fecd652103fbd13f0c9e6a3c7613a9174680077 SHA512 3f596b225fd0f428ecb74e45240eb70f77ad2e6ee38a01f0b862c1455680708aef836c21b09b3526910b0a4d31217431895d075cdba1a16719a95839d06b54da
+EBUILD xoat-9999.ebuild 872 BLAKE2B b532ceab8336c8fdcf1b2146186e5c17a0ee6ca69e796bf95c82596029f707659ccd4337e826e83cf3df461966f6af6076f5b6ed82c211516ad2a99ede8b71f1 SHA512 699f4cb3dce846d331bcbe0281862b56cbf4a010f71a8e2682971f324858af967ddf3fc7c81b2351ccb900e15f79795616c30cb4a85cdd905ecf3e2772578356
 MISC metadata.xml 295 BLAKE2B 43f1fc1dcd0e05a888e3ec1d708a588b47b926b357a6c7a9f37b6b6941b3687f61d7d34808f61d90d4dd9a003da8e099ec7cc5917609a3d22768930c9d371874 SHA512 dcf39022dd854a3682c0f4bbd85c3d37ef76d374ffec74b6f3b78108e8eac4c4328937d5476958e00c74d9fd721f82c1555c079425daa9e81b5b5b5018768211
diff --git a/x11-wm/xoat/xoat-9999.ebuild b/x11-wm/xoat/xoat-9999.ebuild
index 5ddef98cef3e..914c769f41f6 100644
--- a/x11-wm/xoat/xoat-9999.ebuild
+++ b/x11-wm/xoat/xoat-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit flag-o-matic git-r3 savedconfig toolchain-funcs
 
 DESCRIPTION="X Obstinate Asymmetric Tiler"