Merge branch 'edge' into next

31 files changed, 154 insertions, 1007 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 203eec4ab183..ddeeab2cb01c 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/amiwm/Manifest b/x11-wm/amiwm/Manifest
index 443d7c6a8cd2..66ea295f3769 100644
--- a/x11-wm/amiwm/Manifest
+++ b/x11-wm/amiwm/Manifest
@@ -1,6 +1,3 @@
-AUX amiwm-0.21_p2-flex-2.6.3-fix.patch 686 BLAKE2B 9dc83c547918e54d73db7882f2235dc493eb1e169b400d88df31665a8a6ab2592a39cd33ca15964040246b5ea9feff6bc46ed0e626d573968342b7fa32368083 SHA512 14982dba3c1baf8bbca9daee204c32d3312c2505127bd4e2744eb9348784e927fbf4c2cb7e3f50c84494d62a714313c7bf0762023ad84fdb3707e108e1778693
-AUX amiwm-0.21_p2-gentoo.diff 6030 BLAKE2B 9724d841fbb2905c87008f6020853d89b492af2db63546ca81c0eaf1b79c51dfbd4475762b9bd3b95b3dbb05e6a5c23c9341231936d78ad6540db35ae05bf9c7 SHA512 0eed752869ab7a46de2925e13e53796d1459d1ce656cd3d96b0367dcb6f17fbb2e98cd58a336e0d6880f9e76ca037c7ac2b91f1670ecc636f5ba8281dc35aa82
-AUX amiwm-0.21_p2-implicts.patch 1547 BLAKE2B 698d800eefaa82a7887c98fad6beeca349342f392f950af3068d92e07edd81f1110d49088fafb7c548c88888830029cf4b7444fb9025371545728c6422b7d9f9 SHA512 19a0983d7de963f75696968918553c362941e437e5f5ebe75ceb0d0b4f28402c00f1df003bd1639ad6001274b670cad97ce1324afa1aae68c1dc93a424422b1a
-DIST amiwm0.21pl2.tar.gz 195128 BLAKE2B de7c843e6b756797b7a72a8e0b6fde6d4c02893e3eae8262d85d4417a7ad6309c10add802c04dde2d092bc7c8a604edbc96c4a9fc3c7f1166897a7933a978ccb SHA512 6504a4fd4c30a571b0c501b46fdc442fcc993c27b4595753f7bfa12a38c0b997a01d939c7a35e6c499aa0f8972bc0fda7cc88a9fe77091f363f8cd5a9e8d50de
-EBUILD amiwm-0.21_p2.ebuild 1244 BLAKE2B 8ae34da5973132de636eaea3e2cc2f102109bfaf4aab7ee3ec4df600e519e286a467a60b386a28dcc08186697d84dc01c9238e947a453da1aaff82dfeb63edc7 SHA512 431b38ac15e7a077fc2288e3f71e9d69cedd0366e60f9e4ab7e84c74a8e7b0a72af0f754ca21338b746b857c9f67be7f15f520bc5bb47d4f3792712a6b6d2f70
-MISC metadata.xml 421 BLAKE2B 46cf8aaaec020d3fe7206a8a039c6c00f53958754cc4bd992d3421662c495fe9aff6a53d2a662f7cfae719da48d0668cf3066d8347882da1f056b18ac2b271a2 SHA512 941d314dced43df9951b885f47245c4ca9deff091c8c75727f1cc2b3fcdb485024d4b8e04ebf8d40bebe491bae50522e41ae3cee9f6f600814874f01aae43d90
+DIST amiwm-0.22.01_p20200826.tar.gz 153787 BLAKE2B eebd61436bff6c063c0946f61632f5a56ba01d62f01e2761de62fed1c2c5049a191dbbaf836ac0b0771b38a84dc6f52a40ee53b9c73666855cfe03b6a829f9a8 SHA512 a4329eb8ea98b631611a6e069f27a6c640bfac94aa5a2c3591c9c35c4b08ea6f123fadcd56597353b27ec67bc079e8268e1b700fe85c0d545c9bb93439362c1b
+EBUILD amiwm-0.22.01_p20200826.ebuild 871 BLAKE2B 5f90b34bf74abd5f20f2a1e754ae38a0cb82a07e5a13e0a5e004a888d1bcb16e39591206fc333d546375d00ce4b78813654480aa973cdeecbe0e09560670d451 SHA512 cccbdb9156c475271dd15a9693bf9528d1a4db26c5d5053858bdfb98c96ecb0f6f5cd84c7da3217692faa743dbdec50573c493842b9192c0c5063ae2306b04ae
+MISC metadata.xml 504 BLAKE2B a99b852324030913b424786f9a45c4db6fc56bebdc98ff89bf2c5382374cf5401363ea4a47340dd053b59469a5b30b905c2ba2655d10b8b1aff1e726d77ac1ac SHA512 8afe2f2fc41da290257fd4fe5d3111d2f22f06c49b003bcec59d5edea2e7b0eb28aaee1d433bd9611126fa6185a5d0fa3dbc6263e32be3b1a5d4d40502602fc2
diff --git a/x11-wm/amiwm/amiwm-0.21_p2.ebuild b/x11-wm/amiwm/amiwm-0.21_p2.ebuild
deleted file mode 100644
index 0fba9046d07d..000000000000
--- a/x11-wm/amiwm/amiwm-0.21_p2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib toolchain-funcs
-
-MY_P=${PN}${PV/_p/pl}
-DESCRIPTION="Windowmanager ala Amiga(R) Workbench(R)"
-HOMEPAGE="http://www.lysator.liu.se/~marcus/amiwm.html"
-SRC_URI="ftp://ftp.lysator.liu.se/pub/X11/wm/${PN}/${MY_P}.tar.gz"
-
-LICENSE="amiwm"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-COMMON_DEPEND="x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXext"
-
-RDEPEND="${COMMON_DEPEND}
-	media-gfx/xloadimage
-	x11-apps/xrdb
-	x11-apps/xsetroot
-	x11-terms/xterm"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-gentoo.diff"
-	"${FILESDIR}/${P}-implicts.patch"
-	"${FILESDIR}/${P}-flex-2.6.3-fix.patch"
-)
-
-pkg_setup() {
-	tc-export CC
-}
-
-src_prepare() {
-	default
-	sed -e "s:\$(exec_prefix)/lib:\$(exec_prefix)/$(get_libdir):" \
-		-e '/^STRIPFLAG/s@-s@@' \
-		-e '/$(LN_S)/s@$(DESTDIR)$(AMIWM_HOME)@../..$(AMIWM_HOME)@' \
-		-i Makefile.in || die
-	sed -i -e "s:/bin/ksh:/bin/sh:g" Xsession{,2}.in || die
-
-	cat <<- EOF > "${T}"/amiwm
-		#!/bin/sh
-		exec /usr/bin/amiwm
-	EOF
-}
-
-src_install() {
-	local DOCS=( README* )
-	default
-
-	exeinto /etc/X11/Sessions
-	doexe "${T}"/amiwm
-}
diff --git a/x11-wm/amiwm/amiwm-0.22.01_p20200826.ebuild b/x11-wm/amiwm/amiwm-0.22.01_p20200826.ebuild
new file mode 100644
index 000000000000..7e7eaed103a1
--- /dev/null
+++ b/x11-wm/amiwm/amiwm-0.22.01_p20200826.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+COMMIT="8b8c956a904fa73edb02d4dc6d45bc0358bff3b3"
+DESCRIPTION="Amiga Workbench inspired window manager for Xorg"
+HOMEPAGE="https://github.com/redsPL/amiwm"
+SRC_URI="https://github.com/chewi/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="amiwm"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+COMMON_DEPEND="
+	x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXext
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	media-fonts/font-misc-misc[nls,X]
+	x11-apps/xrdb
+	x11-apps/xsetroot
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+src_prepare() {
+	default
+	eautoconf
+}
+
+src_install() {
+	emake install DESTDIR="${D}" STRIPFLAG=
+	einstalldocs
+
+	exeinto /etc/X11/Sessions
+	newexe - ${PN} <<-EOF
+		#!/bin/sh
+		exec ${PN}
+	EOF
+}
diff --git a/x11-wm/amiwm/files/amiwm-0.21_p2-flex-2.6.3-fix.patch b/x11-wm/amiwm/files/amiwm-0.21_p2-flex-2.6.3-fix.patch
deleted file mode 100644
index ae89aafdae86..000000000000
--- a/x11-wm/amiwm/files/amiwm-0.21_p2-flex-2.6.3-fix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- amiwm0.21pl2/lex.l
-+++ amiwm0.21pl2/lex.l
-@@ -1,5 +1,6 @@
-+%option noyywrap
- %{
- #include <stdio.h>
- #include "gram.h"
- extern char *progname;
- extern int ParseError;
---- amiwm0.21pl2/kbdlexer.l
-+++ amiwm0.21pl2/kbdlexer.l
-@@ -1,5 +1,6 @@
-+%option noyywrap
- %{
- #include <X11/Xmu/CharSet.h>
- #include <string.h>
- 
- #include "libami.h"
-@@ -134,12 +135,9 @@ int parse_keyword(char *str, YYSTYPE *va
- 
- .               { fprintf(stderr, "%s: illegal character \"%s\" ignored\n",
-                           progname, yytext); }
- %%
- 
--#ifndef yywrap
--int yywrap() { return 1; }
--#endif
- #undef input
- #define input() ((*inptr)?(*inptr++):0)
- #undef unput
- #define unput(c) (*--inptr=c)
diff --git a/x11-wm/amiwm/files/amiwm-0.21_p2-gentoo.diff b/x11-wm/amiwm/files/amiwm-0.21_p2-gentoo.diff
deleted file mode 100644
index fa875a4a43bf..000000000000
--- a/x11-wm/amiwm/files/amiwm-0.21_p2-gentoo.diff
+++ /dev/null
@@ -1,160 +0,0 @@
-Fix parallel build, don't strip binaries, respect CC LDFLAGS, fix install dirs
-Fix incompatible implicit declaration of built-in function {strlen,memset,strcpy}
-
-http://bugs.gentoo.org/show_bug.cgi?id=248680
-http://bugs.gentoo.org/show_bug.cgi?id=299918
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -14,7 +14,7 @@
- exec_prefix = @exec_prefix@
- bindir = $(exec_prefix)/bin
- libdir = $(exec_prefix)/lib
--mandir = $(prefix)/man
-+mandir = $(prefix)/share/man
- INSTALL = @INSTALL@
- LN_S = @LN_S@
- RM = -rm -f
-@@ -45,13 +45,19 @@
- 
- AMIWM_HOME = $(libdir)/amiwm
- 
-+.PHONY: yaccs all clean lib_all lexs
-+
-+.SUFFIXES: .c
-+
- all : lib_all
- 	@$(MAKE) local_all
- 
- local_all : $(PROGS) $(MODULES)
- 
-+$(OBJS): lexs
-+
- lib_all :
--	@( cd libami; $(MAKE) all )
-+	@$(MAKE) -C libami all
- 
- .c.o:
- 	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $<
-@@ -71,83 +77,75 @@
- ppmtoinfo.o : ppmtoinfo.c
- 	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -DAMIWM_HOME=\"$(AMIWM_HOME)\" $<
- 
--gram.h gram.c: gram.y
--	$(YACC) $(YFLAGS) $<
--	mv y.tab.c gram.c
--	mv y.tab.h gram.h
-+yaccs: gram.c kbdmodule.c
-+lexs: yaccs lex.c kbdlexer.c
-+
-+%.c: %.y
-+	$(YACC) $(YFLAGS) $< -o $@
- 
--lex.c : lex.l
--	$(LEX) -t $< > lex.c
- 
--kbdmodule.h kbdmodule.c: kbdmodule.y
--	$(YACC) $(YFLAGS) $<
--	mv y.tab.c kbdmodule.c
--	mv y.tab.h kbdmodule.h
-+lex.c : lex.l
-+	$(LEX) -t $< > lex.c
- 
- kbdlexer.c : kbdlexer.l
- 	$(LEX) -t $< > kbdlexer.c
- 
--install : $(PROGS) $(MODULES) Xsession Xsession2 Xinitrc amiwm-init
--	-mkdir -p $(AMIWM_HOME)
--	$(INSTALL) $(STRIPFLAG) requestchoice $(AMIWM_HOME)/requestchoice
--	$(INSTALL) $(STRIPFLAG) executecmd $(AMIWM_HOME)/executecmd
-+install : Xsession Xsession2 Xinitrc amiwm-init
-+	$(INSTALL) -D requestchoice $(DESTDIR)$(AMIWM_HOME)/requestchoice
-+	$(INSTALL) executecmd $(DESTDIR)$(AMIWM_HOME)/executecmd
- 	for module in $(MODULES); do \
- 	  if [ "$$module" = "$(srcdir)/Background" ]; then \
--	    $(INSTALL) $$module $(AMIWM_HOME)/Background; \
-+	    $(INSTALL) $$module $(DESTDIR)$(AMIWM_HOME)/Background; \
- 	  else \
--	    $(INSTALL) $(STRIPFLAG) $$module $(AMIWM_HOME)/$$module; \
-+	    $(INSTALL) $(STRIPFLAG) $$module $(DESTDIR)$(AMIWM_HOME)/$$module; \
- 	  fi; \
- 	done
--	$(INSTALL) -m 644 $(srcdir)/system.amiwmrc $(AMIWM_HOME)/system.amiwmrc
--	$(INSTALL) -m 644 $(srcdir)/def_tool.info $(AMIWM_HOME)/def_tool.info
--	$(INSTALL) -m 644 $(srcdir)/system.map $(AMIWM_HOME)/system.map
--	$(INSTALL) -m 644 $(srcdir)/magicwb.map $(AMIWM_HOME)/magicwb.map
--	$(INSTALL) -m 644 $(srcdir)/schwartz.map $(AMIWM_HOME)/schwartz.map
--	$(INSTALL) -m 755 Xsession $(AMIWM_HOME)/Xsession
--	$(INSTALL) -m 755 Xsession2 $(AMIWM_HOME)/Xsession2
--	$(INSTALL) -m 755 Xinitrc $(AMIWM_HOME)/Xinitrc
--	$(INSTALL) -m 755 $(srcdir)/amiwm-init $(AMIWM_HOME)/amiwm-init
--	-mkdir -p $(bindir)
--	$(INSTALL) $(STRIPFLAG) amiwm $(bindir)/amiwm
--	$(INSTALL) $(STRIPFLAG) ppmtoinfo $(bindir)/ppmtoinfo
--	$(RM) $(bindir)/requestchoice
--	$(LN_S) $(AMIWM_HOME)/requestchoice $(bindir)/requestchoice
--	-mkdir -p $(mandir)/man1
--	$(INSTALL) -m 644 $(srcdir)/amiwm.1 $(mandir)/man1/amiwm.1
-+	$(INSTALL) -m 644 $(srcdir)/system.amiwmrc $(DESTDIR)$(AMIWM_HOME)/system.amiwmrc
-+	$(INSTALL) -m 644 $(srcdir)/def_tool.info $(DESTDIR)$(AMIWM_HOME)/def_tool.info
-+	$(INSTALL) -m 644 $(srcdir)/system.map $(DESTDIR)$(AMIWM_HOME)/system.map
-+	$(INSTALL) -m 644 $(srcdir)/magicwb.map $(DESTDIR)$(AMIWM_HOME)/magicwb.map
-+	$(INSTALL) -m 644 $(srcdir)/schwartz.map $(DESTDIR)$(AMIWM_HOME)/schwartz.map
-+	$(INSTALL) -m 755 Xsession $(DESTDIR)$(AMIWM_HOME)/Xsession
-+	$(INSTALL) -m 755 Xsession2 $(DESTDIR)$(AMIWM_HOME)/Xsession2
-+	$(INSTALL) -m 755 Xinitrc $(DESTDIR)$(AMIWM_HOME)/Xinitrc
-+	$(INSTALL) -m 755 $(srcdir)/amiwm-init $(DESTDIR)$(AMIWM_HOME)/amiwm-init
-+	$(INSTALL) -D amiwm $(DESTDIR)$(bindir)/amiwm
-+	$(INSTALL) ppmtoinfo $(DESTDIR)$(bindir)/ppmtoinfo
-+	$(RM) $(DESTDIR)$(bindir)/requestchoice
-+	$(LN_S) $(DESTDIR)$(AMIWM_HOME)/requestchoice $(DESTDIR)$(bindir)/requestchoice
-+	$(INSTALL) -D -m 644 $(srcdir)/amiwm.1 $(DESTDIR)$(mandir)/man1/amiwm.1
- 
- fs-install : Filesystem
--	$(INSTALL) $(STRIPFLAG) Filesystem $(AMIWM_HOME)/Filesystem
--	$(INSTALL) -m 644 def_disk.info $(AMIWM_HOME)/def_disk.info
--	$(INSTALL) -m 644 def_drawer.info $(AMIWM_HOME)/def_disk.info
-+	$(INSTALL) Filesystem $(DESTDIR)$(AMIWM_HOME)/Filesystem
-+	$(INSTALL) -m 644 def_disk.info $(DESTDIR)$(AMIWM_HOME)/def_disk.info
-+	$(INSTALL) -m 644 def_drawer.info $(DESTDIR)$(AMIWM_HOME)/def_disk.info
- 
- cde-install : Xresources.amiwm Amilogo.bm Amilogo.pm
--	-mkdir -p $(DT_DIR)/config/C/Xresources.d
--	$(INSTALL) -m 644 Xresources.amiwm $(DT_DIR)/config/C/Xresources.d/Xresources.amiwm
--	-mkdir -p $(DT_DIR)/appconfig/icons/C
--	$(INSTALL) -m 644 Amilogo.bm $(DT_DIR)/appconfig/icons/C/Amilogo.bm
-+	$(INSTALL) -D -m 644 Xresources.amiwm $(DESTDIR)$(DT_DIR)/config/C/Xresources.d/Xresources.amiwm
-+	$(INSTALL) -D -m 644 Amilogo.bm $(DESTDIR)$(DT_DIR)/appconfig/icons/C/Amilogo.bm
- 	$(INSTALL) -m 644 Amilogo.pm $(DT_DIR)/appconfig/icons/C/Amilogo.pm
- 
- 
- amiwm : $(OBJS) $(LIBAMI)
--	$(CC) -o amiwm $(OBJS) $(LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o amiwm $(OBJS) $(LIBS)
- 
- requestchoice : requestchoice.o $(LIBAMI)
--	$(CC) -o requestchoice requestchoice.o $(LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o requestchoice requestchoice.o $(LIBS)
- 
- executecmd : executecmd.o $(LIBAMI)
--	$(CC) -o executecmd executecmd.o $(LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o executecmd executecmd.o $(LIBS)
- 
- Filesystem : filesystem.o $(LIBAMI)
--	$(CC) -o Filesystem filesystem.o $(LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o Filesystem filesystem.o $(LIBS)
- 
- Keyboard : kbdmodule.o kbdlexer.o $(LIBAMI)
--	$(CC) -o Keyboard kbdmodule.o kbdlexer.o $(LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o Keyboard kbdmodule.o kbdlexer.o $(LIBS)
- 
- ppmtoinfo : ppmtoinfo.o
--	$(CC) -o ppmtoinfo ppmtoinfo.o -lm
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o ppmtoinfo ppmtoinfo.o -lm
- 
- localetest : localetest.o $(LIBAMI)
--	$(CC) -o localetest localetest.o $(LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o localetest localetest.o $(LIBS)
- 
- clean :
- 	$(RM) core $(PROGS) $(LIBAMI) Keyboard *.o libami/*.o
diff --git a/x11-wm/amiwm/files/amiwm-0.21_p2-implicts.patch b/x11-wm/amiwm/files/amiwm-0.21_p2-implicts.patch
deleted file mode 100644
index 4a01347d0e86..000000000000
--- a/x11-wm/amiwm/files/amiwm-0.21_p2-implicts.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- a/main.c
-+++ b/main.c
-@@ -131,6 +131,7 @@
- extern void read_rc_file(char *filename, int manage_all);
- extern void init_modules();
- extern void flushmodules();
-+extern void closescreen();
- extern void raiselowerclient(Client *, int);
- 
- #ifndef AMIGAOS
---- a/menu.c
-+++ b/menu.c
-@@ -45,6 +45,11 @@
- extern void mod_menuselect(struct module *, int, int, int);
- extern void setfocus(Window);
- extern void flushmodules();
-+extern void openscreen(char *, Window);
-+extern void realizescreens(void);
-+extern void screentoback();
-+extern void wberror(Scrn *, char *);
-+extern void closescreen();
- 
- Scrn *mbdclick=NULL, *mbdscr=NULL;
- 
---- a/icc.c
-+++ b/icc.c
-@@ -6,6 +6,7 @@
- #include "prefs.h"
- 
- #include <string.h>
-+#include <stdlib.h>
- 
- #ifdef AMIGAOS
- #include <pragmas/xlib_pragmas.h>
---- a/libami/lists.c
-+++ b/libami/lists.c
-@@ -1,3 +1,4 @@
-+#include <string.h>
- #include "libami.h"
- 
- #ifndef AMIGAOS
---- a/kbdmodule.y
-+++ b/kbdmodule.y
-@@ -2,6 +2,8 @@
- #include <stdio.h>
- #include <string.h>
- #include "libami.h"
-+int yyerror(char *);
-+int yylex (void);
- 
- void docmd(XEvent *e, void *callback)
- {
---- a/gram.y
-+++ b/gram.y
-@@ -8,6 +8,8 @@
- #include "screen.h"
- #include "icc.h"
- #include "style.h"
-+int yyerror(char *);
-+int yylex (void);
- extern void set_sys_palette(void);
- extern void set_mwb_palette(void);
- extern void set_schwartz_palette(void);
---- a/ppmtoinfo.c
-+++ b/ppmtoinfo.c
-@@ -1,6 +1,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <time.h>
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
diff --git a/x11-wm/amiwm/metadata.xml b/x11-wm/amiwm/metadata.xml
index 722041341d07..06ced70e47f0 100644
--- a/x11-wm/amiwm/metadata.xml
+++ b/x11-wm/amiwm/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription>
-	amiwm is an X window manager that tries to make your display look and 
-	feel like an Amiga Workbench screen. It is fully functional and can do 
-	all the usual window manager stuff, like moving and resizing windows.
+	<maintainer type="person">
+		<email>chewi@gentoo.org</email>
+		<name>James Le Cuirot</name>
+	</maintainer>
+	<longdescription>
+		amiwm is an X window manager that tries to make your display look and
+		feel like an Amiga Workbench screen. It is fully functional and can do
+		all the usual window manager stuff, like moving and resizing windows.
 	</longdescription>	
 </pkgmetadata>
diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
index 5582668c5dc8..ef532c51b58d 100644
--- a/x11-wm/enlightenment/Manifest
+++ b/x11-wm/enlightenment/Manifest
@@ -1,4 +1,4 @@
 AUX gentoo-sysactions.conf 3056 BLAKE2B 155b0826c544a5a4829214b4b43d49e2dad455d041f0afc7077dc44780d12bd1a99a1bc94bb5a4a9ba21f59f679e1d4c82609791ee5a5e9828543b1e9154fae5 SHA512 688f02cbff0d50a847eb08ca7832699b836adca9b22e15a780943a8e5a8213aac04b335cfdf3cb96adbff238f681ae8954a720153e8e35b2afaba3225d53206a
 DIST enlightenment-0.23.1.tar.xz 26426096 BLAKE2B d781dc951ad8eddd90f633b29a6b1180be63e6052a56e60644b4f738f4c0d42617aeb4f7326cf3284d0b331dd87d605fa0625ea6435f4e36b8f5b3ccce82ca53 SHA512 b5b8a34f6abe47d9b23dbcaf09d2f61f74b3f8d5a97b30a9666916b4bd307a45cb2ad874288419ab40ef06fa57c3b7dc15377dd9acaeb6eb71cd8c0c24fc42cb
-EBUILD enlightenment-0.23.1.ebuild 2771 BLAKE2B 20d010c60aaa1797b5a0c3f2c5014fc0cb9ea7cc16224f4002ebf7670ccf5f59452cba86bc558b3fa8010506b55ef283e03797eeccb90a1b169c873347ade3c6 SHA512 1ed389d8b6a23c03b32a1a524596654ec66ea381a0df8e4256fd081ba8f083b5a2a2139db5418813b10bbfa7e2cf2f03fe5462e2870d607b164476c7e4fe6b4e
-MISC metadata.xml 802 BLAKE2B b7b4f3531b89d5aa743c0153171fc9c36e732ba609eb7703961fd65780c59662ebf796cd7c822ab3cfeed7198fbf4fe8f9b481755f6ac5792729f30e4cc13c6c SHA512 4634f5d13c9f6ae6a7ddeb2c50e8882fac00ac17de37e8eabc24d5edd2470a5e35ffcf21a885be572d1d55f12610eb7496b39a29aad5b3d5f48e67ec26be884b
+EBUILD enlightenment-0.23.1-r1.ebuild 2752 BLAKE2B 272b992ec94ae89c9105c547b23511acc46b58f20cca99e608b1dd0684d9666957ee07b9f97272291362912a3ab7dcad9a6fd84bdfcd829d97c8c0ab89d6e6f6 SHA512 2c04ceb74c05e55911b18867693930e66846754d97dbe93c5f650ed706609f37227ed57cafc9ba5b333216cfbd4b315c4d093792298039a43864ffeac9d632e3
+MISC metadata.xml 721 BLAKE2B 85587a677b7e22cd1dbfe187c367574ccef7ad88a1bdde00acecc9fc5f62d48adb9e14c2086953287efc728cc616d6d286fde1b659a44404086fef5e6bde90b1 SHA512 6d22a2f8639b3b75fd1113c0b381edc2869d91e5d3d04d6c67c845c15fae9ba0e370918e30b45e89e91c695f873f1d0ef5966f7720ab5e9cd270c6254c792dc5
diff --git a/x11-wm/enlightenment/enlightenment-0.23.1.ebuild b/x11-wm/enlightenment/enlightenment-0.23.1-r1.ebuild
index f7ace1703863..e499a09c51e8 100644
--- a/x11-wm/enlightenment/enlightenment-0.23.1.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.23.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils meson xdg-utils
+inherit eutils flag-o-matic meson xdg-utils
 
 DESCRIPTION="Enlightenment window manager"
 HOMEPAGE="https://www.enlightenment.org"
@@ -12,7 +12,7 @@ SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
 LICENSE="BSD-2"
 SLOT="0.17/${PV%%_*}"
 KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-IUSE="acpi bluetooth connman doc geolocation nls packagekit pam systemd udisks wayland wifi xwayland"
+IUSE="acpi bluetooth connman doc geolocation nls pam systemd udisks wayland wifi xwayland"
 
 REQUIRED_USE="xwayland? ( wayland )"
 
@@ -27,7 +27,6 @@ RDEPEND="
 	bluetooth? ( net-wireless/bluez )
 	connman? ( dev-libs/efl[connman] )
 	geolocation? ( app-misc/geoclue:2.0 )
-	packagekit? ( app-admin/packagekit-base )
 	pam? ( sys-libs/pam )
 	systemd? ( sys-apps/systemd )
 	udisks? ( sys-fs/udisks:2 )
@@ -57,12 +56,13 @@ src_configure() {
 		-D install-sysactions=false
 		-D mount-eeze=false
 
+		-D packagekit=false
+
 		$(meson_use udisks mount-udisks)
 		$(meson_use bluetooth bluez5)
 		$(meson_use connman)
 		$(meson_use geolocation)
 		$(meson_use nls)
-		$(meson_use packagekit)
 		$(meson_use pam)
 		$(meson_use systemd)
 		$(meson_use wayland wl)
@@ -82,6 +82,8 @@ src_configure() {
 		)
 	fi
 
+	append-cflags -fcommon
+
 	meson_src_configure
 }
 
diff --git a/x11-wm/enlightenment/metadata.xml b/x11-wm/enlightenment/metadata.xml
index d5f28f5d919c..d377aee6304b 100644
--- a/x11-wm/enlightenment/metadata.xml
+++ b/x11-wm/enlightenment/metadata.xml
@@ -6,7 +6,6 @@
     <name>Joonas Niilola</name>
   </maintainer>
   <use>
-    <flag name="packagekit">Enable module for package manager integration</flag>
     <flag name="xwayland">Enable XWayland application support</flag>
   </use>
   <longdescription>
diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest
index 2291aa3404f8..b8e9bfd67ab2 100644
--- a/x11-wm/herbstluftwm/Manifest
+++ b/x11-wm/herbstluftwm/Manifest
@@ -1,8 +1,10 @@
 DIST herbstluftwm-0.7.2.tar.gz 245506 BLAKE2B 72d0bb2a77e519161d193ac7b2b9f1f878ccb6cfe4914b6c75d060e2daa0bec4203ee4ebf203b9fa1dfb844d71d50aa7c03257c78aa22e906bf42519d1e592af SHA512 abb49bbc3de9a0ef619ce7063c1cea0d0d25ab2195c53dc0d33e061ad24060da4bbe9b99b9b9126028cdf68b462d4fcc8d1534431e4892d571ff897a68d2113c
 DIST herbstluftwm-0.8.0.tar.gz 358434 BLAKE2B 770aa66c2e8926d5f73b36ae2376e33ac92f9f72e2d45f55caa3247710f88b0eef72bed8a7242ba4ef298d9e8a7af3768114bd5149aa5596aa4682caef7e9e91 SHA512 108ef76e6f81d98742c37a1a5ecf1ce998d6fc8ee43642acb08716a5bee2e7a691f1f8defe9c81ecc8930f8b29ba7a49efe2eb00a3699c22de1a5f841266873c
 DIST herbstluftwm-0.8.1.tar.gz 369291 BLAKE2B 7f500c0d3b5b8e4c30778e8cf4af97ef3605c8cad7d3825d2edc04fc3be56f4eaa3889e505b48c9a83277b0e495a894d96b68b5b683590c0f286a8438ad4a429 SHA512 ba845e91242d08fdd264c6354651e84dba3b8941bab3756102570c82c78d5ca734694fd3fcbc9c035776133be8a98a62cc8218378ecddb22aca4cda1ae1fb5be
+DIST herbstluftwm-0.8.2.tar.gz 377790 BLAKE2B 88cee9937f134f6784fb5917435f629db67971339b09da8c6b91b55286fc50a7ba9d8dbea98dc583a92f5ae6e0e427dd487265cfb7d1ca4bbc10f865a2532e3e SHA512 1a2bf3861ce23e33bb09afed285f7d85450307b46d00a666d02eaf9c454d53904e4d54ca8b0245da5ef095667a0adf9cdfc3aff170089c99df6b7f01e9038d5f
 EBUILD herbstluftwm-0.7.2-r1.ebuild 1534 BLAKE2B a88a23d3cdcaf5761198b31112ebeeac213f5e576e3d5e566121713875e1e9b8a78d9c7e63659da6144b6733905f0b2def82761dff36e29400b899670d3c2aec SHA512 8bf19a5fc434271eeafc58a168dd852a8962cd9c8c35ecd2779eb2f195d4fae3942ff7884c96c8177592d4374e4b3bcd63a5c33bee46e73ff5b08b5dd20f0e9f
 EBUILD herbstluftwm-0.8.0.ebuild 1167 BLAKE2B 556d2bbadcbfb4bd0467e471e4c64ccd35fd27d448eeda3f672bdc237cec65df27823574d85066a7faee604d2801eedea790472ef8c2cb5fbce371bd235a4163 SHA512 832df6fa39018048f62294cab2e8d5f9759c013ad4d4bb0574af1c05713722e1fbdfb0fa63f48ce6cbe401fc018e1e9247f08f0a0e1c98f9d21feeb76cae8cc6
 EBUILD herbstluftwm-0.8.1.ebuild 1167 BLAKE2B 556d2bbadcbfb4bd0467e471e4c64ccd35fd27d448eeda3f672bdc237cec65df27823574d85066a7faee604d2801eedea790472ef8c2cb5fbce371bd235a4163 SHA512 832df6fa39018048f62294cab2e8d5f9759c013ad4d4bb0574af1c05713722e1fbdfb0fa63f48ce6cbe401fc018e1e9247f08f0a0e1c98f9d21feeb76cae8cc6
+EBUILD herbstluftwm-0.8.2.ebuild 1167 BLAKE2B 556d2bbadcbfb4bd0467e471e4c64ccd35fd27d448eeda3f672bdc237cec65df27823574d85066a7faee604d2801eedea790472ef8c2cb5fbce371bd235a4163 SHA512 832df6fa39018048f62294cab2e8d5f9759c013ad4d4bb0574af1c05713722e1fbdfb0fa63f48ce6cbe401fc018e1e9247f08f0a0e1c98f9d21feeb76cae8cc6
 EBUILD herbstluftwm-9999.ebuild 1167 BLAKE2B 556d2bbadcbfb4bd0467e471e4c64ccd35fd27d448eeda3f672bdc237cec65df27823574d85066a7faee604d2801eedea790472ef8c2cb5fbce371bd235a4163 SHA512 832df6fa39018048f62294cab2e8d5f9759c013ad4d4bb0574af1c05713722e1fbdfb0fa63f48ce6cbe401fc018e1e9247f08f0a0e1c98f9d21feeb76cae8cc6
 MISC metadata.xml 210 BLAKE2B bb9591af5406abbf589664053ab6e5cb38933fe6ef97c11609405392b050b26cff8e94e04e85e5798124abd46283bee67b2a74923a5041616df15aaa9cff6da9 SHA512 f7cbe57a24b67a28696f91061ad8bd61d7d4cf3d59d20c3dcc6a4921e29672d00ecf3ece70a8813399d2467ebd626f8f829300e81fc722e9aaa527e213a5fb54
diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.8.2.ebuild b/x11-wm/herbstluftwm/herbstluftwm-0.8.2.ebuild
new file mode 100644
index 000000000000..30dd0c6dd266
--- /dev/null
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.8.2.ebuild
@@ -0,0 +1,61 @@
+# 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 xinerama zsh-completion"
+
+DEPEND="
+	x11-libs/libX11
+	x11-libs/libXext
+	xinerama? ( x11-libs/libXinerama )
+"
+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
+
+	mycmakeargs=(
+		-DWITH_XINERAMA=$(usex xinerama)
+	)
+
+	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/marco/Manifest b/x11-wm/marco/Manifest
index 478b8ab41192..677d0aa768bc 100644
--- a/x11-wm/marco/Manifest
+++ b/x11-wm/marco/Manifest
@@ -1,9 +1,6 @@
-DIST marco-1.22.1.tar.xz 1357864 BLAKE2B 241e71795acfdcbf90070ef0d14f0cc55894a5cddbf48bd8741cf9580cfcaa035890b23a2182738875ce4d89d099a80d59aa7b1937e4a34a18a5a969830e7db9 SHA512 18093f4d419fbc90f957a04ec3e36a153b3c51a6bcdc1ac5884adcc0292f157bc5e4af51e171451a4b54b5bccffdee2e8a07ed13dafb6106773abfb06b6a8a4f
 DIST marco-1.22.4.tar.xz 1368868 BLAKE2B 45a1bdfa13419f690e4a1604a18f1ef4f57b95cc64c628a8d1c4b8d5a92409eb8ecb946b60c9b9711151858a4668247f2ee031a95464463f3005952edd95265c SHA512 46867396b66453c63624e54c382845b898b10768db0560100f021e57ec80189785093be38eeaf19c50a9e4728de2b6e605267a8f1d5a5596aaa75958c0e3a6b0
 DIST marco-1.24.0.tar.xz 1827076 BLAKE2B e4bcf8584199cbe4f9f813c7512176dd9b84a39ed162cd051f1f174c428828d1d73d6ab64c19ca681f0aea966742e0474256935f2a7c0c490b77dda91147162c SHA512 b257994c097f174fe83f3f0f4d6b6991e8c0f402daffd99f8a9521d588b609c56953e73dd4d143be64f5c9a4caa8d890ff30a120e18a9d5b36c6f856a7190428
-EBUILD marco-1.22.1-r2.ebuild 1478 BLAKE2B b0e7be73aee1d0a4cb23aecbc4aa3389c495f5a01159bc70b1805986fdd976539e5892cb6826b0e41f9d6dcfa105e719ac5844c54782460970f91c61acda1f9b SHA512 41c1b18086fdce186a0caf28ea85849682492a39e69acc6eb5cd3b825dd1ba2ce494ebaa15156743809ab2fee8df529aa0bcccb4961d699e9461c78f6e4bb3e0
-EBUILD marco-1.22.4-r1.ebuild 1480 BLAKE2B e6cedb9687d8c8d102f644bc03f9f14a4497cf54da113cf555e73505fc2fb195f8d8b728801a6680a8be0595104971513cccbd91a28a2a8aa1487505cf60c733 SHA512 c4758e8f6c5c3657cf2e1a29bbc3396cc6e2d7227a476d70967c5ff7d9b8c5d3b525e60108012e463e0aeff35bd85d083d662169f3f8a781056899c5f3743999
-EBUILD marco-1.22.4.ebuild 1478 BLAKE2B 91e512c87fb2df54950faf531d537272457ae4538f0590e32eee49466820ae88278de23046ecfa06d2ad54da9dffaaa01062e237a030d42cf57bf6a3f6b4c261 SHA512 8fd77016b4741cd0a48399d2840290f09cf8dcbe1cdd0288eeef468ab3eafaf2d1a179b0e017e37fe66b1dbf5d4579e6f6e52e505e28fe22c1c382b6d6c4fd62
+EBUILD marco-1.22.4-r2.ebuild 1475 BLAKE2B 77a83a4e4e7d32f02a7d7de5d15e7ef5ff23a4386d30c8873bfdc3dbe4a562d470a0dae4724fad3cbffbb46d00d956d43bcd74ff6bdb5183bb75e647de7098b2 SHA512 6a8c138b654cb33f1389587dd60239847ba0d952e017a74407fbe2eecfcf6553770d249c7a2b036d3bb087dd24f55517db714c0359e39083dbea9239d81861f7
 EBUILD marco-1.24.0-r1.ebuild 1485 BLAKE2B dc08a2e61ce2eb12c552341552d97fe73063e696d13a3257de25554448e7c040bf1cb30f48b5c2cc2647df6a38816cae17653071b2aa50908c9d37390da8cccc SHA512 82d828b42511b687d67c5910ac9635fe0b61b690a187181363392a9e97f4a8e9f7199ef30615b4baf96350dcba2303c220965624eba7a4df6041912418f1ad6e
 EBUILD marco-1.24.0.ebuild 1483 BLAKE2B 892fc383553d75e6a572b8c3ed10256fb553909131758a6cebd3cb1e851c8a2ede9c9dcacc95a25ef61d8195354b263709718cd5871cf396be91fc97707f15dc SHA512 fe1bd773fd110d273800716894b391558a049e07c8cc0132a3892f69bac3593b44f378ad9c7a78f66502d37229a0e4863db1bcad94687f3900f3c6e2a63d012f
 MISC metadata.xml 334 BLAKE2B 4a521e1c77d597f68a11cdaa695afcb40a5a2670a7fd643db0999362884a0bad7fb8106b7ba479a939930fbf0323c7f22186cf3fca5583210227a819631ead5d SHA512 f55f007780c371bc133eb3b8eed1bb4f930cab1e29c9ff0ab2dd99cd2e1458058dc86bf3fd70e9f4e9f1db259a7b8a5a247b04282ca08e88d767ee2f1878a451
diff --git a/x11-wm/marco/marco-1.22.4-r1.ebuild b/x11-wm/marco/marco-1.22.4-r1.ebuild
deleted file mode 100644
index f20058b183b5..000000000000
--- a/x11-wm/marco/marco-1.22.4-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE2_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="MATE default window manager"
-LICENSE="FDL-1.2+ GPL-2+ LGPL-2+ MIT"
-SLOT="0/2"
-
-IUSE="startup-notification test xinerama"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-libs/atk
-	>=dev-libs/glib-2.50:2
-	>=gnome-base/libgtop-2:2=
-	media-libs/libcanberra[gtk3]
-	x11-libs/cairo
-	>=x11-libs/pango-1.2[X]
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	>=x11-libs/libXcomposite-0.3
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXpresent
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	>=x11-libs/startup-notification-0.7
-	virtual/libintl
-	xinerama? ( x11-libs/libXinerama )
-	!!x11-wm/mate-window-manager"
-
-RDEPEND="${COMMON_DEPEND}
-	gnome-extra/zenity
-	>=mate-base/mate-desktop-1.20.0"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	>=dev-util/intltool-0.34.90
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto
-	test? ( app-text/docbook-xml-dtd:4.5 )
-	xinerama? ( x11-base/xorg-proto )"
-
-src_configure() {
-	mate_src_configure \
-		--enable-compositor \
-		--enable-render \
-		--enable-shape \
-		--enable-sm \
-		--enable-xsync \
-		$(use_enable startup-notification) \
-		$(use_enable xinerama)
-}
-
-src_install() {
-	mate_src_install
-	dodoc {,doc/}*.txt
-}
diff --git a/x11-wm/marco/marco-1.22.1-r2.ebuild b/x11-wm/marco/marco-1.22.4-r2.ebuild
index a55e5ffb66ba..6d548e2a562d 100644
--- a/x11-wm/marco/marco-1.22.1-r2.ebuild
+++ b/x11-wm/marco/marco-1.22.4-r2.ebuild
@@ -13,7 +13,7 @@ fi
 
 DESCRIPTION="MATE default window manager"
 LICENSE="FDL-1.2+ GPL-2+ LGPL-2+ MIT"
-SLOT="0/1"
+SLOT="0/2"
 
 IUSE="startup-notification test xinerama"
 RESTRICT="!test? ( test )"
@@ -69,5 +69,5 @@ src_configure() {
 
 src_install() {
 	mate_src_install
-	dodoc {,doc/}*.txt
+	dodoc doc/*.txt
 }
diff --git a/x11-wm/marco/marco-1.22.4.ebuild b/x11-wm/marco/marco-1.22.4.ebuild
deleted file mode 100644
index a693ad0e7c52..000000000000
--- a/x11-wm/marco/marco-1.22.4.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE2_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="MATE default window manager"
-LICENSE="FDL-1.2+ GPL-2+ LGPL-2+ MIT"
-SLOT="0"
-
-IUSE="startup-notification test xinerama"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-libs/atk
-	>=dev-libs/glib-2.50:2
-	>=gnome-base/libgtop-2:2=
-	media-libs/libcanberra[gtk3]
-	x11-libs/cairo
-	>=x11-libs/pango-1.2[X]
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	>=x11-libs/libXcomposite-0.3
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXpresent
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	>=x11-libs/startup-notification-0.7
-	virtual/libintl
-	xinerama? ( x11-libs/libXinerama )
-	!!x11-wm/mate-window-manager"
-
-RDEPEND="${COMMON_DEPEND}
-	gnome-extra/zenity
-	>=mate-base/mate-desktop-1.20.0"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	>=dev-util/intltool-0.34.90
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto
-	test? ( app-text/docbook-xml-dtd:4.5 )
-	xinerama? ( x11-base/xorg-proto )"
-
-src_configure() {
-	mate_src_configure \
-		--enable-compositor \
-		--enable-render \
-		--enable-shape \
-		--enable-sm \
-		--enable-xsync \
-		$(use_enable startup-notification) \
-		$(use_enable xinerama)
-}
-
-src_install() {
-	mate_src_install
-	dodoc {,doc/}*.txt
-}
diff --git a/x11-wm/metacity/Manifest b/x11-wm/metacity/Manifest
index 84ad4f836459..6ab368343586 100644
--- a/x11-wm/metacity/Manifest
+++ b/x11-wm/metacity/Manifest
@@ -1,5 +1,3 @@
-DIST metacity-3.32.0.tar.xz 2055388 BLAKE2B c8ed41e44b0a4890129fe7e79e2dcd486c986541c6b19b8873264f2c179b98c17095f19fbd93290ad253571d0c9ae5f5367df1fe1ba2ac68685139680a2e3afd SHA512 2260411b9ab07fcd1aee8152d700f1e2aa7f1f0753cae6dab82a55cac2cac186a5c9f42377a311a6f90a53ba8ba200d9f5d73a770abc76b558896cd58c30abde
 DIST metacity-3.34.1.tar.xz 2055708 BLAKE2B c1bac27f83d26718fa3d02f777a627324efc3e3eaffbf385a84dd97960adc30e84090f511500fe96a4fbbb373da80a38eaba4c5e14910fbcf8783857c0767ef2 SHA512 e9234ad0aee9fe27cf1c2030e31d8f2c292ae2ee2e9b8546ed86e396152faa9dc4cc67fa8321a0c3d3bf577a83bc143111c6ac225f423db243347a6a760695ee
-EBUILD metacity-3.32.0.ebuild 1233 BLAKE2B 4bcaab355a10be79e9a5a2865463fadc773ec40308ca98774a828dda0dcf0a92b8cb1c0de36bd065f42b21ff9d6c07c0082b6526685cf77d596cdeffe310bfec SHA512 e28076ddbfd40149522a83f8cc16cb022554a592aedd29d8de6e62dec874315e676447867be428d6abe5a5ff9d136c279e83e17a2cf7fb1a9a20cbd0045b5cb9
 EBUILD metacity-3.34.1.ebuild 1233 BLAKE2B 6849286bfcc9997d335d7e842a6b03a6150707adae71c0f224b7d4dbe2fe41d3fbf0c89d18780b4f3b36dee20c01026171caa98cae840751b30ef8fe18550a96 SHA512 3519262f4f14a86750a3f833adcb8ef88282ef797c2c2a8c47531ff507d6f81713f336e8a04eb2573b9e485db427de10d7a4469a2b4a832994b48cbcc8c4c621
 MISC metadata.xml 477 BLAKE2B 592b2957c7bff2b55505a056a2eef8d8cec25eecb400b5046bfbbd84eadfc6baa1f1475fd772a568538360c6867f0b5c0934d85bc5c6fd6ad362d80bad31ea33 SHA512 e475ae41ee3fa97f037acca5634bcb8ded17e783183459aeb83b3566df36fe7d09832991e9252f59e900982bcd0c80e8987bccc2c3e042080405d5448af9423a
diff --git a/x11-wm/metacity/metacity-3.32.0.ebuild b/x11-wm/metacity/metacity-3.32.0.ebuild
deleted file mode 100644
index 1522fd20cf9a..000000000000
--- a/x11-wm/metacity/metacity-3.32.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="GNOME Flashback window manager"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/metacity/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+libcanberra vulkan xinerama"
-KEYWORDS="~amd64"
-
-# TODO: libgtop could be optional, but no knob
-RDEPEND="
-	>=dev-libs/glib-2.44.0:2
-	>=x11-libs/gtk+-3.22.0:3[X]
-	>=x11-libs/pango-1.2.0[X]
-	>=x11-libs/libXcomposite-0.3
-	>=gnome-base/gsettings-desktop-schemas-3.3.0
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXdamage
-	libcanberra? ( media-libs/libcanberra[gtk3] )
-	>=x11-libs/startup-notification-0.7
-	x11-libs/libXcursor
-	gnome-base/libgtop:2=
-	x11-libs/libX11
-	xinerama? ( x11-libs/libXinerama )
-	x11-libs/libXrandr
-	x11-libs/libXext
-	x11-libs/libICE
-	x11-libs/libSM
-	gnome-extra/zenity
-	vulkan? ( media-libs/vulkan-loader )
-"
-DEPEND="${RDEPEND}
-	vulkan? ( dev-util/vulkan-headers )
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.4
-	x11-base/xorg-proto
-	virtual/pkgconfig
-" # autoconf-archive for eautoreconf
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable libcanberra canberra) \
-		$(use_enable xinerama) \
-		$(use_enable vulkan)
-}
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 5cb949c21abd..ac673277a42b 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,15 +1,6 @@
-AUX 3.26.2-non-wayland-build.patch 1035 BLAKE2B 7c9beb268c2f1b5784bbb2b44d8199f9821462c0be7678b69c9feb05171f46a2ccf96c18e8ed45b32c7ce576a7693839d03a90b4beb787f5291e7853b28b514c SHA512 88bda28953ba08bb6cf7847de49356d7896d554169d0039b599963eb333a0c688b49dc9d55c8b8e497b15d54ad3bed495bf18ded00d09d6510bb399d20750ca0
 AUX 3.32-eglmesaext-include.patch 2078 BLAKE2B cea9ba1a8d2749eb3590dd17a598aace69ad96897cbc5a6c1061c4041a8fe3809ff9f5bcc99cbdc33611a3a3319cda20f74f88434e71f03f2a1cac108185f3fb SHA512 23296f0e0b6ffd4610be3f0c6e1d524d15a5d259c5607a7ded4a8c39846f555dee92e5a8bb9c766211b758f8bc7483715a9640718bb9b7daa42905d802b2ee71
-AUX 3.32.2-no-cogl-gles2.patch 2350 BLAKE2B 3d78e408009fe7486542127162b3ea580ccc070bf46addb5799b3bcecd435d364bdf942ebfd463360be0c9105c51dcd8cb86aeae0d5599fc50f8d322376add56 SHA512 0210fdd7c5a716788918987a2e61ef765a5ae0c6268a05cfbb75ce5b469336109c4677696cab94ec12006ac4abc616222ddb62a719c2e5cac59d4833b0794beb
-DIST mutter-3.26.2-patchset.tar.xz 48156 BLAKE2B 7b33495a8bb7ac69f5610e1dfcb1fef49a983403fd176b229a75bcc7691e83e76a3dd87b7663ece0fcdc4077becd3ffa5e33217584f156456813769646730bf9 SHA512 2eeb9dfe137d6ea65f957ed19aa5ef83106aa16a049531c0c41d3ab6afac6c1b345cc68f2a9a9c41658172cc0dde61b946e6bf2507979ff4155e79770adf5e90
-DIST mutter-3.26.2.tar.xz 3622904 BLAKE2B b32af24c6ffcd0e6af38ab1ff7cd0ba16ea3ceb84c62ed21d9e38fff5357eda2648050beada3fc8727474407a419a2c218331c8a87f7eb68eddf824d26ca9c51 SHA512 95885b4c053d4bc467a7c11615ee3d1a3086a674ae10e7cb9bb241f692e66dd8190508db1cdf1760bc2f19100e532e68d5e147d344e94d1430d80dd26ca0156b
-DIST mutter-3.32.2-patchset.tar.xz 26872 BLAKE2B 026c87cc3859624bcfd273694a8a34661d97cc77776e3df5f6f5de16b8758fc435773b1c96172b867fe0d9bea421c56986db2e7263c6ec3482171cc2adf06295 SHA512 e318fcfa4ee7850814cdfb5fbcc118a92fa3df524a78b24a440346be6a6c7cb975f90218a2d4feeacd222f2daf56c4cff4195c83e3ed74726dc1da63d38a93c5
-DIST mutter-3.32.2.tar.xz 2797664 BLAKE2B 8b69436778d9c3e10b0373c83e1f306cb2718e49ad1f351f2e3a1ef92caeb1eb7a391be07c60578cfb2601eea5dc3949b1d8305e9f079b2b00d43ff305409f00 SHA512 e4494d028ae71441fbdc584bd8acd9c2559d52ac72402bad9a7cb43f4f519487d11df6453172fd27a9df7f2cade020d6317931613bd0be343c66170e6cda0269
-DIST mutter-3.34.4-patchset.tar.xz 7216 BLAKE2B 6a9d503a8da80a9255649150c1256ea0d1459b11c0803728553f6699f0bb54b56161a411e9dec3725e5cd4230531c90b0160ef702083285443849c9ec4ca8278 SHA512 b592a6ded20c61c15fe8dc5a69fb73e81143975632237a32329bbf40239bdc2c392aef4676cd8800f7ad39eb16e8f159b0cec87c8bd035302db0a8001ddeda2e
-DIST mutter-3.34.4.tar.xz 2791624 BLAKE2B cd7ea49333dc50574f993f15638504eac0d0a6f1e85f34a617accbabcec71f02244ce6cd292c968def302652707e21692d94dcccb01d59b3661220c90cefd802 SHA512 6cae8473071d9ab105a3635cee314157a268894fc3b18e53857e097223a9c2677e1cd51b10b501a3b85f74c83470c2ce87986972218f9833c9f6ad31b1910f6a
 DIST mutter-3.34.5.tar.xz 2804640 BLAKE2B b73a34f4e064b74b321b7ac54749170663c10874a82c0e4f6b20b1f9d97662af0ba188e5ac13a187117765b8aee820fc7367dfbeecc26002942151e77433012c SHA512 4199cf66e6551ebf80b9d2217e3164b1de30b055c58a64bc2d88961aad3a35c137174f6aea96f0250fa3efb2bf4676aa409fefb1a9237bbc7acf438aeed2e78a
-EBUILD mutter-3.26.2-r1.ebuild 4109 BLAKE2B a4073e48c06b2185bf37a22c509c1959c0855cb838151d91d9b697e4679bc7ec9438b92eaa6499ecfa0f6e389415254b64621d24efa6df9c0abc1a8711ec7c14 SHA512 05266bd54e4bc87fc0bab475354dae4670da1c1d64a6db7cfae3dace6069b78515c5a904d6542cfc471f5cc056b2204dbf95cdabbdf5d49e7854b0c98d8e3592
-EBUILD mutter-3.32.2.ebuild 4619 BLAKE2B 09a4dca8c10a02d8aa1b211ba2c453b60f75c2e307c5d261bd9ab9ad028ef7337ea83c66f6425eaf9d64415732498f781cef066b888ede050a3b42801b523fd3 SHA512 fc14e72a1e2ae68997c0c9f55265d1ebef27f4b016830e5d3902e004270eace97229f09657406e29475544d98471364485f365b5bd5abada0f12bbef388dbe04
-EBUILD mutter-3.34.4.ebuild 4721 BLAKE2B 50eef6d2ec032e2a3d1079bf08d786920643e3eee7fc4ccbf0baa6f901ea3923f9fd8e351453e02cb0378ddcc72836346dda79276d19f195a3c635d0cb65a459 SHA512 ed1cb27b361d6203d2dfe2aedc7ce3867a2bb529513e0fbd5ed51f8e0197f1a0054f60e2ad9ac565f65ca05dcc463902ac4a5700756b46d9eede8630177cb281
+DIST mutter-3.34.6.tar.xz 2805328 BLAKE2B bba0e062ab81f8e88e7e59b6dbf51226b6e2d43932c7d61aca5a3e709119f909e30acea67a5444c95205ddf929a1f5bf7785eec7aed4f2da743c19543aa79962 SHA512 dd240fdcfc8ba0c62c0ff423a40ec6e0007d154f0be39e18cea543da7ff548e10a9b712f9b2cc09c58ad342b1e7eb50fb2a8790c55d284846bb6f1a76f8c6d6b
 EBUILD mutter-3.34.5.ebuild 4566 BLAKE2B a4550c12085dd8dedbe1d3652ab06475adee962d6006ded1506ff491773dacec9c50e1568e851418d2a95dbbcfbc104b50c771b1c2075190eab57c52f4fc473b SHA512 f5c4f35cbce4916d564e15d11a1a420c87cc695d24046d808e499916f01170709a546594e0ab1da2447ab1165d9bce287608644a24486897febe16135d781fda
-MISC metadata.xml 662 BLAKE2B 500aef5ca1856da7a8027c1f69c30639791430cf7e94302de37edca6b8c85aa10f244bb85dcd193c1bab65854652b1999219c35fbe8eab49c33647a3b6a0b486 SHA512 b36d65b3f0bd8bf904cc3270b963d997eebe188ee98425a2cffe9df2e15dc28106baea2d0437972c8c211045200b979cd9fb6a902527efe2f6640380bed15801
+EBUILD mutter-3.34.6.ebuild 4568 BLAKE2B d8cf3267696b61193efbe0189e45bf2c5e96e5d6f44e727c630a19b4b33b6796a23596b51171cb8bdbe40879d05a73f66a1438c828067086e279bc87a01e560c SHA512 b47cc0637b4a59e7a680dace7f3ca95b32c6ef9b903cfffcd34395dca037f88b859ac2905fb97d4ca6e91e4277d035d781cd257d471ccc9b25dfb9d71af15bf6
+MISC metadata.xml 605 BLAKE2B 5dc68fbf8b85c2bf75ea435abe116a9ed7072ec40a45bda28de9cb277a03e5c363487f1c3aa5c60cab5f710e06f15d966790684cac1573676af635e59b3cdfbd SHA512 440e7a33404e218da15c127614d843edcd42c469aced4609c2e7d7d8ec1281c9eceb64aebe406a75e9ba0a05b6be18bbb721257e140f6d334aff6143b1233fb8
diff --git a/x11-wm/mutter/files/3.26.2-non-wayland-build.patch b/x11-wm/mutter/files/3.26.2-non-wayland-build.patch
deleted file mode 100644
index a2a8d356e07e..000000000000
--- a/x11-wm/mutter/files/3.26.2-non-wayland-build.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 6cc48d8cbbf11fa82ec78cac0b29d52f05eabb60 Mon Sep 17 00:00:00 2001
-From: Ting-Wei Lan <lantw@src.gnome.org>
-Date: Sun, 24 Dec 2017 17:55:14 +0800
-Subject: [PATCH] build: Fix non-wayland builds
-
-meta_dnd_wayland_handle_end_modal is not available on non-wayland build.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=791916
----
- src/compositor/compositor.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c
-index 51d22bc17..aa49347c9 100644
---- a/src/compositor/compositor.c
-+++ b/src/compositor/compositor.c
-@@ -419,11 +419,13 @@ meta_end_modal_for_plugin (MetaCompositor *compositor,
-   meta_backend_ungrab_device (backend, META_VIRTUAL_CORE_POINTER_ID, timestamp);
-   meta_backend_ungrab_device (backend, META_VIRTUAL_CORE_KEYBOARD_ID, timestamp);
- 
-+#ifdef HAVE_WAYLAND
-   if (meta_is_wayland_compositor ())
-     {
-       meta_dnd_wayland_handle_end_modal (compositor);
-       meta_display_sync_wayland_input_focus (display);
-     }
-+#endif
- }
- 
- static void
--- 
-2.18.0
-
diff --git a/x11-wm/mutter/files/3.32.2-no-cogl-gles2.patch b/x11-wm/mutter/files/3.32.2-no-cogl-gles2.patch
deleted file mode 100644
index 41c3e94d8602..000000000000
--- a/x11-wm/mutter/files/3.32.2-no-cogl-gles2.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From a00bd286724b3186c17d70f1b2fe98da2d90bf60 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sun, 1 Sep 2019 14:42:04 +0300
-Subject: [PATCH] build: Allow building native backend without cogl-gles2
-
-Native backend already requires gles2, but was controlled by gles2
-meson option, even though it's hard required with native_backend
-already, and errored out if gles2 wasn't enabled too.
-Instead allow native_backend to be built without cogl-gles2 by simply
-checking for the gles2 hard requirement in case of have_native_backend
-too and not erroring out without -Dgles2=true, which is now used only
-for controlling cogl-gles2 build.
----
- meson.build     | 10 +++-------
- src/meson.build |  4 ++--
- 2 files changed, 5 insertions(+), 9 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 6160a4bb3..c85284ba2 100644
---- a/meson.build
-+++ b/meson.build
-@@ -150,12 +150,13 @@ endif
- have_egl_xlib = have_egl and have_x11
- 
- have_gles2 = get_option('gles2')
--if have_gles2
-+have_native_backend = get_option('native_backend')
-+if have_gles2 or have_native_backend
-   gles2_dep = dependency('glesv2')
-   gles2_libname = get_option('gles2_libname')
- 
-   if not have_egl
--    error('GLESv2 support requires EGL to be enabled')
-+    error('GLESv2 and native backend support requires EGL to be enabled')
-   endif
- endif
- 
-@@ -177,7 +178,6 @@ if have_libgudev
-   gudev_dep = dependency('gudev-1.0', version: gudev_req)
- endif
- 
--have_native_backend = get_option('native_backend')
- if have_native_backend
-   libdrm_dep = dependency('libdrm')
-   libgbm_dep = dependency('gbm', version: gbm_req)
-@@ -194,10 +194,6 @@ if have_native_backend
-     error('The native backend requires EGL to be enabled')
-   endif
- 
--  if not have_gles2
--    error('The native backend requires GLESv2 to be enabled')
--  endif
--
-   if not have_libgudev
-     error('The native backend requires udev to be enabled')
-   endif
-diff --git a/src/meson.build b/src/meson.build
-index 182f7f5f5..af9776480 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -36,7 +36,7 @@ if have_gl
-   ]
- endif
- 
--if have_gles2
-+if have_native_backend
-   mutter_pkg_private_deps += [
-     gles2_dep,
-   ]
-@@ -436,7 +436,7 @@ if have_egl
-   ]
- endif
- 
--if have_gles2
-+if have_native_backend
-   mutter_sources += [
-     'backends/meta-gles3.c',
-     'backends/meta-gles3.h',
--- 
-2.20.1
-
diff --git a/x11-wm/mutter/metadata.xml b/x11-wm/mutter/metadata.xml
index 9bd58e53b934..10c80726fde4 100644
--- a/x11-wm/mutter/metadata.xml
+++ b/x11-wm/mutter/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="elogind">Rely on <pkg>sys-auth/elogind</pkg> as logind provider for Wayland sessions</flag>
-		<flag name="gles2">Enable OpenGL ES 2.0 support</flag>
 		<flag name="screencast">Enable support for remote desktop and screen cast using <pkg>media-video/pipewire</pkg></flag>
 		<flag name="sysprof">Enable profiling data capture support using <pkg>dev-util/sysprof-capture</pkg></flag>
 	</use>
diff --git a/x11-wm/mutter/mutter-3.26.2-r1.ebuild b/x11-wm/mutter/mutter-3.26.2-r1.ebuild
deleted file mode 100644
index 412f34a9e30f..000000000000
--- a/x11-wm/mutter/mutter-3.26.2-r1.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF="yes"
-inherit gnome2 virtualx
-
-DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/1" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
-
-IUSE="debug gles2 input_devices_wacom +introspection test udev wayland"
-RESTRICT="!test? ( test )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# libXi-1.7.4 or newer needed per:
-# https://bugzilla.gnome.org/show_bug.cgi?id=738944
-RDEPEND="
-	>=dev-libs/atk-2.5.3
-	>=x11-libs/gdk-pixbuf-2:2
-	>=dev-libs/json-glib-0.12.0
-	>=x11-libs/pango-1.30[introspection?]
-	>=x11-libs/cairo-1.14[X]
-	>=x11-libs/gtk+-3.19.8:3[X,introspection?]
-	>=dev-libs/glib-2.53.2:2
-	>=media-libs/libcanberra-0.26[gtk3]
-	>=x11-libs/startup-notification-0.7
-	>=x11-libs/libXcomposite-0.2
-	>=gnome-base/gsettings-desktop-schemas-3.21.4[introspection?]
-	<gnome-base/gsettings-desktop-schemas-3.31
-	gnome-base/gnome-desktop:3=
-	>sys-power/upower-0.99:=
-
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	>=x11-libs/libXcomposite-0.4
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	>=x11-libs/libXfixes-3
-	>=x11-libs/libXi-1.7.4
-	x11-libs/libXinerama
-	>=x11-libs/libXrandr-1.5
-	x11-libs/libXrender
-	x11-libs/libxcb
-	x11-libs/libxkbfile
-	>=x11-libs/libxkbcommon-0.4.3[X]
-	x11-misc/xkeyboard-config
-
-	gnome-extra/zenity
-	media-libs/mesa[egl]
-
-	gles2? ( media-libs/mesa[gles2] )
-	input_devices_wacom? ( >=dev-libs/libwacom-0.13 )
-	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
-	udev? ( >=dev-libs/libgudev-232:= )
-	wayland? (
-		>=dev-libs/libgudev-232:=
-		>=dev-libs/libinput-1.4
-		>=dev-libs/wayland-1.13.0
-		>=dev-libs/wayland-protocols-1.9
-		>=media-libs/mesa-10.3[egl,gbm,wayland]
-		sys-apps/systemd
-		>=virtual/libudev-136:=
-		x11-base/xorg-server[wayland]
-		x11-libs/libdrm:=
-	)
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.6
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	test? ( app-text/docbook-xml-dtd:4.5 )
-	wayland? ( >=sys-kernel/linux-headers-4.4 )
-"
-
-PATCHES=(
-	# Lots of patches from gnome-3-26 branch on top of 3.26.2
-	"${WORKDIR}"/patches/
-
-	# Fix non-wayland builds, bug #667244
-	"${FILESDIR}"/${PV}-non-wayland-build.patch
-)
-
-src_prepare() {
-	# Disable building of noinst_PROGRAM for tests
-	if ! use test; then
-		sed -e '/^noinst_PROGRAMS/d' \
-			-i cogl/tests/conform/Makefile.{am,in} || die
-		sed -e '/noinst_PROGRAMS += testboxes/d' \
-			-i src/Makefile-tests.am || die
-		sed -e '/noinst_PROGRAMS/ s/testboxes$(EXEEXT)//' \
-			-i src/Makefile.in || die
-	fi
-
-	gnome2_src_prepare
-
-	# Leave the damn CFLAGS alone
-	sed -e 's/$CFLAGS -g/$CFLAGS /' \
-		-i clutter/configure || die
-	sed -e 's/$CFLAGS -g -O0/$CFLAGS /' \
-		-i cogl/configure || die
-	sed -e 's/$CFLAGS -g -O/$CFLAGS /' \
-		-i configure || die
-}
-
-src_configure() {
-	# TODO: pipewire remote desktop support; --disable-remote-desktop actually enables it due to upstream autotools bug in 3.26.2 (omitted means disabled)
-	# TODO: nvidia EGLDevice support
-	# Prefer gl driver by default
-	# GLX is forced by mutter but optional in clutter
-	# xlib-egl-platform required by mutter x11 backend
-	# native backend without wayland is useless
-	gnome2_src_configure \
-		--disable-static \
-		--enable-compile-warnings=minimum \
-		--enable-gl \
-		--enable-glx \
-		--enable-sm \
-		--enable-startup-notification \
-		--enable-verbose-mode \
-		--enable-xlib-egl-platform \
-		--with-default-driver=gl \
-		--with-libcanberra \
-		$(usex debug --enable-debug=yes "") \
-		$(use_enable gles2)        \
-		$(use_enable gles2 cogl-gles2) \
-		$(use_enable introspection) \
-		$(use_enable wayland) \
-		$(use_enable wayland kms-egl-platform) \
-		$(use_enable wayland native-backend) \
-		$(use_enable wayland wayland-egl-server) \
-		$(use_with input_devices_wacom libwacom) \
-		$(use_with udev gudev)
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/x11-wm/mutter/mutter-3.32.2.ebuild b/x11-wm/mutter/mutter-3.32.2.ebuild
deleted file mode 100644
index 38ea482c947d..000000000000
--- a/x11-wm/mutter/mutter-3.32.2.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson virtualx xdg
-
-DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${PF}-patchset.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/4" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
-
-IUSE="elogind gles2 input_devices_wacom +introspection screencast systemd test udev wayland"
-# native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider
-REQUIRED_USE="
-	wayland? ( ^^ ( elogind systemd ) udev )
-	test? ( wayland )"
-RESTRICT="!test? ( test )"
-
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-# libXi-1.7.4 or newer needed per:
-# https://bugzilla.gnome.org/show_bug.cgi?id=738944 - https://gitlab.gnome.org/GNOME/mutter/merge_requests/766
-
-# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema
-# xorg-server is needed at build and runtime with USE=wayland for Xwayland
-# v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order
-DEPEND="
-	x11-libs/libX11
-	>=x11-libs/gtk+-3.19.8:3[X,introspection?]
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/pango-1.30[introspection?]
-	>=x11-libs/cairo-1.14[X]
-	>=gnome-base/gsettings-desktop-schemas-3.31.0[introspection?]
-	>=dev-libs/glib-2.53.2:2
-	gnome-base/gnome-settings-daemon
-	>=dev-libs/json-glib-0.12.0[introspection?]
-	gnome-base/gnome-desktop:3=
-	>=x11-libs/libXcomposite-0.4
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	>=x11-libs/libXfixes-3
-	>=x11-libs/libXi-1.7.4
-	x11-libs/libXtst
-	x11-libs/libxkbfile
-	x11-misc/xkeyboard-config
-	>=x11-libs/libxkbcommon-0.4.3[X]
-	x11-libs/libXrender
-	>=x11-libs/libXrandr-1.5.0
-	x11-libs/libxcb
-	x11-libs/libXinerama
-	x11-libs/libICE
-	>=dev-libs/atk-2.5.3[introspection?]
-	>=media-libs/libcanberra-0.26
-	media-libs/mesa[X(+),egl,gles2?]
-	wayland? (
-		>=dev-libs/wayland-protocols-1.16
-		>=dev-libs/wayland-1.13.0
-		x11-libs/libdrm:=
-		>=media-libs/mesa-10.3[egl,gbm,wayland,gles2]
-		>=dev-libs/libinput-1.4
-		systemd? ( sys-apps/systemd )
-		elogind? ( sys-auth/elogind )
-		x11-base/xorg-server[wayland]
-	)
-	udev? ( >=dev-libs/libgudev-232:=
-		>=virtual/libudev-232-r1:= )
-	x11-libs/libSM
-	input_devices_wacom? ( >=dev-libs/libwacom-0.13 )
-	>=x11-libs/startup-notification-0.7
-	screencast? ( >=media-video/pipewire-0.2.2:0/0.2 )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-RDEPEND="${DEPEND}
-	gnome-extra/zenity
-"
-DEPEND="${DEPEND}
-	x11-base/xorg-proto
-"
-# wayland bdepend for wayland-scanner, xorg-server for cvt utility
-BDEPEND="
-	dev-libs/wayland
-	>=dev-util/meson-0.50.0
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? ( app-text/docbook-xml-dtd:4.5 )
-	wayland? ( >=sys-kernel/linux-headers-4.4
-		x11-base/xorg-server )
-"
-
-PATCHES=(
-	# Some patches from gnome-3-32 branch on top of 3.32.2
-	"${WORKDIR}"/patches/
-	# Allow building USE=wayland without cogl-gles2 from USE=gles2
-	"${FILESDIR}"/${PV}-no-cogl-gles2.patch
-
-	"${FILESDIR}"/3.32-eglmesaext-include.patch
-)
-
-src_configure() {
-	# TODO: Replicate debug vs release meson build type behaviour under our buildtype=plain
-	local emesonargs=(
-		-Dopengl=true
-		#opengl_libname
-		#gles2_libname
-		$(meson_use gles2)
-		-Degl=true
-		-Dglx=true
-		$(meson_use wayland)
-		$(meson_use wayland native_backend)
-		$(meson_use screencast remote_desktop)
-		-Degl_device=false # This should be dependent on wayland,video_drivers_nvidia, once eglstream support is there
-		-Dwayland_eglstream=false # requires packages egl-wayland for wayland-eglstream-protocols.pc
-		$(meson_use udev)
-		$(meson_use input_devices_wacom libwacom)
-		-Dpango_ft2=true
-		-Dstartup_notification=true
-		-Dsm=true
-		$(meson_use introspection)
-		$(meson_use test cogl_tests)
-		$(meson_use test clutter_tests)
-		$(meson_use test tests)
-		-Dinstalled_tests=false
-		#verbose # Let upstream choose default for verbose mode
-		#xwayland_path
-		# TODO: relies on default settings, but in Gentoo we might have some more packages we want to give Xgrab access (mostly virtual managers and remote desktops)
-		#xwayland_grab_default_access_rules
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/x11-wm/mutter/mutter-3.34.4.ebuild b/x11-wm/mutter/mutter-3.34.6.ebuild
index edd7e4a06986..4703c77a3b87 100644
--- a/x11-wm/mutter/mutter-3.34.4.ebuild
+++ b/x11-wm/mutter/mutter-3.34.6.ebuild
@@ -6,7 +6,6 @@ inherit gnome.org gnome2-utils meson virtualx xdg
 
 DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
 HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${PF}-patchset.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0/5" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
@@ -93,9 +92,6 @@ BDEPEND="
 "
 
 PATCHES=(
-	# Some patches from gnome-3-34 branch on top of 3.34.4
-	"${WORKDIR}"/patches/
-
 	"${FILESDIR}"/3.32-eglmesaext-include.patch
 )
 
diff --git a/x11-wm/openbox/Manifest b/x11-wm/openbox/Manifest
index 3a43f3f8d368..255310bb52c3 100644
--- a/x11-wm/openbox/Manifest
+++ b/x11-wm/openbox/Manifest
@@ -2,7 +2,7 @@ AUX openbox-3.5.2-gnome-session.patch 574 BLAKE2B 64d1d141245172140c16e7d4bee919
 AUX openbox-3.6.1-py3-xdg.patch 4702 BLAKE2B 52e8f35626bf71a10327efe99d518994aece46561f4cb4d26d71412f8f5e1528efbd17c48b38a902053b6d3eefbaa9b79f79c06783d669b0c76cbdf256300463 SHA512 7079cf38a79e2fe7e35c07a5600de8a4678961239d3990596378239f064522204ca40522861f1d403d6e621bca92ca14b06873645ba60fda2c86a4132a9aa16a
 DIST openbox-3.6.1.tar.gz 962665 BLAKE2B 1c0288137d7b02d443c384f970cd9a3f4d5d5585989917ac6ae8cf492e045dc086650c245907e168bc7b6d0ce701339854a5d94ad510823141cc78e28c1e13c5 SHA512 5e6f4a214005bea8b26bc8959fe5bb67356a387ddd317e014f43cb5b5bf263ec617a5973e2982eb76a08dc7d3ca5ec9e72e64c9b5efd751001a8999b420b1ad0
 DIST surreal-gentoo.tar.gz 13410 BLAKE2B e7d902278004785c68a2e5aa02aa326cee1ef04fe964fce283afde00cb668b06d5d8461207ef9571aa402b960ec16bdff6bf11cf38ca9a76335ced173592ffce SHA512 dd43cb78e5e33345767edad22d0470765ac9eeae02bbad0acd8098bc096c15a166bf651493d12a5953bc043c9be92e9b160607eafb4723a6bcfc5d1d6fae235e
-EBUILD openbox-3.6.1-r3.ebuild 2722 BLAKE2B 64238c8c479fdf98589cfa021d4bbd1e1962705f83baadb53a942a1f8220a598802b11d9dc8ce124f3384022a991e97a05751a320ca2875ee6bd56be20895d89 SHA512 78a05754f7dea9ef8d3be428b03ac286305b1fda2b19211233e569c46a94b433942964daae33ff323d6ba7bfe3a591522c4ed74f19e9b48239d6f1d789c8fac8
+EBUILD openbox-3.6.1-r3.ebuild 2715 BLAKE2B e1202e54c1d6c963fa6f44c86e33232ed13631528f567f10ca600c2c87e7b39b199b72b0f417e94d6b110a984efd45799b8cfe9a4b9ed0b1dc63fb1a370525c2 SHA512 b7f176fc34e07ce6ca1f91901ca36fd3781bc9c15a48adc96e83f68c358ade496f3d3032f03b600b1e0ce817a65f39d8f7ec6557fcbd19c0ad4064389edabab5
 EBUILD openbox-3.6.1.ebuild 2608 BLAKE2B 310fb7279464260f025ece227bad2a3481ce1fbe3f841d212949ed6a6d4ed2143789092b6c702628dea66569f03fa5a716442a0a7b686c437f707f15a0e06290 SHA512 a915e92e485f840e864280a1d633d7d75de916ca812158544a7561254d1335727f996ca0bd7724ea3b2ac4f4624d90a3a33ee800a39f9ffb747d11257b2d1612
 EBUILD openbox-9999.ebuild 2722 BLAKE2B 64238c8c479fdf98589cfa021d4bbd1e1962705f83baadb53a942a1f8220a598802b11d9dc8ce124f3384022a991e97a05751a320ca2875ee6bd56be20895d89 SHA512 78a05754f7dea9ef8d3be428b03ac286305b1fda2b19211233e569c46a94b433942964daae33ff323d6ba7bfe3a591522c4ed74f19e9b48239d6f1d789c8fac8
 MISC metadata.xml 704 BLAKE2B 6a8354358ddaa1b4af8e662aa43800168e49aecc074ec4e9c353813e70650e5e44c6647a1848f465e74571367d873a5d32ead3a340e4da730432524adfc4eec5 SHA512 f232879857441d09e1a0b7251849ab466e0a1a5c75e035ab28aa5bc91a7d11e962cd618672aaa65746ec019fb5cd08a190a28e001a89b9e6a82f9afc11d5c207
diff --git a/x11-wm/openbox/openbox-3.6.1-r3.ebuild b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
index 736a89bce398..68f72a7a3c55 100644
--- a/x11-wm/openbox/openbox-3.6.1-r3.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="git://git.openbox.org/dana/openbox"
 else
 	SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86	~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86 ~x86-linux"
 fi
 
 SRC_URI+=" branding? ( https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 5182942acc16..00a2c891d473 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -4,6 +4,6 @@ AUX xpra-3.0.2-ldconfig.patch 1270 BLAKE2B b4eaa81610899c16a43b43c5f11f93335ca48
 AUX xpra-3.0.2_ignore-gentoo-no-compile.patch 610 BLAKE2B 963b3b61602f6a7ad7c8247109932d0da7eeef2762eaa8a987a8f10178a13cec3255000661bc7e3344319a555c9f0ed41b6383be7728af543cb5d2e004c377b2 SHA512 ff16637dca766ba2d36351e1aeeb87f2bab02e73e8da8fdb566051727b0c6fec6df1925318eee8d1c87580196ec78f0303da56d3439b4b4bace3105a914251e8
 DIST xpra-3.0.2.tar.xz 2749196 BLAKE2B 3c8745657a12637704fb88ac7b867ab387ef7ed2250396d9e534aecf81e40f85332a2c51ba49638834012f4a4d85c03bd7e49ee259bb2400aeb60fb06abf8b59 SHA512 115f606ff5886d99a906f318cb1a7a4a86e80ebf23e4336e67938267d92ef624de577cc8fc06c6ce541b7c44a0cef58d930b5928f32e24dfc67c72127c7b623c
 DIST xpra-3.0.5.tar.xz 2752016 BLAKE2B a36d6a4ebb0b14665014da92d510c0d5f978c96db653709ddc09a1015426d6ac6f71f9a221db68ee1114c95eeaca6600f9e49102ce9f936d9b0ee298ac432647 SHA512 3dbc122ebc8c4aa67154acfe92668ac364d8469022b03e28946d763e4d396f8c707690b2a4dbf07b55545259a53b46c9dd94e6e40131289ccc3dce6a88107681
-EBUILD xpra-3.0.2.ebuild 4254 BLAKE2B 784a438fe336eefcb73f58ce929df6a57f748cbe6b0647ea160603dccc68b44aa6942215552a2f46838fe9d750f79117790e2a39ce128640517d30a41550d13f SHA512 c7f7d9f54e438a887659163bc1f43a101761398b79b0cbbb4f65775bf9de1d9602993591cea6bcd72ca75ec183d0bf6a7e508bcc50eb0f821ad2b5dbad920c8d
-EBUILD xpra-3.0.5.ebuild 3753 BLAKE2B 5da6b764b8a1b46af7eceb493b6d018abe54f97d531fa724e02d0f79642e4dfe1261bf376b6b2415aa509d58547f4090a4ded062a48f6840365999c88f980f2f SHA512 aebb8edc4960928d06646e656a0ea3ee282afe5f17197b315d6032a02293116b3f0ed26ca644bd7de4f2a79805147272c877e7a936d1343a059dae0b61e986a9
+EBUILD xpra-3.0.2-r1.ebuild 3987 BLAKE2B 4772c5968b01f2ab4e8ec826fa0bd4d6c45a17bee86bdff9ea2248aca4350b04898930ad282e99136346ce8841fffc4082c72f8a73c7e33c127bc3fdcfd6e7a7 SHA512 c5836c2783be02375889e8d10448d076f4ca3bd4ddfb8b5c45b20763ce59048ce836dce0873e6d8f3e4e7e50dec934b7f8803d40db03e495e7ae458e642a3b18
+EBUILD xpra-3.0.5-r1.ebuild 3642 BLAKE2B 99147ccdb77786e829bfc950689ca82cab85e6bff73e660c8ea0a311beb96a8c96552aa5d841abdb703d788977106e9977bcef7659fdd494331ca076efa0f58e SHA512 60113eda0d5688e720d94908025b79c939ce7b40b21b3d0a535d9b71cb742fd6b5c6f9ad95152033a5be59ae1d9a1b579272abd9c0d86ea279fc4b82ad7926d7
 MISC metadata.xml 1183 BLAKE2B 3401d4bc8847e1da6884abaa431cf0c64bc6cd2d1e118bde8b225f8a3670b561d9109cfa248652a71c397a9cdc8d50f6fd83a48ab41de569e03e22e63f5acd2b SHA512 5a48871a51cebe09db53997d61e49ed0828be430f34772b88fc06770bd90a935bec31e0dce7fb78756c337faf9cc1fa4896f5d6d709857fee9fde007ec0b0986
diff --git a/x11-wm/xpra/xpra-3.0.2.ebuild b/x11-wm/xpra/xpra-3.0.2-r1.ebuild
index 1b1afa0b1211..67c37be000fb 100644
--- a/x11-wm/xpra/xpra-3.0.2.ebuild
+++ b/x11-wm/xpra/xpra-3.0.2-r1.ebuild
@@ -14,7 +14,7 @@ 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 libav +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam webp"
+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 ) )
@@ -33,32 +33,20 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	x11-libs/libXrandr
 	x11-libs/libXtst
 	x11-libs/libxkbfile
-	csc? (
-		!libav? ( >=media-video/ffmpeg-1.2.2:0= )
-		libav? ( media-video/libav:0= )
-	)
-	dec_avcodec2? (
-		!libav? ( >=media-video/ffmpeg-2:0=[x264,x265] )
-		libav? ( media-video/libav:0=[x264,x265] )
-	)
-	enc_ffmpeg? (
-		!libav? ( >=media-video/ffmpeg-3.2.2:0= )
-		libav? ( media-video/libav:0= )
-	)
+	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
-		!libav? ( >=media-video/ffmpeg-1.0.4:0=[x264] )
-		libav? ( media-video/libav:0=[x264] )
-	)
+	>=media-video/ffmpeg-1.0.4:0=[x264] )
 	enc_x265? ( media-libs/x265
-		!libav? ( >=media-video/ffmpeg-2:0=[x264] )
-		libav? ( media-video/libav:0=[x264] ) )
+	>=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 virtual/ffmpeg )
+	vpx? ( media-libs/libvpx media-video/ffmpeg )
 	webp? ( media-libs/libwebp )"
 
 RDEPEND="${COMMON_DEPEND}
diff --git a/x11-wm/xpra/xpra-3.0.5.ebuild b/x11-wm/xpra/xpra-3.0.5-r1.ebuild
index f76f7a9fc36f..ab142fb477a1 100644
--- a/x11-wm/xpra/xpra-3.0.5.ebuild
+++ b/x11-wm/xpra/xpra-3.0.5-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://xpra.org/src/${P}.tar.xz"
 LICENSE="GPL-2 BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+client +clipboard csc cups dbus ffmpeg jpeg libav +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam webp"
+IUSE="+client +clipboard csc cups dbus ffmpeg jpeg +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam webp"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	|| ( client server )
@@ -32,21 +32,15 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	x11-libs/libXrandr
 	x11-libs/libXtst
 	x11-libs/libxkbfile
-	csc? (
-		!libav? ( >=media-video/ffmpeg-1.2.2:0= )
-		libav? ( media-video/libav:0= )
-	)
-	ffmpeg? (
-		!libav? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] )
-		libav? ( media-video/libav:0=[x264,x265] )
-	)
+	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 )
 	sound? ( media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
 		dev-python/gst-python:1.0 )
-	vpx? ( media-libs/libvpx virtual/ffmpeg )
+	vpx? ( media-libs/libvpx media-video/ffmpeg )
 	webp? ( media-libs/libwebp )
 "
 RDEPEND="${COMMON_DEPEND}