Updating liguros repov21.1.3

27 files changed, 704 insertions, 579 deletions

diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest
index 26f45d52c32f..d617392d176f 100644
--- a/x11-wm/awesome/Manifest
+++ b/x11-wm/awesome/Manifest
@@ -1,2 +1 @@
-DIST awesome-4.2.tar.xz 987024 BLAKE2B b2aaa993bafa83121d165d21083dfcac825e373be9547490f8b93b8e8b0f90470395a0238affaf9990f719b8bd2f36a255f6468b6422406787a3c96946c4e831 SHA512 134dd3625c86243861b3d0701cc8bfd8c00986d7027f0832016c3f5e59e6b9a1ef2f677bb0d1d66ece63449533e4b13d8d7388e96e6f9014212030a79f163e09
 DIST awesome-4.3.tar.xz 1037816 BLAKE2B b4afc5e7bfb01ddc16b67776cc00dd7b0bcbefc9d17f9bec9c04256953858aef2bf0e4b15a525909029b7da771ade0d749758aba2878832f356d7b2c4f0363b7 SHA512 c5ef1e8dc593e7783b895d22143154aea8f211beeda24672a7ee4ed5112b4f4284043f848a151f3d3c4f569e91308670367a4353f705b20511b36495b22fa3f5
diff --git a/x11-wm/awesome/awesome-4.2-r3.ebuild b/x11-wm/awesome/awesome-4.2-r3.ebuild
deleted file mode 100644
index adaf85cd6a08..000000000000
--- a/x11-wm/awesome/awesome-4.2-r3.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils desktop pax-utils versionator
-
-DESCRIPTION="A dynamic floating and tiling window manager"
-HOMEPAGE="https://awesomewm.org/"
-SRC_URI="https://github.com/awesomeWM/awesome-releases/raw/master/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86"
-IUSE="dbus doc gnome luajit test"
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-lang/lua-5.1:0
-	luajit? ( dev-lang/luajit:2 )
-	dev-libs/glib:2
-	>=dev-libs/libxdg-basedir-1
-	>=dev-lua/lgi-0.8
-	x11-libs/cairo[X,xcb(+)]
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/libxcb-1.6[xkb]
-	>=x11-libs/pango-1.19.3[introspection]
-	>=x11-libs/startup-notification-0.10_p20110426
-	>=x11-libs/xcb-util-0.3.8
-	x11-libs/xcb-util-cursor
-	>=x11-libs/xcb-util-keysyms-0.3.4
-	>=x11-libs/xcb-util-wm-0.3.8
-	>=x11-libs/xcb-util-xrm-1.0
-	x11-libs/libXcursor
-	x11-libs/libxkbcommon[X]
-	>=x11-libs/libX11-1.3.99.901
-	dbus? ( >=sys-apps/dbus-1 )
-"
-
-# graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
-DEPEND="${RDEPEND}
-	>=app-text/asciidoc-8.4.5
-	app-text/xmlto
-	dev-util/gperf
-	virtual/pkgconfig
-	media-gfx/imagemagick[png]
-	>=x11-base/xcb-proto-1.5
-	x11-base/xorg-proto
-	doc? ( dev-lua/ldoc )
-	test? (
-		app-shells/zsh
-		x11-base/xorg-server[xvfb]
-		dev-lua/busted
-		dev-lua/luacheck
-	)
-"
-
-# 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
-)
-
-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-utils_src_configure
-}
-
-src_test() {
-	# awesome's test suite starts Xvfb by itself, no need for virtualx eclass
-	HEADLESS=1 cmake-utils_src_make check -j1
-}
-
-src_install() {
-	cmake-utils_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 && touch "${ED}"/usr/share/doc/${PF}/doc/images.ecompress.skip
-}
-
-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"
-
-	for v in ${REPLACING_VERSIONS}; do
-		if [ "$(get_major_version ${v})" = "3" ]; then
-			elog "Awesome-4 introduced breaking changes. For release notes and porting guide see"
-			elog "https://awesomewm.org/apidoc/documentation/89-NEWS.md.html#v4 and"
-			elog "https://awesomewm.org/apidoc/documentation/17-porting-tips.md.html#v4"
-		fi
-	done
-}
diff --git a/x11-wm/awesome/awesome-4.3-r100.ebuild b/x11-wm/awesome/awesome-4.3-r101.ebuild
index b1f0242877b8..10e9827219ea 100644
--- a/x11-wm/awesome/awesome-4.3-r100.ebuild
+++ b/x11-wm/awesome/awesome-4.3-r101.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
@@ -7,71 +7,73 @@ LUA_COMPAT=( lua5-{1..4} luajit )
 
 inherit cmake desktop lua-single 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/"
-SRC_URI="https://github.com/awesomeWM/awesome-releases/raw/master/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="dbus doc gnome test"
 
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
-RESTRICT="test"
+RESTRICT="test" # https://bugs.gentoo.org/654084
 
 RDEPEND="${LUA_DEPS}
 	dev-libs/glib:2
-	>=dev-libs/libxdg-basedir-1
+	dev-libs/libxdg-basedir
 	$(lua_gen_cond_dep 'dev-lua/lgi[${LUA_USEDEP}]')
 	x11-libs/cairo[X,xcb(+)]
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=x11-libs/libxcb-1.6[xkb]
-	>=x11-libs/pango-1.19.3[introspection]
-	>=x11-libs/startup-notification-0.10_p20110426
-	>=x11-libs/xcb-util-0.3.8
+	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-0.3.4
-	>=x11-libs/xcb-util-wm-0.3.8
-	>=x11-libs/xcb-util-xrm-1.0
+	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-1.3.99.901
-	dbus? ( >=sys-apps/dbus-1 )
-"
-
-# graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
+	x11-libs/libX11
+	dbus? ( sys-apps/dbus )"
 # ldoc is used by invoking its executable, hence no need for LUA_SINGLE_USEDEP.
 # On the other hand, it means that we should explicitly depend on a version
 # migrated to Lua eclasses so that during the upgrade from unslotted
 # to slotted dev-lang/lua, the package manager knows to emerge migrated
 # ldoc before migrated awesome.
 DEPEND="${RDEPEND}
-	>=app-text/asciidoc-8.4.5
-	app-text/xmlto
-	dev-util/gperf
-	virtual/pkgconfig
-	media-gfx/imagemagick[png]
-	>=x11-base/xcb-proto-1.5
+	x11-base/xcb-proto
 	x11-base/xorg-proto
-	doc? ( >=dev-lua/ldoc-1.4.6-r100 )
 	test? (
-		app-shells/zsh
 		x11-base/xorg-server[xvfb]
 		$(lua_gen_cond_dep '
 			dev-lua/busted[${LUA_USEDEP}]
 			dev-lua/luacheck[${LUA_USEDEP}]
 		')
-	)
-"
+	)"
+# graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
+BDEPEND="app-text/asciidoc
+	media-gfx/imagemagick[png]
+	virtual/pkgconfig
+	doc? ( >=dev-lua/ldoc-1.4.6-r100 )
+	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}/${PN}-4.3-fno-common.patch"    # bug #707262
+	"${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}"/${PN}-4.3-fno-common.patch    # bug #707262
 )
 
 src_configure() {
@@ -90,7 +92,7 @@ src_configure() {
 
 src_test() {
 	# awesome's test suite starts Xvfb by itself, no need for virtualx eclass
-	HEADLESS=1 cmake_src_make check -j1
+	HEADLESS=1 cmake_build check -j1
 }
 
 src_install() {
@@ -117,7 +119,7 @@ src_install() {
 	fi
 
 	# This directory contains SVG images which we don't want to compress
-	use doc && touch "${ED}"/usr/share/doc/${PF}/doc/images.ecompress.skip
+	use doc && docompress -x /usr/share/doc/${PF}/doc
 }
 
 pkg_postinst() {
diff --git a/x11-wm/awesome/awesome-4.3-r2.ebuild b/x11-wm/awesome/awesome-4.3-r2.ebuild
index 206d64b0eb27..c402663215fd 100644
--- a/x11-wm/awesome/awesome-4.3-r2.ebuild
+++ b/x11-wm/awesome/awesome-4.3-r2.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
@@ -10,7 +10,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"
@@ -114,7 +114,7 @@ src_install() {
 	fi
 
 	# This directory contains SVG images which we don't want to compress
-	use doc && touch "${ED}"/usr/share/doc/${PF}/doc/images.ecompress.skip
+	use doc && docompress -x /usr/share/doc/${PF}/doc
 }
 
 pkg_postinst() {
diff --git a/x11-wm/awesome/awesome-9999.ebuild b/x11-wm/awesome/awesome-9999.ebuild
index 9bddbdfb5d3b..1c43a7858a2c 100644
--- a/x11-wm/awesome/awesome-9999.ebuild
+++ b/x11-wm/awesome/awesome-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
@@ -44,9 +44,7 @@ RDEPEND="${LUA_DEPS}
 	x11-libs/libxkbcommon[X]
 	x11-libs/libX11
 	dbus? ( sys-apps/dbus )"
-
-# graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
-# ldoc is used by invoking its executable, hence no need for LUA_SINGLE_USEDEP
+# ldoc is used by invoking its executable, hence no need for LUA_SINGLE_USEDEP.
 # On the other hand, it means that we should explicitly depend on a version
 # migrated to Lua eclasses so that during the upgrade from unslotted
 # to slotted dev-lang/lua, the package manager knows to emerge migrated
@@ -61,8 +59,8 @@ DEPEND="${RDEPEND}
 			dev-lua/luacheck[${LUA_USEDEP}]
 		')
 	)"
-BDEPEND="
-	app-text/asciidoc
+# graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
+BDEPEND="app-text/asciidoc
 	media-gfx/imagemagick[png]
 	virtual/pkgconfig
 	doc? ( >=dev-lua/ldoc-1.4.6-r100 )
@@ -70,6 +68,7 @@ BDEPEND="
 
 # 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
@@ -81,7 +80,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DSYSCONFDIR="${EPREFIX}"/etc
 		-DCOMPRESS_MANPAGES=OFF
-		-DWITH_DBUS=$(usex dbus ON OFF)
+		-DWITH_DBUS=$(usex dbus)
 		-DGENERATE_DOC=$(usex doc)
 		-DAWESOME_DOC_PATH="${EPREFIX}"/usr/share/doc/${PF}
 		-DLUA_INCLUDE_DIR="$(lua_get_include_dir)"
@@ -119,7 +118,7 @@ src_install() {
 	fi
 
 	# This directory contains SVG images which we don't want to compress
-	use doc && touch "${ED}"/usr/share/doc/${PF}/doc/images.ecompress.skip
+	use doc && docompress -x /usr/share/doc/${PF}/doc
 }
 
 pkg_postinst() {
diff --git a/x11-wm/awesome/files/awesome-3.5.5-cflag-cleanup.patch b/x11-wm/awesome/files/awesome-3.5.5-cflag-cleanup.patch
deleted file mode 100644
index 3cfeaba2df36..000000000000
--- a/x11-wm/awesome/files/awesome-3.5.5-cflag-cleanup.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u awesome-3.5.5/awesomeConfig.cmake awesome-3.5.5.new/awesomeConfig.cmake
---- awesome-3.5.5/awesomeConfig.cmake   2014-08-24 23:28:04.178646000 -0400
-+++ awesome-3.5.5.new/awesomeConfig.cmake   2014-08-24 23:28:44.204646000 -0400
-@@ -16,7 +16,7 @@
- option(GENERATE_DOC "generate API documentation" ON)
- 
- # {{{ CFLAGS
--add_definitions(-O1 -std=gnu99 -ggdb3 -rdynamic -fno-strict-aliasing -Wall -Wextra
-+add_definitions(-std=gnu99 -fno-strict-aliasing -Wall -Wextra
-     -Wchar-subscripts -Wundef -Wshadow -Wcast-align -Wwrite-strings
-     -Wsign-compare -Wunused -Wno-unused-parameter -Wuninitialized -Winit-self
-     -Wpointer-arith -Wformat-nonliteral
diff --git a/x11-wm/awesome/files/awesome-3.5.5-util.lua-xdg-icons-fix.patch b/x11-wm/awesome/files/awesome-3.5.5-util.lua-xdg-icons-fix.patch
deleted file mode 100644
index 588f9ab9ec52..000000000000
--- a/x11-wm/awesome/files/awesome-3.5.5-util.lua-xdg-icons-fix.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From: Uli Schlachter <psychon@znc.in>
-Date: Sat, 12 Apr 2014 14:15:11 +0000 (+0200)
-Subject: Merge git://github.com/Teknocrat/awesome
-X-Git-Url: http://git.naquadah.org/?p=awesome.git;a=commitdiff_plain;h=d76d3e0b6a00b8b289b3801ba197e0dae732a92d;hp=1090719d677c86e90a1394a34f0effb418728493
-
-Merge git://github.com/Teknocrat/awesome
----
-
-diff --git a/lib/awful/util.lua.in b/lib/awful/util.lua.in
-index 1d35f2f..123c4a6 100644
---- a/lib/awful/util.lua.in
-+++ b/lib/awful/util.lua.in
-@@ -185,21 +185,24 @@ end
- --             of the dirs are searched first
- function util.geticonpath(iconname, exts, dirs, size)
-     exts = exts or { 'png', 'gif' }
--    dirs = dirs or { '/usr/share/pixmaps/' }
-+    dirs = dirs or { '/usr/share/pixmaps/', '/usr/share/icons/hicolor/' }
-+    icontypes = { 'apps', 'actions',  'categories',  'emblems',
-+    'mimetypes',  'status', 'devices', 'extras', 'places', 'stock' }
-     for _, d in pairs(dirs) do
-+        local icon
-         for _, e in pairs(exts) do
--            local icon
--            if size then
--                icon = string.format("%s%ux%u/%s.%s",
--                       d, size, size, iconname, e)
--                if util.file_readable(icon) then
--                    return icon
--                end
--            end
-             icon = d .. iconname .. '.' .. e
-             if util.file_readable(icon) then
-                 return icon
-             end
-+            if size then
-+                for _, t in pairs(icontypes) do
-+                    icon = string.format("%s%ux%u/%s/%s.%s", d, size, size, t, iconname, e)
-+                    if util.file_readable(icon) then
-+                        return icon
-+                    end
-+                end
-+            end
-         end
-     end
- end
diff --git a/x11-wm/awesome/files/awesome-3.5.9-slotted-lua.patch b/x11-wm/awesome/files/awesome-3.5.9-slotted-lua.patch
deleted file mode 100644
index 67f0d9810f44..000000000000
--- a/x11-wm/awesome/files/awesome-3.5.9-slotted-lua.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -Nuar awesome-3.5.9.orig/build-utils/lgi-check.sh awesome-3.5.9/build-utils/lgi-check.sh
---- awesome-3.5.9.orig/build-utils/lgi-check.sh	2016-03-06 14:05:54.000000000 +0000
-+++ awesome-3.5.9/build-utils/lgi-check.sh	2019-01-23 21:36:35.973967623 +0000
-@@ -1,5 +1,7 @@
- #!/bin/sh
- 
-+LUA=${LUA:=lua}
-+
- die()
- {
- 	exec >&2
-@@ -22,11 +24,11 @@
- }
- 
- # Check if we have lgi
--lua -e 'require("lgi")' || die
-+$LUA -e 'require("lgi")' || die
- 
- # Check the version number
- # Keep this in sync with lib/gears/surface.lua.in!
--lua -e 'if tonumber(string.match(require("lgi.version"), "(%d%.%d)")) < 0.7 then error("lgi too old, need at least version 0.7.0") end' || die
-+$LUA -e 'if tonumber(string.match(require("lgi.version"), "(%d%.%d)")) < 0.7 then error("lgi too old, need at least version 0.7.0") end' || die
- 
- # Check for the needed gi files
--lua -e 'l = require("lgi") assert(l.cairo, l.Pango, l.PangoCairo)' || die
-+$LUA -e 'l = require("lgi") assert(l.cairo, l.Pango, l.PangoCairo)' || die
-diff -Nuar awesome-3.5.9.orig/awesomeConfig.cmake awesome-3.5.9/awesomeConfig.cmake
---- awesome-3.5.9.orig/awesomeConfig.cmake	2019-01-23 22:01:17.364046606 +0000
-+++ awesome-3.5.9/awesomeConfig.cmake	2019-01-23 21:50:30.152919084 +0000
-@@ -66,6 +66,7 @@
- include(FindPkgConfig)
- # lua 5.1
- include(FindLua51)
-+set(ENV{LUA} "${LUA_EXECUTABLE}")
- # }}}
- 
- # {{{ Check if documentation can be build
-diff -Nuar awesome-3.5.9.orig/CMakeLists.txt awesome-3.5.9/CMakeLists.txt
---- awesome-3.5.9.orig/CMakeLists.txt	2016-03-06 14:05:54.000000000 +0000
-+++ awesome-3.5.9/CMakeLists.txt	2019-01-23 22:00:08.715111414 +0000
-@@ -105,7 +105,9 @@
- 
- # check for lgi and the needed gobject introspection files
- add_custom_target(lgi-check ALL
--    COMMAND ${SOURCE_DIR}/build-utils/lgi-check.sh)
-+    COMMAND ${CMAKE_COMMAND} -E env LUA=${LUA_EXECUTABLE} ${SOURCE_DIR}/build-utils/lgi-check.sh
-+    COMMENT "Verifying LGI module")
-+#   VERBATIM)
- 
- # atoms
- file(MAKE_DIRECTORY ${BUILD_DIR}/common)
diff --git a/x11-wm/awesome/files/awesome-3.5_rc1-convert-path.patch b/x11-wm/awesome/files/awesome-3.5_rc1-convert-path.patch
deleted file mode 100644
index e6c37b0f9c76..000000000000
--- a/x11-wm/awesome/files/awesome-3.5_rc1-convert-path.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nuar --exclude '*.orig' awesome-3.5-rc1.orig/awesomeConfig.cmake awesome-3.5-rc1/awesomeConfig.cmake
---- awesome-3.5-rc1.orig/awesomeConfig.cmake	2012-11-24 13:51:33.000000000 +0000
-+++ awesome-3.5-rc1/awesomeConfig.cmake	2012-11-24 20:42:23.743412441 +0000
-@@ -56,7 +56,7 @@
- a_find_program(LUA_EXECUTABLE lua FALSE)
- a_find_program(LDOC_EXECUTABLE ldoc.lua FALSE)
- # theme graphics
--a_find_program(CONVERT_EXECUTABLE convert TRUE)
-+a_find_program(CONVERT_EXECUTABLE bin/convert TRUE)
- # doxygen
- include(FindDoxygen)
- # pkg-config
diff --git a/x11-wm/awesome/metadata.xml b/x11-wm/awesome/metadata.xml
index 302d8cb17852..e4f1a8991037 100644
--- a/x11-wm/awesome/metadata.xml
+++ b/x11-wm/awesome/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">awesomeWM/awesome</remote-id>
 	</upstream>
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index 7d96efce6032..179664bdead6 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,3 +1,4 @@
 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
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 eccab60a6f30..c9c9c615cdbf 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -1,3 +1,3 @@
-DIST muffin-4.8.0.tar.gz 5196236 BLAKE2B 4c2770d2d4774fc749dfd415de639da8b01cb07242e69e22f5de1c214a93494388fe0a0f8a2a7f7ca2064fc2c87a66b5c379fbfd335dccedc8ce09935483c018 SHA512 22a07853db6dacce4567c71e4f2553294f23c1b48ff414c5ce40208558611998af68794e0eaabcad7d9dbf8889adf709a7909ce0815daab59d583626596d7d20
-EBUILD muffin-4.8.0.ebuild 2330 BLAKE2B 762b33d2befe7e52d878b86897979cceeddd43f98345f8b672824e9c8dacf948585d4fdff9af6dc2e5e6efb148e61ff344818ff122360f10b065d7f08df91168 SHA512 8e97b6e7d0a3b87ce84461f307af3969ff1baeda3e8075aeb135de4753cc8a6141381f0c71698bba6a7785be0f574528c8e4ba983ca80e8ab9f08aec11bb7238
+DIST muffin-4.8.1.tar.gz 5195618 BLAKE2B 33dbbf7231b8f8d5c7df23d6cf8ddb29a86caca7b8c3b4af1231c98e114ee797d1c6bc866574348fcabaa65a93ff95c80366329bd5a41a46a74ba53ba81ce545 SHA512 61b621c7a4e25fc8ac69f2f5182e2caf52dfcfd456154f3b91ebb8b126319e704acd927ab5abe9e19ff057f38002a3b7e322e8d411db21e0fee7ec19d7928d31
+EBUILD muffin-4.8.1.ebuild 2338 BLAKE2B 9f88d9f356e4cc3033836d2c659575b82f477fa178fb1dc473d445d1e6b7407441aa268e4a76a590f0a0709d4dad14668eeecc52a71cf199b3a32c3fb25b5682 SHA512 27d26ae3fea92ef20a89e7d9503d31a0c3128776292b31d5b80b3f510e566fc023565806d3753587594581de2f7aaa95ef6784a172a10d442c56a14ec01cfb8d
 MISC metadata.xml 455 BLAKE2B d4584f37c17ed7f43e3200c5b4cf5db9d73634ec2634575d0667a2b6de278f746839cb52b037f9239aa1a570a056fa6ff3990bd26a1cde3975a391ef44360660 SHA512 e21ad4e3cab168c13fd6b34335e1d615a548160f78c558655def493f1632ac6cac170892b781a020f8e6a877526d320051154aa0cfcf986d3e76dcc89e61bf21
diff --git a/x11-wm/muffin/muffin-4.8.0.ebuild b/x11-wm/muffin/muffin-4.8.1.ebuild
index ce4fb688db1c..28b45d8ec772 100644
--- a/x11-wm/muffin/muffin-4.8.0.ebuild
+++ b/x11-wm/muffin/muffin-4.8.1.ebuild
@@ -3,10 +3,10 @@
 
 EAPI=7
 
-inherit autotools eutils gnome2-utils xdg-utils virtualx
+inherit autotools gnome2-utils xdg-utils virtualx
 
 DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
-HOMEPAGE="https://projects.linuxmint.com/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+"
@@ -45,7 +45,8 @@ RDEPEND="
 	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
 	xinerama? ( x11-libs/libXinerama )
 "
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	x11-base/xorg-proto
 
 	test? ( app-text/docbook-xml-dtd:4.5 )
@@ -61,7 +62,6 @@ BDEPEND="
 "
 
 src_prepare() {
-	xdg_environment_reset
 	default
 	eautoreconf
 	gnome2_disable_deprecation_warning
diff --git a/x11-wm/treewm/metadata.xml b/x11-wm/treewm/metadata.xml
index 825317bce9ec..c3668ba52a00 100644
--- a/x11-wm/treewm/metadata.xml
+++ b/x11-wm/treewm/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>lordvan@gentoo.org</email>
-    <name>Thomas Raschbacher</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="sourceforge">treewm</remote-id>
   </upstream>
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
+	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)
 
-	# 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)"
+		# 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/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)
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 8a4b5fa5d884..50c37163f42b 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,4 +1,3 @@
-DIST xpra-3.0.2.tar.xz 2749196 BLAKE2B 3c8745657a12637704fb88ac7b867ab387ef7ed2250396d9e534aecf81e40f85332a2c51ba49638834012f4a4d85c03bd7e49ee259bb2400aeb60fb06abf8b59 SHA512 115f606ff5886d99a906f318cb1a7a4a86e80ebf23e4336e67938267d92ef624de577cc8fc06c6ce541b7c44a0cef58d930b5928f32e24dfc67c72127c7b623c
 DIST xpra-3.0.5.tar.xz 2752016 BLAKE2B a36d6a4ebb0b14665014da92d510c0d5f978c96db653709ddc09a1015426d6ac6f71f9a221db68ee1114c95eeaca6600f9e49102ce9f936d9b0ee298ac432647 SHA512 3dbc122ebc8c4aa67154acfe92668ac364d8469022b03e28946d763e4d396f8c707690b2a4dbf07b55545259a53b46c9dd94e6e40131289ccc3dce6a88107681
-DIST xpra-4.0.4.tar.xz 2792512 BLAKE2B e16c47e82cf9f8712521c8f9c436b7bb819d9469fc0135ade1f2c9fc6f2a8a0fecf417caae87a1eca9c4b6daec1a82add5d6547208caee1a1d681ebc7b3d3d3b SHA512 91a90cdab775ec2501ef1601188b97ca4aa741e541f8d941add8d509767790a144b67f094177dda7539eff305710f2c834b90a93e9441437dac615677963094c
 DIST xpra-4.0.5.tar.xz 2795828 BLAKE2B fed6514d75dbb08f386325e30e375fd2077db1dad91602e575e3955a622a52ade2fc8e0c6c823d8a495684afb3a2f55f27e28abdf8734d0eca25275a3d358193 SHA512 d2aa2b70b6ec702bca5b0c2b06378107d45c4cad79f83ee2a1ed27fd5f66474e2d8e1d28d5111e60417ed089f91bab0b1566b0c9b3dcf6f0cb5e204ff5c42c92
+DIST xpra-4.0.6.tar.xz 2797752 BLAKE2B 3f2d4108fec1f1b5c0cd38a26f1a2c41af253fd234427e8e54104ff3742b9f7ae3e1863db837addd76acc6856b6f3cfcbde97edc2bc75314b215d4ca46a816f8 SHA512 e3dc66040898ed40ef12b8cdb89e5f42c2f36edc071afb435334389e727f376ddc116dbee47018468bff24f2cdd7be35750b58bc108ba73c5558bd9eccbd04ea
diff --git a/x11-wm/xpra/files/xpra-3.0.2-dbus.patch b/x11-wm/xpra/files/xpra-3.0.2-dbus.patch
deleted file mode 100644
index e0f14b8ba59d..000000000000
--- a/x11-wm/xpra/files/xpra-3.0.2-dbus.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Remove dbus functionality if USE=dbus is not specified.
-
-Index: xpra-3.0.2/xpra/scripts/server.py
-===================================================================
---- xpra-3.0.2.orig/xpra/scripts/server.py
-+++ xpra-3.0.2/xpra/scripts/server.py
-@@ -748,14 +748,9 @@ def do_run_server(error_cb, opts, mode,
-         log("chdir(%s)", opts.chdir)
-         os.chdir(opts.chdir)
- 
--    dbus_pid, dbus_env = 0, {}
-     if not shadowing and POSIX and not OSX and not clobber:
-         no_gtk()
-         assert starting or starting_desktop or proxying
--        from xpra.server.dbus.dbus_start import start_dbus
--        dbus_pid, dbus_env = start_dbus(opts.dbus_launch)
--        if dbus_env:
--            os.environ.update(dbus_env)
- 
-     display = None
-     if not proxying:
-@@ -835,7 +830,6 @@ def do_run_server(error_cb, opts, mode,
-         app.display_name = display_name
-         app.init(opts)
-         app.init_sockets(sockets)
--        app.init_dbus(dbus_pid, dbus_env)
-         if not shadowing and (xvfb_pid or clobber):
-             app.init_display_pid(xvfb_pid)
-         app.original_desktop_display = desktop_display
diff --git a/x11-wm/xpra/files/xpra-4.0.6-r28363.patch b/x11-wm/xpra/files/xpra-4.0.6-r28363.patch
new file mode 100644
index 000000000000..5187b700c0df
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-4.0.6-r28363.patch
@@ -0,0 +1,238 @@
+Index: selinux/xpra_socketactivation/xpra_socketactivation.te
+===================================================================
+--- a/selinux/xpra_socketactivation/xpra_socketactivation.te	(revision 28285)
++++ b/selinux/xpra_socketactivation/xpra_socketactivation.te	(revision 28363)
+@@ -27,6 +27,7 @@
+ 	type unconfined_t;
+ 	type bin_t;
+ 	type avahi_t;
++	type config_home_t;
+ 
+ 	attribute can_read_shadow_passwords;
+ }
+@@ -55,6 +56,9 @@
+ allow xpra_t xpra_conf_t:dir { getattr open read search };
+ files_search_etc(xpra_t)
+ 
++allow xpra_t config_home_t:dir { getattr search };
++allow xpra_t config_home_t:file { getattr ioctl open read };
++
+ type xpra_socket_t;
+ files_type(xpra_socket_t)
+ 
+Index: setup.py
+===================================================================
+--- a/setup.py	(revision 28285)
++++ b/setup.py	(revision 28363)
+@@ -1533,8 +1533,9 @@
+                     for k,v in subs.items():
+                         data = data.replace(k, v)
+                 with open(dst_file, "wb") as f:
+-                    return f.write(data)
++                    f.write(data)
+                 if chmod:
++                    print("chmod(%s, %s)" % (dst_file, oct(chmod)))
+                     os.chmod(dst_file, chmod)
+ 
+             if printing_ENABLED and POSIX:
+Index: unittests/unit/net/crypto_test.py
+===================================================================
+--- a/unittests/unit/net/crypto_test.py	(revision 28285)
++++ b/unittests/unit/net/crypto_test.py	(revision 28363)
+@@ -88,7 +88,7 @@
+         start = monotonic_time()
+         self.do_test_backend(data, enc_iterations, dec_iterations)
+         end = monotonic_time()
+-        elapsed = end-start
++        elapsed = max(0.0001, end-start)
+         speed = (asize*16) * (enc_iterations + dec_iterations) / elapsed
+         iter_time = elapsed*1000/(enc_iterations + dec_iterations)
+         print("%10iKB: %5.1fms: %16iMB/s" % (asize*16//1024, iter_time, speed//1024//1024))
+Index: win32/MINGW_BUILD.sh
+===================================================================
+--- a/win32/MINGW_BUILD.sh	(revision 28285)
++++ b/win32/MINGW_BUILD.sh	(revision 28363)
+@@ -286,6 +286,8 @@
+ #why is it shipping those files??
+ find lib/ -name "*dll.a" -exec rm {} \;
+ #only keep the actual loaders, not all the other crap cx_Freeze put there:
++#but keep librsvg
++mv lib/gdk-pixbuf-2.0/2.10.0/loaders/librsvg* ./
+ mkdir lib/gdk-pixbuf-2.0/2.10.0/loaders.tmp
+ mv lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-*.dll lib/gdk-pixbuf-2.0/2.10.0/loaders.tmp/
+ rm -fr lib/gdk-pixbuf-2.0/2.10.0/loaders
+@@ -326,6 +328,9 @@
+ #and keep pdfium:
+ mv lib/*pdfium*.dll ./
+ pushd lib > /dev/null
++#cx_Freeze forgets these two!?
++cp $MINGW_PREFIX/bin/libatk-*dll ./
++cp $MINGW_PREFIX/bin/libgtk-*dll ./
+ #remove all the pointless duplication:
+ for x in `ls *dll`; do
+ 	find ./ -mindepth 2 -name "${x}" -exec rm {} \;
+Index: xpra/client/gtk_base/gtk_client_window_base.py
+===================================================================
+--- a/xpra/client/gtk_base/gtk_client_window_base.py	(revision 28285)
++++ b/xpra/client/gtk_base/gtk_client_window_base.py	(revision 28363)
+@@ -1806,10 +1806,16 @@
+ 
+     def _set_backing_size(self, ww, wh):
+         b = self._backing
++        bw = self._client.cx(ww)
++        bh = self._client.cy(wh)
++        if max(ww, wh)>=32000 or min(ww, wh)<0:
++            raise Exception("invalid window size %ix%i" % (ww, wh))
++        if max(bw, bh)>=32000:
++            raise Exception("invalid window backing size %ix%i" % (bw, bh))
+         if b:
+-            b.init(ww, wh, self._client.cx(ww), self._client.cy(wh))
++            b.init(ww, wh, bw, bh)
+         else:
+-            self.new_backing(self._client.cx(ww), self._client.cy(wh))
++            self.new_backing(bw, bh)
+ 
+     def resize(self, w, h, resize_counter=0):
+         ww, wh = self.get_size()
+Index: xpra/net/file_transfer.py
+===================================================================
+--- a/xpra/net/file_transfer.py	(revision 28285)
++++ b/xpra/net/file_transfer.py	(revision 28363)
+@@ -580,6 +580,10 @@
+ 
+     def _process_open_url(self, packet):
+         url, send_id = packet[1:3]
++        try:
++            url = strtobytes(url).decode("utf8")
++        except UnicodeDecodeError:
++            url = bytestostr(url)
+         if not self.open_url:
+             filelog.warn("Warning: received a request to open URL '%s'", url)
+             filelog.warn(" but opening of URLs is disabled")
+@@ -670,12 +674,12 @@
+         filelog("process send-data-request: send_id=%s, url=%s, printit=%s, openit=%s", s(send_id), url, printit, openit)
+         def cb_answer(accept):
+             filelog("accept%s=%s", (url, printit, openit), accept)
++            self.send("send-data-response", send_id, accept)
+         #filenames and url are always sent encoded as utf8:
+         try:
+             url = strtobytes(url).decode("utf8")
+         except:
+             url = bytestostr(url)
+-            self.send("send-data-response", send_id, accept)
+         if dtype==b"file":
+             if not self.file_transfer:
+                 cb_answer(False)
+Index: xpra/net/socket_util.py
+===================================================================
+--- a/xpra/net/socket_util.py	(revision 28285)
++++ b/xpra/net/socket_util.py	(revision 28363)
+@@ -622,7 +622,7 @@
+             log.info(" %s does not exist", dirname)
+         #only show extra information if the socket permissions
+         #would have been accessible by the group:
+-        if POSIX and (sperms & 0o40):
++        elif POSIX and (sperms & 0o40):
+             uid = getuid()
+             username = get_username_for_uid(uid)
+             groups = get_groups(username)
+Index: xpra/platform/xposix/paths.py
+===================================================================
+--- a/xpra/platform/xposix/paths.py	(revision 28285)
++++ b/xpra/platform/xposix/paths.py	(revision 28363)
+@@ -102,12 +102,12 @@
+ 
+ def do_get_user_conf_dirs(uid):
+     #per-user configuration location:
+-    #(but never use /root/.xpra)
++    #(but never use /root/.xpra or /root/.config/xpra)
+     if uid is None:
+         uid = os.getuid()
+     dirs = []
+-    dirs += [os.path.join(os.environ.get("XDG_CONFIG_HOME", "~/.config"), "xpra")]
+     if uid>0:
++        dirs += [os.path.join(os.environ.get("XDG_CONFIG_HOME", "~/.config"), "xpra")]
+         dirs.append("~/.xpra")
+     return dirs
+ 
+Index: xpra/platform/xposix/sd_listen.pyx
+===================================================================
+--- a/xpra/platform/xposix/sd_listen.pyx	(revision 28285)
++++ b/xpra/platform/xposix/sd_listen.pyx	(revision 28363)
+@@ -52,7 +52,7 @@
+     return sockets
+ 
+ def get_sd_socket_type(fd):
+-    from xpra.net.common import TCP_SOCKTYPES
++    from xpra.net.bytestreams import TCP_SOCKTYPES
+     socktype = os.environ.get("XPRA_SD%i_SOCKET_TYPE" % fd)
+     if not socktype:
+         socktype = os.environ.get("XPRA_SD_SOCKET_TYPE", "tcp")
+Index: xpra/server/mixins/audio_server.py
+===================================================================
+--- a/xpra/server/mixins/audio_server.py	(revision 28285)
++++ b/xpra/server/mixins/audio_server.py	(revision 28363)
+@@ -121,7 +121,7 @@
+             from xpra.platform.xposix.paths import _get_xpra_runtime_dir, get_runtime_dir
+             rd = osexpand(get_runtime_dir())
+             if not os.path.exists(rd) or not os.path.isdir(rd):
+-                log.warn("Warning: the runtime directory '%s' does not exist,")
++                log.warn("Warning: the runtime directory '%s' does not exist,", rd)
+                 log.warn(" cannot start a private pulseaudio server")
+             else:
+                 xpra_rd = _get_xpra_runtime_dir()
+Index: xpra/server/window/motion.pyx
+===================================================================
+--- a/xpra/server/window/motion.pyx	(revision 28285)
++++ b/xpra/server/window/motion.pyx	(revision 28363)
+@@ -79,7 +79,7 @@
+         for i,v in enumerate(arr):
+             self.a2[i] = <uint64_t> abs(v)
+ 
+-    def update(self, pixels, int16_t x, int16_t y, uint16_t width, uint16_t height, uint16_t rowstride, uint8_t bpp=4):
++    def update(self, pixels, int16_t x, int16_t y, uint16_t width, uint16_t height, uint32_t rowstride, uint8_t bpp=4):
+         """
+             Add a new image to compare with,
+             checksum its rows into a2,
+Index: xpra/server/window/window_video_source.py
+===================================================================
+--- a/xpra/server/window/window_video_source.py	(revision 28285)
++++ b/xpra/server/window/window_video_source.py	(revision 28363)
+@@ -1785,6 +1785,13 @@
+             scrolllog("no scrolling: detection has already been used on this image")
+             #we've already checked
+             return False
++        x = image.get_target_x()
++        y = image.get_target_y()
++        w = image.get_width()
++        h = image.get_height()
++        if w>=32000 or h>=32000:
++            scrolllog("no scrolling: the image is too large, %ix%i", w, h)
++            return False
+         #don't download the pixels if we have a GPU buffer,
+         #since that means we're likely to be able to compress on the GPU too with NVENC:
+         if not image.has_pixels():
+@@ -1792,10 +1799,6 @@
+         if self.content_type=="video" or not self.non_video_encodings:
+             scrolllog("no scrolling: content is video")
+             return False
+-        x = image.get_target_x()
+-        y = image.get_target_y()
+-        w = image.get_width()
+-        h = image.get_height()
+         if w<MIN_SCROLL_IMAGE_SIZE or h<MIN_SCROLL_IMAGE_SIZE:
+             scrolllog("no scrolling: image size %ix%i is too small, minimum is %ix%i",
+                       w, h, MIN_SCROLL_IMAGE_SIZE, MIN_SCROLL_IMAGE_SIZE)
+Index: xpra/x11/x11_server_core.py
+===================================================================
+--- a/xpra/x11/x11_server_core.py	(revision 28285)
++++ b/xpra/x11/x11_server_core.py	(revision 28363)
+@@ -687,7 +687,7 @@
+                 #we can use XRRSetScreenSize:
+                 try:
+                     with xsync:
+-                        RandR.xrr_set_screen_size(w, h, self.xdpi or self.dpi, self.ydpi or self.dpi)
++                        RandR.xrr_set_screen_size(w, h, self.xdpi or self.dpi or 96, self.ydpi or self.dpi or 96)
+                 except XError:
+                     screenlog("XRRSetScreenSize failed", exc_info=True)
+             screenlog("calling RandR.get_screen_size()")
diff --git a/x11-wm/xpra/metadata.xml b/x11-wm/xpra/metadata.xml
index 40ebd14c248c..0b0091e20849 100644
--- a/x11-wm/xpra/metadata.xml
+++ b/x11-wm/xpra/metadata.xml
@@ -13,6 +13,10 @@
 	<email>alexxy@gentoo.org</email>
 	<name>Alexey Shvetsov</name>
 </maintainer>
+<maintainer type="person">
+	<email>chewi@gentoo.org</email>
+	<name>James Le Cuirot</name>
+</maintainer>
 <upstream>
 	<bugs-to>https://www.xpra.org/trac/report</bugs-to>
 </upstream>
@@ -21,10 +25,6 @@
 	<flag name="client">Build client-side code</flag>
 	<flag name="clipboard">Enable clipboard support</flag>
 	<flag name="csc">Enable csc softscaler support</flag>
-	<flag name="dec_avcodec2">Enable avcodec2 decoder support</flag>
-	<flag name="enc_ffmpeg">Enable advanced ffmpeg/libav encoder support</flag>
-	<flag name="enc_x264">Enable x264 encoder support</flag>
-	<flag name="enc_x265">Enable x265 encoder support</flag>
 	<flag name="pillow">Enable pillow support</flag>
 	<flag name="server">Build server-side code</flag>
 	<flag name="vpx">Enable vpx image format support</flag>
diff --git a/x11-wm/xpra/xpra-3.0.2-r1.ebuild b/x11-wm/xpra/xpra-3.0.2-r1.ebuild
deleted file mode 100644
index a5257c2d2b08..000000000000
--- a/x11-wm/xpra/xpra-3.0.2-r1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# PyCObject_Check and PyCObject_AsVoidPtr vanished with python 3.3
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit xdg distutils-r1 eutils flag-o-matic user tmpfiles prefix
-
-DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
-HOMEPAGE="https://xpra.org/ http://xpra.org/src/"
-SRC_URI="http://xpra.org/src/${P}.tar.xz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+client +clipboard csc cups dbus dec_avcodec2 enc_ffmpeg enc_x264 enc_x265 jpeg +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam webp"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	clipboard? ( || ( server client ) )
-	cups? ( dbus )
-	opengl? ( client )
-	|| ( client server )
-	client? ( enc_x264? ( dec_avcodec2 ) enc_x265? ( dec_avcodec2 ) )"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3[introspection]
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXtst
-	x11-libs/libxkbfile
-	csc? ( >=media-video/ffmpeg-1.2.2:0= )
-	dec_avcodec2? ( >=media-video/ffmpeg-2:0=[x264,x265] )
-	enc_ffmpeg? ( >=media-video/ffmpeg-3.2.2:0= )
-	enc_x264? ( media-libs/x264
-	>=media-video/ffmpeg-1.0.4:0=[x264] )
-	enc_x265? ( media-libs/x265
-	>=media-video/ffmpeg-2:0=[x264] )
-	jpeg? ( media-libs/libjpeg-turbo )
-	opengl? ( dev-python/pyopengl )
-	pulseaudio? ( media-sound/pulseaudio )
-	sound? ( media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		dev-python/gst-python:1.0 )
-	vpx? ( media-libs/libvpx media-video/ffmpeg )
-	webp? ( media-libs/libwebp )"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-python/netifaces[${PYTHON_USEDEP}]
-	dev-python/rencode[${PYTHON_USEDEP}]
-	dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
-	virtual/ssh
-	x11-apps/xmodmap
-	cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
-	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
-	lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
-	lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
-	opengl? (
-		client? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
-	)
-	server? ( x11-base/xorg-server[-minimal,xvfb]
-		x11-drivers/xf86-input-void
-	)
-	webcam? ( dev-python/numpy[${PYTHON_USEDEP}]
-		media-libs/opencv[python]
-		dev-python/pyinotify[${PYTHON_USEDEP}] )"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	>=dev-python/cython-0.16[${PYTHON_USEDEP}]"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch
-	"${FILESDIR}"/${PN}-2.0-suid-warning.patch
-	"${FILESDIR}"/${PN}-3.0.2-ldconfig.patch
-)
-
-pkg_postinst() {
-	enewgroup ${PN}
-	tmpfiles_process /usr/lib/tmpfiles.d/xpra.conf
-
-	xdg_pkg_postinst
-}
-
-python_prepare_all() {
-	use dbus || eapply "${FILESDIR}/${PN}-3.0.2-dbus.patch"
-
-	hprefixify -w '/os.path/' setup.py
-	hprefixify tmpfiles.d/xpra.conf xpra/server/server_util.py \
-		xpra/platform{/xposix,}/paths.py xpra/scripts/server.py
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	sed -e "/'pulseaudio'/s:DEFAULT_PULSEAUDIO:$(usex pulseaudio True False):" \
-		-i setup.py || die
-
-	mydistutilsargs=(
-		--without-PIC
-		--without-Xdummy
-		$(use_with client)
-		$(use_with clipboard)
-		$(use_with csc csc_swscale)
-		--without-csc_libyuv
-		--without-cuda_rebuild
-		--without-cuda_kernels
-		$(use_with cups printing)
-		--without-debug
-		$(use_with dbus)
-		$(use_with dec_avcodec2)
-		$(use_with enc_ffmpeg)
-		$(use_with enc_x264)
-		$(use_with enc_x265)
-		--without-gtk2
-		--with-gtk3
-		--without-html5
-		$(use_with jpeg jpeg_encoder)
-		$(use_with jpeg jpeg_decoder)
-		--without-mdns
-		--without-minify
-		$(use_with opengl)
-		$(use_with server shadow)
-		$(use_with server)
-		$(use_with sound)
-		--with-strict
-		$(use_with vpx)
-		--with-warn
-		$(use_with webcam)
-		$(use_with webp)
-		--with-x11
-	)
-
-	# see https://www.xpra.org/trac/ticket/1080
-	# and http://trac.cython.org/ticket/395
-	append-cflags -fno-strict-aliasing
-
-	export XPRA_SOCKET_DIRS="${EPREFIX}/run/xpra"
-}
diff --git a/x11-wm/xpra/xpra-4.0.4.ebuild b/x11-wm/xpra/xpra-4.0.6_p28363.ebuild
index 7ca931b0261c..bf886a4feeec 100644
--- a/x11-wm/xpra/xpra-4.0.4.ebuild
+++ b/x11-wm/xpra/xpra-4.0.6_p28363.ebuild
@@ -1,20 +1,22 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_SINGLE_IMPL=yes
 DISTUTILS_USE_SETUPTOOLS=no
-inherit xdg distutils-r1 eutils flag-o-matic tmpfiles prefix
+inherit xdg distutils-r1 tmpfiles prefix
 
+MY_P="${PN}-${PV%_p*}"
 DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
-HOMEPAGE="https://xpra.org/ http://xpra.org/src/"
-SRC_URI="http://xpra.org/src/${P}.tar.xz"
+HOMEPAGE="https://xpra.org/"
+SRC_URI="https://xpra.org/src/${MY_P}.tar.xz"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="brotli +client +clipboard csc cups dbus ffmpeg jpeg +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam webp"
+IUSE="brotli +client +clipboard csc cups dbus ffmpeg jpeg +lz4 lzo minimal opengl pillow pulseaudio server sound test vpx webcam webp"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	|| ( client server )
@@ -22,8 +24,13 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	opengl? ( client )
 "
 
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
+DEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
+		opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
+		sound? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
+	')
 	x11-libs/gtk+:3[introspection]
 	x11-libs/libX11
 	x11-libs/libXcomposite
@@ -36,40 +43,50 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	csc? ( >=media-video/ffmpeg-1.2.2:0= )
 	ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] )
 	jpeg? ( media-libs/libjpeg-turbo )
-	opengl? ( dev-python/pyopengl )
 	pulseaudio? (
 		media-sound/pulseaudio
 		media-plugins/gst-plugins-pulse:1.0
 	)
-	sound? ( media-libs/gstreamer:1.0
+	sound? (
+		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
-		dev-python/gst-python:1.0 )
+	)
 	vpx? ( media-libs/libvpx media-video/ffmpeg )
 	webp? ( media-libs/libwebp )
 "
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="
+	${DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/netifaces[${PYTHON_USEDEP}]
+		dev-python/rencode[${PYTHON_USEDEP}]
+		dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
+		cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
+		dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+		lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
+		lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
+		opengl? (
+			client? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
+		)
+		webcam? (
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/pyinotify[${PYTHON_USEDEP}]
+			media-libs/opencv[${PYTHON_USEDEP},python]
+		)
+	')
 	acct-group/xpra
-	dev-python/netifaces[${PYTHON_USEDEP}]
-	dev-python/rencode[${PYTHON_USEDEP}]
-	dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
 	virtual/ssh
 	x11-apps/xmodmap
-	cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
-	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
-	lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
-	lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
-	opengl? (
-		client? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
-	)
-	server? ( x11-base/xorg-server[-minimal,xvfb]
+	server? (
+		x11-base/xorg-server[-minimal,xvfb]
 		x11-drivers/xf86-input-void
 	)
-	webcam? ( dev-python/numpy[${PYTHON_USEDEP}]
-		media-libs/opencv[python]
-		dev-python/pyinotify[${PYTHON_USEDEP}] )"
-DEPEND="${COMMON_DEPEND}
+"
+BDEPEND="
 	virtual/pkgconfig
-	>=dev-python/cython-0.16[${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep '
+		>=dev-python/cython-0.16[${PYTHON_USEDEP}]
+	')
+"
 
 RESTRICT="!test? ( test )"
 
@@ -77,8 +94,11 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch
 	"${FILESDIR}"/${PN}-3.0.2-ldconfig.patch
 	"${FILESDIR}"/${PN}-4.0.3-suid-warning.patch
+	"${FILESDIR}"/${PN}-4.0.6-r28363.patch
 )
 
+S="${WORKDIR}/${MY_P}"
+
 pkg_postinst() {
 	tmpfiles_process /usr/lib/tmpfiles.d/xpra.conf
 
@@ -90,6 +110,11 @@ python_prepare_all() {
 	hprefixify tmpfiles.d/xpra.conf xpra/server/server_util.py \
 		xpra/platform{/xposix,}/paths.py xpra/scripts/server.py
 
+	if use minimal; then
+		sed -r -e 's/^(pam|scripts|xdg_open)_ENABLED.*/\1_ENABLED=False/' \
+			-i setup.py || die
+	fi
+
 	distutils-r1_python_prepare_all
 }
 
@@ -131,9 +156,5 @@ python_configure_all() {
 		--with-x11
 	)
 
-	# see https://www.xpra.org/trac/ticket/1080
-	# and http://trac.cython.org/ticket/395
-	append-cflags -fno-strict-aliasing
-
 	export XPRA_SOCKET_DIRS="${EPREFIX}/run/xpra"
 }