gentoo resync : 18.08.2019

15 files changed, 251 insertions, 24 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index e00bd8ba485f..77cb5fee67a0 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/e16/Manifest b/x11-wm/e16/Manifest
index 249d0817c5fe..3155340b0371 100644
--- a/x11-wm/e16/Manifest
+++ b/x11-wm/e16/Manifest
@@ -1,4 +1,4 @@
 AUX e16-user-fonts.patch 412 BLAKE2B c3b7e6b0599eb511afe9c6f969f5c529313be2732e4cad2a772c9860427eaf84eb1083fb10ff28853c19a972f734f0b231e78d4862ce5246d9d3bdde6e532c96 SHA512 6fdcbe6191d93cc5c64efb6039cbe9409fd08734a4c99c29482bde06f044b1e6b88c35ef34dc65ce384ecdfb78883022a18885dde6e1bac8ca8192d5f6901c42
 DIST e16-1.0.19.tar.xz 1433016 BLAKE2B 9c27dd6a8d78d2f765b495e5398041a30bf939a5d3926f9f07e022c9bbbc70716b072e40beb6592159f896cc7a15e2fd4e25c8a07db333a80fc8156a82dce357 SHA512 9dc66a4224eacde92c567f9f5b029f21543675207b782077e25f3082ef2133a547eb955fc877b01b2200d99c26148f54a6b59f1ba191163760ecf3b32d5dd374
-EBUILD e16-1.0.19.ebuild 2884 BLAKE2B 83972ec1f7ae0a8eb7d518412891124b9bcd754b650b30cc537c1320b125c3ac6ae2c84977ffc0b5d3e5be2b68e8191fa47daf8812024ded56148478e542d25e SHA512 3dc128379fddbb28909a7f66f44adc8a24cbd789e260bd02bfabf8dc9cb1010476d2b0be7eeadc5479ca539bbddd05c3d5e8188dfb3ab78783615bc76a0aa376
+EBUILD e16-1.0.19.ebuild 2890 BLAKE2B bbabc819922d8f4174e44bb53d3e7c68cf3fcd390f08c276a8b06f8506ebdf4b7b3b05334096343c8797acd235222e9de93bf32dc69dd7876f873ed93e6fe841 SHA512 de0d6644a1a998df765d6e827a48c24041eb3d460ddd8a453b1b043ab8fa9e9337e3e2bd8e3a7ec0466bf8efcc637c3ff0f4d4f87c72e026140186b6d44ce6d4
 MISC metadata.xml 1752 BLAKE2B 49a4d0adb7affcaf5d0f5156bc89057b701ea2ed9c469e3e3ff37720624e5d4f3740934b52537902148e7bde019c04d9b5b41ab341a24447fc3caf1394da4459 SHA512 dc40df2c5cc12d8d59d8446f3cb3195ce9f0ec988ba913f6fb6e3cac429fbe1151432226e170e260aa8e61d08cac13d7bf7f191a1fa845c101e0124df82b9ebd
diff --git a/x11-wm/e16/e16-1.0.19.ebuild b/x11-wm/e16/e16-1.0.19.ebuild
index f76feca9f8b2..8f543706ab66 100644
--- a/x11-wm/e16/e16-1.0.19.ebuild
+++ b/x11-wm/e16/e16-1.0.19.ebuild
@@ -22,7 +22,7 @@ CDEPEND="
 	dbus? ( sys-apps/dbus )
 	doc? ( app-doc/e16-docs )
 	nls? ( virtual/libintl )
-	opengl? ( media-libs/glu media-libs/mesa )
+	opengl? ( media-libs/glu media-libs/mesa[X(+)] )
 	pango? ( x11-libs/pango[X] )
 	sound? (
 		|| ( media-sound/pulseaudio media-sound/apulse[sdk] )
diff --git a/x11-wm/marco/Manifest b/x11-wm/marco/Manifest
index 09204388159e..ee89959ab7f7 100644
--- a/x11-wm/marco/Manifest
+++ b/x11-wm/marco/Manifest
@@ -1,3 +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
 MISC metadata.xml 334 BLAKE2B 4a521e1c77d597f68a11cdaa695afcb40a5a2670a7fd643db0999362884a0bad7fb8106b7ba479a939930fbf0323c7f22186cf3fca5583210227a819631ead5d SHA512 f55f007780c371bc133eb3b8eed1bb4f930cab1e29c9ff0ab2dd99cd2e1458058dc86bf3fd70e9f4e9f1db259a7b8a5a247b04282ca08e88d767ee2f1878a451
diff --git a/x11-wm/marco/marco-1.22.2.ebuild b/x11-wm/marco/marco-1.22.2.ebuild
new file mode 100644
index 000000000000..2aebb9ee0bb0
--- /dev/null
+++ b/x11-wm/marco/marco-1.22.2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 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="GPL-2"
+SLOT="0"
+
+IUSE="startup-notification test xinerama"
+
+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/mutter/Manifest b/x11-wm/mutter/Manifest
index b43ce3837702..82dd1419ddf9 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -4,8 +4,10 @@ DIST mutter-3.26.2-patchset.tar.xz 48156 BLAKE2B 7b33495a8bb7ac69f5610e1dfcb1fef
 DIST mutter-3.26.2.tar.xz 3622904 BLAKE2B b32af24c6ffcd0e6af38ab1ff7cd0ba16ea3ceb84c62ed21d9e38fff5357eda2648050beada3fc8727474407a419a2c218331c8a87f7eb68eddf824d26ca9c51 SHA512 95885b4c053d4bc467a7c11615ee3d1a3086a674ae10e7cb9bb241f692e66dd8190508db1cdf1760bc2f19100e532e68d5e147d344e94d1430d80dd26ca0156b
 DIST mutter-3.30.2-r1-patchset.tar.xz 14096 BLAKE2B 83f2e975a4404b878e832a70fe7a84a2a39d291dc1f6191e5805633327d21fb0796b8b0172a35602bec9c7e879819ebdb189f324cba3f4a4aee232d5e439ba0a SHA512 f842920d6855803b8712e1736399805ecd3266a61dd7baba1f80383978d00533e34fd742103b578f9f2969ab2059f9e0c7b3812d2ea2283b6ffa91810bf6094f
 DIST mutter-3.30.2-r3-patchset.tar.xz 30208 BLAKE2B 502e9c1d005cf268548e2732d4574b0eb7491940531c77c357e73e2da23b60acfbb183f9e818edd86cf0d6abca4e43c2e687db27544bb4fe7e9a33a162df01da SHA512 22b66395ffae07b208efa3a1305c71ea2282470a08300a5c3de23a2a45f03afef7804d5943934028286406adedbb9851dc562f4e57fdff77df22591893f0908b
+DIST mutter-3.30.2-r4-patchset.tar.xz 44820 BLAKE2B 2448dcd6bca338dbe2b87a93ca4374fd5b4cc5d8834dd40739e74a65280b7f00b99d61361082673f5f41e44fb40e36f0889d5ee00fbc034efe87294540fba48e SHA512 a7024b95bc56ab25cfdb27003b4b1fc39925117795c05f78b2d473fdbcf3bb6ce870ee5bc030ec4ce5e10b42d94fa0007bf5870bd2a4e94de3885c9434a39835
 DIST mutter-3.30.2.tar.xz 3725692 BLAKE2B 280b7a6319e5d4705baee965936df6f31ba8ca96ce3812cf640578c6817aaa82b6ff8fde7b2740ecd8edb6c4746f4608f997772a24d67f12fcb0c5c77fc9b29a SHA512 3890270b7eb4b8753274d30ad26693b829a69b31f36501845c59b000deb174be58b5167f6754767dba02ebc44688697fbe7344a327879a073955047b69333a2e
 EBUILD mutter-3.26.2-r1.ebuild 4036 BLAKE2B ac9aba438fa514748247827c3d6eb87b036c36528fad4818292778605de06423cbb9ef1fce00cca51c4a90581f7429079e563416ab656664e5c3a6d7a45d74ad SHA512 d4d168a12dd1fd3b3f32b036808fd55c976a9234d5f4c4d944fd6c88277d72d260c6e23dea57fd86d7e556029c6a5d6619c8af871e06f60598cbf8bc83388373
-EBUILD mutter-3.30.2-r1.ebuild 4817 BLAKE2B e2128d9fe651f03bff0153be4102245a8da5270614b9cec07528d523e0bde4d5cd86b7f3f5c79437cec0425f8414ff5c57d816f06ba0b830520aa1fee4e50daa SHA512 bd965f23aea6eee86f4e647f3a4b38fdcc54b5fd9abf2c9c6971858940ffbcc73e0244b437635a1d831bdb126e78a360c3c57da12049145b799f7f469e747268
-EBUILD mutter-3.30.2-r3.ebuild 4819 BLAKE2B 0331ce71d812745f6c67112cb52dbf81537540fbef1c4b60b98818020b6083bbe33822e6f3d50a74204bf67d6ebca516daadc998d461460427f54b84eeacc23b SHA512 21c5d1ad6d85a1676ee838562c2c989fdbc5cf5c1b957fe2d5e2e71ffd98f2c11fc1f54de6d9f0f93abffb1a2a3a759b7c8398f43c050d1ffa6f6d5df1bf57dc
-MISC metadata.xml 431 BLAKE2B 224bce7cb810d88b198f757a6df09da0ba641a08ec75aba918d0fe4e914a3e572e73a863d88bbbd05ab1be52f10d2b30dc20e3420a79fdaa5893b51e72aea476 SHA512 e66679d251265d2666ef26d927110d647d09dbdf4b6fd1f4f1fbac14a35074bfd77182c78e798cba7e2a4649b2a54c16431620a211f9558f922281c522944b85
+EBUILD mutter-3.30.2-r1.ebuild 4735 BLAKE2B 1900763e23cd4ce19d0a6a8cb9784401f69944ebe5ea0d13ac815b648666c4e34fbfd5d0f0b6974cb38ba1fc5f783bc6725009ec648525c8a46d21a28140037c SHA512 03ac658be19c1c085092a88f60172c01d18a9e6af9c0954a78202a6a609909b22a5df08e786ba665387cd8f3581553395dba8b86d74fed624a0f69db3dbbb87a
+EBUILD mutter-3.30.2-r3.ebuild 4744 BLAKE2B a1247e741936b0e620c320818a7c9e2ad445010312e23720837fc6b97631923581d9722d1e6535bc001f34108da17159c366ff2ae7d55bb44dcf3184cf385ec9 SHA512 e9c8e37faf7cfbce738b6f4f6f816133f77be4f658d0de73301f51a2c447e94825cb77c36010c0ac32135095c42ef7f688348e6c964fde26528d6dad3bf1a78f
+EBUILD mutter-3.30.2-r4.ebuild 4822 BLAKE2B 918ddb2cce457d40990fd1dec775a7885535f6acd10397f571d3902ad1a8d3976f9b7f8564e8e2306df3d16d4413b8026734dc800ee7a208d2663ca27aaec731 SHA512 a4cf62fa0ed50b2e051ede44f34883d0adfe03606036713957db3611792480845b0f895e754fad506ad4b654992eb12e6c84f654864b19ca2731507b1a9178bb
+MISC metadata.xml 552 BLAKE2B 1e0ae54a432b5f0882ec17726ae8753e0168a8191c57fe204f7dbbd54ead1eb543224a46e42644508b7c69d6969d8849bf80dd16f0af2f5075f1942725851e40 SHA512 cf8d304399b4af16bcfb43c5ba3b1ea94ea9bf92be925fab584b4febf8ede21bb0f95dd590b12e1a5528f48372792da2ca31c5c469ad443c7fd20e5b8f7cc700
diff --git a/x11-wm/mutter/metadata.xml b/x11-wm/mutter/metadata.xml
index bd2aac01e71a..4da93b48e48d 100644
--- a/x11-wm/mutter/metadata.xml
+++ b/x11-wm/mutter/metadata.xml
@@ -8,5 +8,6 @@
 	<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>
 	</use>
 </pkgmetadata>
diff --git a/x11-wm/mutter/mutter-3.30.2-r1.ebuild b/x11-wm/mutter/mutter-3.30.2-r1.ebuild
index c0fa10f52b91..bd9ea4cb462f 100644
--- a/x11-wm/mutter/mutter-3.30.2-r1.ebuild
+++ b/x11-wm/mutter/mutter-3.30.2-r1.ebuild
@@ -111,7 +111,7 @@ src_prepare() {
 }
 
 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: pipewire remote desktop support
 	# TODO: nvidia EGLDevice support
 	# TODO: elogind vs systemd is automagic in 3.28.3 - if elogind is found, it's used instead of systemd; but not a huge problem as elogind package blocks systemd package
 	# TODO: lack of --with-xwayland-grab-default-access-rules 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)
@@ -130,6 +130,7 @@ src_configure() {
 		--enable-xlib-egl-platform \
 		--with-default-driver=gl \
 		--with-libcanberra \
+		--disable-remote-desktop \
 		$(usex debug --enable-debug=yes "") \
 		$(use_enable gles2)        \
 		$(use_enable gles2 cogl-gles2) \
diff --git a/x11-wm/mutter/mutter-3.30.2-r3.ebuild b/x11-wm/mutter/mutter-3.30.2-r3.ebuild
index 67f779d74521..a6b546ea6ad2 100644
--- a/x11-wm/mutter/mutter-3.30.2-r3.ebuild
+++ b/x11-wm/mutter/mutter-3.30.2-r3.ebuild
@@ -17,7 +17,7 @@ IUSE="debug elogind gles2 input_devices_wacom +introspection systemd test udev w
 REQUIRED_USE="
 	wayland? ( ^^ ( elogind systemd ) )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~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
@@ -111,7 +111,7 @@ src_prepare() {
 }
 
 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: pipewire remote desktop support
 	# TODO: nvidia EGLDevice support
 	# TODO: elogind vs systemd is automagic in 3.28.3 - if elogind is found, it's used instead of systemd; but not a huge problem as elogind package blocks systemd package
 	# TODO: lack of --with-xwayland-grab-default-access-rules 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)
@@ -130,6 +130,7 @@ src_configure() {
 		--enable-xlib-egl-platform \
 		--with-default-driver=gl \
 		--with-libcanberra \
+		--disable-remote-desktop \
 		$(usex debug --enable-debug=yes "") \
 		$(use_enable gles2)        \
 		$(use_enable gles2 cogl-gles2) \
diff --git a/x11-wm/mutter/mutter-3.30.2-r4.ebuild b/x11-wm/mutter/mutter-3.30.2-r4.ebuild
new file mode 100644
index 000000000000..4a195cee4a18
--- /dev/null
+++ b/x11-wm/mutter/mutter-3.30.2-r4.ebuild
@@ -0,0 +1,149 @@
+# 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/${PF}-patchset.tar.xz"
+
+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"
+# native backend requires gles3 for hybrid graphics blitting support and a logind provider
+REQUIRED_USE="
+	wayland? ( ^^ ( elogind systemd ) )"
+
+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
+# gl.pc package is required, which is only installed by mesa if glx is enabled; pre-emptively requiring USE=X on mesa, as hopefully eventually it'll support disabling glx for wayland-only systems
+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/gnome-desktop:3=
+
+	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[X(+),egl,gles2?]
+
+	input_devices_wacom? ( >=dev-libs/libwacom-0.13 )
+	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
+	udev? ( >=virtual/libgudev-232:= )
+	screencast? ( >=media-video/pipewire-0.2.2:0/0.2 )
+	wayland? (
+		>=dev-libs/libinput-1.4
+		>=dev-libs/wayland-1.13.0
+		>=dev-libs/wayland-protocols-1.16
+		>=media-libs/mesa-10.3[egl,gbm,wayland,gles2]
+		systemd? ( sys-apps/systemd )
+		elogind? ( sys-auth/elogind )
+		>=virtual/libgudev-232:=
+		>=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=(
+	# Some patches from gnome-3-30 branch on top of 3.30.2
+	"${WORKDIR}"/patches/
+	# Hack to not fail USE="-wayland,-gles2" builds with no mesa[gles2]
+	"${FILESDIR}"/3.28.3-no-gles2-fix.patch # requires eautoreconf
+)
+
+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
+	# TODO: nvidia EGLDevice support
+	# TODO: elogind vs systemd is automagic in 3.28.3 - if elogind is found, it's used instead of systemd; but not a huge problem as elogind package blocks systemd package
+	# TODO: lack of --with-xwayland-grab-default-access-rules 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)
+	# 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 screencast remote-desktop) \
+		$(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/stumpwm/Manifest b/x11-wm/stumpwm/Manifest
index a5e5bb1c5d16..a8b53f6ddd78 100644
--- a/x11-wm/stumpwm/Manifest
+++ b/x11-wm/stumpwm/Manifest
@@ -4,4 +4,4 @@ DIST stumpwm-1.0.1_rc.tar.gz 197530 BLAKE2B 2883ee8a0f75d3c673f6b6f65675c98e9fad
 DIST stumpwm-18.05.tar.gz 199467 BLAKE2B d532a531b7ceec7a80be66563dc2f36a6f1957d1e0f014ccf61cac1edf23073370dbe7cf3d7004f6dab144a88a4b54360e82ce7b13bdbc40cba59adfcb8e8af1 SHA512 a28c0af3a82670c0f31a5839227301672cc0706c47fb353355f90f791944556fb6125f3fa4d8547e6fbcf4817cdac5b0fe47de2dbae3a304d631a895af6ddb35
 EBUILD stumpwm-1.0.1_rc.ebuild 1720 BLAKE2B a6289438611ad9fbc80574180ecc3c1e8a7f69e043e092c9bf65011bd8f302dcbb22eb3eefce1cec3a3ae4a62370456bde525df4f3463ef56db5bd77bd3c0fb9 SHA512 3a384f1a61caa62bd8ed598ef546d43a842beaf19cce966c319d6b8ae371f23ac1d0da5ff57a34078b112d051695a69ce512ae401ec64eadc4ac100513676b1d
 EBUILD stumpwm-18.05.ebuild 1636 BLAKE2B 9ad4bfb55786e66731069b3c54d6a5c62dd66d6bb3c54f597ac21b5f807a00847c93837242fcdb13437a0e21c95f156d96c407659b9e89cc3643f3bff156e0aa SHA512 ed4381c2b597db24ea622ff2b0de301be55a70a7917e4cbeb144b8a881e32b9f656b8c01987734a4fa698799ff5b61f19356e3d5d14e1c0f3dce30409e13a87f
-MISC metadata.xml 2276 BLAKE2B 8667a15ae08adf0636bd5ec9f5a3290a98dc951d710c237695424daaf81e93fc9eb12c07d8b847f5bc233dbca7dd06a33b87563092bb277559f3165ee3b94456 SHA512 692ea34e9c41b0ff6d92f0b7ae4c7f1f1b9507c1649481a2421c9c552d8454384ffcbbe7cd0e56b284d3e6c5d600662642428e898a02be8921ca370802971f7c
+MISC metadata.xml 2220 BLAKE2B f41cb5a9738d00631d9fa733f705d8717db4c75640914d7e5b115fa18a6bf1869c7019e79d8330f2cf4d514ed7c48eda7b2bf5f8f9a22a11fff9022c9b7cf927 SHA512 457b833b3e03bac4189c980e12de25289c1f8c6b26cffdd40e09c410554f5d48aa06ea559cf9cf86c0d00014c50c06af902802303736fed7ac086244266ed0bb
diff --git a/x11-wm/stumpwm/metadata.xml b/x11-wm/stumpwm/metadata.xml
index 0af3d431108f..a03de960eba8 100644
--- a/x11-wm/stumpwm/metadata.xml
+++ b/x11-wm/stumpwm/metadata.xml
@@ -47,7 +47,6 @@
   <use>
     <flag name="contrib">Install contrib modules</flag>
     <flag name="doc">Include documentation</flag>
-    <flag name="emacs">Add support for GNU Emacs</flag>
   </use>
   <upstream>
     <remote-id type="github">stumpwm/stumpwm</remote-id>
diff --git a/x11-wm/subtle/Manifest b/x11-wm/subtle/Manifest
index 6dbccc637ff0..a6420d52cd40 100644
--- a/x11-wm/subtle/Manifest
+++ b/x11-wm/subtle/Manifest
@@ -1,4 +1,4 @@
 DIST subtle-0.11.3244.tar.gz 190549 BLAKE2B bb4b78165741ef30c1e9e145d4f26c8903d597dfa210688246210bb6f04ffb8b62b9295ffdfd0829f1c36019287ff82677253daf87878562b7ba55a517fb00ce SHA512 3d6edd5cb1b5dcd058caeddf3ead024c7cce39684baca8bac9709683ce3130a5c8433cbe046d28dc7420637dd855a2b6775638097f78a5e701bb85e505e8167c
-EBUILD subtle-0.11.3244.ebuild 2038 BLAKE2B 86791243c1a9792d79f72602a0c9a354241054101db282a4ddc4631478475d958124eba664abc95d1d8cf20d6f77a35a478e6dc533c0c9b349f1acb58b448722 SHA512 fb62f9712d4b676255eccad5b49b5f9b6512b610dd8e0f5482274d1cd26d25e0e7f8f82752dc90c2bb66bfb489d9a737a5c30dc76a6b69b1ef539b09105a402e
-EBUILD subtle-9999.ebuild 2038 BLAKE2B 86791243c1a9792d79f72602a0c9a354241054101db282a4ddc4631478475d958124eba664abc95d1d8cf20d6f77a35a478e6dc533c0c9b349f1acb58b448722 SHA512 fb62f9712d4b676255eccad5b49b5f9b6512b610dd8e0f5482274d1cd26d25e0e7f8f82752dc90c2bb66bfb489d9a737a5c30dc76a6b69b1ef539b09105a402e
+EBUILD subtle-0.11.3244.ebuild 2041 BLAKE2B 8aa83cd08a267f087a445cb819f0fed42212b40268eae32c5503756e54ee587cd987d175830c57d0ca09f8a9459bb9a0701541401f1f74152640428417f3d5e1 SHA512 94e34ae59d9fcce5d816d72dbc763a354ca0121738b0f8111f519aa4d492b18c905d2713c7a40a3115392bbd3c1294b34ccc4995e1f064754750f8b36aa96338
+EBUILD subtle-9999.ebuild 2041 BLAKE2B 8aa83cd08a267f087a445cb819f0fed42212b40268eae32c5503756e54ee587cd987d175830c57d0ca09f8a9459bb9a0701541401f1f74152640428417f3d5e1 SHA512 94e34ae59d9fcce5d816d72dbc763a354ca0121738b0f8111f519aa4d492b18c905d2713c7a40a3115392bbd3c1294b34ccc4995e1f064754750f8b36aa96338
 MISC metadata.xml 1150 BLAKE2B ddf49036e8ab76460cada5ea521f81cb16be0eb12af31f868493274b82a9513a9650ff61d22c3ff38279f0a3dfd641a476212e63e84d2d1b25e4e641b5fa2c64 SHA512 842ba7afc25372e9bb6a5bef00c0ddc99acda3d8ac0d40b15a2b40f1bb9a32eaf77f2515a32090ed7468e8830ae67e34649e8f30b024278d29d4ac1446678637
diff --git a/x11-wm/subtle/subtle-0.11.3244.ebuild b/x11-wm/subtle/subtle-0.11.3244.ebuild
index 6417ae23f9b2..e0a5b55666b7 100644
--- a/x11-wm/subtle/subtle-0.11.3244.ebuild
+++ b/x11-wm/subtle/subtle-0.11.3244.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-USE_RUBY="ruby22 ruby23 ruby24"
+EAPI="7"
+USE_RUBY="ruby24 ruby25 ruby26"
 
 inherit ruby-ng toolchain-funcs
 
@@ -28,8 +28,8 @@ RDEPEND="x11-libs/libX11
 	xpm? ( x11-libs/libXpm )
 	xtest? ( x11-libs/libXtst )
 	xrandr? ( x11-libs/libXrandr )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 ruby_add_rdepend "dev-ruby/archive-tar-minitar"
 ruby_add_bdepend "dev-ruby/rake doc? ( dev-ruby/rdoc )"
@@ -79,7 +79,7 @@ all_ruby_install() {
 
 	dodoc AUTHORS NEWS
 
-	use doc && dohtml -r html/*
+	use doc && dodoc -r html
 }
 
 pkg_postinst() {
diff --git a/x11-wm/subtle/subtle-9999.ebuild b/x11-wm/subtle/subtle-9999.ebuild
index 6417ae23f9b2..e0a5b55666b7 100644
--- a/x11-wm/subtle/subtle-9999.ebuild
+++ b/x11-wm/subtle/subtle-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-USE_RUBY="ruby22 ruby23 ruby24"
+EAPI="7"
+USE_RUBY="ruby24 ruby25 ruby26"
 
 inherit ruby-ng toolchain-funcs
 
@@ -28,8 +28,8 @@ RDEPEND="x11-libs/libX11
 	xpm? ( x11-libs/libXpm )
 	xtest? ( x11-libs/libXtst )
 	xrandr? ( x11-libs/libXrandr )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 ruby_add_rdepend "dev-ruby/archive-tar-minitar"
 ruby_add_bdepend "dev-ruby/rake doc? ( dev-ruby/rdoc )"
@@ -79,7 +79,7 @@ all_ruby_install() {
 
 	dodoc AUTHORS NEWS
 
-	use doc && dohtml -r html/*
+	use doc && dodoc -r html
 }
 
 pkg_postinst() {