gentoo resync : 15.12.2019

43 files changed, 656 insertions, 68 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 54b5f11f54ab..30f747804f42 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/aewm/Manifest b/x11-wm/aewm/Manifest
index 00c0d911e0e6..86e8b8405597 100644
--- a/x11-wm/aewm/Manifest
+++ b/x11-wm/aewm/Manifest
@@ -1,4 +1,6 @@
 AUX aewm-1.3.12-gentoo.patch 1690 BLAKE2B f8bb7d861f3852d48c4a4919d06138baaabb053546261fbeb8d6f6e79d49f7561381cc02a614cc17998e37d40e000df1def0be71c8417194ea448797c911e6c8 SHA512 39c4d3258b29550fc99ac088c84f83af40645ebe48013f053584dd60baf99d9e58e3c3b4f221835c5ba7da27f6cc66a5d387a74928d596ba4a99a38aabaafb32
+AUX aewm-1.3.12-r1-gentoo.patch 2259 BLAKE2B 427a3286dfdf7170866a2e8b73b14259f390553fb53fc60780c6e5a8c87c224b46d6fcecda2784a17024ded5e513c1ca6be71a5aad5bd7dd6a82e783e6a4c8d6 SHA512 e3039462193018661acf9ed6532c67034a1352e381bb378a41ca3493580dfe847fa244b41389c37b3882fb5d0db4a26b9c6067b25a47134cc2d39f88b53415c9
 DIST aewm-1.3.12.tar.bz2 36677 BLAKE2B f84d272b82408600b10a3d08523219484cfbefff1ea5134284759e8743ae29918ceba842de07c640ca6fbc52c875df93f30f1692239119afcefb5a28ba3aa55e SHA512 69435edf1ba99661464221070ab6708a875056d244ee73b2eba1ed2beefba52ac2418d37e0d8b9f0c7c8a382e9d8740215b9c7098eca4f39cdf73b3c894125f1
+EBUILD aewm-1.3.12-r1.ebuild 800 BLAKE2B f8f5eea9b6db3dadc7a3dd30e864324158f55fd917f0fffcefeebe97f2b9a41ef55ad145fdf3592debec8414b2649e3d36cff94ad1a14b3fcad7689c099c986b SHA512 b03191aa54b4090e80333dba75e3a0c027e2f758144170848bd081bd5c98a8e5a58422836c4623f1b8e6a8ac964304f8e9c57dd560eaedb1ee9f18ea48a8b5f8
 EBUILD aewm-1.3.12.ebuild 924 BLAKE2B 3e672f88b219b1ea92d04f73236f101236afc9df4ae0e87c9b9968966b6eede4eed8f4b8a70f548b4b2c4d66511d157c1794d76652cfb46738761c5e4f105097 SHA512 be091793244569e0d64bd6e004a675fb1872d0133c176b2060cf1f620d9e6cef4a190ffcc6e15bea09f27e4623799a82858a11be21860f4166123c754f7cfc6a
 MISC metadata.xml 559 BLAKE2B 262c00ea913f10dccedef6d9b086d19de9b2b210cba0dac9125cad36642149d76b669387682ce1fa09fd96cfc715e618e1cc9c758ab2a66838d6fcf7fdb6a182 SHA512 f9a2092397717d558532432ee9ccb9715923338145485b7655fa84b83d08c89d900c3baf16d60cf3d16e5d495d26f04d889371ab010aa3dc54bdff3d7fa04831
diff --git a/x11-wm/aewm/aewm-1.3.12-r1.ebuild b/x11-wm/aewm/aewm-1.3.12-r1.ebuild
new file mode 100644
index 000000000000..e0a143a90091
--- /dev/null
+++ b/x11-wm/aewm/aewm-1.3.12-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="A minimalistic X11 window manager"
+HOMEPAGE="https://www.red-bean.com/decklin/aewm/"
+SRC_URI="${HOMEPAGE}${P}.tar.bz2"
+
+LICENSE="MIT 9wm"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+PATCHES=(
+	"${FILESDIR}"/${P}-r1-gentoo.patch
+)
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)"
+}
+
+src_install() {
+	emake \
+		DESTDIR="${ED}" \
+		MANDIR="${ED}"/usr/share/man/man1 \
+		XROOT="/usr" \
+		install
+
+	dodoc NEWS README
+}
diff --git a/x11-wm/aewm/files/aewm-1.3.12-r1-gentoo.patch b/x11-wm/aewm/files/aewm-1.3.12-r1-gentoo.patch
new file mode 100644
index 000000000000..a08aa2760ed4
--- /dev/null
+++ b/x11-wm/aewm/files/aewm-1.3.12-r1-gentoo.patch
@@ -0,0 +1,92 @@
+--- a/Makefile
++++ b/Makefile
+@@ -6,12 +6,12 @@
+ XROOT = /usr/X11R6
+ 
+ # Uncomment to enable Shape extension support
+-#OPT_WMFLAGS += -DSHAPE
++OPT_WMFLAGS += -DSHAPE
+ #OPT_WMLIB += -lXext
+ 
+ # Uncomment to add Xft support
+-#OPT_WMFLAGS += -DXFT `pkg-config --cflags xft`
+-#OPT_WMLIB += `pkg-config --libs xft` -lXext
++OPT_WMFLAGS += -DXFT $(shell $(PKG_CONFIG) --cflags xft xext)
++OPT_WMLIB += $(shell $(PKG_CONFIG) --libs xft xext)
+ 
+ # Uncomment for debugging (abandon all hope, ye who enter here)
+ #OPT_WMFLAGS += -DDEBUG
+@@ -46,7 +46,7 @@
+ 
+ X11FLAGS = -I$(XROOT)/include
+ WMFLAGS = $(X11FLAGS) $(OPT_WMFLAGS)
+-GTKFLAGS = `pkg-config --cflags gtk+-2.0`
++GTKFLAGS = $(shell $(PKG_CONFIG) --cflags gtk+-2.0)
+ 
+ $(PLAINOBJ): %.o: %.c
+ 	$(CC) $(CFLAGS) -c $< -o $@
+@@ -60,37 +60,36 @@
+ $(GTKOBJ): %.o: %.c
+ 	$(CC) $(CFLAGS) $(GTKFLAGS) -c $< -o $@
+ 
+-X11LIB = -L$(XROOT)/lib -lX11
++X11LIB = $(shell $(PKG_CONFIG) --libs x11)
+ WMLIB = $(X11LIB) $(OPT_WMLIB)
+-GTKLIB = `pkg-config --libs gtk+-2.0`
++GTKLIB = $(shell $(PKG_CONFIG) --libs gtk+-2.0)
+ 
+ $(PLAINBIN): %: %.o
+-	$(CC) $^ -o $@
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@
+ 
+ $(X11BIN): %: %.o
+-	$(CC) $^ $(X11LIB) -o $@
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(X11LIB) -o $@
+ 
+ $(WMBIN): %:
+-	$(CC) $^ $(WMLIB) -o $@
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(WMLIB) -o $@
+ 
+ $(GTKBIN): %: %.o
+-	$(CC) $^ $(GTKLIB) -o $@
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(GTKLIB) $(X11LIB) -o $@
+ 
+ AEMAN = aewm.1x aeclients.1x
+ AERC = aewmrc clientsrc
+ 
+ install: all
+ 	mkdir -p $(BINDIR) $(MANDIR) $(CFGDIR)
+-	install -s $(ALLBIN) $(BINDIR)
++	install $(ALLBIN) $(BINDIR)
+ 	for i in $(AEMAN); do \
+ 	    install -m 644 doc/$$i $(MANDIR); \
+-	    gzip -9 $(MANDIR)/$$i; \
+ 	done
+ 	for i in $(AERC); do \
+ 	    install -m 644 doc/$$i.ex $(CFGDIR)/$$i; \
+ 	done
+ 	for i in $(PLAINBIN) $(X11BIN) $(GTKBIN); do \
+-	    ln -sf aeclients.1x.gz $(MANDIR)/$$i.1x.gz; \
++	    ln -sf aeclients.1x $(MANDIR)/$$i.1x; \
+ 	done
+ 
+ clean:
+--- a/doc/aewmrc.ex
++++ b/doc/aewmrc.ex
+@@ -3,7 +3,7 @@
+ 
+ # Titlebar font. "fixed" is the default.
+ 
+-font "lucidasans-10"
++font "fixed"
+ 
+ # Window colors
+ 
+--- a/doc/clientsrc.ex
++++ b/doc/clientsrc.ex
+@@ -10,4 +10,4 @@
+     cmd "Gaim" "gaim"
+ end
+ 
+-cmd "Logout" "skill aesession"
++cmd "Logout" "pkill aesession"
diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest
index 382d1265249b..dcc19931d1f3 100644
--- a/x11-wm/awesome/Manifest
+++ b/x11-wm/awesome/Manifest
@@ -13,8 +13,8 @@ AUX awesome-xsession.patch 291 BLAKE2B fb8ca929487ef45cd64c44bbb3db2b7c4a1be4f5a
 DIST awesome-3.5.9.tar.xz 723084 BLAKE2B 96f4c5df98147399f28d1b1455ac53800f2222969599486c2f79b73ba36cfa237270cd5972d4e10e0a4f774a54dfa92948bba5d2e0438687d36739e12c3f5ecc SHA512 6a4c679b293e8cd85d1f7e13f6dea704cbb267e42b9260496a54b657a66d6148aae51521d802d61baaeb23df0d4a8ad0b28d9dc922ea5da2a347b4251cce5e25
 DIST awesome-4.2.tar.xz 987024 BLAKE2B b2aaa993bafa83121d165d21083dfcac825e373be9547490f8b93b8e8b0f90470395a0238affaf9990f719b8bd2f36a255f6468b6422406787a3c96946c4e831 SHA512 134dd3625c86243861b3d0701cc8bfd8c00986d7027f0832016c3f5e59e6b9a1ef2f677bb0d1d66ece63449533e4b13d8d7388e96e6f9014212030a79f163e09
 DIST awesome-4.3.tar.xz 1037816 BLAKE2B b4afc5e7bfb01ddc16b67776cc00dd7b0bcbefc9d17f9bec9c04256953858aef2bf0e4b15a525909029b7da771ade0d749758aba2878832f356d7b2c4f0363b7 SHA512 c5ef1e8dc593e7783b895d22143154aea8f211beeda24672a7ee4ed5112b4f4284043f848a151f3d3c4f569e91308670367a4353f705b20511b36495b22fa3f5
-EBUILD awesome-3.5.9-r2.ebuild 3288 BLAKE2B b93b5e412dd1b54249a1cb2459ab26cb49c228bac8a2587dcdb10395097b115a3411f0076376572b471aa17c827e39a1a9ec0964752acf7b7a36cc8e1f5b3bae SHA512 2fa288d128df52d1eeeedbeeebd4b3a3c456ab18c5920c9e5b10b60f8d796d2d141a34345e8b2c106db0b35c1b581e0d636d0b96bbee4304c66c8f27d89edce7
+EBUILD awesome-3.5.9-r2.ebuild 3267 BLAKE2B f519ac55294cfc2a83105c24841eb1a2e50062d51a001ca8755c80555dcec6053e97f2021fc781e5d8fabe8451469c3df14980ed452b74467f024f3b79dc6619 SHA512 a87845d24e4d307fc8e7b44984312a389748a0c2b45e219806741f8c62bc8921b9535a4d4867dd2019e4973d281c4fa5c42920100bd0da1f2ef18e5d961c7096
 EBUILD awesome-4.2-r2.ebuild 4035 BLAKE2B 3be21e28b04474f1a00b7dcd9ba475621b1497e5ddec0abca0fdfa6f1886fd76daefeac7f98a988174551660c29cca0db0201bad5864240780bf5223f04d7a82 SHA512 4d65e4b5db4ac47ebf060e1227c31615d793b92d32bc53f0fe851f0265e612a1e4e96d76149041135bbde9cdc316c06c330742446c37c4c08832d42a8e4864fd
 EBUILD awesome-4.3.ebuild 3686 BLAKE2B 52dc4a4e1c32c827d2f6959b520f2ab85d48253bda43c82d3868ae337241f8cd8a1113c6fc8e2a197fd60953ac0f46ade809e450b67b9c2ae5515d855c99a253 SHA512 96d285068b309b0bd4839aa1c54bbbef4fb045fb6477d9f8109fe54dbaaf5075117dc24e0ef4fffc0cc51d8e912feda89f158e41e215eaf48c5d1044029576a5
-EBUILD awesome-9999.ebuild 3640 BLAKE2B 91184513d785b8ed8784531d3a1a69a14a67818a07147cb74f07d52e0ab8bbb2e5b0fb5915173171eaf714fb855b3e1111a49c74cfa5a7db0beb4fea5532b604 SHA512 8e44954f42557f380b54fd01c2cff621831979a2a1677af44424241e5b112100bcf58ebe01744e96367726d1cbd5d243bfc8ef9bf1e4d2105b16d7620684f0ec
+EBUILD awesome-9999.ebuild 3641 BLAKE2B 9633653cae787ede99239c46c5f974ae125f45c33caf7e3de494259c9934595bb55345a11aebccbfa1673e5ab9f1b7d598f41e5e30820372335f6508a089ebc7 SHA512 a07b36d9bc54dc831a9b81027d45ce4b3360f9c6556829a55e34f3e1449a4c1e77b9f1e89a32fa7f52d58963ff93d63cfc1a05c029cf0ab54d7afec0ac665e83
 MISC metadata.xml 331 BLAKE2B 177b7ac838fb250b847c6a596c17e7a998715672112462c6c438ec15442b32d2402d87da6d4578e2b78d7bd2a16671a7df7974bebb645e0892bb3f785f95937a SHA512 14550c266d8de65db614c3f0893da85487656bef5166a2829e8a2bc636c50bbd1a505ff7972bc6c5ca553bdcb35caeb1dc4697171d4810ec9fe73420f880ebea
diff --git a/x11-wm/awesome/awesome-3.5.9-r2.ebuild b/x11-wm/awesome/awesome-3.5.9-r2.ebuild
index 099659de11bc..619a51c6f336 100644
--- a/x11-wm/awesome/awesome-3.5.9-r2.ebuild
+++ b/x11-wm/awesome/awesome-3.5.9-r2.ebuild
@@ -86,7 +86,7 @@ src_install() {
 		(
 			cd "${CMAKE_BUILD_DIR}"/doc
 			mv html doxygen
-			dohtml -r doxygen || die
+			dohtml -r doxygen
 		)
 	fi
 	rm -rf "${ED}"/usr/share/doc/${PN} || die "Cleanup of dupe docs failed"
@@ -98,12 +98,12 @@ src_install() {
 	if use gnome ; then
 		# GNOME session
 		insinto /usr/share/gnome-session/sessions
-		newins "${FILESDIR}/${PN}-gnome-3.session" "${PN}-gnome.session" || die
+		newins "${FILESDIR}/${PN}-gnome-3.session" "${PN}-gnome.session"
 		# Application launcher
 		domenu "${FILESDIR}/${PN}-gnome.desktop" || die
 		# X Session
 		insinto /usr/share/xsessions/
-		doins "${FILESDIR}/${PN}-gnome-xsession.desktop" || die
+		doins "${FILESDIR}/${PN}-gnome-xsession.desktop"
 	fi
 }
 
diff --git a/x11-wm/awesome/awesome-9999.ebuild b/x11-wm/awesome/awesome-9999.ebuild
index 23c61a5483c4..d3a7330d045f 100644
--- a/x11-wm/awesome/awesome-9999.ebuild
+++ b/x11-wm/awesome/awesome-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils eutils git-r3 pax-utils
+inherit cmake-utils desktop git-r3 pax-utils
 
 DESCRIPTION="A dynamic floating and tiling window manager"
 HOMEPAGE="https://awesomewm.org/"
diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index 733c54d504e4..c31559a9b8cb 100644
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -5,6 +5,6 @@ AUX fvwm-2.6.5-mouse-buttons.patch 519 BLAKE2B 23b31933e9dcc456d73be15573226017f
 AUX fvwm-2.6.8-perl528.patch 515 BLAKE2B 44df7b8aef71d85c3aefefb40ab45b9e6227ef6a13aaab60cec8956db669013b4ee4dc869216972e1a443d1f69e6550e7f80dc81cdf8b7642d6c49ae46793b2a SHA512 ab35b8aef3c6d8a07f1e03290c209736ee892729d98fece3d0134fd9994f8c57bdd5703492b405a6eb52cfcd67cd9cd72c16bc25a729a46560eb6e21f2d7918f
 DIST fvwm-2.6.5.tar.bz2 2582655 BLAKE2B 02c6f3124c0bb2ffe5dd25c218e4137977030ee6e96c7d20517e10dc93b85b295d941c700786f53231045b1b76e6d069b0387942ccf55b8543b0efe9ae303520 SHA512 a1b8cf5a5124b939441834a2fb44c885c579939e4099cf2c8178ea2c4261258df4e565068593699f9446e363135a2666c9288c1bce551a6cf5c6c79287104698
 DIST fvwm-2.6.8.tar.gz 3915662 BLAKE2B 0b71182c5c0b5a07314fde8a673efe46712b92484e1164cd6357ad2e36e557dd822bf6c25d201092953ec10200bb0f93846af6cde0d701c65c81a4086de64652 SHA512 12e0def0a1d565c1c44356b48b4e516b7be4f51f13f91d9f8b89364ae106f6d7773e12fd17c71b6f0569c64fb3a5374c036c118cb76f739a63b1e17b5dfba287
-EBUILD fvwm-2.6.5-r3.ebuild 4836 BLAKE2B e29921f9446cba23a2a252254f73fa7c3af3dcb67aa1d96865c5a84ad71ff02555f459e60dd54731f1110ad72d52da3f70f78a4b1cf56b9e1718461e76ecae69 SHA512 a541d24e9af5ffda54079bcb998496e68beec0ddd49c3f686ed828110f2872fea706d22cd662552dc10ee9fdd4ad2530b44e2d0b94f43176c0c16095797c18c9
-EBUILD fvwm-2.6.8-r2.ebuild 4145 BLAKE2B 9706fddeb0107445c644660b80de1c7926e0e2df4a54f9a2574509123934a2ae6e315565a97052549efef413d16e73d001596a64e2e4b9ff0f30d27b67d6fe88 SHA512 d32a9ca91344023b5741c48cd63b766f0c2b22bb3a45a2c6a2234b8492bd9048bd85946e3295d5671f4b2451fd9e14b8bf9c83d86919291cdb6eb25b2c263867
+EBUILD fvwm-2.6.5-r3.ebuild 4829 BLAKE2B 00dc802a709c4ac1bdec33b723899895f26fe20e70ff245838c142d25b24eae646a16c93ba342395684b914ec52c3bd9f256efe5a4f876232b40b33bcb286277 SHA512 c1ae5188318030d01b65f6429874a990fe8df1a62afefe265e82beade9b5960958a40fd3f578c8ed1e34a10ec060ae6d2d277b493a399d292435585872152e25
+EBUILD fvwm-2.6.8-r2.ebuild 4138 BLAKE2B ed620d5747213fb8a7fa9757f7afa02c6d2f6d9dc482e4de4813d833c5b880580a8fb4de062db20d9e683b9a60758de541ff7fe63141a84d9acb90c12d35f69c SHA512 1a7d8ec7ca928adcac5abe0cc2cb69102cd66f987595293bf453ffa63aca396c0b94960f7108093ea50ad1cce817022586eee6c3585f5978193ce66374a3408a
 MISC metadata.xml 765 BLAKE2B 003f88ef882dda6da8b314975c8f40ea450faff79e086f962946e3634ec8722dc8b0d821692d8daa4d80ac6025d9b7e21827e64ccca3407ea60a79c12d752b3f SHA512 0feb8344498792784c3d640455316527855b7d37f1e6d3109776bec2749b48819bcc6b88f55b214d6675eab671add82e9338c52817cf4e0b25a20ae390519581
diff --git a/x11-wm/fvwm/fvwm-2.6.5-r3.ebuild b/x11-wm/fvwm/fvwm-2.6.5-r3.ebuild
index 2dc00c44059a..62f0374f99b3 100644
--- a/x11-wm/fvwm/fvwm-2.6.5-r3.ebuild
+++ b/x11-wm/fvwm/fvwm-2.6.5-r3.ebuild
@@ -153,7 +153,7 @@ src_install() {
 
 	dodir /etc/X11/Sessions
 	echo "/usr/bin/fvwm" > "${D}/etc/X11/Sessions/${PN}" || die
-	fperms a+x /etc/X11/Sessions/${PN} || die
+	fperms a+x /etc/X11/Sessions/${PN}
 
 	dodoc AUTHORS ChangeLog NEWS README \
 		docs/{ANNOUNCE,BUGS,COMMANDS,CONVENTIONS} \
diff --git a/x11-wm/fvwm/fvwm-2.6.8-r2.ebuild b/x11-wm/fvwm/fvwm-2.6.8-r2.ebuild
index eb52e364b68c..b5e6d5907947 100644
--- a/x11-wm/fvwm/fvwm-2.6.8-r2.ebuild
+++ b/x11-wm/fvwm/fvwm-2.6.8-r2.ebuild
@@ -144,7 +144,7 @@ src_install() {
 
 	dodir /etc/X11/Sessions
 	echo "/usr/bin/fvwm" > "${D}"/etc/X11/Sessions/${PN} || die
-	fperms a+x /etc/X11/Sessions/${PN} || die
+	fperms a+x /etc/X11/Sessions/${PN}
 
 	dodoc docs/{COMMANDS,DEVELOPERS.md}
 
diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest
index ccc699a5084a..92aae2d7ca69 100644
--- a/x11-wm/herbstluftwm/Manifest
+++ b/x11-wm/herbstluftwm/Manifest
@@ -1,4 +1,5 @@
 DIST herbstluftwm-0.7.2.tar.gz 245506 BLAKE2B 72d0bb2a77e519161d193ac7b2b9f1f878ccb6cfe4914b6c75d060e2daa0bec4203ee4ebf203b9fa1dfb844d71d50aa7c03257c78aa22e906bf42519d1e592af SHA512 abb49bbc3de9a0ef619ce7063c1cea0d0d25ab2195c53dc0d33e061ad24060da4bbe9b99b9b9126028cdf68b462d4fcc8d1534431e4892d571ff897a68d2113c
+EBUILD herbstluftwm-0.7.2-r1.ebuild 1540 BLAKE2B 70399b7c8a52331236e06b40d20bb21d9bbaae5b6c4677b2aea7b85efe3beeb90cd7391ba2207b374ffce6020d6607ec30963865a3d9fa6ad8617f8ad8da964e SHA512 f973f30cdbddb0ae6ec977817bd3264a99e3448dd69a5f980acacc962a4ece846ef2cbe2895dea85df5c07a306cc3d79d1785dcfb8bfd37bac221e5c79eb4546
 EBUILD herbstluftwm-0.7.2.ebuild 1557 BLAKE2B 8e44818c37fb80eb25f340d80092c77712ca44b521447a0f0583a8898940205806e0c0d18ecb525088ef3d8a738558e789360692deb205ae63f581b4fc399e0c SHA512 5a0772c7156db342a2de39f5b7a72c93f0c7b0c3b1163a11e9a904bbf98f33ec1b49c103617885493bf697a310c46fbdafe09d27f4bf85a11c541bf675d48675
-EBUILD herbstluftwm-9999.ebuild 1559 BLAKE2B cd44c6a88dfd2f1084b279a391768b6aeb5baeeed638fc07294b736567574360cd6740543497c40c852a2ec76850e32e438ec61cf18e8391ed434a96a13c8310 SHA512 46153fc48f0993b6d09553d34be9df56d1d2aa69cfbc068af2bd8d65766f1b8db1ed7032690859f077781481f0bde7c2b1942085dfd51aabab5343de4e4758bf
-MISC metadata.xml 246 BLAKE2B a30d57a217fcd3c7c7d170b71f1ab806d11e9b520595802ebfb0123a82682d4fc045f033b164402ac51f939fef7cad737eb2012f62864298b6c5d23c69575519 SHA512 ca07e0609b698c2b53062b71008fee49b91af78fc2ef25997311e37985d79283d333f5b842257a16e7dee36ce34c07d405e1f93742f341f10ca70904e9f9a4e6
+EBUILD herbstluftwm-9999.ebuild 1540 BLAKE2B 70399b7c8a52331236e06b40d20bb21d9bbaae5b6c4677b2aea7b85efe3beeb90cd7391ba2207b374ffce6020d6607ec30963865a3d9fa6ad8617f8ad8da964e SHA512 f973f30cdbddb0ae6ec977817bd3264a99e3448dd69a5f980acacc962a4ece846ef2cbe2895dea85df5c07a306cc3d79d1785dcfb8bfd37bac221e5c79eb4546
+MISC metadata.xml 210 BLAKE2B bb9591af5406abbf589664053ab6e5cb38933fe6ef97c11609405392b050b26cff8e94e04e85e5798124abd46283bee67b2a74923a5041616df15aaa9cff6da9 SHA512 f7cbe57a24b67a28696f91061ad8bd61d7d4cf3d59d20c3dcc6a4921e29672d00ecf3ece70a8813399d2467ebd626f8f829300e81fc722e9aaa527e213a5fb54
diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.7.2-r1.ebuild b/x11-wm/herbstluftwm/herbstluftwm-0.7.2-r1.ebuild
new file mode 100644
index 000000000000..c68ba3acf29a
--- /dev/null
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.7.2-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs bash-completion-r1
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm.git"
+	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="
+	>=dev-libs/glib-2.24:2
+	x11-libs/libX11
+	x11-libs/libXext
+	xinerama? ( x11-libs/libXinerama )
+"
+RDEPEND="
+	${DEPEND}
+	app-shells/bash
+	zsh-completion? ( app-shells/zsh )
+"
+BDEPEND+="
+	virtual/pkgconfig
+"
+
+src_compile() {
+	tc-export CC CXX LD PKG_CONFIG
+
+	emake LDXX="$(tc-getCXX)" COLOR=0 VERBOSE= \
+		$(use xinerama || echo XINERAMAFLAGS= XINERAMALIBS= )
+}
+
+src_install() {
+	dobin herbstluftwm herbstclient
+	dodoc BUGS MIGRATION NEWS README.md
+
+	doman doc/{herbstluftwm,herbstclient}.1
+
+	exeinto /etc/xdg/herbstluftwm
+	doexe share/{autostart,panel.sh,restartpanels.sh}
+
+	insinto /usr/share/xsessions
+	doins share/herbstluftwm.desktop
+
+	newbashcomp share/herbstclient-completion herbstclient
+
+	if use zsh-completion ; then
+		insinto /usr/share/zsh/site-functions
+		doins share/_herbstclient
+	fi
+
+	if use examples ; then
+		exeinto /usr/share/doc/${PF}/examples
+		doexe scripts/*.sh
+		docinto examples
+		dodoc scripts/README
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild b/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
index 0cea06f49ee7..c68ba3acf29a 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
@@ -7,11 +7,11 @@ inherit toolchain-funcs bash-completion-r1
 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm.git"
-	EXTRA_DEPEND="app-text/asciidoc"
+	BDEPEND="app-text/asciidoc"
 else
 	SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
-	EXTRA_DEPEND=""
+	BDEPEND=""
 fi
 
 DESCRIPTION="A manual tiling window manager for X"
@@ -21,19 +21,23 @@ LICENSE="BSD-2"
 SLOT="0"
 IUSE="examples xinerama zsh-completion"
 
-CDEPEND=">=dev-libs/glib-2.24:2
+DEPEND="
+	>=dev-libs/glib-2.24:2
 	x11-libs/libX11
 	x11-libs/libXext
-	xinerama? ( x11-libs/libXinerama )"
-RDEPEND="${CDEPEND}
+	xinerama? ( x11-libs/libXinerama )
+"
+RDEPEND="
+	${DEPEND}
 	app-shells/bash
-	zsh-completion? ( app-shells/zsh )"
-DEPEND="${CDEPEND}
-	${EXTRA_DEPEND}
-	virtual/pkgconfig"
+	zsh-completion? ( app-shells/zsh )
+"
+BDEPEND+="
+	virtual/pkgconfig
+"
 
 src_compile() {
-	tc-export CC LD CXX
+	tc-export CC CXX LD PKG_CONFIG
 
 	emake LDXX="$(tc-getCXX)" COLOR=0 VERBOSE= \
 		$(use xinerama || echo XINERAMAFLAGS= XINERAMALIBS= )
diff --git a/x11-wm/herbstluftwm/metadata.xml b/x11-wm/herbstluftwm/metadata.xml
index 78e64a5cf1ad..5ba62861f1c4 100644
--- a/x11-wm/herbstluftwm/metadata.xml
+++ b/x11-wm/herbstluftwm/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
-	</maintainer>
+<maintainer type="person">
+<email>jer@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index 0cfa8b39add4..92a800020465 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -5,7 +5,7 @@ DIST i3-4.15.tar.bz2 1196263 BLAKE2B 36f20327202957dba30aface91af4d2c6261979e726
 DIST i3-4.16.1.tar.bz2 1211532 BLAKE2B 64a6996c0b89516069b58bf1cba92908a7f61ab04d66659b612b27411eb92fa9d49a7214eccdba33e7c33605b5f9247f69c1f0e23de629552edf113ab7520747 SHA512 3e328f8c7216697c5e484ca854605350f78844e24cc6cfb9c10e71368c2c0457387a14f819abdf8be2370d437889297f452fbf63f3924766ca81c157ab27e1b0
 DIST i3-4.16.tar.bz2 1213251 BLAKE2B a65d15278a83bac9903a611628ea53c64cd554ab9fff2a8864e649fd962858b2f3e77fe69d0dc70affc93dc69b3cbbd7b3ee670a2af9d697e28e9e4ea3323f67 SHA512 99abd15349ee8e61c084b3664ef3a189c92ea07812ac59eb6a5441df7cebea8211be52204e39bddcc33d8c714447fddbbe2c5c8a25b756a96e2dc6732526cbf8
 DIST i3-4.17.1.tar.bz2 1218418 BLAKE2B eb798eee2b618691ceb47b72c08fe09b09e2913c17fe667fab95426069c86497bff67278bea5fc97fdf90ebdfc6574e68cad36b21036a63d053edced1edf8592 SHA512 af397dc1768ea6530e4b2ce8ef21b20ecff8ab9eebf380df224456173eea4c3bacf28b55c8efcdc70f76f0d66543c163564a94cfd66028221ace481fa3c2913f
-EBUILD i3-4.14.ebuild 2113 BLAKE2B c602bbb48b166ffa70d735f9181ec81a4174fe7df08830bff5c2cd955f668d2e34453f421dd1c8fb616497be5cc5707332f412d73397287ed55ea5468ffc755d SHA512 709efb5ca49d7e2e1aa6426c631e653b66f15e261eb1462036b4bdef61cd68a690a03a71ae787d221939808b9b15f3d7604551c1cc3227b9194efea076b1390e
+EBUILD i3-4.14.ebuild 2137 BLAKE2B b231eb56417b8c1d679d8578e3939973390c1bd4d8bedf1479124159070b4b9a3050b7bc274dfb83464b48a92b50aa0b3290bb5f3b6822f80ab85ddb024def74 SHA512 07a3f71719ce11fd5d90ddcec4551d943cc0832515650ae2bd4ba26b93cf49db89202389d63771c4c5e13b0b0b1b757231861dbef95fd8005fe8bcccc6352d2c
 EBUILD i3-4.15.ebuild 2323 BLAKE2B bf5ead0f91a4a040866f00f3dfe4b0c71a2d4e41eb9480c27e464790c37cbf641069729d34e48152223e4f7545a6b6b43be3f45213774219fe49eaa594491ad2 SHA512 95cf2e6f2053ffe180418dda38535a08ed8447085d65cd3ac342ba0e0468e8320d95ed8468bdcc11ec637ea2f2ef4926a0df8bacad186109fc5f2c42330e3692
 EBUILD i3-4.16.1.ebuild 2325 BLAKE2B 8b944e98274f9b573712f90906f5c44f4770107743ec2742fb90d9076209b4b8db2ce4e0cc530a95b2064b969f5cde30b1af494d3b00bb6e9d5b8bf363ed2923 SHA512 325c3129b367ddace668f1f162466f94f970b8f0a3cde9f2d9d0be2506ae2389fb6946a94952035e5a8a8912e4b618dbda04e2ee72c9351a3fc851d2b042acd1
 EBUILD i3-4.16.ebuild 2318 BLAKE2B 5897090120c632fc6385196d48e8bb14c9c1346699df738230b28c954842a8cf192adc9e690fdee208003e4d514b76d850970e8e12624c7ff17ef7dff0d1046b SHA512 ec02ae998edfa9f4188b51d4038f44cf3a910b5ac7a1e75552bce5387d3b93b77bfa5770adcb04bf4bd82d2b25c79dee6420561d18f9a7ad2062eda3969884a8
diff --git a/x11-wm/i3/i3-4.14.ebuild b/x11-wm/i3/i3-4.14.ebuild
index 26d946ec6f08..f93c30e3ffaf 100644
--- a/x11-wm/i3/i3-4.14.ebuild
+++ b/x11-wm/i3/i3-4.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="doc debug test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="dev-libs/libev
 	dev-libs/libpcre
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index 42493734eaaf..ec7a87a1c0c3 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,8 +1,8 @@
 AUX icewm 33 BLAKE2B 5605658012ad8ed16bbd4cf0c4cb7cbe5204f73c20ef2c3d9fef1011a80b9e68863de64b45e4b043604b147c9d31f3f5d2617d067b694f5ec5329ad895472b0e SHA512 3fe619e59cc5d354242ccd85d3b1982dd7db6d0f6170f46f9d33975872f6d5a342a08d69db763162dc43681eedb96e9ba5075455bf54adf4fb86bf19887bf6e0
 DIST icewm-1.5.5.tar.xz 1707656 BLAKE2B 670ab4d1c1648faa24c848ddb04f3e353a3acd8e9a105837229d00ca344a61b3432d7b23b89dc054e220797cfd56d6504ad233d8793a3a5d95d9943c79017797 SHA512 5d75d33bf6e45ea0b46ace5173d825e9d1a12318cf7a5319b20ea704b019f6c09391f0f199b0fac678ba0f160d8236fc1cfee5d3b47d1895b7ba3721ff62a05e
-DIST icewm-1.6.1.tar.lz 1651274 BLAKE2B 85c3bda7bacf8f2e1e6ed250fc1b66d151bb030118c56300fc2ce9ad1a54c8693c3e0f83c81cec1f1878f0c0b300c25ac78bdb6440e235877a18586e07601de3 SHA512 dfc221d9afa6c7949dda983c06bdac5527f8cdb93dd20babdc1de75a7ab6cf9b3b1fe8e8d617cb70bd93ebe9aec70ac419d915b76b564b31dbec42b57d6f6011
 DIST icewm-1.6.2.tar.lz 1673647 BLAKE2B 006424aa005483b85ca36bd4447ce814ca81cd7243fc8045242a02355c2b35e9cbf6de0f1225d9b5e7685aca2961a731f060f7442250ef4f1527594233e8eac8 SHA512 0da78b9caf5cbbd8f944b4c89a15cb8b0e998de2075b09f65338d23027cbf024bbb9cfe9fffbe5d9606f11832090cb6552be2693cca5a62c011024f36ec1a0f9
+DIST icewm-1.6.3.tar.lz 1678149 BLAKE2B cfb41b104f0e64172b1aa983b542dc42b6369061ad4365547b14f4f96bccba6610c9b4324ccdc691421354c387c37fa80e525658139ba4213b6ea8d86448e3cf SHA512 18d77695c22131fac98172c09e27c014c10e908f4fc0cbeeb376b9308a659f0a51b466c80fc39875d8e0cf52fd6b385e636faf96c55fcb80b2cb9c1d0eb57e41
 EBUILD icewm-1.5.5.ebuild 2339 BLAKE2B bebb46e2f8508227fa060a88d4afe147fa81c876ed3c615d80080cfec6bcf16ee25592750aa9180073396969e421f5952e84200812e5f7f49d278be46acf01f4 SHA512 bb10e88ae08956a7637d3ce9481c7a48dd64d775723dd1c06f69e44f1fb352f21de655e5bac82ee9a1f2b31132c4e2292169493c6b7dc9846cf7538af4801403
-EBUILD icewm-1.6.1.ebuild 2358 BLAKE2B eee40d6e1337a04b341e597f499575186d2384c70962153dd7845d24e79ea05014fa73e8ce2c089ed4120d3edabae93c4158e71d91bfa4a77d7b603f9511be60 SHA512 ce7fae5d81b38c904b5f3b67636f69c42e251fcf62bee1a776c8ed706efd4f64ce458d6e2735369a9346763d026919124fc5a3566a6f422538946be008186e5c
-EBUILD icewm-1.6.2.ebuild 2358 BLAKE2B eee40d6e1337a04b341e597f499575186d2384c70962153dd7845d24e79ea05014fa73e8ce2c089ed4120d3edabae93c4158e71d91bfa4a77d7b603f9511be60 SHA512 ce7fae5d81b38c904b5f3b67636f69c42e251fcf62bee1a776c8ed706efd4f64ce458d6e2735369a9346763d026919124fc5a3566a6f422538946be008186e5c
-MISC metadata.xml 671 BLAKE2B f58cf53a373b1ba887cf376f5fc676b6d533348f186550a55961ac3d77a1867d8302759a83f69a3c8d757d16dcd2b0e4e7fdf52f485575d92a9d3b93fab3c463 SHA512 ea3df07996cdff6f369609a827cb4b23a6d2e3858fabc7fd9e85e382db7a53e0ca3dbe4ca50359c333b93372671e7c8753d2e7f40d1dfe6cd06c4714acf4ab9e
+EBUILD icewm-1.6.2-r1.ebuild 2673 BLAKE2B dd1c63f6b41603e4b8d263624ed183837c4d4d3a067af7da94c37dcd39edda67b10819245cc7ec2d86ed040892cdec2dd64935b0916f448eb4194938645cce64 SHA512 e7a0a485e014d3d4d27efe82e06ed34bdfafcceb64fb8f64b1531cd2b05fdcde59d30da2e9b3ed212eba271dca1273924f9114caa0ab4b1f677596c861744bfc
+EBUILD icewm-1.6.3.ebuild 2673 BLAKE2B dd1c63f6b41603e4b8d263624ed183837c4d4d3a067af7da94c37dcd39edda67b10819245cc7ec2d86ed040892cdec2dd64935b0916f448eb4194938645cce64 SHA512 e7a0a485e014d3d4d27efe82e06ed34bdfafcceb64fb8f64b1531cd2b05fdcde59d30da2e9b3ed212eba271dca1273924f9114caa0ab4b1f677596c861744bfc
+MISC metadata.xml 747 BLAKE2B a986dc65f9b603519ef92fecc63cadd2921d6569e8735956a55ce91673426082e367664cce23c2b80cec19e0d997da357ac8f9d3d78c738ad92f42f6f426c225 SHA512 f9b84c60b780b5999c8a295b64bdf1bdb734108984e48f1271257cb35602df024a347560526de52f43ede16f67031551f4ae3f37401d3320e4dbdfb913e557fe
diff --git a/x11-wm/icewm/icewm-1.6.1.ebuild b/x11-wm/icewm/icewm-1.6.2-r1.ebuild
index 869277de7f94..4c87bc3f6120 100644
--- a/x11-wm/icewm/icewm-1.6.1.ebuild
+++ b/x11-wm/icewm/icewm-1.6.2-r1.ebuild
@@ -12,7 +12,7 @@ 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 nls truetype uclibc xinerama"
+IUSE="+alsa ao bidi debug +gdk-pixbuf nls truetype uclibc xinerama"
 
 # Tests broken in all versions, patches welcome, bug #323907, #389533
 RESTRICT="test"
@@ -22,15 +22,25 @@ REQUIRED_USE="|| ( alsa ao )"
 #fix for icewm preversion package names
 S="${WORKDIR}/${P/_}"
 
-RDEPEND="
+# 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/gdk-pixbuf:2[X]
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+"
+
+RDEPEND="
+	${CORE_DEPEND}
 	x11-libs/libICE
 	x11-libs/libSM
-	x11-libs/libX11
 	x11-libs/libXft
+	x11-libs/libXpm
 	x11-libs/libXrandr
-	x11-libs/libXrender
 	alsa? (
 		media-libs/alsa-lib
 		media-libs/libsndfile[alsa]
@@ -40,15 +50,22 @@ RDEPEND="
 		media-libs/libsndfile
 	)
 	bidi? ( dev-libs/fribidi )
-	truetype? ( x11-libs/libXext )
+	gdk-pixbuf? (
+		x11-libs/gdk-pixbuf:2[X]
+	)
+	!gdk-pixbuf? (
+		media-libs/libpng:0=
+		virtual/jpeg
+	)
 	xinerama? ( x11-libs/libXinerama )
 "
 DEPEND="
 	${RDEPEND}
 	$(unpacker_src_uri_depends)
+	dev-libs/glib:2
 	gnome-base/librsvg
 	x11-base/xorg-proto
-	truetype? ( >=media-libs/freetype-2.0.9 )
+	gdk-pixbuf? ( gnome-base/librsvg:2 )
 "
 
 BDEPEND="
@@ -76,7 +93,6 @@ src_configure() {
 	fi
 
 	local myconf=(
-		--enable-gdk-pixbuf
 		--enable-logevents
 		--enable-xrandr
 		--with-cfgdir=/etc/icewm
@@ -85,6 +101,7 @@ src_configure() {
 		--with-libdir=/usr/share/icewm
 		$(use_enable bidi fribidi)
 		$(use_enable debug)
+		$(use_enable gdk-pixbuf)
 		$(use_enable nls i18n)
 		$(use_enable nls)
 		$(use_enable xinerama)
diff --git a/x11-wm/icewm/icewm-1.6.2.ebuild b/x11-wm/icewm/icewm-1.6.3.ebuild
index 869277de7f94..4c87bc3f6120 100644
--- a/x11-wm/icewm/icewm-1.6.2.ebuild
+++ b/x11-wm/icewm/icewm-1.6.3.ebuild
@@ -12,7 +12,7 @@ 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 nls truetype uclibc xinerama"
+IUSE="+alsa ao bidi debug +gdk-pixbuf nls truetype uclibc xinerama"
 
 # Tests broken in all versions, patches welcome, bug #323907, #389533
 RESTRICT="test"
@@ -22,15 +22,25 @@ REQUIRED_USE="|| ( alsa ao )"
 #fix for icewm preversion package names
 S="${WORKDIR}/${P/_}"
 
-RDEPEND="
+# 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/gdk-pixbuf:2[X]
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+"
+
+RDEPEND="
+	${CORE_DEPEND}
 	x11-libs/libICE
 	x11-libs/libSM
-	x11-libs/libX11
 	x11-libs/libXft
+	x11-libs/libXpm
 	x11-libs/libXrandr
-	x11-libs/libXrender
 	alsa? (
 		media-libs/alsa-lib
 		media-libs/libsndfile[alsa]
@@ -40,15 +50,22 @@ RDEPEND="
 		media-libs/libsndfile
 	)
 	bidi? ( dev-libs/fribidi )
-	truetype? ( x11-libs/libXext )
+	gdk-pixbuf? (
+		x11-libs/gdk-pixbuf:2[X]
+	)
+	!gdk-pixbuf? (
+		media-libs/libpng:0=
+		virtual/jpeg
+	)
 	xinerama? ( x11-libs/libXinerama )
 "
 DEPEND="
 	${RDEPEND}
 	$(unpacker_src_uri_depends)
+	dev-libs/glib:2
 	gnome-base/librsvg
 	x11-base/xorg-proto
-	truetype? ( >=media-libs/freetype-2.0.9 )
+	gdk-pixbuf? ( gnome-base/librsvg:2 )
 "
 
 BDEPEND="
@@ -76,7 +93,6 @@ src_configure() {
 	fi
 
 	local myconf=(
-		--enable-gdk-pixbuf
 		--enable-logevents
 		--enable-xrandr
 		--with-cfgdir=/etc/icewm
@@ -85,6 +101,7 @@ src_configure() {
 		--with-libdir=/usr/share/icewm
 		$(use_enable bidi fribidi)
 		$(use_enable debug)
+		$(use_enable gdk-pixbuf)
 		$(use_enable nls i18n)
 		$(use_enable nls)
 		$(use_enable xinerama)
diff --git a/x11-wm/icewm/metadata.xml b/x11-wm/icewm/metadata.xml
index 43abc08bd4b1..7b0cfd7e0829 100644
--- a/x11-wm/icewm/metadata.xml
+++ b/x11-wm/icewm/metadata.xml
@@ -5,6 +5,9 @@
 		<email>polynomial-c@gentoo.org</email>
 		<name>Lars Wendler</name>
 	</maintainer>
+	<use>
+		<flag name="gdk-pixbuf">Enable gdk-pixbuf rendering</flag>
+	</use>
 	<longdescription>
 		IceWM is a window manager designed for speed, usability, and consistency.
 		It is able to emulate the looks of Motif, OS/2, and Windows, and allows you
diff --git a/x11-wm/marco/Manifest b/x11-wm/marco/Manifest
index ee89959ab7f7..dfe571142938 100644
--- a/x11-wm/marco/Manifest
+++ b/x11-wm/marco/Manifest
@@ -1,5 +1,5 @@
 DIST marco-1.22.1.tar.xz 1357864 BLAKE2B 241e71795acfdcbf90070ef0d14f0cc55894a5cddbf48bd8741cf9580cfcaa035890b23a2182738875ce4d89d099a80d59aa7b1937e4a34a18a5a969830e7db9 SHA512 18093f4d419fbc90f957a04ec3e36a153b3c51a6bcdc1ac5884adcc0292f157bc5e4af51e171451a4b54b5bccffdee2e8a07ed13dafb6106773abfb06b6a8a4f
 DIST marco-1.22.2.tar.xz 1366104 BLAKE2B 6caa7da12c32b8adcc6d3ab4525fcf9e892585cb528bd73e47af1e2eeda2c31d174e55acd98f9a4759e22176fa06aa13d8a6ef6a6b2cc82d11bed27b156d6739 SHA512 96665120dbc698c78795eeaa559ae2bfd2a3c7ed4846e40bcfb1d6dfc8d7e359b860e1e715085a17e11c66ce7f31561d372da8372209c21c7b1ce6029a3f5ea1
-EBUILD marco-1.22.1-r1.ebuild 1427 BLAKE2B 2d16fd758026a09c38811d70231f0da7aa3f2348fb21edb176e8aab85ca7620944b99b790adf9d02d22a9c69c4d6605a653f8fb328225e62b7e3f83a214bdea8 SHA512 cb0889144a3b534dc1cc9e3793e79f1c1752bb23e205a4161da9bd9854ca180e5cb47a6ca752f191d679013344fd18bfd0fbf3d41ddf09e9dca1412ce33f6fd2
-EBUILD marco-1.22.2.ebuild 1429 BLAKE2B 17fd76fc4cfcfd6570ac90667da481435a766139f8d530c23371812618129209c1436b63654f885add81f109af1b924f01db3d3528311724aa690e9e0acfa951 SHA512 279bb197b2ae0148fe335893d4ca8bdb587accf1478c374aebd37a90540dce0ec43f2351c09017dd3112c95801795e6474e5d83677c01a24effd163c747e392a
+EBUILD marco-1.22.1-r1.ebuild 1454 BLAKE2B 53ed1c98621ad69fe6653f96a15d70cd508d1572f81c51eb8f57019c5bb435c80f6ba2762b45d7758ee91508926d2082d57c3dc3ba226e251835e7c334507c6b SHA512 5b2f331b387f279eea544589c7f2fc91d4f1ceb905e9694b28a7e382e8bd080e504eb386abf9c19e4d11fa2306653ebd9d835b40b62384d782ece5a681511791
+EBUILD marco-1.22.2.ebuild 1456 BLAKE2B 3796b983fb64d7284f8ff0be2198cc79049936781abc6f5ac70265a4d0ab2750212227c1bc4ee43bc9b6b3bacf6b965e2949348e5d70ec5f35cddb159d915888 SHA512 9c4bcb7c3bc31cd7e43db200b617d18caf5887ad21c939dbaa90eab969859750a020c6a468dcb76a35eedc42538c11ce214a16fc49a085363d3c2a5dd446a225
 MISC metadata.xml 334 BLAKE2B 4a521e1c77d597f68a11cdaa695afcb40a5a2670a7fd643db0999362884a0bad7fb8106b7ba479a939930fbf0323c7f22186cf3fca5583210227a819631ead5d SHA512 f55f007780c371bc133eb3b8eed1bb4f930cab1e29c9ff0ab2dd99cd2e1458058dc86bf3fd70e9f4e9f1db259a7b8a5a247b04282ca08e88d767ee2f1878a451
diff --git a/x11-wm/marco/marco-1.22.1-r1.ebuild b/x11-wm/marco/marco-1.22.1-r1.ebuild
index daca97294de1..1390d88f009e 100644
--- a/x11-wm/marco/marco-1.22.1-r1.ebuild
+++ b/x11-wm/marco/marco-1.22.1-r1.ebuild
@@ -16,6 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 
 IUSE="startup-notification test xinerama"
+RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
 	dev-libs/atk
diff --git a/x11-wm/marco/marco-1.22.2.ebuild b/x11-wm/marco/marco-1.22.2.ebuild
index 2aebb9ee0bb0..9745be329973 100644
--- a/x11-wm/marco/marco-1.22.2.ebuild
+++ b/x11-wm/marco/marco-1.22.2.ebuild
@@ -16,6 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 
 IUSE="startup-notification test xinerama"
+RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
 	dev-libs/atk
diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index 904fc0517da3..1ab415c75477 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -3,7 +3,7 @@ AUX muffin-4.0-cogl-configure.patch 717 BLAKE2B bf55437c4a3c5b41fe4c9dc4bb0a7e58
 DIST muffin-3.6.0.tar.gz 2720809 BLAKE2B 9d1b92907d545990b409c15f9e9e3bf7b3871cc545d02234296efcb15f0082fc630c3a06849789c5e5aed4af9253e6893cc29feb7590aaaaaf2eb38843591c8d SHA512 d077f1310d7600754c9b4f77fc2a82377aec43f9a1cc0b95e28118764741922a58f2348418bee309d8c7fd1484b97ddc898d0105fa1a3fcd855d2fcc68f3679e
 DIST muffin-3.8.2.tar.gz 2723114 BLAKE2B f8218ac1f71ecfa5b74ca7ae8cf76d76e1207e3ce65f715643d477d2fb6429390671f3b05132a64f23a1853297f71563a62c052555f8a26d084469814972a64d SHA512 62dbfb602dd1164779e365e5e6f782431a491a254dcec8faef8a50f27f50cf7b0f8ab958b6df3b75d6b15edcd90c23a2fd6cc18cb11a2a513e669169f09cba05
 DIST muffin-4.0.3.tar.gz 5194156 BLAKE2B 8d58d37f8410ad5384c09a4edabd3ca5bd8a3a612825ded55bf625a9a8c2ba8aba295187e3eb727fc248716b3efe84e9a567a49f95635150c4bda5f309545ed2 SHA512 34a3f152d2701e06498f2de28639af656bd4efa6c7d5c56244fe9002cf769e929fc2360bd036509318fab9c4fe73c976605c3fdb444c9280f52e6db27867a14c
-EBUILD muffin-3.6.0.ebuild 2047 BLAKE2B 91bef2b48265f8abb8e72430404ea3b5bb86a9fb7603f7a5f6eca1ce04888a5693c42773abce631544083f0ac33075bb6b1f53ada813cd3249736671a6a38571 SHA512 3c8f33c6760d08a48b9d5cb58ab58afddd6294beabfd46653e5525db99a66abbbe69ad98f0ba14f4bbd8e05e093f1e480bea8948f00f27c8956b7b02a90b9314
-EBUILD muffin-3.8.2.ebuild 2049 BLAKE2B 787f368ec25ce0ba32712fee1304c575e1727f96e0867d2122cec4b303bfcb736e948adfe1db55761790c2d3605bb618450f85e1727c146e8b23c6ea85857b85 SHA512 a7caafcc86ae7fc2327eec12e445e86056cdc080d2ec8870cd67e74e80890b1ed1fd50fe41dbed23c54e1a57229d9f41447dd52136b9453ef29e4cadfd187de9
+EBUILD muffin-3.6.0.ebuild 2071 BLAKE2B b7320fad755139626fa8bd5537f7bd843e5197634181114e4ddd90fd95c2ae8f491eb13fd13a054dc63ded111e1198385281dbbe0197bd5af340b05eacb8abcd SHA512 546f4da140161e9d26f5bca3eb29b987af74495c778a676fc61a5df9e301f111db1118a0d5f5daf41b023adbd51de0daebd453d353c877e644ec6235d0ceb086
+EBUILD muffin-3.8.2.ebuild 2073 BLAKE2B 438bf3146521c9bf5c4b7b946451488482c9f11d1fa93813fa2cf1c8bc7881f75f3adcb2583efc8d7a09f1bba0f400b4ac746ae3eb110a63c44ca8611132997d SHA512 204c67ef33f5f5922e19e94ef5847b8d6a098fb4385bad819ba6e4fa17b38d36212fbb38d9bbb1364cddd45bf427e6e5aed85fc18236de7600c8b12f64a43ccf
 EBUILD muffin-4.0.3.ebuild 2026 BLAKE2B cc032e3a46a86e52a9b235a6df018cb50028987de9e91d40fa92fb240011eb322fa6b265dd4b79290874430d61bbcb9e0df1cb57b953557e6fd332debc4c2d90 SHA512 80d397c253b6ffe00b9420b99a650df2f6e77b1e150d083828e99b68ca8a88c8a0c30fa41ec81b3b80b04ac4e112a047c406e60ee219a79b673a5b915e3adc14
 MISC metadata.xml 333 BLAKE2B d29a873cc8702d8251ff425eca5ec16b4ea2a75f4e512c05513c3a6a61e38e0fde4450158503cdb2e71b324c86a7e66e03c1eecba8bff6a6be81244f040ceaad SHA512 42c7d8e82dd95e76e6b72973d53a0a27de2562108b5989092c34804140d336dcb20b331a4c70b1fcf6730ef5f377f366f480271597c63f7ce3e8f7aa8d359555
diff --git a/x11-wm/muffin/muffin-3.6.0.ebuild b/x11-wm/muffin/muffin-3.6.0.ebuild
index 5c2e5abbdfbe..7c819c0d3e1a 100644
--- a/x11-wm/muffin/muffin-3.6.0.ebuild
+++ b/x11-wm/muffin/muffin-3.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,6 +11,7 @@ SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="+introspection test xinerama"
+RESTRICT="!test? ( test )"
 KEYWORDS="amd64 x86"
 
 COMMON_DEPEND="
diff --git a/x11-wm/muffin/muffin-3.8.2.ebuild b/x11-wm/muffin/muffin-3.8.2.ebuild
index 1b8f08d29402..75b55dec4d10 100644
--- a/x11-wm/muffin/muffin-3.8.2.ebuild
+++ b/x11-wm/muffin/muffin-3.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,6 +11,7 @@ SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="+introspection test xinerama"
+RESTRICT="!test? ( test )"
 KEYWORDS="~amd64 ~x86"
 
 COMMON_DEPEND="
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 915fce04dedf..02997052c4c4 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,5 +1,7 @@
 AUX 3.26.2-non-wayland-build.patch 1035 BLAKE2B 7c9beb268c2f1b5784bbb2b44d8199f9821462c0be7678b69c9feb05171f46a2ccf96c18e8ed45b32c7ce576a7693839d03a90b4beb787f5291e7853b28b514c SHA512 88bda28953ba08bb6cf7847de49356d7896d554169d0039b599963eb333a0c688b49dc9d55c8b8e497b15d54ad3bed495bf18ded00d09d6510bb399d20750ca0
 AUX 3.28.3-no-gles2-fix.patch 1442 BLAKE2B f5cdaa84bf635d3f729f77ab0d5150a35c19fb52df5fad3a2b3fa7fe7d87cc36ab31f302fe0170870e9471e0ede55875a7d741be920e884f91406334477a495d SHA512 534915f1646773182c2f724d7c07b5e92b95549627d5d5cb7efc8222209d7c990e27fff40e997f189de22409383ff71d0a05e5f4c9379697aa09a14d7aacc4cb
+AUX 3.30-eglmesaext-include.patch 2013 BLAKE2B 35f1976d73bf4190896a85346088ef98a396d28ee68da3562c5e049cfa7c7817c0abf5cbcc41f65ba535245fff05164d59da3c32d25ecfd5ee5b0e7464ac3f0d SHA512 856db08f41c77bcc72109646cd327b46fc2696e3bdebffd66b036297174b9f3f0f1eea0e95458280fc598bc533814669cdac6cffe9188b42838801aaea8f8a17
+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
@@ -7,7 +9,7 @@ DIST mutter-3.30.2-r4-patchset.tar.xz 44820 BLAKE2B 2448dcd6bca338dbe2b87a93ca43
 DIST mutter-3.30.2.tar.xz 3725692 BLAKE2B 280b7a6319e5d4705baee965936df6f31ba8ca96ce3812cf640578c6817aaa82b6ff8fde7b2740ecd8edb6c4746f4608f997772a24d67f12fcb0c5c77fc9b29a SHA512 3890270b7eb4b8753274d30ad26693b829a69b31f36501845c59b000deb174be58b5167f6754767dba02ebc44688697fbe7344a327879a073955047b69333a2e
 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
-EBUILD mutter-3.26.2-r1.ebuild 4082 BLAKE2B 3523b775405ff372d8ee13f84f75264e6b79b4b1a9e1e9873f7e13921033a8a5489be6b48d7f7a086b06b39db7cbcaa5ed545c446d109e0ef7d79c45f1f85243 SHA512 1985c0798f2dbffad04ed461dafe0ae02a3ee635feb7b9cad5308c51eaebcdb66d630e7ad7c4e1a57fa5fdda438a6682ff32186700fe78b4399807a492b51303
-EBUILD mutter-3.30.2-r4.ebuild 4866 BLAKE2B a4a73ae8eda0c858baef747c90c8ed0f31a8d5b55d37f8386b398b69beee3d56c8374098abbd91276aa3ef6a1e7c32f41ddcdc115bf6a2c88b475b6122c357b0 SHA512 cee4214b253c458686f626baf1a0bfe7067d635883964f76623a82a7ca3475d9d5e40e8a4977a80da63a71ae43f14493d28e4b9e5584fcf5ae431fa60c95a65a
-EBUILD mutter-3.32.2.ebuild 4572 BLAKE2B a1c621f50cede09389c655f493f6525bc4ee6e4f3e426ce21a4a4b80d9457d89646f29b5563a848c46b2eb77ac57ee21a9417bb3910de0b80a28f84defc188b8 SHA512 d67fb6e699a6caf6d0d79862b03da25bfe7efe45e026cce0cea23f22909a7f30a68aff51cc5b50745384d40fba882a703fd22731f1f64d893ee09d58ab7aa6c8
+EBUILD mutter-3.26.2-r1.ebuild 4109 BLAKE2B a4073e48c06b2185bf37a22c509c1959c0855cb838151d91d9b697e4679bc7ec9438b92eaa6499ecfa0f6e389415254b64621d24efa6df9c0abc1a8711ec7c14 SHA512 05266bd54e4bc87fc0bab475354dae4670da1c1d64a6db7cfae3dace6069b78515c5a904d6542cfc471f5cc056b2204dbf95cdabbdf5d49e7854b0c98d8e3592
+EBUILD mutter-3.30.2-r4.ebuild 4939 BLAKE2B d5de93e534ce0aa95ecf522144b1339165341da4c40625f76e89b448b44daaea9ba2e239f3b07895f776c8d8d6ab75f53bc398428b9b7415b8d2252cb45936b0 SHA512 58c1617818b288f9a0a212979d12e7ba841ca77faa16aa349d29a304209e30cb85fcc08c6a223f9ed0e59f9967f96d5e3807ab27aca67d26a00ab72dbe5458e5
+EBUILD mutter-3.32.2.ebuild 4616 BLAKE2B 8cd6df26f4acf74802c805735f5055eab857f32532b4ed267e1aa5b87120b6dff51d88e78c54d1745dc3244323c291c26a8abc9693a184ebf43730cb20357109 SHA512 68a16d5a4282d3db04c24914bedbf1e413910f4519db96dd5646bf1fa971c7f07c606803df34ac6c0c3bcd687f41fa8d09f1d9b099bf0a09c44acb78d016431e
 MISC metadata.xml 552 BLAKE2B 1e0ae54a432b5f0882ec17726ae8753e0168a8191c57fe204f7dbbd54ead1eb543224a46e42644508b7c69d6969d8849bf80dd16f0af2f5075f1942725851e40 SHA512 cf8d304399b4af16bcfb43c5ba3b1ea94ea9bf92be925fab584b4febf8ede21bb0f95dd590b12e1a5528f48372792da2ca31c5c469ad443c7fd20e5b8f7cc700
diff --git a/x11-wm/mutter/files/3.30-eglmesaext-include.patch b/x11-wm/mutter/files/3.30-eglmesaext-include.patch
new file mode 100644
index 000000000000..884d57cc6f05
--- /dev/null
+++ b/x11-wm/mutter/files/3.30-eglmesaext-include.patch
@@ -0,0 +1,69 @@
+From 813ea4e5743920ecf325aac8efe420bd5fe3baf2 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
+Date: Sun, 20 Oct 2019 12:04:31 +0200
+Subject: [PATCH] EGL: Include EGL/eglmesaext.h
+
+The eglext.h shipped by libglvnd does not include the Mesa extensions,
+unlike the header shipped in Mesa.
+
+Fixes https://gitlab.gnome.org/GNOME/mutter/issues/876
+---
+ cogl/configure.ac           | 3 ++-
+ src/backends/meta-egl-ext.h | 1 +
+ src/backends/meta-egl.c     | 1 +
+ src/backends/meta-egl.h     | 1 +
+ 4 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/cogl/configure.ac b/cogl/configure.ac
+index 3be282fc2..f333b0512 100644
+--- a/cogl/configure.ac
++++ b/cogl/configure.ac
+@@ -759,7 +759,8 @@ AS_IF([test "x$NEED_EGL" = "xyes" && test "x$EGL_CHECKED" != "xyes"],
+           )
+ 
+         COGL_EGL_INCLUDES="#include <EGL/egl.h>
+-#include <EGL/eglext.h>"
++#include <EGL/eglext.h>
++#include <EGL/eglmesaext.h>"
+         AC_SUBST([COGL_EGL_INCLUDES])
+       ])
+ 
+diff --git a/src/backends/meta-egl-ext.h b/src/backends/meta-egl-ext.h
+index 8705e7d5b..db0b74f76 100644
+--- a/src/backends/meta-egl-ext.h
++++ b/src/backends/meta-egl-ext.h
+@@ -29,6 +29,7 @@
+ 
+ #include <EGL/egl.h>
+ #include <EGL/eglext.h>
++#include <EGL/eglmesaext.h>
+ 
+ /*
+  * This is a little different to the tests shipped with EGL implementations,
+diff --git a/src/backends/meta-egl.c b/src/backends/meta-egl.c
+index 755ec4908..bd253c956 100644
+--- a/src/backends/meta-egl.c
++++ b/src/backends/meta-egl.c
+@@ -31,6 +31,7 @@
+ 
+ #include <EGL/egl.h>
+ #include <EGL/eglext.h>
++#include <EGL/eglmesaext.h>
+ #include <gio/gio.h>
+ #include <glib.h>
+ #include <glib-object.h>
+diff --git a/src/backends/meta-egl.h b/src/backends/meta-egl.h
+index 060c7cd2d..2fef2642e 100644
+--- a/src/backends/meta-egl.h
++++ b/src/backends/meta-egl.h
+@@ -27,6 +27,7 @@
+ 
+ #include <EGL/egl.h>
+ #include <EGL/eglext.h>
++#include <EGL/eglmesaext.h>
+ #include <glib-object.h>
+ 
+ #define META_EGL_ERROR meta_egl_error_quark ()
+-- 
+2.23.0
+
diff --git a/x11-wm/mutter/files/3.32-eglmesaext-include.patch b/x11-wm/mutter/files/3.32-eglmesaext-include.patch
new file mode 100644
index 000000000000..c91c56235f31
--- /dev/null
+++ b/x11-wm/mutter/files/3.32-eglmesaext-include.patch
@@ -0,0 +1,68 @@
+From a444a4c5f58ea516ad3cd9d6ddc0056c3ca9bc90 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
+Date: Sun, 20 Oct 2019 12:04:31 +0200
+Subject: [PATCH] EGL: Include EGL/eglmesaext.h
+
+The eglext.h shipped by libglvnd does not include the Mesa extensions,
+unlike the header shipped in Mesa.
+
+Fixes https://gitlab.gnome.org/GNOME/mutter/issues/876
+---
+ cogl/cogl/meson.build       | 2 +-
+ src/backends/meta-egl-ext.h | 1 +
+ src/backends/meta-egl.c     | 1 +
+ src/backends/meta-egl.h     | 1 +
+ 4 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/cogl/cogl/meson.build b/cogl/cogl/meson.build
+index 261955796..b0e66bff3 100644
+--- a/cogl/cogl/meson.build
++++ b/cogl/cogl/meson.build
+@@ -48,7 +48,7 @@ cogl_gl_header_h = configure_file(
+ built_headers += [cogl_gl_header_h]
+ 
+ if have_egl
+-  cogl_egl_includes_string = '#include <EGL/egl.h>\n#include <EGL/eglext.h>'
++  cogl_egl_includes_string = '#include <EGL/egl.h>\n#include <EGL/eglext.h>\n#include <EGL/eglmesaext.h>'
+ else
+   cogl_egl_includes_string = ''
+ endif
+diff --git a/src/backends/meta-egl-ext.h b/src/backends/meta-egl-ext.h
+index 8705e7d5b..db0b74f76 100644
+--- a/src/backends/meta-egl-ext.h
++++ b/src/backends/meta-egl-ext.h
+@@ -29,6 +29,7 @@
+ 
+ #include <EGL/egl.h>
+ #include <EGL/eglext.h>
++#include <EGL/eglmesaext.h>
+ 
+ /*
+  * This is a little different to the tests shipped with EGL implementations,
+diff --git a/src/backends/meta-egl.c b/src/backends/meta-egl.c
+index 6554be935..fdeff4f77 100644
+--- a/src/backends/meta-egl.c
++++ b/src/backends/meta-egl.c
+@@ -27,6 +27,7 @@
+ 
+ #include <EGL/egl.h>
+ #include <EGL/eglext.h>
++#include <EGL/eglmesaext.h>
+ #include <gio/gio.h>
+ #include <glib.h>
+ #include <glib-object.h>
+diff --git a/src/backends/meta-egl.h b/src/backends/meta-egl.h
+index f2a816445..4591e7d85 100644
+--- a/src/backends/meta-egl.h
++++ b/src/backends/meta-egl.h
+@@ -28,6 +28,7 @@
+ 
+ #include <EGL/egl.h>
+ #include <EGL/eglext.h>
++#include <EGL/eglmesaext.h>
+ #include <glib-object.h>
+ 
+ #define META_EGL_ERROR meta_egl_error_quark ()
+-- 
+2.22.0
+
diff --git a/x11-wm/mutter/mutter-3.26.2-r1.ebuild b/x11-wm/mutter/mutter-3.26.2-r1.ebuild
index 6cf45b571911..412f34a9e30f 100644
--- a/x11-wm/mutter/mutter-3.26.2-r1.ebuild
+++ b/x11-wm/mutter/mutter-3.26.2-r1.ebuild
@@ -13,6 +13,7 @@ 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"
 
diff --git a/x11-wm/mutter/mutter-3.30.2-r4.ebuild b/x11-wm/mutter/mutter-3.30.2-r4.ebuild
index 8f07d9a2c971..12b4bdab7b32 100644
--- a/x11-wm/mutter/mutter-3.30.2-r4.ebuild
+++ b/x11-wm/mutter/mutter-3.30.2-r4.ebuild
@@ -13,6 +13,7 @@ LICENSE="GPL-2+"
 SLOT="0/3" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
 
 IUSE="debug elogind gles2 input_devices_wacom +introspection screencast systemd test udev wayland"
+RESTRICT="!test? ( test )"
 # native backend requires gles3 for hybrid graphics blitting support and a logind provider
 REQUIRED_USE="
 	wayland? ( ^^ ( elogind systemd ) )"
@@ -88,6 +89,8 @@ PATCHES=(
 	"${WORKDIR}"/patches/
 	# Hack to not fail USE="-wayland,-gles2" builds with no mesa[gles2]
 	"${FILESDIR}"/3.28.3-no-gles2-fix.patch # requires eautoreconf
+
+	"${FILESDIR}"/3.30-eglmesaext-include.patch
 )
 
 src_prepare() {
diff --git a/x11-wm/mutter/mutter-3.32.2.ebuild b/x11-wm/mutter/mutter-3.32.2.ebuild
index 4685bb23716c..46696dc11813 100644
--- a/x11-wm/mutter/mutter-3.32.2.ebuild
+++ b/x11-wm/mutter/mutter-3.32.2.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
 	test? ( wayland )"
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+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
@@ -97,6 +97,8 @@ PATCHES=(
 	"${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() {
diff --git a/x11-wm/openbox/Manifest b/x11-wm/openbox/Manifest
index 7ac3c0a1e750..63cef81d8e06 100644
--- a/x11-wm/openbox/Manifest
+++ b/x11-wm/openbox/Manifest
@@ -2,6 +2,6 @@ AUX openbox-3.5.2-gnome-session.patch 574 BLAKE2B 64d1d141245172140c16e7d4bee919
 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-r1.ebuild 2584 BLAKE2B 95dad82aebe611f66b5b4e6bf949faf3b2ea1ef8890c06733f603097ec88fc9284a9935cc5d61c7b432b11bb42744632f2ec687f380d53b914b6f72db0556f42 SHA512 3b82c0e85f29e7a7a08fda6a4e07c896e36e39382fab54c8ab0a161c4d8f41c64e7afaeeb80c5b7908c52e5383ef381732b21aaf5cd6cbc43831c58ba3776e47
-EBUILD openbox-3.6.1.ebuild 2608 BLAKE2B 2b7d6ac171c0801bd902503a28fdb07efc9cdcf14926049c27fa1cd91152e4c4cb569b51f2b0d59a7637abc0c65308fabbe2649fd96e2479c18a257244ee1c25 SHA512 4c7c696b8b63145b9e80b51b6510abe31f818ab5bdb33390947b9c34c3c9883d7a2d44b5328214911bef129f2cd36b3f4e1064ea182841c73f855758c568595f
+EBUILD openbox-3.6.1.ebuild 2602 BLAKE2B a2da64beb0666f9d30f45aa25095fa14a7194aaa328b387d111c054a999e1078c2f8ce7ef3ad8e17e7a76bf9ea00f8c2a2d4b7e3a8ee43d712699f86a0741b42 SHA512 41e5e4cec298ef038a8177a92704424e3e32e19a57b3090e5f5dd0ffd91c5a6e338bf9ca7bf57b4d5d5bebd105e6d4bafc6113e88ef68fcb977ed385baa94a5a
 EBUILD openbox-9999.ebuild 2571 BLAKE2B 090fa6460c016b773f261a8b18193c877037eb5d4010fb7d4f559d6577c478010f327ea792383ab60182a746281c96ffbc10cdd07ae7875cdf4a4ab82f12f868 SHA512 e86a5a5cee36e22f8cba4f1438f65d29e39acbca9e3c99599ae9ac56535b1340d7b5ecb675513d818a1f1a2a27dc39842b2b231107a08bdb3536385aac3e0dc5
 MISC metadata.xml 719 BLAKE2B 3236c3d611795444ade10b779d3453ab3e3823654ce11e2b0a961f360b40b443806c41f84a015d5ec4f6f0b14058002f286ec899a0714ed339c510ec00d68230 SHA512 b43b7e174748e26c812a0549c924ca01ce892177a7964c3cd777af9096b68c21e869278a3f05c613f9e071fdcd4804d837cfe04bc1b2c19a2ce1fe6b2d9db127
diff --git a/x11-wm/openbox/openbox-3.6.1.ebuild b/x11-wm/openbox/openbox-3.6.1.ebuild
index 4fee4c0952ca..35d268b94df5 100644
--- a/x11-wm/openbox/openbox-3.6.1.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1.ebuild
@@ -50,7 +50,7 @@ DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
 src_prepare() {
-	use xdg && python_export_best
+	use xdg && python_setup
 	epatch "${FILESDIR}"/${PN}-3.5.2-gnome-session.patch
 	sed -i \
 		-e "s:-O0 -ggdb ::" \
diff --git a/x11-wm/sawfish/Manifest b/x11-wm/sawfish/Manifest
index 0d6f822b0bd5..4faf03b76e69 100644
--- a/x11-wm/sawfish/Manifest
+++ b/x11-wm/sawfish/Manifest
@@ -1,5 +1,5 @@
 AUX 50sawfish-gentoo.el 366 BLAKE2B 5d068cfae8fd522037656d009a2007188ab272d4ea0c541d6b389b1f87cf7b209bfd54cbdb0677e80ae34c31fb3fadb767f4f890fc51fb0412aebac308429dca SHA512 a05fe8328ed42c11fcf7ce43eac8278e53d69610a53118283d1292c89c690aa85b43090cbcfd0995a9e2e92cb61277848404a27b1797e33c80ad09db752d8ba5
 AUX sawfish-1.12.0-desktop.patch 839 BLAKE2B cbc68895b979d5d0eb794f95a6e002f4807cd7712be992bdfe7d20bfc5fe6bfcf8a1c0407f8a1394ad2bfed8fe5663745edd761a7d41c0ced226f400c414a7d1 SHA512 ab96ea42c01e1fb2bde192f55273fc647a6fd9904c6bcd05303eea03dc306dde90c152ab7dfea003a50441dcd344f37478e184d9a9c1124961b96556e3aab40d
 DIST sawfish_1.12.0.tar.xz 2814340 BLAKE2B 58901cf62d10641ef32756a3283c6d53b27a68a4af7c578c49e6968045f5993f744eb0b6c7b81da08b91774f1fb8faec467a6a22cd046a2fea135f749ac24319 SHA512 e8f831a9f6206ccf4e2a823bc3464c11b9d2d38a72ada4a142f952813a56c620b511f9cd8912bbf06e38976e54f1d9445f68d6dd24ee5ed59918c18de379e71f
-EBUILD sawfish-1.12.0.ebuild 1993 BLAKE2B c215ab62a52a75c827ce8b76c07da06a4b3101cec86651255792b446f0ceef19fe804a56f5b7a30cfa370bac6fa4efcb663eaad4967a07422d2a7cd503f76d79 SHA512 1fc01c0a4c0e8f691035989cbfabdc2b5d7857ae5277f0a2f0341466994afcdee10cdeee303e6e0499989ccc2409fbef665dbd33587136b9c99fef0f14d312cd
+EBUILD sawfish-1.12.0.ebuild 1974 BLAKE2B 0ac1c8e5cebb2cc29ad0ee65c4ded5d6ca87822eb5335bc15ea7aab13f2b0e2dc24af42517f3499c9939a17954977ba28c9c8046fe9eb15312c26b6b6176a0f7 SHA512 553bd0c1b176c02cd06c27e9a984363f344baf282be70217a7db04d1165e1538d02550a8b3259b0ce365301158f22bcf8fa2532da70d09e45d036b41a662029b
 MISC metadata.xml 357 BLAKE2B 7ff08550d41c65ecf933abf4a3c1932a06f9462016ea8cff09145c713e7017dd68dd5e6473845eac654e0ae1fdded17e6b92b36a4f97db539524dfb67b5aec4f SHA512 ab28ed64d52513cf76bea32b2f289dedab2420e91592ba31d2917efc2d7868a4bf949067562594254a601e62885cf530d7ec00404cf62dd4705b7ac1a892ba9b
diff --git a/x11-wm/sawfish/sawfish-1.12.0.ebuild b/x11-wm/sawfish/sawfish-1.12.0.ebuild
index e59ea8fc3e5b..cb45251a0829 100644
--- a/x11-wm/sawfish/sawfish-1.12.0.ebuild
+++ b/x11-wm/sawfish/sawfish-1.12.0.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="alpha amd64 ia64 ppc ~ppc64 ~sh sparc x86"
 IUSE="emacs kde nls xinerama"
 
 RDEPEND="
-	emacs? ( virtual/emacs !app-emacs/sawfish )
+	emacs? ( virtual/emacs )
 	>=dev-libs/librep-0.92.1
 	>=x11-libs/rep-gtk-0.90.7
 	x11-libs/pangox-compat
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 775f83d7eff1..7ab08671f486 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,9 +1,12 @@
 AUX xpra-0.13.1-ignore-gentoo-no-compile.patch 485 BLAKE2B 2c4a9c0d0fd6e9542abbcd7834d487ca64018b43ef365478f18d8959f0602dd1f4a50f48332487aa413ad4b4f8a91946494ef223b1b2b2c887400e7f7077f429 SHA512 244d6aaa805ef0f99238a0f1ff592efc9fda9d7c3898c0e3ff8a40bfb2d27597737e941b90d1d86c794a50dc61ade8862a4be97ef4938005b0f918565dc7abe9
 AUX xpra-2.0-suid-warning.patch 617 BLAKE2B dc7f1ba0ec9e30e260601f1151edb43855619a1c34bc29c05536c4dea30c8131179ea17ca30ce3ae2c87d7b374f7a02a5afcde89b6bf29921fc0a9de457e3d54 SHA512 f0d69a6e57435d6c9ef1ecb10e9fa6916b2a8b11f5979b7dffcc37c0a8ec387306b651d50ca3fe10a489cb28f6c2384fbe578510bd7f9bc7a51249e66c4d17ab
+AUX xpra-3.0.2_ignore-gentoo-no-compile.patch 610 BLAKE2B 963b3b61602f6a7ad7c8247109932d0da7eeef2762eaa8a987a8f10178a13cec3255000661bc7e3344319a555c9f0ed41b6383be7728af543cb5d2e004c377b2 SHA512 ff16637dca766ba2d36351e1aeeb87f2bab02e73e8da8fdb566051727b0c6fec6df1925318eee8d1c87580196ec78f0303da56d3439b4b4bace3105a914251e8
 DIST xpra-2.2.2.tar.xz 2195836 BLAKE2B 39d8354738df399d98248a0d455c3b7fa6124f374f0f6e0a476bae53b9728b9ab16c11bd759b6ff52a28295445809fb18b3379b7fc620f0916944f738a00b280 SHA512 5c09e29732c9ca7d03557e4e6070517b192484e67944532d5aeca53e518c8617f7d3a5919a2557050fbb9aa4123a0302a53720dd7036823db83588264dd3e6d2
 DIST xpra-2.2.6.tar.xz 2198720 BLAKE2B 41f238e98dbb60598cffcc3960375a525658c72db478acace0acb964fe3ee039acb5e352a76ffb5724b6c4acd63ea510505f6841f688c67d0ae2a3cbc2270642 SHA512 f47b7a8b08fc90bdf3cba91e4f7343785cdf6e24a0979f4564e9f6885b0f36c03ff5656e2d7ac5fd21895faca7b00e8839ebd66c82122a2c7cab2b40bd44e745
 DIST xpra-2.4.3.tar.xz 2434852 BLAKE2B 3d2dd4d8a64a20a88004a91f95d8e6165f45dac7a3d725f41c437d605f55bbd903284e7e829e02c1e94e33c3777ce660c55b469fb5b1f6c5025853b0cae1a6c3 SHA512 5174f7852571eaeb6c2fb629aa2686e19bff7251622ff08903af188989f132b73e4509c98edfac9cddd0f582e63d0ffae94442111a7bfcef8013b3fc87dffd54
-EBUILD xpra-2.2.2-r1.ebuild 4047 BLAKE2B 0188064f36f179c378a29c0eacb418177eac49ecbe9ea844cb7638ba1e8719b3b09dfa6d9afeaede8a82161b67051c152e9186994fadad421afbd3d6872cdeb7 SHA512 f075fca9a968d24c03136ccb90c059b7ba18ef84f9beb8916f65d5534c0ad804abffd648bf9549c4892a468b59d8277c2827e58b15664140497aa1617ea934c6
-EBUILD xpra-2.2.6-r2.ebuild 4095 BLAKE2B 0e1a4646024233f18422a27886d2da0816ddafccc625aa8a2aeea7aef9078e4e8c0abc4b680ecf1aff53f9bad88a2503709bf389fa43a53ff7b16c3c03708102 SHA512 ffa6e3a20e9f753cbe5f20af611b552f5eb605deda06d82b06642053b6fcffda1b806703763024e902be8007f8962773b39f9e9591ea1a9cb6e48592c2310f46
-EBUILD xpra-2.4.3.ebuild 4134 BLAKE2B c524d54cd55ef9f76e0c61046bd22b9225c7608b165fd3b9e8138ab9c5e37f9c5606b405a5d547810296e0ba52d3e3139c539fb3ae6d6750826be37d30324e17 SHA512 5f96ccad721365b11190b6a5a164b2590cc48134ef00440b6664cc6f83c58755c8573a5f7200080164410b2768469ccd83d43501bebf07dac4f5a53718635769
-MISC metadata.xml 979 BLAKE2B a73af09dd3e3c794df8214545c7fd32208cd567de64bc25d5f23ef950ca99931b37f21265a8d2ec1f2e919463e9af44e01ff2fd52e29734a96595540d28a384c SHA512 854b7708a2b1bcccb19f42bd850a8a7ea31b1dad69ba40961dccadb5ab3c8c82ec65b2491f2a353b59a6591a65f5f971154b9d680a525db2cd82442c7654a723
+DIST xpra-3.0.2.tar.xz 2749196 BLAKE2B 3c8745657a12637704fb88ac7b867ab387ef7ed2250396d9e534aecf81e40f85332a2c51ba49638834012f4a4d85c03bd7e49ee259bb2400aeb60fb06abf8b59 SHA512 115f606ff5886d99a906f318cb1a7a4a86e80ebf23e4336e67938267d92ef624de577cc8fc06c6ce541b7c44a0cef58d930b5928f32e24dfc67c72127c7b623c
+EBUILD xpra-2.2.2-r1.ebuild 4074 BLAKE2B 6e3faee346e422a113ba09c8cf355caa2ecc41c74c2ab1d720b32e6a3b051ba8b156785bc2c0a872ba186a18af2dd370b668dc512a4cfe3fdc6f421d9c16ae52 SHA512 24476f6100dd733d61316d695d644337b4c3bfcbd405cddc9429496fe64502a6605157a648c5417045db9b75c21343e072d87f12b239ed31c0289a87f96c06f3
+EBUILD xpra-2.2.6-r2.ebuild 4122 BLAKE2B 661931d507e047c6d78871adf14693b11a499eb05e96afadec6ac93678f890b715bcd884982fa9d76fb5ded069de09f5ee1df9a56d0d1668e25aa0b0d05eb82d SHA512 4a038cffd380329cb608d91ec5372df75fcb01724cf37dd24b10b222a91697d3a53e5042e631bdeb3c430f91c7ede8418aeaa31a9905624030947a55c7a608e4
+EBUILD xpra-2.4.3.ebuild 4161 BLAKE2B 29513d3a7d880f921bf474b5d2994315ba5b78ee38ea6d44ac1891ffd551571b42a5d6ffbdff24149c0df0a6898ae73f5585c3ade877f09475b2d7c2769cd116 SHA512 aa6a85ae73339fd65d7f971da9e77f7fee9803f5056e5273f07c7ae8a66fca40065546cf571fa9a2db8cdfe711f4f1ed86c893be8d0ff0490065f0e0d0ec9de5
+EBUILD xpra-3.0.2.ebuild 4283 BLAKE2B cc64121bc0b17e0304c456fe2bdeed4b87f78dc0604a54a402fc2453f695daf868166c4c0741721ea87da84f7c7648cc81f7601a73cfb633daea816bc2822e3a SHA512 4831ab12404ea3d0f0129c34403508d558126cebfb37cdfdf0339f0e4ce661aba6e143407bae356fba69e07c372ab9f5177f277f353f8b114d74e7a8d5ac2362
+MISC metadata.xml 1183 BLAKE2B 3401d4bc8847e1da6884abaa431cf0c64bc6cd2d1e118bde8b225f8a3670b561d9109cfa248652a71c397a9cdc8d50f6fd83a48ab41de569e03e22e63f5acd2b SHA512 5a48871a51cebe09db53997d61e49ed0828be430f34772b88fc06770bd90a935bec31e0dce7fb78756c337faf9cc1fa4896f5d6d709857fee9fde007ec0b0986
diff --git a/x11-wm/xpra/files/xpra-3.0.2_ignore-gentoo-no-compile.patch b/x11-wm/xpra/files/xpra-3.0.2_ignore-gentoo-no-compile.patch
new file mode 100644
index 000000000000..5823ac8c167e
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-3.0.2_ignore-gentoo-no-compile.patch
@@ -0,0 +1,13 @@
+Index: xpra-3.0.2/setup.py
+===================================================================
+--- xpra-3.0.2.orig/setup.py
++++ xpra-3.0.2/setup.py
+@@ -516,7 +516,7 @@ def cython_add(extension, min_version="0
+     #python2.7 setup.py build -b build-2.7 install --no-compile \
+     #    --root=/var/tmp/portage/x11-wm/xpra-0.7.0/temp/images/2.7
+     if "--no-compile" in sys.argv and not ("build" in sys.argv and "install" in sys.argv):
+-        return
++        pass
+     assert cython_ENABLED, "cython compilation is disabled"
+     cython_version_check(min_version)
+     from Cython.Distutils import build_ext
diff --git a/x11-wm/xpra/metadata.xml b/x11-wm/xpra/metadata.xml
index 9ac095e40d67..e1742788d2bf 100644
--- a/x11-wm/xpra/metadata.xml
+++ b/x11-wm/xpra/metadata.xml
@@ -5,6 +5,14 @@
 	<email>dilfridge@gentoo.org</email>
 	<name>Andreas K. Huettel</name>
 </maintainer>
+<maintainer type="person">
+	<email>heroxbd@gentoo.org</email>
+	<name>Benda Xu</name>
+</maintainer>
+<maintainer type="person">
+	<email>alexxy@gentoo.org</email>
+	<name>Alexey Shvetsov</name>
+</maintainer>
 <upstream>
 	<bugs-to>https://www.xpra.org/trac/report</bugs-to>
 </upstream>
diff --git a/x11-wm/xpra/xpra-2.2.2-r1.ebuild b/x11-wm/xpra/xpra-2.2.2-r1.ebuild
index 5cb93348090d..31e44b5473b9 100644
--- a/x11-wm/xpra/xpra-2.2.2-r1.ebuild
+++ b/x11-wm/xpra/xpra-2.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ LICENSE="GPL-2 BSD"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 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"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	clipboard? ( || ( server client ) )
diff --git a/x11-wm/xpra/xpra-2.2.6-r2.ebuild b/x11-wm/xpra/xpra-2.2.6-r2.ebuild
index 6602c5a6ba85..d8009b90ad39 100644
--- a/x11-wm/xpra/xpra-2.2.6-r2.ebuild
+++ b/x11-wm/xpra/xpra-2.2.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ LICENSE="GPL-2 BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 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"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	clipboard? ( || ( server client ) )
diff --git a/x11-wm/xpra/xpra-2.4.3.ebuild b/x11-wm/xpra/xpra-2.4.3.ebuild
index 246fbbf2f766..f74fe5051c8e 100644
--- a/x11-wm/xpra/xpra-2.4.3.ebuild
+++ b/x11-wm/xpra/xpra-2.4.3.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-2 BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 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"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	clipboard? ( || ( server client ) )
diff --git a/x11-wm/xpra/xpra-3.0.2.ebuild b/x11-wm/xpra/xpra-3.0.2.ebuild
new file mode 100644
index 000000000000..c57900d96ee6
--- /dev/null
+++ b/x11-wm/xpra/xpra-3.0.2.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2019 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} )
+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="http://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 libav +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/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXfixes
+	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= )
+	)
+	enc_x264? ( media-libs/x264
+		!libav? ( >=media-video/ffmpeg-1.0.4:0=[x264] )
+		libav? ( media-video/libav:0=[x264] )
+	)
+	enc_x265? ( media-libs/x265
+		!libav? ( >=media-video/ffmpeg-2:0=[x264] )
+		libav? ( media-video/libav: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 )
+	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
+	x11-libs/gtk+:3[introspection]
+	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 )
+
+pkg_postinst() {
+	enewgroup ${PN}
+	tmpfiles_process /usr/lib/tmpfiles.d/xpra.conf
+
+	xdg_pkg_postinst
+}
+
+python_prepare_all() {
+	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"
+}
+
+src_compile() {
+	# xpra calls `ldconfig -p` during compile to locate libraries.
+	addpredict /etc
+	distutils-r1_src_compile
+}