gentoo resync : 07.10.2018

19 files changed, 167 insertions, 329 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 6b25980417d7..4f9677aa880d 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index e2145797fb05..f0fba8270154 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -7,6 +7,6 @@ DIST i3-4.15.tar.bz2 1196263 BLAKE2B 36f20327202957dba30aface91af4d2c6261979e726
 EBUILD i3-4.13-r1.ebuild 1993 BLAKE2B 60d2df3b1f17b4e0fe0a547a736c64dd46ab46642f68837730498038348615e69dde8a80f035591ef1486cb6d8b07127fb4cbfd299ea6ef9795eeaf7412e3697 SHA512 d56ad669b2c30627401cce39b4a8489e3657aa9ec42a3443305a4d3453dd876ec969544ff2a862fafcb84d17c9ebe3074bbb2ba8176a30c88ea5181a0225362c
 EBUILD i3-4.14.1.ebuild 2376 BLAKE2B 00f9ca5d7c45ee211a834a50da364a72c0968a778a4846065bec847a927c52b066e2e673d96d372ecd6f10fa70fddf49631f4c806dd5009207850b572ff67f87 SHA512 03a988ac0ab63792d7712e18eb622077b29bbd280030bf435096741a65024a1f9ea6ac01cacd64e09b336c3c2e792319ae1f18b8e03938268aeb00a0381a70ab
 EBUILD i3-4.14.ebuild 2113 BLAKE2B c602bbb48b166ffa70d735f9181ec81a4174fe7df08830bff5c2cd955f668d2e34453f421dd1c8fb616497be5cc5707332f412d73397287ed55ea5468ffc755d SHA512 709efb5ca49d7e2e1aa6426c631e653b66f15e261eb1462036b4bdef61cd68a690a03a71ae787d221939808b9b15f3d7604551c1cc3227b9194efea076b1390e
-EBUILD i3-4.15.ebuild 2383 BLAKE2B cdc0275edf65a942f0b437efd9626d2fe266797aa8e7ee4a81e068347a26850450b17e78af7086ff5d2988a1b9c7495e1bebb81f096b13993db6db975c2a6e05 SHA512 3f728a008566c80c17f96800c0fbc1b2cd54ec9a7708e0ab87466275ff247f9a712ffd3ff25d5366241d2b59659b8eba8ef8a3752088d213a9ec07c148604f40
+EBUILD i3-4.15.ebuild 2378 BLAKE2B 77e8d97976727d1e744bbfa30c4622438a03beaec260c285e94f0e6e0c928a524cc812c78e49bf7cbae019404fc156b29b38fb55a7cd0ef60dd5c1da8855b787 SHA512 9ade8311053db9c8c9c5951a162aaba959ad83dca2011734fd1adf4c1ac18fab4c267b724a3381591fc4d4b9c74c84720fba243422cb503cd41ca527f4983e2d
 EBUILD i3-9999.ebuild 1812 BLAKE2B ce78f54be6f2cd1949342fa8b24fa4b162679edaa062eef113619af1aca0c976dc3d50302bd49ed80e3a8dc417816b0fdb802f71f31d16305a4a02be9962bfc7 SHA512 77bee1cddd30f86bfbea6276c44aea2112be335aa6d8720856be4aa6f8d77c84282f7c2e2fa32adba35fddfd2e1ac60cd7924f779e1b9bd4705e3a068dcb82cf
 MISC metadata.xml 470 BLAKE2B 1c4fd7b44860934e88fb5165254fe0e8ca7e647c11af9af7d959f240e51002e6a454d9b93b30da8944891a1aa6a989f7a3e2a8af44ba41de174e78745393dd79 SHA512 52eddb56541d1172b04ca3ae646d01e52fb300dd62f5dfeaf2abe9d791965813e87b24a1477743797227bf8d407051f79076d54edb599524f89f3cfc716cc47e
diff --git a/x11-wm/i3/i3-4.15.ebuild b/x11-wm/i3/i3-4.15.ebuild
index 90f223b0d2c3..350a31d97589 100644
--- a/x11-wm/i3/i3-4.15.ebuild
+++ b/x11-wm/i3/i3-4.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://i3wm.org/downloads/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc debug test"
 
 CDEPEND="dev-libs/libev
diff --git a/x11-wm/larswm/Manifest b/x11-wm/larswm/Manifest
index 6efd7d97d3b5..58463d11b78c 100644
--- a/x11-wm/larswm/Manifest
+++ b/x11-wm/larswm/Manifest
@@ -1,4 +1,5 @@
 AUX larswm.desktop 125 BLAKE2B 15556dde41d8bbec4649e946a0cc8113fda06d667bb0c85691964af2513e32a36da0e0ce5bf979c212f295e4305b3fae202f62f883c459b297516facc66547db SHA512 033ca80e83d928eca524c0a5473f2776f363ff301442a7a7c3f34bb99bc61af8a524f6bf39ee1d6282ce5f732bd1fd7b0b242ad4909063496c4c6965becd7b43
 DIST larswm-7.5.3.tar.gz 84505 BLAKE2B 4548f8d757b8dc86f8bf545bc45b09f8b934792fea2a9a49d905669b767b453d007b29923fc0d7c9b4bd744f8c77e72652388bb66f51658846699d6b517f40d5 SHA512 7c99aadcc419f695b55bf0ea2f9833757c06f6ba0f00ae58e1db6e38df70bf944bac44834418bb52188d844722a7ac3c49388280c649ede073a74c21572cf3d4
 EBUILD larswm-7.5.3-r1.ebuild 1078 BLAKE2B f8b14cf87f046a374f7e0eb58d6f2ffebfedd2c67509d371bb08d28ddf92f8a1431d1516707715f67b81979ad47d1f5acb85183e70c2f7a411d950d81afd663a SHA512 da3268fd8b1ab4fb827cad6c574431ddacd5c6072a44b382055ea627515d021cc676baefb0a2cc5f75d24a41f44a670bf44454f717589f402932319385cc7cf2
+EBUILD larswm-7.5.3-r2.ebuild 1062 BLAKE2B 264987fd2b95cfcd219324818449cdf4ffcff9a2b6cb2c9121471bf63c79dc3b459224a8963e520d557953aaae50a8e7889be1b02ea4d267c3ba83dce6b7640e SHA512 b97af0e59075b108afa05d111bfe06179c22a3da3f734653c0c8926b1996b02323476722c406e9f48324fa95dab9f118035e59c2fe87296853575fd2782195ef
 MISC metadata.xml 605 BLAKE2B a55956469773e235d3c3bae88bcc826689fcc80aad5b1cfbf36908875253a0ce4728cd1a8692bd91c551e1cc1c2c5aa293a5339beb27799c5fa8d5fcf94438c8 SHA512 5c777d2c54e8cbe89c8644cd68697e1da2049c75a450cd6be085fba62bab7d56a8b4a28850330599684dfe9c9725977d14f8de1e52e624911d5c5c7088acb29d
diff --git a/x11-wm/larswm/larswm-7.5.3-r2.ebuild b/x11-wm/larswm/larswm-7.5.3-r2.ebuild
new file mode 100644
index 000000000000..84b61cef262f
--- /dev/null
+++ b/x11-wm/larswm/larswm-7.5.3-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Tiling window manager for X11, based on 9wm by David Hogan"
+HOMEPAGE="http://www.fnurt.net/larswm/"
+SRC_URI="http://www.fnurt.net/larswm/${P}.tar.gz"
+LICENSE="9wm"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	x11-misc/imake
+	x11-misc/gccmakedep
+	app-text/rman"
+
+src_configure() {
+	xmkmf -a || die
+}
+
+src_compile() {
+	emake \
+		CC=$(tc-getCC) \
+		CCOPTIONS="${CFLAGS}" \
+		EXTRA_LDOPTIONS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin larsclock larsmenu larsremote larswm
+	newbin sample.xsession larswm-session
+	local x
+	for x in *.man; do
+		newman ${x} ${x/man/1}
+	done
+	dodoc ChangeLog README* sample.*
+
+	insinto /etc/X11
+	newins sample.larswmrc larswmrc
+	exeinto /etc/X11/Sessions
+	newexe sample.xsession larswm
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/larswm.desktop
+}
diff --git a/x11-wm/marco/Manifest b/x11-wm/marco/Manifest
index 2e96632f65f1..0fd04e5eceea 100644
--- a/x11-wm/marco/Manifest
+++ b/x11-wm/marco/Manifest
@@ -1,10 +1,3 @@
-DIST marco-1.12.1.tar.xz 1163996 BLAKE2B ff133af6d56a7c91c0b104fdbfe82ce16492429ec24a06251d106b76b52b3cf4c560ec1c304b398ced61350d79410aceb5e004fc4cd8d9893faae6743788cf34 SHA512 d271c4627fc50643d8e1a2faec33b5327999ad16a3975d62ea3ded956bccf3d5e015ed8085d43a200a34f1ea78f17d7e4ea4afaa9111e5f2e3a2230b51752945
-DIST marco-1.14.2.tar.xz 1244076 BLAKE2B a1f88f49a2d5048ba6fec2c5c5b86ff1ed546638256782ef1e9fa27f5253e65d67055e96d8d337d4bcc41fbe614164695483e76c2f2fac6bccd1f842548ab795 SHA512 6ca782f5dbbc01f5df4be901a1a6bf5b23398716e5802118482a0bf98e35f4dc544a6070358a931ca11f2d8b71cbbfb7e8768e0535c6605433a202be348ddf84
-DIST marco-1.16.1.tar.xz 1247072 BLAKE2B 71959f5b37a2e499ae7a304de279d0b87b56618ffb135e6792dccbbdf0fe4dbff091257d6c6e856162a0c80d3c08c0aae8233e94d8526af3072479b4d06a02b5 SHA512 c5f88d71378a210e6490edab2db8bedf12eb013ce89fe232863c6538b240f38b7393474893bcead6904aad1835d1dc8794328e71235f17194ba3f0c3c426de36
 DIST marco-1.18.2.tar.xz 1255492 BLAKE2B 034ad26789f894d7fa829e48ed39d11925e304dd8f6c3c74b14972a332b63782d1a8c4cb5b81b20f4d8bc12a74d053bf587ed72e3c1dca8b4fddd567dd6551ef SHA512 f18cd8d46c2ad6e6d86e6e110fb588ea8c6c301c6ffc1ee72ce80984125be5cbdeb20bf4a7fe8d1d1a60b93c7cb32de8dbd00532462c5637b747068f96e79129
-EBUILD marco-1.12.1-r1.ebuild 1502 BLAKE2B 2c53f9c4df33cd624d2ed1abd1f290d2d0cd1912931f3947057f00a7ecd4715da7402ebde8dd640dcdef6a03edce59b5044f09755874f6f90ede2991a3ee3f5f SHA512 e1204bc07cc8485caf2c877e623edc8bfe15f6e990efd00810611c17dd6a461e42d0300ab864c4a6bec940272d0bf9153ac54ea9b2a6db1568e29219a4bf34d8
-EBUILD marco-1.12.1.ebuild 1460 BLAKE2B b2bbb460a3eba5c2ffa7e6ffb9c135d848d1c5ec0bc76e7fe440b9d9f1a3cee5e7924296a4bcb3f64197dba91ed956ca677a065825000eceff2e7938a4958947 SHA512 44cd5b5dee0a98fcb55e89db74a519bd852f3bee3a3676ff43b40b85ae98a62bcd3a7349cad9e5ba4e8d4a7627c11fa900a62b5cae3b19906552ea01106f7bb7
-EBUILD marco-1.14.2-r1.ebuild 1543 BLAKE2B 401d6c5b53ed2e44917f73b6ddaed9f606ff159f001ce62db1306a06d2dc5027d16debf3c805ba26b73052509639278bd17ae8012b101e37fd1f5431a8b1d7c8 SHA512 7fc91ad79deb72fc660455b8db00571bd17fe6974d44e4c6bf447b54ea2c2ecafef631a577ef36ab8844774026bc46d42697e6e75581193acfc18541c5a074f8
-EBUILD marco-1.16.1.ebuild 1543 BLAKE2B 401d6c5b53ed2e44917f73b6ddaed9f606ff159f001ce62db1306a06d2dc5027d16debf3c805ba26b73052509639278bd17ae8012b101e37fd1f5431a8b1d7c8 SHA512 7fc91ad79deb72fc660455b8db00571bd17fe6974d44e4c6bf447b54ea2c2ecafef631a577ef36ab8844774026bc46d42697e6e75581193acfc18541c5a074f8
 EBUILD marco-1.18.2.ebuild 1415 BLAKE2B 66a7ff62f82a0c175317f6ad8c45a9673af56f1189a73a65ab1d9300edad4cee9913d0c3393686d2c67300f47a5c6f5d869e81040a9c216f1ac03cde8f3b2c7e SHA512 8e55470bb754512e57a949b07702381969005bd7ddeb0a5a26c654a88cb748466e04f8c2a9a37a38fce7fdc7b5697c047c4f5346b1020b4e94c6a709a553a3dd
-MISC metadata.xml 410 BLAKE2B 11d9345ad1a0ebbb5b537c27a3447cfb56cdcb621bb3df330f163612415a48e542a78c563689c33e52ee81eb19a9654a2ed45f27f45604b5f6cc2e6ef04953d5 SHA512 3736e03b4952f45354445560aa2aa6118a3257fe8b00d8d39df7946f65cfee017ef04f48447807387a9a4b6f37641bc55074efa7cadd944e1243feb183ab1d84
+MISC metadata.xml 334 BLAKE2B 4a521e1c77d597f68a11cdaa695afcb40a5a2670a7fd643db0999362884a0bad7fb8106b7ba479a939930fbf0323c7f22186cf3fca5583210227a819631ead5d SHA512 f55f007780c371bc133eb3b8eed1bb4f930cab1e29c9ff0ab2dd99cd2e1458058dc86bf3fd70e9f4e9f1db259a7b8a5a247b04282ca08e88d767ee2f1878a451
diff --git a/x11-wm/marco/marco-1.12.1-r1.ebuild b/x11-wm/marco/marco-1.12.1-r1.ebuild
deleted file mode 100644
index 72471cfeadd6..000000000000
--- a/x11-wm/marco/marco-1.12.1-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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 ~x86"
-fi
-
-DESCRIPTION="MATE default window manager"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="gtk3 startup-notification test xinerama"
-
-RDEPEND="
-	dev-libs/atk:0
-	>=dev-libs/glib-2.32.10:2
-	>=gnome-base/libgtop-2:2=
-	gnome-extra/zenity:0
-	>=mate-base/mate-desktop-1.9[gtk3(-)=]
-	x11-libs/cairo:0
-	>=x11-libs/pango-1.2:0[X]
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	>=x11-libs/libXcomposite-0.3:0
-	x11-libs/libXcursor:0
-	x11-libs/libXdamage:0
-	x11-libs/libXext:0
-	x11-libs/libXfixes:0
-	x11-libs/libXrandr:0
-	x11-libs/libXrender:0
-	>=x11-libs/startup-notification-0.7:0
-	virtual/libintl:0
-	!gtk3? (
-		media-libs/libcanberra:0[gtk]
-		>=x11-libs/gtk+-2.24:2
-	)
-	gtk3? (
-		media-libs/libcanberra:0[gtk3]
-		>=x11-libs/gtk+-3.0:3
-	)
-	xinerama? ( x11-libs/libXinerama:0 )
-	!!x11-wm/mate-window-manager"
-
-DEPEND="${RDEPEND}
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.34.90:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto
-	test? ( app-text/docbook-xml-dtd:4.5 )"
-
-src_configure() {
-	mate_src_configure \
-		--enable-compositor \
-		--enable-render \
-		--enable-shape \
-		--enable-sm \
-		--enable-xsync \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable startup-notification) \
-		$(use_enable xinerama)
-}
-
-src_install() {
-	mate_src_install
-	dodoc {,doc/}*.txt
-}
diff --git a/x11-wm/marco/marco-1.12.1.ebuild b/x11-wm/marco/marco-1.12.1.ebuild
deleted file mode 100644
index 81301b782686..000000000000
--- a/x11-wm/marco/marco-1.12.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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 x86"
-fi
-
-DESCRIPTION="MATE default window manager"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="gtk3 startup-notification test xinerama"
-
-RDEPEND="
-	dev-libs/atk:0
-	>=dev-libs/glib-2.32.10:2
-	>=gnome-base/libgtop-2:2=
-	gnome-extra/zenity:0
-	x11-libs/cairo:0
-	>=x11-libs/pango-1.2:0[X]
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	>=x11-libs/libXcomposite-0.3:0
-	x11-libs/libXcursor:0
-	x11-libs/libXdamage:0
-	x11-libs/libXext:0
-	x11-libs/libXfixes:0
-	x11-libs/libXrandr:0
-	x11-libs/libXrender:0
-	>=x11-libs/startup-notification-0.7:0
-	virtual/libintl:0
-	!gtk3? (
-		media-libs/libcanberra:0[gtk]
-		>=x11-libs/gtk+-2.24:2
-	)
-	gtk3? (
-		media-libs/libcanberra:0[gtk3]
-		>=x11-libs/gtk+-3.0:3
-	)
-	xinerama? ( x11-libs/libXinerama:0 )
-	!!x11-wm/mate-window-manager"
-
-DEPEND="${RDEPEND}
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.34.90:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto
-	test? ( app-text/docbook-xml-dtd:4.5 )"
-
-src_configure() {
-	mate_src_configure \
-		--enable-compositor \
-		--enable-render \
-		--enable-shape \
-		--enable-sm \
-		--enable-xsync \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable startup-notification) \
-		$(use_enable xinerama)
-}
-
-src_install() {
-	mate_src_install
-	dodoc {,doc/}*.txt
-}
diff --git a/x11-wm/marco/marco-1.14.2-r1.ebuild b/x11-wm/marco/marco-1.14.2-r1.ebuild
deleted file mode 100644
index 33a7096f18cd..000000000000
--- a/x11-wm/marco/marco-1.14.2-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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 ~x86"
-fi
-
-DESCRIPTION="MATE default window manager"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="gtk3 startup-notification test xinerama"
-
-COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/glib-2.32.10:2
-	>=gnome-base/libgtop-2:2=
-	x11-libs/cairo:0
-	>=x11-libs/pango-1.2:0[X]
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	>=x11-libs/libXcomposite-0.3:0
-	x11-libs/libXcursor:0
-	x11-libs/libXdamage:0
-	x11-libs/libXext:0
-	x11-libs/libXfixes:0
-	x11-libs/libXrandr:0
-	x11-libs/libXrender:0
-	>=x11-libs/startup-notification-0.7:0
-	virtual/libintl:0
-	!gtk3? (
-		media-libs/libcanberra:0[gtk]
-		>=x11-libs/gtk+-2.24:2
-	)
-	gtk3? (
-		media-libs/libcanberra:0[gtk3]
-		>=x11-libs/gtk+-3.0:3
-	)
-	xinerama? ( x11-libs/libXinerama:0 )
-	!!x11-wm/mate-window-manager"
-
-RDEPEND="${COMMON_DEPEND}
-	gnome-extra/zenity:0
-	>=mate-base/mate-desktop-1.9[gtk3(-)=]
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.34.90:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto
-	test? ( app-text/docbook-xml-dtd:4.5 )"
-
-src_configure() {
-	mate_src_configure \
-		--enable-compositor \
-		--enable-render \
-		--enable-shape \
-		--enable-sm \
-		--enable-xsync \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable startup-notification) \
-		$(use_enable xinerama)
-}
-
-src_install() {
-	mate_src_install
-	dodoc {,doc/}*.txt
-}
diff --git a/x11-wm/marco/marco-1.16.1.ebuild b/x11-wm/marco/marco-1.16.1.ebuild
deleted file mode 100644
index 33a7096f18cd..000000000000
--- a/x11-wm/marco/marco-1.16.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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 ~x86"
-fi
-
-DESCRIPTION="MATE default window manager"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="gtk3 startup-notification test xinerama"
-
-COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/glib-2.32.10:2
-	>=gnome-base/libgtop-2:2=
-	x11-libs/cairo:0
-	>=x11-libs/pango-1.2:0[X]
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	>=x11-libs/libXcomposite-0.3:0
-	x11-libs/libXcursor:0
-	x11-libs/libXdamage:0
-	x11-libs/libXext:0
-	x11-libs/libXfixes:0
-	x11-libs/libXrandr:0
-	x11-libs/libXrender:0
-	>=x11-libs/startup-notification-0.7:0
-	virtual/libintl:0
-	!gtk3? (
-		media-libs/libcanberra:0[gtk]
-		>=x11-libs/gtk+-2.24:2
-	)
-	gtk3? (
-		media-libs/libcanberra:0[gtk3]
-		>=x11-libs/gtk+-3.0:3
-	)
-	xinerama? ( x11-libs/libXinerama:0 )
-	!!x11-wm/mate-window-manager"
-
-RDEPEND="${COMMON_DEPEND}
-	gnome-extra/zenity:0
-	>=mate-base/mate-desktop-1.9[gtk3(-)=]
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.34.90:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto
-	test? ( app-text/docbook-xml-dtd:4.5 )"
-
-src_configure() {
-	mate_src_configure \
-		--enable-compositor \
-		--enable-render \
-		--enable-shape \
-		--enable-sm \
-		--enable-xsync \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable startup-notification) \
-		$(use_enable xinerama)
-}
-
-src_install() {
-	mate_src_install
-	dodoc {,doc/}*.txt
-}
diff --git a/x11-wm/marco/metadata.xml b/x11-wm/marco/metadata.xml
index e5009557a916..cfe84acaa324 100644
--- a/x11-wm/marco/metadata.xml
+++ b/x11-wm/marco/metadata.xml
@@ -5,9 +5,6 @@
 		<email>mate@gentoo.org</email>
 		<name>Gentoo MATE Desktop</name>
 	</maintainer>
-	<use>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">mate-desktop/marco</remote-id>
 	</upstream>
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 6e7266798d83..dc69739c50b1 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -5,11 +5,12 @@ AUX 3.22.4-wayland-ensure-pending-geometry.patch 1744 BLAKE2B 7bfa1bc1b1111829af
 AUX 3.22.4-wayland-size-hints.patch 2281 BLAKE2B 022782665cfd36da1bb60ff7ee459041e10d41d59b99cf1a806bc76c207f6e168e96e0980e72b6bdf12307874343a9f27cd83961ce01ce88a331fd88671e0107 SHA512 cf2afdb822f67a729713df571db446e955b111ac5d56342ba318646a6b3302a8cac394d63166c4043b94678360d19e3d35ddf60102794c038fdfc9039729318a
 AUX 3.24.4-build-debug.patch 1159 BLAKE2B 1ceb783c5c1c8117c7b4e9809a370d2b46ebd4fa59b401a99f60c7a8c06ba88fdef6a382149fa6ae0b0d05344b24640d730d56736dfe38b645578f3b01c41528 SHA512 e0ae9b9ed1dc74b4b2a641f03589408d078ac7a2250e75fb024dd765dc755a6dcd1917d62cb271f541db5cd97ca8417433f8cfe8e40250331adc5609bbf1ffc6
 AUX 3.24.4-gudev-232.patch 1034 BLAKE2B 8f6bfbaa50dca872c6ad21eaef5b23af8d75749140f16f595deaec1aa47021650da569e2f46b0fc4c446cf86f735c3b3a5a04df72737d175a51eacb52c0b7891 SHA512 a73aabd388c73a6a4ab91f69cdd647e5e2b1295f67c1576725f7cbaa8dc24afeb77a7f4e3880f6b2e8fc604aeefb4b44f30cc80f3f2f88b0d0c03b49dd6bbfe2
+AUX 3.26.2-non-wayland-build.patch 1035 BLAKE2B 7c9beb268c2f1b5784bbb2b44d8199f9821462c0be7678b69c9feb05171f46a2ccf96c18e8ed45b32c7ce576a7693839d03a90b4beb787f5291e7853b28b514c SHA512 88bda28953ba08bb6cf7847de49356d7896d554169d0039b599963eb333a0c688b49dc9d55c8b8e497b15d54ad3bed495bf18ded00d09d6510bb399d20750ca0
 DIST mutter-3.22.4.tar.xz 3536792 BLAKE2B e395dec6a8f5f46864ab5d7da3c345c20adf65f7609547d296036b0cb4be79e451387395f32d3d9a736a5b8c4be5a03a9fa56d5fbebeedaef3c35ea6e5c16302 SHA512 849e98186cecb4ffcab3da055febf72ef76fa87ecbdc506c696c2c7debd5183361c4b3b31d00d3c85e45d7f47aa5abf748d999571b147c831eb999116919023c
 DIST mutter-3.24.4.tar.xz 3583916 BLAKE2B 86a9e16ed96270713e400ccb4dc64b91c263125ea4a04373ed1f8364e906031ef26dc991fa13d01cf0e50895360c87be6773e3332d823c2ce1991cd57d59b292 SHA512 7ae579ab3e9df09cae37fbc1b277e382c9f610058b914b69a7bdb89f3bec510403210c0cded16a6487111507151f4d7075d161e051c0b88585d6ab6b4575b8d3
 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
-EBUILD mutter-3.22.4-r1.ebuild 4074 BLAKE2B f8d93705b79bbdc066d5e2637318c988288d57c538ae7ab11ab715cf629568b4b78c953f4bb0116a3cd36aa4a6aac8e05680994277308d6c3a4eda5b5ed744c0 SHA512 fd0cae9ccceb3eeb158cc331b077c7ac664266509f6d6669bdac16b8651a5f8c769488109ac9701e32cdfad7ed2bfd11f2fe49bac8a6d4d81086fae46acda047
-EBUILD mutter-3.24.4.ebuild 3672 BLAKE2B f07f0b1874371e26460ec17112af090f6bfe93537a7a56063ec0b00ee5cae91ba9d65e0c6cd06245fc7db06bf071a437dd8dc123a4b04934c99e658e04e2f874 SHA512 f74446183f52159acb10684bd027001cceb671ca6110b3898e3f16590a6deca65e70ec619f90b0c9a91c3dd0084c795df5b1358145005ad6f0df87817c914b8f
-EBUILD mutter-3.26.2-r1.ebuild 3949 BLAKE2B c064f5a7f5f663dfd87e9d800a31805293ef370c9a8a443bb4a73c3f0f344dba10569afb2433891ae57bf60782356a3cbdc757c7858e4dc2ee2b511aa7cba247 SHA512 78d27692678f4c0583363e391bf79c5480fedb9da39f63755ff65398f30abbce176ec6cb95ae656e8782ab13821edbad00d5bc938d0feac895017977b53875b9
+EBUILD mutter-3.22.4-r1.ebuild 4092 BLAKE2B a0ccf9508af2cf98cc54a48d39f1eb35ff07bc0b8f5da7f10348ee51974a66993a964c72aeda9288d8aa30263338a6cf54e2771eec60fd86e5dcf66f9179e578 SHA512 4e77a16dce245c654a3dba1abcabeb3115fa60a09c3748261f3bda1443a183f8611b9d3d52b22e73dc53c2607dcf1f9b7921d8a9e71acf470b05d6132377f20a
+EBUILD mutter-3.24.4.ebuild 3690 BLAKE2B 318c35b0902a8c6805231ac9878b364a7b266a0a2f7c9751c3e44680e29fbbaf19945db05adc8f14a5325581fe1d0b1151580d31506b7951c7fc037fcd0ebb8e SHA512 26e2dde5942f74e15aad3ceba56987228e21c7229829aee2dd35d1fad1e8b7795a9ec80ff965a5ea44822cb27c844e73eb8459cf82e0bf4b8d628eda3ca56c85
+EBUILD mutter-3.26.2-r1.ebuild 4034 BLAKE2B 6eac303303c5d14baaf6f35eb93d2a38083b5bbe49520af2bc36fcdbb05a1bfcf5ac85d7fb9ff869abebeaa678cd8758950a4c01435867bcfedd8e9425c82be5 SHA512 555e9d5cf89f37dcf3e1033bbf636a2d1a447b3212d848054989a4dc878caf94532122a73d7648bbac97ce13dc70e75b385032e10078e17af2c4c295358018ac
 MISC metadata.xml 325 BLAKE2B 3ee20e50b2bbbab4ac5083cf64dd2817b397a0e8a77895f5aa7197f016af1e958d6debe92e6e69c10319b1d468f80f16831aa57a0dda1f57173732056b5856c4 SHA512 2732e366e7870b21a854e6bccf57d479c754fe5a9cf17673c3a78e231a1b476b684fd97497f8ab51c57137d066f9bfa6590458f56e5f42c5c38e1cd00962fe80
diff --git a/x11-wm/mutter/files/3.26.2-non-wayland-build.patch b/x11-wm/mutter/files/3.26.2-non-wayland-build.patch
new file mode 100644
index 000000000000..a2a8d356e07e
--- /dev/null
+++ b/x11-wm/mutter/files/3.26.2-non-wayland-build.patch
@@ -0,0 +1,33 @@
+From 6cc48d8cbbf11fa82ec78cac0b29d52f05eabb60 Mon Sep 17 00:00:00 2001
+From: Ting-Wei Lan <lantw@src.gnome.org>
+Date: Sun, 24 Dec 2017 17:55:14 +0800
+Subject: [PATCH] build: Fix non-wayland builds
+
+meta_dnd_wayland_handle_end_modal is not available on non-wayland build.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=791916
+---
+ src/compositor/compositor.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c
+index 51d22bc17..aa49347c9 100644
+--- a/src/compositor/compositor.c
++++ b/src/compositor/compositor.c
+@@ -419,11 +419,13 @@ meta_end_modal_for_plugin (MetaCompositor *compositor,
+   meta_backend_ungrab_device (backend, META_VIRTUAL_CORE_POINTER_ID, timestamp);
+   meta_backend_ungrab_device (backend, META_VIRTUAL_CORE_KEYBOARD_ID, timestamp);
+ 
++#ifdef HAVE_WAYLAND
+   if (meta_is_wayland_compositor ())
+     {
+       meta_dnd_wayland_handle_end_modal (compositor);
+       meta_display_sync_wayland_input_focus (display);
+     }
++#endif
+ }
+ 
+ static void
+-- 
+2.18.0
+
diff --git a/x11-wm/mutter/mutter-3.22.4-r1.ebuild b/x11-wm/mutter/mutter-3.22.4-r1.ebuild
index 8868471403f7..01419c52e5c7 100644
--- a/x11-wm/mutter/mutter-3.22.4-r1.ebuild
+++ b/x11-wm/mutter/mutter-3.22.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -68,6 +68,7 @@ COMMON_DEPEND="
 	)
 "
 DEPEND="${COMMON_DEPEND}
+	dev-util/glib-utils
 	>=sys-devel/gettext-0.19.6
 	virtual/pkgconfig
 	x11-base/xorg-proto
diff --git a/x11-wm/mutter/mutter-3.24.4.ebuild b/x11-wm/mutter/mutter-3.24.4.ebuild
index 7307af626908..8a196f8d6038 100644
--- a/x11-wm/mutter/mutter-3.24.4.ebuild
+++ b/x11-wm/mutter/mutter-3.24.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -68,6 +68,7 @@ COMMON_DEPEND="
 	)
 "
 DEPEND="${COMMON_DEPEND}
+	dev-util/glib-utils
 	>=sys-devel/gettext-0.19.6
 	virtual/pkgconfig
 	x11-base/xorg-proto
diff --git a/x11-wm/mutter/mutter-3.26.2-r1.ebuild b/x11-wm/mutter/mutter-3.26.2-r1.ebuild
index 71a77b248294..209182f780be 100644
--- a/x11-wm/mutter/mutter-3.26.2-r1.ebuild
+++ b/x11-wm/mutter/mutter-3.26.2-r1.ebuild
@@ -81,6 +81,9 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	# Lots of patches from gnome-3-26 branch on top of 3.26.2
 	"${WORKDIR}"/patches/
+
+	# Fix non-wayland builds, bug #667244
+	"${FILESDIR}"/${PV}-non-wayland-build.patch
 )
 
 src_prepare() {
diff --git a/x11-wm/treewm/Manifest b/x11-wm/treewm/Manifest
index a93cd220759a..4ee581955458 100644
--- a/x11-wm/treewm/Manifest
+++ b/x11-wm/treewm/Manifest
@@ -1,5 +1,6 @@
-AUX treewm-0.4.5-gcc43.patch 614 BLAKE2B 033c54a54ec06e81ac80890501f4d1f9d27633cd1b489566e6f32bdbab59286175eebe6f6a063aa7cae47f5acc7a74212744bded7bef5f2be5e25b8b27dbe026 SHA512 2e2e965c8592083e411da78eb3abdf2112e0b37b5759dd98ea62ad8c19859a59b72de1d0b9630962d8651921f220ad8e670e9e963a062dd3435a9e7d9e517e94
+AUX treewm-0.4.5-gcc43.patch 568 BLAKE2B 481b948412109a7febbf97dbab7681b7ff33c3f603885755103cff663288b97925d8122ee3eb18ce2b0c448830c73b92db4162c02c992781f9ee07955e925de5 SHA512 db7bede71787693a561072ad2fd89a8a5a9c46918d4f98021d587ec447318adaf76235db189990597eba36db44f720b5ab486ee7b4aae529fb0a4fed26eeebc4
 DIST treewm-0.4.5.tar.bz2 87098 BLAKE2B 4ec890573aa32fafef99590f12b1e5491759ece65347339654844f077e9fdf794a96322d62066196eb3c50be271e8f16e842344a755411f3914a347b8cf2835e SHA512 96eb8eec11cec992daa4492b5a9243db5cc80b23d3827169d223d81b9ff289b62dbe6c8c3ea9da5da2e32435d98cc4552038c26e975cddec795de3b88f9db9cf
 EBUILD treewm-0.4.5-r1.ebuild 1599 BLAKE2B 904b4cada4b8c3be319caaee79be8f3b3b0454a7c565877ddf190ac10d35514e74c0a98b1f6040ef50aefa0295b853acf610d243d592592a64bd427a6b4a17f7 SHA512 539d70320dfd4aabf552e9ca89e0ec19ffaaf8c362a01a82d33cfc02ad33afa4468cd7cede0d760b5ebbf9d54a60244c299254471d353c24de6fefec02581d9c
+EBUILD treewm-0.4.5-r2.ebuild 1589 BLAKE2B 78a64ae7946970acf37a9b7820c812f6bcb35d6dfb537a5ce31b087cf14e454415e20cf7435c0ae28d0db880941d2a48a9d42968fd37dbe7f3c5f27c7648dffb SHA512 a40275d30c81d01fac01cda23e83c724c46a6dac289fa181d508d7d813b68edfb4136363cbfb6b667cbeb459d28f9c6fca02aa7c7995c537e7784497853f2492
 EBUILD treewm-0.4.5.ebuild 925 BLAKE2B fdb77850da3956c010cdc3323eac63f44d128a986fd5d740891deb6ca90ca96eb18d27a296385bc651adb44dfdbc0a9c53075e26c4296d9bfb7b0918ea18ecb6 SHA512 08d4c32998543e58c3dc3afa4b4c41508c5a6bec8ead513d230b32cb8bd3773bcdbf71b5759de0021d1788ed8c8cee970c4e44f750cc01020a4fafc6319fe605
 MISC metadata.xml 436 BLAKE2B 666d6583ce2dc47607e4e99557a889d765cd2436131ccba2496e4ea00e9d288e943e4b8aeed2bf4645671baa6911b5063c41fc65511bd854c0dd008b9ba65ba3 SHA512 cde7c7c0dadb71cb58c15a2fa7efb031fda246d1464bebb476c4a02c64baf1f90a03198b82e1188ac83b36eb4778e21595335bce5af14beb1cf20de4b978b7e8
diff --git a/x11-wm/treewm/files/treewm-0.4.5-gcc43.patch b/x11-wm/treewm/files/treewm-0.4.5-gcc43.patch
index a8faf4319871..687bf809e3c7 100644
--- a/x11-wm/treewm/files/treewm-0.4.5-gcc43.patch
+++ b/x11-wm/treewm/files/treewm-0.4.5-gcc43.patch
@@ -1,5 +1,5 @@
---- treewm-0.4.5b/src/action.cc	2009-01-17 18:17:32.000000000 -0400
-+++ treewm-0.4.5/src/action.cc	2009-01-17 18:20:41.000000000 -0400
+--- a/src/action.cc	2009-01-17 18:17:32.000000000 -0400
++++ b/src/action.cc	2009-01-17 18:20:41.000000000 -0400
 @@ -9,6 +9,7 @@
  #include "clienttree.h"
  #include "clientinfo.h"
@@ -8,8 +8,8 @@
  
  Action::Action(Section *section) {
    s = section;
---- treewm-0.4.5b/src/resmanager.h	2009-01-17 18:17:32.000000000 -0400
-+++ treewm-0.4.5/src/resmanager.h	2009-01-17 18:21:10.000000000 -0400
+--- a/src/resmanager.h	2009-01-17 18:17:32.000000000 -0400
++++ b/src/resmanager.h	2009-01-17 18:21:10.000000000 -0400
 @@ -12,6 +12,7 @@
  #include "global.h"
  #include "client.h"
diff --git a/x11-wm/treewm/treewm-0.4.5-r2.ebuild b/x11-wm/treewm/treewm-0.4.5-r2.ebuild
new file mode 100644
index 000000000000..751b8b2fe249
--- /dev/null
+++ b/x11-wm/treewm/treewm-0.4.5-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="WindowManager that arranges the windows in a tree (not in a list)"
+HOMEPAGE="http://treewm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/treewm/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~ppc ~sparc ~x86"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXxf86vm
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	x11-misc/imake"
+
+src_prepare() {
+	default
+	# bug 251845
+	eapply "${FILESDIR}/${P}-gcc43.patch"
+	# bug 86453
+	sed -i xprop/dsimple.c \
+		-e 's:malloc:Malloc:g' \
+		|| die "sed xprop/dsimple.c"
+}
+
+src_compile() {
+	# only compile treewm, not (x11-apps/){xprop,xkill}
+	emake treewm \
+		CXX=$(tc-getCXX) \
+		CCOPTIONS="${CFLAGS}" \
+		EXTRA_LDOPTIONS="${LDFLAGS}" \
+		PREFIX="/usr" ROOT="${D}"
+}
+
+src_install() {
+	# only install treewm, not (x11-apps/){xprop,xkill}
+	dobin src/treewm
+	dodoc AUTHORS ChangeLog PROBLEMS README README.tiling TODO default.cfg \
+		sample.cfg
+	insinto /usr/share/pixmaps/treewm
+	doins src/pixmaps/*.xpm
+}
+
+pkg_postinst() {
+	elog "x11-wm/treewm used to install its own versions of x11-apps/xprop and"
+	elog "x11-apps/xkill as treewm-xprop and treewm-xkill respectively, since"
+	elog "they are assumed to be broken in combination with treewm. Since"
+	elog "X(org) has become modular since treewm's last release and are not"
+	elog "installed by default, we can leave those out and simply point out"
+	elog "that it is NOT adviseable to use these programs when using treewm."
+}