gentoo resync : 29.01.2021

24 files changed, 496 insertions, 327 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 78d5367e8bba..2fdbd6d5d59c 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest
index 547a57da2083..338072e65441 100644
--- a/x11-wm/awesome/Manifest
+++ b/x11-wm/awesome/Manifest
@@ -8,7 +8,6 @@ AUX awesome-gnome.session 220 BLAKE2B ea84c3a24feb5c9921940dedd6f3fa05a6987b6aab
 AUX awesome-session 1999 BLAKE2B c7c784fba884ff0e579eb60cb049e695022be162a535065a172c461ec60d369415faa26be7cd60645e671ae8b2861b192ff962b803473746b567ef874bc706e9 SHA512 b6e7cc0813569b448b030cb8516d0272ebcf60b96f680b7de43dc4374e6e2d85b9bd841c6f1ab62caca52120c303332653e3de38eca0fe6a813b9bc5b68ac8b7
 AUX awesome-xsession.patch 291 BLAKE2B fb8ca929487ef45cd64c44bbb3db2b7c4a1be4f5abf5f8fa7467694226bdcd1441bd5c601f0f27e7d2c8656bb4c75cb364cd6d8d641a648611ed2658b27cd389 SHA512 1d19f3ac5e9f8fd1084fd5e092d52ffbabb06fc3dc94f6f8e62834a3a03bd5bcb04adc698ac3a022c5446a07a847be35e3f3003e8bc9e7d35c6c82350517233d
 DIST awesome-4.3.tar.xz 1037816 BLAKE2B b4afc5e7bfb01ddc16b67776cc00dd7b0bcbefc9d17f9bec9c04256953858aef2bf0e4b15a525909029b7da771ade0d749758aba2878832f356d7b2c4f0363b7 SHA512 c5ef1e8dc593e7783b895d22143154aea8f211beeda24672a7ee4ed5112b4f4284043f848a151f3d3c4f569e91308670367a4353f705b20511b36495b22fa3f5
-EBUILD awesome-4.3-r101.ebuild 4018 BLAKE2B d9cf27c7dc9bc200c277c7517916ac9ce444a567fefba8e83b8d73dcad68041d68c5e6c06c6300b0ef9327f5f463cd9089e1d79a0e37ea44f362f8fc0145c8a1 SHA512 6a340fcedffc2162b5029c6c04c4f5e1998096154cef36d62b1d156b8a6041dddbbd261b3d350505d3e54533f58b588adb6ea03e769a491d731b8cc343769983
-EBUILD awesome-4.3-r2.ebuild 3628 BLAKE2B 13d41fa0d81ac06d95294d603e19caa5d50d2307b482746eea0f9603b215790503cedd75490a0cab49880b66f1215f22b901748cc78e4a91bc0ede95533fda54 SHA512 c662a249779837b4397fe749113c78f87c0f2312cc76ce13926b2732fabd5e12fe97baec4c9a41816178925b3da65821dfdeab7b4a4089b69883cd6f7d1a3284
+EBUILD awesome-4.3-r101.ebuild 4013 BLAKE2B 8de97a602b1d365a241115ee410fa0967176b629f8906b68519951ad194e5b958b3e401d6b5bead8b55bfc76e1de2d361eb00842f750aea35ddc9d491e859e25 SHA512 9cfc73d8d2c514548d06c9d25343ddb4750b208c00eb57cc8a30b41b0041cec7fd36c44f4db1bf8944f116a1f247c6e33655bb0ce82e06ef9fc42c628c19080d
 EBUILD awesome-9999.ebuild 3959 BLAKE2B c8198273b9ad36c5dabfc202bd4d64438b8156370a9a1220f5b0b36d4422a64c493cbe9116b25a69016474e3c4ae1d7445925961f2f9d2d3ad0f7e033f9aa59b SHA512 bf6b1b79f597e476a6754c6bbd24e50311e10f137d89ec7fb65d4d4e683ca12f65f71f51bc9e6f014a65528489520b4b01891d4fc00f43289e5a80e55339880c
 MISC metadata.xml 327 BLAKE2B 2b34d6e8f8e02580c16d30bf9d65e33e29447c848fe58f4fb2324d0d3adbe93e7ba7eaeb440d1bd987ce300f21116742383b59c3fe53c15176a14eda684c6a5e SHA512 4bfbb536edf61389e39e0f6ae53e7255a4f2cf78f197f44317be2e11419ddb950b2aab540d48a1552c2b4c9cc050665ba944e10da5227f95ddacac29ed741276
diff --git a/x11-wm/awesome/awesome-4.3-r101.ebuild b/x11-wm/awesome/awesome-4.3-r101.ebuild
index 48a04ca56869..d89688d5699b 100644
--- a/x11-wm/awesome/awesome-4.3-r101.ebuild
+++ b/x11-wm/awesome/awesome-4.3-r101.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/awesomeWM/${PN}.git"
 else
 	SRC_URI="https://github.com/awesomeWM/awesome-releases/raw/master/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 arm ppc ppc64 x86"
 fi
 
 DESCRIPTION="A dynamic floating and tiling window manager"
diff --git a/x11-wm/awesome/awesome-4.3-r2.ebuild b/x11-wm/awesome/awesome-4.3-r2.ebuild
deleted file mode 100644
index c402663215fd..000000000000
--- a/x11-wm/awesome/awesome-4.3-r2.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop pax-utils
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/awesomeWM/${PN}.git"
-else
-	SRC_URI="https://github.com/awesomeWM/awesome-releases/raw/master/${P}.tar.xz"
-	KEYWORDS="amd64 arm ppc ppc64 x86"
-fi
-
-DESCRIPTION="A dynamic floating and tiling window manager"
-HOMEPAGE="https://awesomewm.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="dbus doc gnome luajit test"
-RESTRICT="test" # https://bugs.gentoo.org/654084
-
-RDEPEND="
-	dev-lang/lua:0
-	dev-libs/glib:2
-	dev-libs/libxdg-basedir
-	dev-lua/lgi
-	x11-libs/cairo[X,xcb(+)]
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libxcb[xkb]
-	x11-libs/pango[introspection]
-	x11-libs/startup-notification
-	x11-libs/xcb-util
-	x11-libs/xcb-util-cursor
-	x11-libs/xcb-util-keysyms
-	x11-libs/xcb-util-wm
-	x11-libs/xcb-util-xrm
-	x11-libs/libXcursor
-	x11-libs/libxkbcommon[X]
-	x11-libs/libX11
-	dbus? ( sys-apps/dbus )
-	luajit? ( dev-lang/luajit:2 )
-"
-
-# graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
-DEPEND="${RDEPEND}
-	x11-base/xcb-proto
-	x11-base/xorg-proto
-	test? (
-		x11-base/xorg-server[xvfb]
-		dev-lua/busted
-		dev-lua/luacheck
-	)
-"
-BDEPEND="
-	app-text/asciidoc
-	media-gfx/imagemagick[png]
-	virtual/pkgconfig
-	doc? ( dev-lua/ldoc )
-	test? ( app-shells/zsh )"
-
-# Skip installation of README.md by einstalldocs, which leads to broken symlink
-DOCS=()
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0-convert-path.patch  # bug #408025
-	"${FILESDIR}"/${PN}-xsession.patch          # bug #408025
-	"${FILESDIR}"/${PN}-4.0-cflag-cleanup.patch # bug #509658
-	"${FILESDIR}"/${P}-fno-common.patch         # bug #707262
-)
-
-src_configure() {
-	# Compression of manpages is handled by portage
-	local mycmakeargs=(
-		-DSYSCONFDIR="${EPREFIX}"/etc
-		-DCOMPRESS_MANPAGES=OFF
-		-DWITH_DBUS=$(usex dbus)
-		-DGENERATE_DOC=$(usex doc)
-		-DAWESOME_DOC_PATH="${EPREFIX}"/usr/share/doc/${PF}
-	)
-	if use luajit; then
-		mycmakeargs+=("-DLUA_INCLUDE_DIR=${EPREFIX}/usr/include/luajit-2.0")
-		mycmakeargs+=("-DLUA_LIBRARY=${EPREFIX}/usr/$(get_libdir)/libluajit-5.1.so")
-	fi
-	cmake_src_configure
-}
-
-src_test() {
-	# awesome's test suite starts Xvfb by itself, no need for virtualx eclass
-	HEADLESS=1 cmake_build check -j1
-}
-
-src_install() {
-	cmake_src_install
-	rm "${ED}"/usr/share/doc/${PF}/LICENSE || die
-
-	pax-mark m "${ED}"/usr/bin/awesome
-
-	exeinto /etc/X11/Sessions
-	newexe "${FILESDIR}"/${PN}-session ${PN}
-
-	# GNOME-based awesome
-	if use gnome; then
-		# GNOME session
-		insinto /usr/share/gnome-session/sessions
-		newins "${FILESDIR}"/${PN}-gnome-3.session ${PN}-gnome.session
-
-		# Application launcher
-		domenu "${FILESDIR}"/${PN}-gnome.desktop
-
-		# X Session
-		insinto /usr/share/xsessions
-		doins "${FILESDIR}"/${PN}-gnome-xsession.desktop
-	fi
-
-	# This directory contains SVG images which we don't want to compress
-	use doc && docompress -x /usr/share/doc/${PF}/doc
-}
-
-pkg_postinst() {
-	# bug #447308
-	if use gnome; then
-		elog "You have enabled the gnome USE flag."
-		elog "Please note that quitting awesome won't kill your gnome session."
-		elog "To really quit the session, you should bind your quit key"
-		elog "to the following command:"
-		elog "  gnome-session-quit --logout"
-		elog "For more info visit"
-		elog "  https://bugs.gentoo.org/show_bug.cgi?id=447308"
-	fi
-
-	# bug #440724
-	elog "If you are having issues with Java application windows being"
-	elog "completely blank, try installing"
-	elog "  x11-misc/wmname"
-	elog "and setting the WM name to LG3D."
-	elog "For more info visit"
-	elog "  https://bugs.gentoo.org/show_bug.cgi?id=440724"
-}
diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest
index 9c71a4c94479..368ec6308376 100644
--- a/x11-wm/herbstluftwm/Manifest
+++ b/x11-wm/herbstluftwm/Manifest
@@ -1,10 +1,6 @@
 DIST herbstluftwm-0.7.2.tar.gz 245506 BLAKE2B 72d0bb2a77e519161d193ac7b2b9f1f878ccb6cfe4914b6c75d060e2daa0bec4203ee4ebf203b9fa1dfb844d71d50aa7c03257c78aa22e906bf42519d1e592af SHA512 abb49bbc3de9a0ef619ce7063c1cea0d0d25ab2195c53dc0d33e061ad24060da4bbe9b99b9b9126028cdf68b462d4fcc8d1534431e4892d571ff897a68d2113c
-DIST herbstluftwm-0.8.2.tar.gz 377790 BLAKE2B 88cee9937f134f6784fb5917435f629db67971339b09da8c6b91b55286fc50a7ba9d8dbea98dc583a92f5ae6e0e427dd487265cfb7d1ca4bbc10f865a2532e3e SHA512 1a2bf3861ce23e33bb09afed285f7d85450307b46d00a666d02eaf9c454d53904e4d54ca8b0245da5ef095667a0adf9cdfc3aff170089c99df6b7f01e9038d5f
-DIST herbstluftwm-0.8.3.tar.gz 379052 BLAKE2B e8216d856df7111951842001992cac07b37efa89ba8cd52c804a763135a91512f92902910e726193a2cc902e93dacc1bae1e701ff4c669e164080992a3410bca SHA512 ff6acb64a6609030abfe315452567f7011088b39e123f3fd988448183c4bf1c65aa0ba49ba1b0ab18b959448e12638a8198093db25bcfba828791e3305966ef1
-DIST herbstluftwm-0.9.0.tar.gz 406897 BLAKE2B 06a2d6f303e1cf3990ae5247104952936e374b39ec4be316885718a94741f21c868f084ac7c3d4854d3e2870c26b4037153f3f18bffdb7458e56b3039eb4f1e1 SHA512 a9d4486729a65c8eb87b0d36f0cc28349f670abee82e20c9649e1348298ca5e73f9b349921007d555d620327cc09dab4c24e9c76dd971afc7f4de98b9408d925
+DIST herbstluftwm-0.9.1.tar.gz 432926 BLAKE2B 38f8626f3f8957cae32d71202b03515c26a4e174ce550ed6b31e7e024c3a3095374ad68f5aecc55c608c0a8565063ff39f85596444884557f38ff39043bd1d7d SHA512 c69cc5a77e98e2e0a1c84938394fe97cd985bfedb8bb1e2dceddb0268f30597cdf9b30048aa3618c20ec549f2113b7a6bbbb94f2fbcc578b8f0117bdd8cac85d
 EBUILD herbstluftwm-0.7.2-r1.ebuild 1534 BLAKE2B a88a23d3cdcaf5761198b31112ebeeac213f5e576e3d5e566121713875e1e9b8a78d9c7e63659da6144b6733905f0b2def82761dff36e29400b899670d3c2aec SHA512 8bf19a5fc434271eeafc58a168dd852a8962cd9c8c35ecd2779eb2f195d4fae3942ff7884c96c8177592d4374e4b3bcd63a5c33bee46e73ff5b08b5dd20f0e9f
-EBUILD herbstluftwm-0.8.2.ebuild 1110 BLAKE2B 2079a99b70b18b38e39876135b44532261bee69a94679f2e7941b5baa9cd16b871386d9160121b5faaa0aad064dc7b9d429f47cd3bf0a6f38d9a309344fc9a1d SHA512 56d405e82d5ba44aa8e33e5d3883a528cc4d7b482ed4d00d4345b6e57705f2115ba16c09c8992e7c73558dff7c79094c303c855e176ce12a8fad878fc9e8701d
-EBUILD herbstluftwm-0.8.3.ebuild 954 BLAKE2B f5cad9f6b9303e33f7c57d9551d49f371cc50acbe0489cf12131ae22beb0291a4b6de8c60995cb39f25746524335e5d250baa2ccf5bc1d7de090414c5d0f5118 SHA512 888d78e245b8183e08cd15cffe4d8af680c3facc0c8b10beeef444106761e001a8db9b7ae0950f5a862546058b8b35bcf5655ade47ce0e84623188e2945c904d
-EBUILD herbstluftwm-0.9.0.ebuild 930 BLAKE2B 5aa5c8be1806e29b3f0e6f37ecb7132cef0a51b62d58725b0a06768c5b76c1e3e554e819aafd48ca7f6b9e76638b5b99a3584d92dc7fe1748133dfcbf0c906e8 SHA512 8e020bf24206958b7c5d8a6a80da68742b5bf60540a066240dc26865978b257fe30e4002dda510dd12ddf3e3e605b3971525678d132e5058056837a5e08bf795
-EBUILD herbstluftwm-9999.ebuild 919 BLAKE2B ab6e147439be27c948e76f7daa1b011ed3a4623fe6511280501651361bc23081936df36d18f5221cc4616ba3bfb9a9ec697cba5cf147aa94c012c05112edbfc1 SHA512 c702d88eddca8da725f351a7db7c5ce3dadb17ed336646fdabb5b95d5f1df7f8064f9c1ede59e3f68ed52da3fb9d22b09a0474629b38f0db7cd56621bbf67589
+EBUILD herbstluftwm-0.9.1.ebuild 1055 BLAKE2B b3d76f81274b4019a10bfee919de68c5c52f391025514dbe0c6ffcadf84e50db7a5173e15d553c86dfd206b594483da32f383b866b81bbd14e58757536f5a769 SHA512 db8fb6e23a86b722c3ea779cffe2a13167330e8be46fc07e770d87361ba76ce4b51c4773966a8730da2f2182eb60605daf5a7a79c82056f872ba1012e97c4e97
+EBUILD herbstluftwm-9999.ebuild 1044 BLAKE2B e65193b1bd6c7b42ba0976b298dd8e2df2bbdf18fb5a623224a2184c897e70db2a14124729fa81753f6fd73105f3dc65711305a94d2de04d5140a127da08744d SHA512 94d9732c9805962a2144d9fa1ac9b4f136f7960cca790b3059a6aa2f76e157eba13ed291d113429e942e1858e8a90e40da76883b9ed5b964ee304e78f0b4e9a8
 MISC metadata.xml 535 BLAKE2B 0a0d6cc68bc3e5a21d1c561279947f2174ef91ba6d18c487720069928462379a6c4c23affa425236364b711a40f85faf98af78b5f28ea5148f9dcdb8795252f3 SHA512 34849ec9fe1cdd2a40af6c334844c648eb8d26fda26331618adb285d7c9ffa7360cbb07fd963e8a047ace524abee7b17085b38ae153a83c52127b1909b278b5c
diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.8.2.ebuild b/x11-wm/herbstluftwm/herbstluftwm-0.8.2.ebuild
deleted file mode 100644
index 716b6043cb68..000000000000
--- a/x11-wm/herbstluftwm/herbstluftwm-0.8.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs cmake-utils
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm"
-	BDEPEND="app-text/asciidoc"
-else
-	SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	BDEPEND=""
-fi
-
-DESCRIPTION="A manual tiling window manager for X"
-HOMEPAGE="https://herbstluftwm.org/"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="examples zsh-completion"
-
-DEPEND="
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-"
-RDEPEND="
-	${DEPEND}
-	app-shells/bash
-	zsh-completion? ( app-shells/zsh )
-"
-BDEPEND+="
-	virtual/pkgconfig
-"
-
-src_configure() {
-	sed -i \
-		-e '/^install.*LICENSEDIR/d' \
-		-e '/set(DOCDIR / s#.*#set(DOCDIR ${CMAKE_INSTALL_DOCDIR})#' \
-		CMakeLists.txt || die
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if ! use examples; then
-		rm -r "${ED}"/usr/share/doc/${PF}/examples || die
-	fi
-
-	if ! use zsh-completion; then
-		rm -r "${ED}"/usr/share/zsh || die
-	fi
-}
diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.8.3.ebuild b/x11-wm/herbstluftwm/herbstluftwm-0.8.3.ebuild
deleted file mode 100644
index a27ee0ea3e0d..000000000000
--- a/x11-wm/herbstluftwm/herbstluftwm-0.8.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs cmake-utils
-
-DESCRIPTION="A manual tiling window manager for X"
-HOMEPAGE="https://herbstluftwm.org/"
-SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="doc examples"
-
-DEPEND="
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-"
-RDEPEND="
-	${DEPEND}
-	app-shells/bash
-"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-text/asciidoc )
-"
-
-src_prepare() {
-	sed -i \
-		-e '/^install.*LICENSEDIR/d' \
-		-e '/set(DOCDIR / s#.*#set(DOCDIR ${CMAKE_INSTALL_DOCDIR})#' \
-		CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DWITH_DOCUMENTATION=$(usex doc)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if ! use examples; then
-		rm -r "${ED}"/usr/share/doc/${PF}/examples || die
-	fi
-}
diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.9.0.ebuild b/x11-wm/herbstluftwm/herbstluftwm-0.9.1.ebuild
index c2dc9d85fed9..cd6435359276 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-0.9.0.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.9.1.ebuild
@@ -1,8 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit cmake toolchain-funcs
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit cmake python-any-r1 toolchain-funcs
 
 DESCRIPTION="A manual tiling window manager for X"
 HOMEPAGE="https://herbstluftwm.org/"
@@ -24,6 +27,7 @@ RDEPEND="
 	app-shells/bash
 "
 BDEPEND="
+	${PYTHON_DEPS}
 	virtual/pkgconfig
 	doc? ( app-text/asciidoc )
 "
@@ -37,10 +41,12 @@ src_prepare() {
 }
 
 src_configure() {
+	# Ensure that 'python3' is in PATH. #765118
+	python_setup
+
 	mycmakeargs=(
 		-DWITH_DOCUMENTATION=$(usex doc)
 	)
-
 	cmake_src_configure
 }
 
diff --git a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild b/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
index 383fa9d17eae..28d103f5405a 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
@@ -1,8 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit git-r3 toolchain-funcs cmake
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit cmake git-r3 python-any-r1 toolchain-funcs
 
 DESCRIPTION="A manual tiling window manager for X"
 HOMEPAGE="https://herbstluftwm.org/"
@@ -23,6 +26,7 @@ RDEPEND="
 	app-shells/bash
 "
 BDEPEND="
+	${PYTHON_DEPS}
 	virtual/pkgconfig
 	doc? ( app-text/asciidoc )
 "
@@ -36,10 +40,12 @@ src_prepare() {
 }
 
 src_configure() {
+	# Ensure that 'python3' is in PATH. #765118
+	python_setup
+
 	mycmakeargs=(
 		-DWITH_DOCUMENTATION=$(usex doc)
 	)
-
 	cmake_src_configure
 }
 
diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index 283118e919c2..18968d3b48e9 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -5,6 +5,6 @@ DIST i3-4.18.tar.bz2 1218591 BLAKE2B 582b7ba3a54edf8dd2657add05eb54a64b7c004761a
 DIST i3-4.19.tar.xz 1278600 BLAKE2B 3af5eac9cb618bc3b3da0bca430e1882701802f49e092d1e6fa7a35ceb3f2c0287b66eceeb0123a7dfda9976df06227bec34d7d98873aedc2292a2ba94584d84 SHA512 e9e85dfa099751e95f05e8ed5048535bc669d73c51d3bd7e83740ee79d613f981a1130c35f54fb4725b31d18bed63d6bd5efacce8e086483e28d7c778407653a
 EBUILD i3-4.18.3.ebuild 2133 BLAKE2B f5b1ca5ab47d57102c358e72d958d4b0153d24b41573067f8760f80860150567a16839b5baf9270f80c9ac2daeb751c103a893ca4c8246e7f476f401200451d9 SHA512 6006b8efd31270c81b4ab4047ef22abc15779729d71ff6a6e3ab2a82376bf84c1e19eb80a6e5d22d7f68ea03d78ca088edd9d4c35e9aa5093a39e2d689d6648a
 EBUILD i3-4.18.ebuild 2126 BLAKE2B 29048fa9165965ccd572cbacc8fdcc15697384bb75039c2c77caa3970040b31592359c1aa4b8df9242fd8c455e0b1a44d33c76422a9e603235651828cb7020d3 SHA512 527a652e1c6e05b1730a404c38a612820aebc2619ea8baf63c3403cbaaa8a4a5608ba63586c4f5ab09d7d57225727ed3f1207da317110b2b50b31b224440820c
-EBUILD i3-4.19-r1.ebuild 2100 BLAKE2B d6db9d136708179704ecac40c31200200661dcd85a1de8122ed87885ca07b3a3b039d394d1b0f2c541964ed58b74ee5ecb610eae868a94fa29c80a31621969e8 SHA512 73f0b934ac6aa89d6f75b1d3f4e41266b8b9170becde54015fbe513adf6a40f4787023ff9d31575edbe9f5d3a9376c5f1a62fb2620eb6e3336b4e2daa9c07a3a
-EBUILD i3-9999.ebuild 2055 BLAKE2B 65c10e891c2dd9971b25ce0e9d4c616aeb77dabca964aba24d2291c9fd57456f1dfb3ae35697e9db9685ccd025ac60e41b2ff03385f352dafa241414d0b2cfa8 SHA512 05d51b87521aeddd0468b114ee61b3d25b1953de5da2f92e548bafc9bf71226674056b5083a35b728f20c2415980a643a94ce55d97a20a8fababac468dbdd54b
+EBUILD i3-4.19-r1.ebuild 2110 BLAKE2B 0078d8bb0fcb1e78bef247c29ef90f66474fb7d822efb5fca002827bb1d71de2a375a38671df84e3525bef8a73a0283c4b5b26f774379dae35cce2ea2c5b02d7 SHA512 97c3107d63ba0876bc830aba788317144ca32b4400efae541316db3ffad6fd2718762dd7abc733e9b45a4935654951b41c69399d7633b953da42a065149b66ae
+EBUILD i3-9999.ebuild 2065 BLAKE2B 0f9ce66d98a51afeb39aa25a3a83a4eeaeccb6f1c80d9964c5ddda090c2a7be6883abd012e2b5cfdf78940acd77210648d1a90d50c6f909d0fd8d4e45ae19ebf SHA512 ef7fdd8536f8218806a9a23f17612e7f349f4fa325b8150fc8ac96dac2c5e1419f007b5d55491fc076fbe94cf0c10a36d8ce864b2088ccf19e60288c88a21db0
 MISC metadata.xml 470 BLAKE2B 1c4fd7b44860934e88fb5165254fe0e8ca7e647c11af9af7d959f240e51002e6a454d9b93b30da8944891a1aa6a989f7a3e2a8af44ba41de174e78745393dd79 SHA512 52eddb56541d1172b04ca3ae646d01e52fb300dd62f5dfeaf2abe9d791965813e87b24a1477743797227bf8d407051f79076d54edb599524f89f3cfc716cc47e
diff --git a/x11-wm/i3/i3-4.19-r1.ebuild b/x11-wm/i3/i3-4.19-r1.ebuild
index 3ef5738daddf..8641db1eba86 100644
--- a/x11-wm/i3/i3-4.19-r1.ebuild
+++ b/x11-wm/i3/i3-4.19-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -76,7 +76,7 @@ src_prepare() {
 
 src_configure() {
 	local emesonargs=(
-		-Ddocdir="/usr/share/doc/${PF}"
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
 		$(meson_use doc docs)
 		$(meson_use doc mans)
 	)
diff --git a/x11-wm/i3/i3-9999.ebuild b/x11-wm/i3/i3-9999.ebuild
index e644fcb77f54..e7b4e3a5694e 100644
--- a/x11-wm/i3/i3-9999.ebuild
+++ b/x11-wm/i3/i3-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -75,7 +75,7 @@ src_prepare() {
 
 src_configure() {
 	local emesonargs=(
-		-Ddocdir="/usr/share/doc/${PF}"
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
 		$(meson_use doc docs)
 		$(meson_use doc mans)
 	)
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index 449e9b226d85..a7f6581fd887 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,8 +1,11 @@
 AUX icewm 33 BLAKE2B 5605658012ad8ed16bbd4cf0c4cb7cbe5204f73c20ef2c3d9fef1011a80b9e68863de64b45e4b043604b147c9d31f3f5d2617d067b694f5ec5329ad895472b0e SHA512 3fe619e59cc5d354242ccd85d3b1982dd7db6d0f6170f46f9d33975872f6d5a342a08d69db763162dc43681eedb96e9ba5075455bf54adf4fb86bf19887bf6e0
+AUX icewm-2.1.0-appmenu_fix.patch 1200 BLAKE2B c68ccef66b08e43eb97da0624218aa36bea070c6030c8a8c1e8724fce3f12590270620b1e56d09ac01fa713f90b71e82344227fdc62941938c54a6cbc05f23f6 SHA512 7cecdcf8d55ec49ee3c3fa145dc492c6a143690abfd3677937799ef636a5f9db3d7cb65790225337895c32d7cb26c2c888052c6374831123ec56ba1f826b2309
 DIST icewm-1.9.2.tar.lz 1694602 BLAKE2B cf30a695ba48093b386aa2f3af5120e78a9fcc57da9038bcd546ade0986e1bc359a3da91d2eeeb8d3a105173f5d755223675a84b38cfc8c907269efd2561c706 SHA512 7b4f8c47c636a0113af576bc1bcd9fde111ae70eb0bcf21fb1d906ca43bea4d8b0337a728e5da35bcfeabd56c66fd0d14581d7377f063dd750fdf01362b24be2
-DIST icewm-2.0.0.tar.lz 1694653 BLAKE2B 36feb02d653256b4d6755618da89400c3925279757da32695d6b8c2206d69228bcf392852eaba8b9096d06b60b5f021a0b6b474140a7754c4865d575d8a868dc SHA512 58b9a62d15add73c9c535e8602711636058b67b5e89b6189656a2d0668d2e647b9a59c45b5602f634ffd89abe7fb8a03be094524f3ff6d2b136bb8e21bc79fa3
 DIST icewm-2.0.1.tar.lz 1694439 BLAKE2B 1476f33fa7350a98b7eca8c5c265455d0a78b28bcbd35ab78969b528ae02d3c960fb73cf2b24ea999ee5e08c9f0641d3502c7d5ed8b285777162c334d645b6db SHA512 ac4126b38d592aed60d2269f58c5a1612b61e871565e3c3e51bc2b430e4da6a4708f78e86c16091fa4dfb9eefd4109ae89102ab708e3bce9a44f1e5fe1970c59
+DIST icewm-2.1.0.tar.lz 1696214 BLAKE2B ba91eac4ea425fc9979d1c64fbc2a4c59f1d8004138f31b1e184484cfcaaca7c1a550cd160ff3683a4f663e54efdd5f8ded001317765485259a1f19b8de794a3 SHA512 a57ebbf76640b5296c90c105bdc9b9b2cc55546d324fa18b2e7bfc6bee4442b56176bda4a584d6a73b2297203e1966d7646354bb6e0baaf64fdf0acdb357ee58
+DIST icewm-2.1.1.tar.lz 1695855 BLAKE2B 81903735a71e13953635a4d70547f2518983b5e58fd9e90124e4aecb6b9b53827d48f77bbff3cec59b929456f4c1ab14fde999bbc45f90c8916bbb1017b8eb20 SHA512 7d0acd655f505755fe0b1186b7422a254805bd1c56f00170ecac90272c31c1c0673f781e4e89e04682515b7313dd57b78797398a81edc62b86abc6991abfc45c
 EBUILD icewm-1.9.2.ebuild 2751 BLAKE2B ffbbde71ff1e7e055de75878203dfcfe4ddf47e0883f9c51d9ed4a68d007c1d294d2bc33ce0009b0fb4b5b8c679a341aefc30252fe3fd3cc0a963574a3b31955 SHA512 42c3df4c4709f963e23264785acb1e56df30fb1b580fbdc06029e86cb7c7fe1b78b4dc46d250cae50195404ccd166582d2560940076f7823e368e36de333e333
-EBUILD icewm-2.0.0.ebuild 2949 BLAKE2B e8e0ac64383edd04cbe752917c001dade85ba729d440d6711cd9f80f2506dbd6565fbd0fcd70ab4e0d8051df82c4597040882dc79ff4056762d020bbe25e9e6d SHA512 14ea2d985d54b32c8788a0b35f4ddfeccfbe6edbd45f751992340127575bcecdee972543c37d339541fe24daf3b5b8f828c6918af4a79f11fbd0b2ec8792a323
 EBUILD icewm-2.0.1.ebuild 2949 BLAKE2B 7cbb263b4244bc2112c5dd6ac91a0b970d31e3ce36034a31d036e1fd77d34923da8de8bfe64ef4d212984640d932727a9b362bf7f2ff6ecea10a9ae57db15906 SHA512 96ef7961a4754b355678b222b1c99f5ea7efc2cf2ec5badf951458fadee580c26a5614dccb540b9685d118e6761cf20df14b71b7ce7ef98f84b8df8bfb596e19
+EBUILD icewm-2.1.0-r1.ebuild 3000 BLAKE2B 08a69f1874b68ed1192dbe7025c4f77f66325577350d670df66030e23f86d2b8c978e21fec1858112148c5249abdafc44d663c01a9410aae1a00ed337333012a SHA512 5240155015ce0f1fec204f6e0b724ce9de66be497dd2c8e253a7d0b33b3c5c50f0539fcece9394b24e1b9898f6051e4b052a64c681bbc5ba91d7e49b8b55ac6a
+EBUILD icewm-2.1.1.ebuild 2949 BLAKE2B 7cbb263b4244bc2112c5dd6ac91a0b970d31e3ce36034a31d036e1fd77d34923da8de8bfe64ef4d212984640d932727a9b362bf7f2ff6ecea10a9ae57db15906 SHA512 96ef7961a4754b355678b222b1c99f5ea7efc2cf2ec5badf951458fadee580c26a5614dccb540b9685d118e6761cf20df14b71b7ce7ef98f84b8df8bfb596e19
 MISC metadata.xml 747 BLAKE2B a986dc65f9b603519ef92fecc63cadd2921d6569e8735956a55ce91673426082e367664cce23c2b80cec19e0d997da357ac8f9d3d78c738ad92f42f6f426c225 SHA512 f9b84c60b780b5999c8a295b64bdf1bdb734108984e48f1271257cb35602df024a347560526de52f43ede16f67031551f4ae3f37401d3320e4dbdfb913e557fe
diff --git a/x11-wm/icewm/files/icewm-2.1.0-appmenu_fix.patch b/x11-wm/icewm/files/icewm-2.1.0-appmenu_fix.patch
new file mode 100644
index 000000000000..d159e4d38e3f
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-2.1.0-appmenu_fix.patch
@@ -0,0 +1,37 @@
+From 1d28361a69d773ba0d026119ff197d38900eac0a Mon Sep 17 00:00:00 2001
+From: Bert Gijsbers <gijsbers@science.uva.nl>
+Date: Sat, 23 Jan 2021 16:02:21 +0100
+Subject: [PATCH] Don't unarm menu popup buttons for issue #527.
+
+---
+ src/ybutton.cc | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/src/ybutton.cc b/src/ybutton.cc
+index 1c11756d..745a8f21 100644
+--- a/src/ybutton.cc
++++ b/src/ybutton.cc
+@@ -58,7 +58,7 @@ YButton::~YButton() {
+     }
+     popdown();
+     if (fPopup && fPopup->isShared() == false) {
+-        delete fPopup;
++        delete fPopup; fPopup = nullptr;
+     }
+     if (--buttonObjectCount == 0) {
+         normalButtonFont = null;
+@@ -289,8 +289,13 @@ void YButton::handleButton(const XButtonEvent &button) {
+             setSelected(false);
+         }
+     }
++    bool unarm = fEnabled && fArmed
++              && button.type == ButtonRelease
++              && button.button == Button1
++              && getClickCount() == 1
++              && dragging();
+     YWindow::handleButton(button);
+-    if (fEnabled && button.type == ButtonRelease && button.button == Button1) {
++    if (unarm && !fPopupActive) {
+         setArmed(false, false);
+     }
+ }
diff --git a/x11-wm/icewm/icewm-2.1.0-r1.ebuild b/x11-wm/icewm/icewm-2.1.0-r1.ebuild
new file mode 100644
index 000000000000..57f469f48b79
--- /dev/null
+++ b/x11-wm/icewm/icewm-2.1.0-r1.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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.lz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="+alsa ao bidi debug +gdk-pixbuf imlib nls truetype uclibc xinerama"
+
+# Tests broken in all versions, patches welcome, bug #323907, #389533
+RESTRICT="test"
+
+REQUIRED_USE="|| ( alsa ao )"
+#?? ( gdk-pixbuf imlib )
+
+#fix for icewm preversion package names
+S="${WORKDIR}/${P/_}"
+
+# These are the core dependencies of icewm.
+# Look into configure.ac and search for PKG_CHECK_MODULES([CORE]
+CORE_DEPEND="
+	media-libs/fontconfig
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+"
+
+RDEPEND="
+	${CORE_DEPEND}
+	dev-libs/glib:2
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXft
+	x11-libs/libXpm
+	x11-libs/libXrandr
+	alsa? (
+		media-libs/alsa-lib
+		media-libs/libsndfile[alsa]
+	)
+	ao? (
+		media-libs/libao
+		media-libs/libsndfile
+	)
+	bidi? ( dev-libs/fribidi )
+	gdk-pixbuf? (
+		x11-libs/gdk-pixbuf-xlib
+		>=x11-libs/gdk-pixbuf-2.42.0:2
+	)
+	!gdk-pixbuf? (
+		imlib? (
+			gnome-base/librsvg:2
+			media-libs/imlib2
+		)
+		!imlib? (
+			media-libs/libpng:0=
+			virtual/jpeg
+		)
+	)
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="
+	${RDEPEND}
+	$(unpacker_src_uri_depends)
+	x11-base/xorg-proto
+	gdk-pixbuf? ( gnome-base/librsvg:2 )
+"
+
+BDEPEND="
+	app-text/asciidoc
+	virtual/pkgconfig
+	nls? ( >=sys-devel/gettext-0.19.8 )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-appmenu_fix.patch"
+)
+
+pkg_pretend() {
+	if use gdk-pixbuf && use imlib ; then
+		einfo 'Confilcting USE flags have been enabled:'
+		einfo '"gdk-pixbuf" and "imlib" exclude each other!'
+		einfo 'Using "gdk-pixbuf".'
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local icesound
+	if use alsa && use ao ; then
+		icesound="alsa,ao"
+	elif use alsa ; then
+		icesound="alsa"
+	elif use ao ; then
+		icesound="ao"
+	fi
+
+	local myconf=(
+		--enable-logevents
+		--enable-xrandr
+		--with-cfgdir="${EPREFIX}"/etc/icewm
+		--with-docdir="${EPREFIX}"/usr/share/doc/${PF}/html
+		--with-icesound="${icesound}"
+		--with-libdir="${EPREFIX}"/usr/share/icewm
+		$(use_enable bidi fribidi)
+		$(use_enable debug)
+		$(use_enable debug logevents)
+		$(use_enable gdk-pixbuf)
+		$(use_enable imlib imlib2)
+		$(use_enable nls i18n)
+		$(use_enable nls)
+		$(use_enable xinerama)
+	)
+	if use truetype ; then
+		myconf+=(
+			--enable-shape
+		)
+	else
+		myconf+=(
+			--disable-xfreetype
+			--enable-corefonts
+		)
+	fi
+
+	econf "${myconf[@]}"
+
+	sed \
+		-e "s:/icewm-\$(VERSION)::" \
+		-e "s:ungif:gif:" \
+		-i src/Makefile || die
+}
+
+src_install() {
+	local DOCS=( AUTHORS ChangeLog NEWS README.md TODO VERSION )
+
+	default
+
+	docinto html
+	dodoc doc/icewm.html
+	dodoc man/*.html
+
+	exeinto /etc/X11/Sessions
+	doexe "${FILESDIR}/icewm"
+}
diff --git a/x11-wm/icewm/icewm-2.0.0.ebuild b/x11-wm/icewm/icewm-2.1.1.ebuild
index e00f833b8352..ec1d0545c005 100644
--- a/x11-wm/icewm/icewm-2.0.0.ebuild
+++ b/x11-wm/icewm/icewm-2.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index feaaa2291ca9..35799a7a6bd4 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -1,3 +1,5 @@
 DIST muffin-4.6.3.tar.gz 5196072 BLAKE2B 1b8c0eeab13c35fc0b66898328f378331cb2bfc78b27a48a8f9e22c842df1a223613f27f5b29fe28c1edaaeb59972262024ed656dfabafa6c9454c4c4c0a74b9 SHA512 c07d83656d3a9164ad488b500f98acb88e0c8e2374af858776ff27dbe90880db4310405505d79539222ba3b4ddedb22934ef3e0f1f6198dc7b36986b784b48f5
+DIST muffin-4.8.1.tar.gz 5195618 BLAKE2B 33dbbf7231b8f8d5c7df23d6cf8ddb29a86caca7b8c3b4af1231c98e114ee797d1c6bc866574348fcabaa65a93ff95c80366329bd5a41a46a74ba53ba81ce545 SHA512 61b621c7a4e25fc8ac69f2f5182e2caf52dfcfd456154f3b91ebb8b126319e704acd927ab5abe9e19ff057f38002a3b7e322e8d411db21e0fee7ec19d7928d31
 EBUILD muffin-4.6.3.ebuild 2227 BLAKE2B 701c1acb5e51e8cea8f8091a9d4de96a0891f49a55d5c79924632670104cc9844c1530e4a3a45f30a40d0d89666e951be442ab0386e8bc9275edd8ab45a1f16a SHA512 0370da5f4e7ce8b90b994550562666a89061e36c88ed6d0aba4779636fc444406231cb726e0c11120c705a4d888997a52d28844589d805441b4a4bb6779b295f
+EBUILD muffin-4.8.1.ebuild 2361 BLAKE2B 4357c71c8397490710a5e430f896687223ba1ad5837b3e86dcb5d05235ecdf7db022b65341543c013393bba5cde807f891a8a49cb3ae4c308fd20a4a60a738ef SHA512 f062ec4cd35055d9a92b2096ec47d58353032b41c9236b68a6a7c89f49f939fc6f25eca9166cadc0a2f473df36eea610b3646ed56e264999f0fea6ebd648ab8f
 MISC metadata.xml 455 BLAKE2B d4584f37c17ed7f43e3200c5b4cf5db9d73634ec2634575d0667a2b6de278f746839cb52b037f9239aa1a570a056fa6ff3990bd26a1cde3975a391ef44360660 SHA512 e21ad4e3cab168c13fd6b34335e1d615a548160f78c558655def493f1632ac6cac170892b781a020f8e6a877526d320051154aa0cfcf986d3e76dcc89e61bf21
diff --git a/x11-wm/muffin/muffin-4.8.1.ebuild b/x11-wm/muffin/muffin-4.8.1.ebuild
new file mode 100644
index 000000000000..2ba5eea03ff7
--- /dev/null
+++ b/x11-wm/muffin/muffin-4.8.1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools gnome2-utils xdg-utils virtualx
+
+DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/muffin"
+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 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.37.3:2[dbus]
+	>=dev-libs/json-glib-1.0
+	>=gnome-extra/cinnamon-desktop-4.8:0=
+	gnome-extra/zenity
+	>=media-libs/libcanberra-0.26[gtk3]
+	virtual/opengl
+	>=x11-libs/cairo-1.14:=[X]
+	x11-libs/gdk-pixbuf:2[introspection?]
+	>=x11-libs/gtk+-3.9.12:3[X,introspection?]
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libxcb
+	>=x11-libs/libXcomposite-0.3
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	>=x11-libs/libXi-1.6.0
+	>=x11-libs/libxkbcommon-0.4.3
+	x11-libs/libxkbfile
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	>=x11-libs/pango-1.14.0[X,introspection?]
+	>=x11-libs/startup-notification-0.7:=
+	x11-misc/xkeyboard-config
+
+	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+
+	test? ( app-text/docbook-xml-dtd:4.5 )
+"
+# needs gtk-doc, not just -am, for gtk-doc.make
+BDEPEND="
+	dev-util/glib-utils
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	xdg_environment_reset
+	default
+	eautoreconf
+	gnome2_disable_deprecation_warning
+}
+
+# Wayland is not supported upstream.
+src_configure() {
+	econf \
+		--disable-gtk-doc \
+		--disable-maintainer-mode \
+		--disable-schemas-compile \
+		--enable-compile-warnings=minimum \
+		--disable-static \
+		--enable-shape \
+		--enable-sm \
+		--enable-startup-notification \
+		--enable-xsync \
+		--enable-verbose-mode \
+		--with-libcanberra \
+		$(use_enable introspection) \
+		$(use_enable xinerama)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+	dodoc HACKING MAINTAINERS *.txt doc/*.txt
+}
+
+src_test() {
+	virtx default
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_schemas_update
+}
diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest
index d68f5a06d844..0184e5130ec9 100644
--- a/x11-wm/windowmaker/Manifest
+++ b/x11-wm/windowmaker/Manifest
@@ -6,5 +6,6 @@ DIST WindowMaker-0.95.9.tar.gz 3397167 BLAKE2B ec751fe0139b359933f4388f8dac3f2bf
 DIST WindowMaker-extra-0.1.tar.gz 238018 BLAKE2B 865b12975d0cdefc1f05a76344b449fdcf8a2841d6a7adf1ab6435857d89cbc4fda22bb62432a1bbba921267380d00a0cded718bfbd344bbb5e6207e59b76096 SHA512 0fe9b3ffc093942db167d8a01e15c0f6741f3a40959d1434ea4f23e7b9d4a9c13935a61eabef9691e5fdfd4e407564caafce15c2d65d66499960a6764a874ab8
 EBUILD windowmaker-0.95.8-r1.ebuild 3118 BLAKE2B 426b31a868c8d9dc807eddc211ede8c54928077aef7eeb72e2f264a5d8da95f76f606829237701e383e3a14ec323586301ddd72539525bb9078d7101e32e5186 SHA512 37c1f9604e7811cb025e43054d1848cfa1103fc24921419ed66e17cd4e816c45ecaeffef2ea2a2c11373de35b4ca23124ec400bd60944479307d4dcb13644aa0
 EBUILD windowmaker-0.95.9-r1.ebuild 3079 BLAKE2B 333833e1b61ffe17dc37e19d768a8e29f254c038cfa8dc46c2bec04a8de420769d6b3ec40c669a78c231a72f0a26b270a982b2c3447bfcc43031ce403fd37133 SHA512 0bd1371818c59d3dd4861ad740aabc76e19cbb160acc9a2c56dbd0b1bede9170c29f5d6453e3141fc3c4381ddd4c3c7bb09a173bae58a9c87943b72f9d8bbce3
-EBUILD windowmaker-9999.ebuild 2906 BLAKE2B 2c34ae03201ba0ffce81ec94b337536aee7ffc6a165ca0c49068d2389fd12a20c54c46d28810798ab523c3b2843e90fadd0212e5f7a7592f51d0c910eb56ca60 SHA512 f7db50510fb3b9f6fc34f1bb84cc00a2928cf9af9fd7aad88aa4dab211f5586395f84c9c75ddde80def0ac0d4ad521c29850f81e948e2442f169ea683d5ae771
+EBUILD windowmaker-0.95.9-r2.ebuild 3207 BLAKE2B 39c6aaaf43499aaab9cd8c50d43ff9f7f5eddc7dab100156880bedc30a3e872d5881e7484c850d6f7b4f89a9c6a3eb7a8f974fac5dd8bb4883ff45ae032e3714 SHA512 2a8ac82d72efd524ff5af6f29f6d0d9f31119a4ad1e0ee421b5a1872acd36a33bd172ca088a6d7db562808269c87a0d4e570ddabb935533a908edbf71cc9439d
+EBUILD windowmaker-9999.ebuild 3027 BLAKE2B cbdbe30ce0edf4c903db6d21e16deb64a27d5d6c7b67a72636e58b939e73a6f8c37da29422092d38ca349f4179f3541fb1688321d03afe04bcd35258132eed3a SHA512 550d6fe89f3c4161f9cf40f9298ad178c811d740475b74a139ddc2222c87b920c2677ef066c25c3dba43b0b40f0e8da885dfaa66dc53c69a3f2df792248d5ea4
 MISC metadata.xml 490 BLAKE2B a74e46dfe5b90558720726c3a18b9c9cf2752fb90ade60450ae568547c52b807e9dee74d1deb842c11cc3e6f564c0793adc5f8e24686893138808669f6fc9766 SHA512 ae731acb1fe00cfbda949fc9cafad9f861b83fb37103a699157256840c67e4a2cd0023114d30eab0b25f6dcb154c00e2a659a4feffaabad97e8ed7aa2a03e3ca
diff --git a/x11-wm/windowmaker/windowmaker-0.95.9-r2.ebuild b/x11-wm/windowmaker/windowmaker-0.95.9-r2.ebuild
new file mode 100644
index 000000000000..169193220615
--- /dev/null
+++ b/x11-wm/windowmaker/windowmaker-0.95.9-r2.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools desktop eutils
+
+DESCRIPTION="The fast and light GNUstep window manager"
+HOMEPAGE="https://www.windowmaker.org/"
+SRC_URI="https://windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.gz
+	https://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="gif imagemagick jpeg modelock nls png tiff webp xinerama +xpm xrandr"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="media-libs/fontconfig
+	>=x11-libs/libXft-2.1.0
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	x11-libs/libXv
+	gif? ( >=media-libs/giflib-4.1.0-r3 )
+	imagemagick? ( >=media-gfx/imagemagick-7:0= )
+	jpeg? ( virtual/jpeg:0= )
+	nls? ( virtual/libintl )
+	png? ( media-libs/libpng:0= )
+	tiff? ( media-libs/tiff:0 )
+	webp? ( media-libs/libwebp )
+	xinerama? ( x11-libs/libXinerama )
+	xrandr? ( x11-libs/libXrandr )"
+RDEPEND="${DEPEND}"
+BDEPEND="nls? ( >=sys-devel/gettext-0.10.39 )"
+
+S=${WORKDIR}/${P/windowm/WindowM}
+
+DOCS=( AUTHORS BUGFORM BUGS ChangeLog INSTALL-WMAKER FAQ
+	NEWS README README.definable-cursor README.i18n TODO )
+PATCHES=( "${FILESDIR}"/${PN}-0.95.8-configure_default_search_paths.patch )
+
+src_prepare() {
+	# Fix some paths
+	for file in WindowMaker/*menu* util/wmgenmenu.c; do
+		if [[ -r $file ]] ; then
+			sed -i -e "s|/usr/local/GNUstep/Applications/WPrefs.app|${EPREFIX}/usr/bin/|g;" "$file" || die
+			sed -i -e "s|/usr/local/share/WindowMaker|${EPREFIX}/usr/share/WindowMaker|g;" "$file" || die
+			sed -i -e "s|/opt/share/WindowMaker|${EPREFIX}/usr/share/WindowMaker|g;" "$file" || die
+		fi
+	done
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local -a myeconfargs=(
+		# image format types
+		$(use_enable gif)
+		$(use_enable imagemagick magick)
+		$(use_enable jpeg)
+		$(use_enable png)
+		$(use_enable tiff)
+		$(use_enable webp)
+		$(use_enable xpm)
+
+		# optional X capabilities
+		$(use_enable modelock)
+		$(use_enable xinerama)
+		$(use_enable xrandr randr)
+	)
+
+	# NLS depends on whether LINGUAS is empty
+	if use nls; then
+		myeconfargs+=( LINGUAS="${LINGUAS:-$(cd po; x=(*.po); echo ${x[*]%.po})}" )
+	else
+		myeconfargs+=( LINGUAS= )
+	fi
+
+	econf \
+		--localedir="${EPREFIX}"/usr/share/locale \
+		--sysconfdir="${EPREFIX}"/etc/X11 \
+		--disable-static \
+		--enable-usermenu \
+		--with-{incs,libs}-from= \
+		--with-pixmapdir="${EPREFIX}"/usr/share/pixmaps \
+		--with-x \
+		"${myeconfargs[@]}"
+
+	pushd ../WindowMaker-extra-0.1 &>/dev/null || die
+	econf
+}
+
+src_compile() {
+	emake
+
+	# WindowMaker Extra Package (themes and icons)
+	emake -C ../WindowMaker-extra-0.1
+}
+
+src_install() {
+	default
+
+	# WindowMaker Extra
+	emake -C ../WindowMaker-extra-0.1 DESTDIR="${D}" install
+	newdoc ../WindowMaker-extra-0.1/README README.extra
+
+	# create wmaker session shell script
+	echo "#!/usr/bin/env bash" > wmaker
+	echo "${EPREFIX}/usr/bin/wmaker" >> wmaker
+	exeinto /etc/X11/Sessions/
+	doexe wmaker
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/wmaker.desktop
+	make_desktop_entry /usr/bin/wmaker
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/x11-wm/windowmaker/windowmaker-9999.ebuild b/x11-wm/windowmaker/windowmaker-9999.ebuild
index 9fabfa3d5f0b..5cc89fa45b5b 100644
--- a/x11-wm/windowmaker/windowmaker-9999.ebuild
+++ b/x11-wm/windowmaker/windowmaker-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools desktop eutils git-r3
+inherit autotools desktop git-r3
 
 DESCRIPTION="The fast and light GNUstep window manager"
 HOMEPAGE="https://www.windowmaker.org/"
@@ -24,15 +24,16 @@ DEPEND="media-libs/fontconfig
 	gif? ( >=media-libs/giflib-4.1.0-r3 )
 	imagemagick? ( >=media-gfx/imagemagick-7:0= )
 	jpeg? ( virtual/jpeg:0= )
+	nls? ( virtual/libintl )
 	png? ( media-libs/libpng:0= )
 	tiff? ( media-libs/tiff:0 )
 	webp? ( media-libs/libwebp )
 	xinerama? ( x11-libs/libXinerama )
 	xrandr? ( x11-libs/libXrandr )"
-RDEPEND="${DEPEND}
-	nls? ( >=sys-devel/gettext-0.10.39 )"
+RDEPEND="${DEPEND}"
+BDEPEND="nls? ( >=sys-devel/gettext-0.10.39 )"
 
-DOCS=( AUTHORS BUGFORM BUGS ChangeLog INSTALL INSTALL-WMAKER FAQ
+DOCS=( AUTHORS BUGFORM BUGS ChangeLog INSTALL-WMAKER FAQ
 	NEWS README README.definable-cursor README.i18n TODO )
 
 src_unpack() {
@@ -49,38 +50,48 @@ src_prepare() {
 			sed -i -e "s|/usr/local/GNUstep/Applications/WPrefs.app|${EPREFIX}/usr/bin/|g;" "$file" || die
 			sed -i -e "s|/usr/local/share/WindowMaker|${EPREFIX}/usr/share/WindowMaker|g;" "$file" || die
 			sed -i -e "s|/opt/share/WindowMaker|${EPREFIX}/usr/share/WindowMaker|g;" "$file" || die
-		fi;
-	done;
+		fi
+	done
 
 	default
 	eautoreconf
 }
 
 src_configure() {
-	local myconf
-
-	# image format types
-	myconf="$(use_enable imagemagick magick) $(use_enable jpeg) $(use_enable gif) $(use_enable png) $(use_enable tiff) $(use_enable webp) $(use_enable xpm)"
-
-	# non required X capabilities
-	myconf="${myconf} $(use_enable modelock) $(use_enable xrandr randr) $(use_enable xinerama)"
-
+	local -a myeconfargs=(
+		# image format types
+		$(use_enable gif)
+		$(use_enable imagemagick magick)
+		$(use_enable jpeg)
+		$(use_enable png)
+		$(use_enable tiff)
+		$(use_enable webp)
+		$(use_enable xpm)
+
+		# optional X capabilities
+		$(use_enable modelock)
+		$(use_enable xinerama)
+		$(use_enable xrandr randr)
+	)
+
+	# NLS depends on whether LINGUAS is empty
 	if use nls; then
-		[[ -z $LINGUAS ]] && export LINGUAS="$(ls po/*.po | sed 's:po/\(.*\)\.po$:\1:' | xargs)"
+		myeconfargs+=( LINGUAS="${LINGUAS:-$(cd po; x=(*.po); echo ${x[*]%.po})}" )
 	else
-		myconf="${myconf} --disable-locale"
+		myeconfargs+=( LINGUAS= )
 	fi
 
-	# default settings with $myconf appended
 	econf \
+		--localedir="${EPREFIX}"/usr/share/locale \
 		--sysconfdir="${EPREFIX}"/etc/X11 \
-		--with-x \
+		--disable-static \
 		--enable-usermenu \
+		--with-{incs,libs}-from= \
 		--with-pixmapdir="${EPREFIX}"/usr/share/pixmaps \
-		--localedir="${EPREFIX}"/usr/share/locale \
-		${myconf}
+		--with-x \
+		"${myeconfargs[@]}"
 
-	pushd ../WindowMaker-extra-0.1 || die
+	pushd ../WindowMaker-extra-0.1 &>/dev/null || die
 	econf
 }
 
@@ -88,18 +99,15 @@ src_compile() {
 	emake
 
 	# WindowMaker Extra Package (themes and icons)
-	pushd ../WindowMaker-extra-0.1 || die
-	emake
+	emake -C ../WindowMaker-extra-0.1
 }
 
 src_install() {
 	default
 
 	# WindowMaker Extra
-	pushd ../WindowMaker-extra-0.1 || die
-	emake DESTDIR="${D}" install
-
-	newdoc README README.extra
+	emake -C ../WindowMaker-extra-0.1 DESTDIR="${D}" install
+	newdoc ../WindowMaker-extra-0.1/README README.extra
 
 	# create wmaker session shell script
 	echo "#!/usr/bin/env bash" > wmaker
@@ -110,4 +118,6 @@ src_install() {
 	insinto /usr/share/xsessions
 	doins "${FILESDIR}"/wmaker.desktop
 	make_desktop_entry /usr/bin/wmaker
+
+	find "${ED}" -type f -name '*.la' -delete || die
 }
diff --git a/x11-wm/wmfs/Manifest b/x11-wm/wmfs/Manifest
index ebfb069d2d29..b3fc84c59fde 100644
--- a/x11-wm/wmfs/Manifest
+++ b/x11-wm/wmfs/Manifest
@@ -1,5 +1,3 @@
-AUX wmfs-201003-desktop.patch 167 BLAKE2B 4150ba608826e4defb56161db0044f13402d08ab2d3243ded7b3520b8c68453fe40b8265d841fbeeb27e8f8bebd4d03a426471174626166d3254f81ee162d1a0 SHA512 20d885f3496d039794f5f94df73936aeafd93e658fff8843af63b433773ec05dde369bdfae43329302614233f1e6a6b453929bcca2660c451d4b33b3a8451717
-AUX wmfs-201003-pthread.patch 191 BLAKE2B 4a317083425e5dc6ae58529a6ebba7185a12a0adbdf5e428a1fa935718d18abe5c6c11470d32e2bedfeba1c777e47b2a76b3c269cf0e50d2ed4d6078cc9f71af SHA512 871a6558fc3201c2652e1a84d221d7d2bd90150f4e1afb8b4a7e6862797e47d012f832ecf0b1c205ad07942aa9b0cd3807a9c839cc6304ce3fae3746065493fc
 AUX wmfs-99999999-Debian.patch 310 BLAKE2B 92f207cad5e54b6a83c08e4248c81a2dd0d61e715f395440c8b0f19b6069411f3f4267b16331214831228b52823c8d2d75bc960188f9574b522bec6eeb6a869c SHA512 25ad3ada9d2376f80d7e17fa483798f2e252e68e388dc63737d3f705b44b0c1c6b524715988ba3516a0de926c8ec479fb3e63d57d5b571f74342674b617625b8
 AUX wmfs-99999999-desktop.patch 153 BLAKE2B e9a3f1039bddd76ddc05955e843e89c1ab81d486b79e870466fc4ac94ec07e72cb1bd0e5d45752543b104386d852f619d749f42e6561ea6767cd797a46e0c434 SHA512 5463fe8bbf312a003e48276fd15e6ad04075d28835f18e61260038278e31f4de4a2a7e38ad7358a12d669af973e2297d121adc0f5a2f07077874327e20362711
 AUX wmfs-99999999-fno-common.patch 1986 BLAKE2B 096becca88a23b15e3fee115640b50baca0f1f3ba58c15903a74fd4da75bc2e1662d672982940ac55c506f79f3820ffa9e851981008f82d9163eaf291e4339cf SHA512 b7593e0c0c0e3e73421a1636cdc2b3cebd6c51896e404bad9bec378e733b54cb0168a53dea40466128210f47459a2bb5e04074d588d33b07908efd1581472eaf
diff --git a/x11-wm/wmfs/files/wmfs-201003-desktop.patch b/x11-wm/wmfs/files/wmfs-201003-desktop.patch
deleted file mode 100644
index 91edac6d88be..000000000000
--- a/x11-wm/wmfs/files/wmfs-201003-desktop.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/wmfs.desktop
-+++ b/wmfs.desktop
-@@ -1,5 +1,4 @@
--[Desktop Entry] 
--Encoding=UTF-8
-+[Desktop Entry]
- Name=wmfs
- Comment=Window manager from scratch
- TryExec=wmfs
diff --git a/x11-wm/wmfs/files/wmfs-201003-pthread.patch b/x11-wm/wmfs/files/wmfs-201003-pthread.patch
deleted file mode 100644
index cbbf6343bdfb..000000000000
--- a/x11-wm/wmfs/files/wmfs-201003-pthread.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -94,7 +92,8 @@
- set(LIBRARIES_TO_LINK
-   ${FREETYPE_LIBRARIES}
-   ${X11_LIBRARIES}
--  Xft)
-+  Xft
-+  pthread)
- 
- # Includes
- include(FindDoxygen)