reinit the tree, so we can have metadata

author: V3n3RiX <venerix@redcorelinux.org> 2017-10-09 18:53:29 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2017-10-09 18:53:29 +0100
commit: 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
tree: ba5f07bf3f9d22d82e54a462313f5d244036c768 /x11-wm
400 files changed, 18425 insertions, 0 deletions
diff --git a/x11-wm/aewm++/Manifest b/x11-wm/aewm++/Manifest
new file mode 100644
index 000000000000..d27ad9ea3c9e
--- /dev/null
+++ b/x11-wm/aewm++/Manifest
@@ -0,0 +1,7 @@
+AUX aewm++-1.1.5-gcc43.patch 1011 SHA256 caa673ac0421cdc33d759a4e824fef101783f876990e5834b7e3115fe022046a SHA512 aa95ca31f68ac57ee4d92377b39839594b8673cf9f54834c15026ab385c17dace0f0e7673feb9b92bbab5aaa528dbd4a861e7df5e3b257052cb253bdffeda3bd WHIRLPOOL 9eec01c57f8f127efc992071877d49515f38dfc1d6bcb402a5b3916e697f4315c065417e94bf10ee522fec8a6d2a14c019dfb33a0a9167c18111157e33290d1b
+AUX aewm++-1.1.5-makefile.patch 853 SHA256 9fcb952cd84ff34486ecc6bec65039fd344230f844840ce8184115d751e63d1c SHA512 f4d3ddec499e18598c6a2d99aed0f709226bbc43b6183c7bb5832e26d2fbe99c3292fe9c249613f62c962e10ddace5b10b6ee3d484f3030d1d233ce0b2269adc WHIRLPOOL 486ee72c23e90bba51cdd19e127ef58445b5a190d34c7d21aa13eadb8046376772d9ca1223b12b19e01de4a391c8ffad3595729799644a69f7ff63755ee1f299
+DIST aewm++-1.1.5.tar.gz 24553 SHA256 10603da6e6ef1e2c8377dce03117fed3270a7fe87accbfe54461b80e5371ea36 SHA512 84fe2d51e82a2098a42ad405da705810e5d3b93513a30cd688f7bb8c717875b286b64bbd8e48ab799e4ee14ac27097fb98276f89bcfeb9301dc8187d0bcad370 WHIRLPOOL df9fba3f5e84c32461e6045222d191348c937cc0c38ad8d4b5cbdf6c074c7b0b8dacc9f647bd895cc13ba7fef6507c126f74ac2156873fe1c5f50a929627fcfa
+EBUILD aewm++-1.1.5-r2.ebuild 686 SHA256 b7e2b5264bc1e7e83089d609afe217d31d65d227e625ee7c9f479918641fb5a2 SHA512 115d5ac974c0997a2f4fd5f6669abd715e99cbac77a35fbfc4bbfae0d258bc884fd3f0f353c9512230897491b0bb8c9d0af088a16e492bafa9ca08240dbcc17c WHIRLPOOL 4e9a2f5c1f670bb48ec70d3ef1d0320de4a96ba36e0885be04786ce819656556c5bfac119d82f2bc6ab6255d8a8b3c241bfb0e735761d1161fcc49e1f970adc8
+MISC ChangeLog 3197 SHA256 958496e47b9004ad6dcc6347b4aff05bc117976559a02180fc54c55bb290fbc6 SHA512 d597c58638c49c41f0445b34bfc7f1f5358db6dc61131fd25d8c4ff4159dbd2e04f2b4a41a8c90d9665c3b30c4e793d2845e735bfe4bbdfe9e9fb04a7ddb87cf WHIRLPOOL c44726f27ae494d72590773bda6680e786be68d6bc445144f119d00e6def0db4b6b4b5b934ce081bd3228c1a0a0ce50c80f52a5507b8b835115cb3b60f65ecba
+MISC ChangeLog-2015 3023 SHA256 320bde243140f83680e29d5d3934dffe74924334b2c9fb5a84c53910e2f9c5eb SHA512 ecf63ab10765266dfe823d5ea160718b4ac2f7d0caffcf451b98269aded51103866fb0766a236cc47b0deacdfc1deaa58b38e4f4b69cfb2ece2c72a64d4e2b13 WHIRLPOOL 483e7a2f5a612b27bd8009850bd94e6c140ed29dc6973e7f38458ef820d4eba87c497401ece18d289fc02a6df61ceafb5368a76037cad860513e597a03e580a6
+MISC metadata.xml 461 SHA256 984db2dd36cec4765104a71735aabbf8b1227edac5e2d9e3fe6fca105e6642a8 SHA512 d26ec6f5aadf0ad8fce04d95bed45a4cc2b5ff8c12f36ad522171e2589829b8805720e2b1c1f3e5c636c9737cc391ff57d7397d406478d204077b55729047eb1 WHIRLPOOL 7085d1459639b04063888b0bb57142f06a33b1d5dbec14cf07d04364005c840df2482ad8960e0497fb22da876beb16142bde28acea0f1f73b703fb665df0bfc9
diff --git a/x11-wm/aewm++/aewm++-1.1.5-r2.ebuild b/x11-wm/aewm++/aewm++-1.1.5-r2.ebuild
new file mode 100644
index 000000000000..843c906b41a9
--- /dev/null
+++ b/x11-wm/aewm++/aewm++-1.1.5-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A window manager with more modern features than aewm"
+HOMEPAGE="https://github.com/frankhale/aewmpp"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	x11-proto/xextproto
+	x11-proto/xproto"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-makefile.patch
+}
+
+src_compile() {
+	emake CXX="$(tc-getCXX)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc ChangeLog README
+}
diff --git a/x11-wm/aewm++/files/aewm++-1.1.5-gcc43.patch b/x11-wm/aewm++/files/aewm++-1.1.5-gcc43.patch
new file mode 100644
index 000000000000..23cacdc43a2b
--- /dev/null
+++ b/x11-wm/aewm++/files/aewm++-1.1.5-gcc43.patch
@@ -0,0 +1,36 @@
+diff -ur aewm++-1.1.5.orig/client.cc aewm++-1.1.5/client.cc
+--- aewm++-1.1.5.orig/client.cc	2005-05-23 06:06:01.000000000 +0300
++++ aewm++-1.1.5/client.cc	2008-05-03 23:50:02.000000000 +0300
+@@ -6,6 +6,8 @@
+  */
+ #include "aewm.hh"
+ 
++#include <string.h>
++
+ Client::Client(Display *d, Window new_client)
+ {
+ 	initialize(d);
+diff -ur aewm++-1.1.5.orig/main.cc aewm++-1.1.5/main.cc
+--- aewm++-1.1.5.orig/main.cc	2005-02-12 05:38:32.000000000 +0200
++++ aewm++-1.1.5/main.cc	2008-05-03 23:50:02.000000000 +0300
+@@ -6,6 +6,8 @@
+  */
+  #include "aewm.hh"
+ 
++#include <string.h>
++
+ // Dunno where I ripped this from. Kudos to the author whoever he is!
+ void forkExec(char *cmd)
+ {
+diff -ur aewm++-1.1.5.orig/windowmanager.cc aewm++-1.1.5/windowmanager.cc
+--- aewm++-1.1.5.orig/windowmanager.cc	2005-05-17 04:41:42.000000000 +0300
++++ aewm++-1.1.5/windowmanager.cc	2008-05-03 23:50:02.000000000 +0300
+@@ -6,6 +6,8 @@
+  */
+ #include "aewm.hh"
+ 
++#include <string.h>
++
+ WindowManager* wm;
+ 
+ #define AEWM_KEY_ALT_COUNT 4
diff --git a/x11-wm/aewm++/files/aewm++-1.1.5-makefile.patch b/x11-wm/aewm++/files/aewm++-1.1.5-makefile.patch
new file mode 100644
index 000000000000..8b84a9963469
--- /dev/null
+++ b/x11-wm/aewm++/files/aewm++-1.1.5-makefile.patch
@@ -0,0 +1,34 @@
+Respect CFLAGS, LDFLAGS, don't strip binaries
+
+http://bugs.gentoo.org/show_bug.cgi?id=336099
+
+--- aewm++-1.1.5/Makefile
++++ aewm++-1.1.5/Makefile
+@@ -1,9 +1,6 @@
+ CC       = g++
+-ADDITIONAL_CFLAGS   = -g -O2 -march=i686 -Wall
+ 
+ prefix   = /usr
+-INCLUDES = -I$/usr/X11R6
+-LDPATH   = -L/usr/X11R6/lib
+ LIBS     = -lXext -lX11
+ 
+ # SHAPE = Shape Extension
+@@ -28,14 +25,13 @@
+ all: aewm++
+ 
+ aewm++: $(OBJS)
+-	$(CC) $(OBJS) $(LDPATH) $(LIBS) -o $@
++	$(CXX) $(LDFLAGS) $(OBJS) $(LDPATH) $(LIBS) -o $@
+ 
+ $(OBJS): %.o: %.cc $(HEADERS)
+-	$(CC) $(CFLAGS) $(ADDITIONAL_CFLAGS) $(DEFINES) $(INCLUDES) -c $< -o $@
++	$(CXX) $(CXXFLAGS) $(DEFINES) $(INCLUDES) -c $< -o $@
+ 
+ install: all
+-	mkdir -p $(DESTDIR)$(prefix)/bin
+-	install -s aewm++ $(DESTDIR)$(prefix)/bin
++	install -D -m 755 aewm++ $(DESTDIR)$(prefix)/bin/aewm++
+ 	
+ clean:
+ 	rm -f aewm++ $(OBJS) core
diff --git a/x11-wm/aewm++/metadata.xml b/x11-wm/aewm++/metadata.xml
new file mode 100644
index 000000000000..925e9916b160
--- /dev/null
+++ b/x11-wm/aewm++/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription>
+	The aewm++ window manager is a fork of the popular minimal window manager 
+	aewm for the X Windows System. What makes it different is its codebase, 
+	feature set and focus.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">frankhale/aewmpp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-wm/aewm/Manifest b/x11-wm/aewm/Manifest
new file mode 100644
index 000000000000..347dd5e9f269
--- /dev/null
+++ b/x11-wm/aewm/Manifest
@@ -0,0 +1,6 @@
+AUX aewm-1.3.12-gentoo.patch 1690 SHA256 9cfdc2c1035db705e7a5118038e4a834aa9e7586f3b5a561d78dd9c6611d3cab SHA512 39c4d3258b29550fc99ac088c84f83af40645ebe48013f053584dd60baf99d9e58e3c3b4f221835c5ba7da27f6cc66a5d387a74928d596ba4a99a38aabaafb32 WHIRLPOOL 7b6bae25bd4ddf037a0f0c598f5258f2b9539a096e90b2e9d7d6489b91876a191cad583652021be2bd619f8fe87901a93a207e10f98ec8b7253de6c2f9f9976c
+DIST aewm-1.3.12.tar.bz2 36677 SHA256 20edc3e57630fe2e0ca6139ce5769bd10a149f59a16f45acdf9bc64268fd59de SHA512 69435edf1ba99661464221070ab6708a875056d244ee73b2eba1ed2beefba52ac2418d37e0d8b9f0c7c8a382e9d8740215b9c7098eca4f39cdf73b3c894125f1 WHIRLPOOL 077486fa4bcf46247915b40ed483c753c11ae1faa8b01b783bfe758d35f4d113cb99626ddea9afdb855358d44042e30e490389c12fb9ee3b8e3c37ada89279ed
+EBUILD aewm-1.3.12.ebuild 964 SHA256 0af859c39372278227af5ab23ab0e068d5d3e2d429d03548b79d71e348c7e093 SHA512 34a8944f454daa6368f40710c973ee832657844a218a960a0ee2368be829efec22bfaee5cca2c4ef923414581a600ac6d1702e20efa7eb01840d3577a842f442 WHIRLPOOL 35e493ede9a22111b38dad30ea5345a374863f3c4d1ed8e49db57bf1ba6ae951a41b44803698ec82eb0fc1ecbe66194269895d2e358048dd59e8b2b350cc3c87
+MISC ChangeLog 2200 SHA256 91d66e3dc8961a0493d2ae22b4aa2f348c8af5cbfdd1bd6d1fca96a249d2d7b6 SHA512 068c77abb255d17c1f63983d08186846ab45088fa2e049f947ab3a087ecba5384f6f9ec8cf73a88ab28582e5e298456fc9854c9921c1bd1604c5ec5a49d9b8d0 WHIRLPOOL 4ea2df0754e035b8ddb97813d9e2e043446f224eba2aa6a97280e6c532b20cdba38d4f2288e07c70e746590eaf60736b3d54f17e55696c7969cf6465aa764d73
+MISC ChangeLog-2015 4105 SHA256 920da6390243bb572aeeb355c2faff609b4a8e58b18ff340e1ce738b2095d425 SHA512 4b76ec924a84c8987799bb739925abc10cbbe5e466af45908cb38b284b5933fc65c66e9a5b6adf926a479c8b8c67e9ccbea2fddc7c20125c48e1e7e35692fe0e WHIRLPOOL 7d3f189bd9de72433d0fd02cc4096c9c66255ddc8676cd3831ae712676002bb43adbf54cf2a1da25fe93feb2906d46527d91e840c2d1663b127d9c515a07fc08
+MISC metadata.xml 559 SHA256 fe2eba1c02f902569dfedc433f5ac81b1202a55962224668af90522e6021b173 SHA512 f9a2092397717d558532432ee9ccb9715923338145485b7655fa84b83d08c89d900c3baf16d60cf3d16e5d495d26f04d889371ab010aa3dc54bdff3d7fa04831 WHIRLPOOL 59e1b01ece3285be73e7bc0b3b0e0d06b1fde55dfa5853227cc6205af7c0bda6d69ae21e104e0316246bce7592bebdb3c96c3fd9c829d0cdf8733442669ff4ac
diff --git a/x11-wm/aewm/aewm-1.3.12.ebuild b/x11-wm/aewm/aewm-1.3.12.ebuild
new file mode 100644
index 000000000000..12e9f0fb5727
--- /dev/null
+++ b/x11-wm/aewm/aewm-1.3.12.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A minimalistic X11 window manager"
+HOMEPAGE="http://www.red-bean.com/~decklin/software/aewm/"
+SRC_URI="${HOMEPAGE}${P}.tar.bz2"
+
+LICENSE="MIT 9wm"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-proto/xextproto
+	x11-proto/xproto
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	sed -i -e '/^font/s|".*"|"fixed"|g' doc/aewmrc.ex || die
+	sed -i -e 's|skill|pkill|g' doc/clientsrc.ex || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)"
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		MANDIR="${D}/usr/share/man/man1" \
+		XROOT="/usr" \
+		install
+
+	dodoc NEWS README
+}
diff --git a/x11-wm/aewm/files/aewm-1.3.12-gentoo.patch b/x11-wm/aewm/files/aewm-1.3.12-gentoo.patch
new file mode 100644
index 000000000000..6cc02f4560d6
--- /dev/null
+++ b/x11-wm/aewm/files/aewm-1.3.12-gentoo.patch
@@ -0,0 +1,63 @@
+--- 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,28 +60,28 @@
+ $(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; \
diff --git a/x11-wm/aewm/metadata.xml b/x11-wm/aewm/metadata.xml
new file mode 100644
index 000000000000..abd9614c9fc5
--- /dev/null
+++ b/x11-wm/aewm/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person"><email>jer@gentoo.org</email></maintainer>
+	<longdescription>
+	aewm is a minimalist window manager for X11. It has no nifty features, 
+	but is light on resources and extremely simple in appearance. It should 
+	eventually make a good reference implementation of the ICCCM. A few 
+	separate programs are included to handle running programs, switching 
+	between windows, etc.
+	</longdescription>	
+</pkgmetadata>
diff --git a/x11-wm/afterstep/Manifest b/x11-wm/afterstep/Manifest
new file mode 100644
index 000000000000..21232df9aa05
--- /dev/null
+++ b/x11-wm/afterstep/Manifest
@@ -0,0 +1,14 @@
+AUX afterstep 29 SHA256 c6e31f7e4912188f1ce7c41298cb66178944960628e1451efd42331236cbc3c5 SHA512 194b2af81df48b4c87704bee1db1d01c4cfac3a529f76d8d073fb1358aa95eb9e84a9c2a7da12983a64d61b63e2689b93a79b778007bb8bcdfad8574086ba852 WHIRLPOOL 15e5739cf470a100616019fcc53326b8a9ba2aef560b2ecf732a388175765ccdf0f9c0b0d6c4cf92aa4ee2a5445e635e5c1b4db36fdd75244fedf78310e71e55
+AUX afterstep-2.2.12-gcc5.patch 9374 SHA256 cc9178ff4c65b32b59972d9475b8e0e16943819d3eafa7fb0ae032ca4d57e564 SHA512 81f0998409d9d45f8a25d66cd1c0ae07d23f6ed40f77f56241aae9085d0098510058807f24310c557825ebd67a513cb0c67ff0430cb2f33d2e355e6482c2b491 WHIRLPOOL 674f4e3529260efb74d39eb0e36183ffd488dbf74af4f32ac0457dfbf2fc4370973a40b435896f2df24bc32e9d1837231c7cbf47aa02468b7d197dec73704918
+AUX afterstep-2.2.9-alpha.patch 475 SHA256 3208d1126ba14fc8c39c537cea701b2c89bcf9f778645add0e3465ce74139cd6 SHA512 7c963518b307346608948b956ef747c5cd5e437ee47682eb0352149dc4fc1a1995902097091882e1600bad1b0edd26e2ca2af797217372122b24b8cfbcd3ead1 WHIRLPOOL ba84f91426f2541a4b08ee006b64dd82edd0327091118ab44610bce48e0424d915996556bd73b26467bd00dade7cee43121267daef9583e45e797a97cd09d5f1
+AUX afterstep-2.2.9-ldflags.patch 1374 SHA256 80d9ff3b0106ff9315eb2f4406d29c6f95a10818f7821866e39a405c1cc3b562 SHA512 92640bfebcbb7f813112268ac18cf750530014b0bc1f187a57333b665f4234da4d0eb996b81517fc59ed3b507fced4a6ae8b0a9c255f2ae809cf1ecbaee43cdf WHIRLPOOL 74dbb3565401b6c15ebf004f2174f66a22de284403ca6730fbc8c6628b8c90fc4ddfd4fcd6abeefbf2cc7691b4209c5e49bac6fbcc274b55105cea41ffe02fc3
+AUX afterstep-2.2.9-libpng15.patch 1132 SHA256 4b08424b98d0b18f744f0a5fe0000f9149963b84bc28487a3e3f8eae1804560d SHA512 9f025d870b7b16bbb63e7097847b528b70e54e3174e1b71b4f8925f9a79f472c4ee8dda957394708d6c65c94068f0ed81273dff4c57bf11d6cf08fff895a6c22 WHIRLPOOL 1f4d861584b991b7002760f52e8198335cf7410d6fdb6101612830f2dc3a25089f0275173938627d5c6b07ebae73d6f3fc5d49fac2a170b6f5abac92ceaea7e0
+AUX afterstep-2.2.9-make_session_data_file.patch 422 SHA256 3fa0e494903d374db0da66de432e407889356cd50d1072aa4078516f5d31b5a3 SHA512 966955ed4bc74e727a2c3b2f521b322a32e29a14f1974aee1bedde5cbd06ac104509ed397ba5f2dda1cb6ee3a8aa63d0c90be1c243dd81704a4297403c6092f6 WHIRLPOOL ce33fca0e46a874e4d6bd5dcaab3d06766b211eaec83225a1c5fb585d1823d9bdb0544c3be53d87f03ce8a41efeddf7b99cde908b9a3c61bd06a477de79fcf59
+AUX no-alternatives-2.2.9.patch 1214 SHA256 f7a87859d043b210dd309128c9338e938f695cf248d2987ae2b8535243405e4f SHA512 d8d98d2f9cdab4818fbbc4050c0e5a6b244365e401996ffc2cd24e97fdb4f795ff396dd12766cd7c180bf0b717ac7f55c7072afc0761a526e529c300970b07fa WHIRLPOOL a94163a1dd362706f983f025a8621ae3a6427bc89e6fe94060ffd6b846f3d4dea269fecf8c7d0e7d13e844790bd6caf8255e9d579d41fc1b41a6e36fa7b98217
+DIST AfterStep-2.2.12.tar.bz2 6132233 SHA256 ff15da51d4122b8e0286567052951e11a746e7d878dade9ce37f9217439ffbc8 SHA512 5cac6ce74b24cbcc5b8e8a6f7cc9308e110f0d09597af1fa0a8730d5f5111932a23332629bc4d372fc8d9583a514d97e35f747b17decf8d4ebfe5e3f20cdbbee WHIRLPOOL eca804facc37252ebd8e3b8d02f23b6fc66f8a8895337bcfd5cbd1f88f4e09868d0e2005a8be29be785b1259914bca132da7ac63f584964e535c3108a0182028
+DIST AfterStep-2.2.9.tar.bz2 6094706 SHA256 678493cd3ec44eee219d65fee0e612f2d1e36f8b93cbabdf40a22133c0617148 SHA512 1191d918785d3e57f1921b1df21639eeae3298fb5f0f6e23a551f47afc5f0e0c945bae17b1ab8ba908ab0bd8476f5d358051593ff977c442783f94bd2e655ea5 WHIRLPOOL 49bae7a57f7f25703a8f3cbe4d8f18ba59131c9f1e5018de28f01eaee08e1f39b2f26e685d3d27f2d15ab7623fe88b61fa0997885a8a79b580a5225902bf6381
+EBUILD afterstep-2.2.12.ebuild 3451 SHA256 6a6bb907adac52dfd3d620a1e28d737b0195b94e2458f9e26e21ec0ea692006a SHA512 29a42713aa8b6e034177c9d782faa7f223881fea2e7e69e6c8f047e5fac9e1efad60b7a4a7894fb38447e6d75be5d6260792fab391da139451a94e40a7fe1031 WHIRLPOOL 9e6ab9d85c141c328fb75a0fe69fbc16683d788b9b24e2b7efaf1312091dea2dc4a7fdb3745fd52f6c7f7cc2e96f6eec70f0d331033f2d812d268df4e8541246
+EBUILD afterstep-2.2.9.ebuild 3557 SHA256 4b33da4a3076fb18f7671719cfe7f7cef6caa20ffd82b7202ebd4900068e3673 SHA512 9ed6878f48ef88704f51727a69a2f1ec6cc697007a40ba0755b8d8997d7941e2bf4dd85b037fdcf1df12ea9dbe2a1e3424e972162c72919b841800ff1dfb4cc0 WHIRLPOOL 99f51731df0487d41b1cfb9acdb22d40113232a82884acedbe8bc1443949508f42142c11a14e7c13350f99b5de9df4866e10a5e9bd4dc46dac6e3ba506f5a6b5
+MISC ChangeLog 3947 SHA256 9668625c783629edfaa423136bd1cadc3462ab43863afdbbd201944f7f3d8bcb SHA512 149a33ac1a440b093842e1a5704c318c12589fe49fc6faab0f35db64eb6e4e3a9471051246ed0da8487e7a03465fe3457dbf5b1affb587e6c16eb837ad276934 WHIRLPOOL 2dfc5af678e47ee603e21e132df8458d45bc2631ecc133c8cbec18880b7b83a53c7d7ef7dc8e0221f954ddf4b056c0fd268a92cee1bb7292ea6450adbe49db77
+MISC ChangeLog-2015 15462 SHA256 249cb29f925f4f261ca712eae67eec1300f4a3ce2713aa4e168aced5bdb53e0c SHA512 a312bd3aed8035cce53cbcfeb0225d8b29ffb83e012fde30b9ca992b68dabea5844f60c0b99212c7f50bba5b97a36fb750d6dfcab6fe2d57744f9d6a50d076c0 WHIRLPOOL c115ffde392adebec3756f39a6ce3a6e5df801b1ad020af0cc1ae45e1a45a8cc9ecdd0baa238fa12f10162785e3e8c7eb907bfeb01d727a674a5321d231176cd
+MISC metadata.xml 245 SHA256 df6d6782fd9d5b1a322b4acf1433c3961216bed7a274948566f41a57f3905fe4 SHA512 9e09ae84ab10dd84251f53e570c7d5bef4a7e3cbfcbba3548d8e3f2a00545b69fb3d01a5905c0d95826b6d0bef822c5c20158c0e70314be191d1d47456aa9a43 WHIRLPOOL 553e44dfba711e188d1babe52756642db8cdc45755fb2f3d203c014aeeb6db8ae2fc8a0e9d1751e16a7791c1ab1a83dc25c1ba704316bd66b9258f78d40951c0
diff --git a/x11-wm/afterstep/afterstep-2.2.12.ebuild b/x11-wm/afterstep/afterstep-2.2.12.ebuild
new file mode 100644
index 000000000000..ecc8881ac2ba
--- /dev/null
+++ b/x11-wm/afterstep/afterstep-2.2.12.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="A feature rich NeXTish window manager"
+HOMEPAGE="http://www.afterstep.org/"
+SRC_URI="ftp://ftp.afterstep.org/stable/AfterStep-${PV}.tar.bz2
+	mirror://sourceforge/${PN}/AfterStep-${PV}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="alsa debug dbus gif gtk jpeg cpu_flags_x86_mmx nls png svg tiff xinerama"
+
+RDEPEND="media-libs/freetype
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( sys-apps/dbus )
+	jpeg? ( virtual/jpeg:= )
+	gif? ( >=media-libs/giflib-4.1.0 )
+	gtk? ( x11-libs/gtk+:2 )
+	png? ( media-libs/libpng:0= )
+	svg? ( gnome-base/librsvg:2 )
+	tiff? ( media-libs/tiff:0 )
+	x11-libs/libICE
+	x11-libs/libXext
+	x11-libs/libSM
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libX11
+	x11-libs/libXpm
+	x11-libs/libXrender
+	xinerama? ( x11-libs/libXinerama )"
+DEPEND="${RDEPEND}
+	!!media-libs/libafterimage
+	x11-proto/xextproto
+	x11-proto/xproto
+	xinerama? ( x11-proto/xineramaproto )"
+
+S=${WORKDIR}/${PN}-devel-${PV}
+
+src_prepare() {
+	sed -i -e '/^install:/s:install.alternative ::' Makefile.in || die
+	sed -i -e '/CFLAGS="-O3"/d' libAfter{Base,Image}/configure || die
+	sed -i -e '/STRIP_BINARIES/s:-s::' autoconf/configure.in || die #252119
+	sed -i -e '/--with-builtin-gif/s/$with_gif/no/' autoconf/configure.in || die #253259
+	sed -i -e 's/install.bin install.alternative/install.bin/' src/afterstep/Makefile.in || die #568694
+	epatch "${FILESDIR}"/${P}-gcc5.patch #574184
+
+	pushd autoconf >/dev/null
+	eautoreconf
+	cp autoconf/config.h.in ./ || die
+	cp configure ../ || die
+	popd >/dev/null
+
+	pushd libAfterBase >/dev/null
+	eautoreconf
+	popd >/dev/null
+}
+
+src_configure() {
+	local myconf
+
+	use debug && myconf="--enable-gdb --enable-warn --enable-gprof
+		--enable-audit --enable-trace --enable-trace-x"
+
+	# Explanation of configure options
+	# ================================
+	# --with-helpcommand="xterm -e man" -  Avoid installing xiterm
+	# --with-xpm - Contained in xfree
+	# --disable-availability - So we can use complete paths for menuitems
+	# --enable-ascp - The AfterStep ControlPanel is abandoned
+	# LDCONFIG - bug #265841
+
+	LDCONFIG=/bin/true econf \
+		$(use_enable alsa) \
+		$(use_enable cpu_flags_x86_mmx mmx-optimization) \
+		$(use_enable nls i18n) \
+		$(use_enable xinerama) \
+		$(use_with dbus dbus1) \
+		$(use_with gif) \
+		$(use_with gtk) \
+		$(use_with jpeg) \
+		$(use_with png) \
+		$(use_with tiff) \
+		$(use_with svg) \
+		--with-helpcommand="xterm -e man" \
+		--disable-availability \
+		--disable-staticlibs \
+		--enable-ascp=no \
+		${myconf}
+}
+
+src_compile() {
+	# gcc: ../libAfterConf/libAfterConf.a: No such file or directory
+	# make[1]: *** [PrintDesktopEntries] Error 1
+	emake -j1
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# Create a symlink from MonitorWharf to Wharf
+	rm "${D}"/usr/bin/MonitorWharf
+	dosym /usr/bin/Wharf /usr/bin/MonitorWharf
+
+	# Handle the documentation
+	dodoc ChangeLog INSTALL NEW* README* TEAM
+	cp -pPR TODO "${D}"/usr/share/doc/${PF}/
+	dodir /usr/share/doc/${PF}/html
+	cp -pPR doc/* "${D}"/usr/share/doc/${PF}/html
+	rm "${D}"/usr/share/doc/${PF}/html/{Makefile*,afterstepdoc.in}
+
+	insinto /usr/share/xsessions
+	newins AfterStep.desktop.final AfterStep.desktop
+
+	# For desktop managers like GDM or KDE
+	exeinto /etc/X11/Sessions
+	doexe "${FILESDIR}"/${PN}
+}
diff --git a/x11-wm/afterstep/afterstep-2.2.9.ebuild b/x11-wm/afterstep/afterstep-2.2.9.ebuild
new file mode 100644
index 000000000000..4a450484b1f4
--- /dev/null
+++ b/x11-wm/afterstep/afterstep-2.2.9.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit autotools flag-o-matic eutils
+
+DESCRIPTION="A feature rich NeXTish window manager"
+HOMEPAGE="http://www.afterstep.org/"
+SRC_URI="ftp://ftp.afterstep.org/stable/AfterStep-${PV}.tar.bz2"
+
+# libAfterBase/libAfterImage are LGPL
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
+IUSE="alsa debug dbus gif gtk jpeg cpu_flags_x86_mmx nls png svg tiff xinerama"
+
+RDEPEND="
+	media-libs/freetype
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( sys-apps/dbus )
+	jpeg? ( virtual/jpeg )
+	gif?  ( >=media-libs/giflib-4.1.0 )
+	gtk? ( x11-libs/gtk+:2 )
+	png? ( media-libs/libpng:0 )
+	svg? ( gnome-base/librsvg:2 )
+	tiff? ( media-libs/tiff:0 )
+	x11-libs/libICE
+	x11-libs/libXext
+	x11-libs/libSM
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libX11
+	x11-libs/libXpm
+	x11-libs/libXrender
+	xinerama? ( x11-libs/libXinerama )"
+
+DEPEND="${RDEPEND}
+	x11-proto/xextproto
+	x11-proto/xproto
+	xinerama? ( x11-proto/xineramaproto )
+	!!media-libs/libafterimage"
+
+S=${WORKDIR}/AfterStep-${PV}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/no-alternatives-${PV}.patch \
+		"${FILESDIR}"/${P}-make_session_data_file.patch \
+		"${FILESDIR}"/${P}-alpha.patch \
+		"${FILESDIR}"/${P}-ldflags.patch \
+		"${FILESDIR}"/${P}-libpng15.patch
+
+	sed -i \
+		-e '/CFLAGS="-O3"/d' \
+		libAfter{Base,Image}/configure || die
+
+	sed -i \
+		-e "/STRIP_BINARIES/s/-s//" \
+		autoconf/configure.in || die #252119
+
+	sed -i \
+		-e '/--with-builtin-gif/s/$with_gif/no/' \
+		autoconf/configure.in || die #253259
+
+	cd "${S}"/autoconf || die
+	eautoreconf
+	cp "${S}"/autoconf/autoconf/config.h.in "${S}"/autoconf || die
+	cp "${S}"/autoconf/configure "${S}" || die
+}
+
+src_configure() {
+	local myconf
+
+	use debug && myconf="--enable-gdb --enable-warn --enable-gprof
+		--enable-audit --enable-trace --enable-trace-x"
+
+	#implied intent of debug means you need the frame pointers.
+	use debug && filter-flags -fomit-frame-pointer
+
+	# Explanation of configure options
+	# ================================
+	# --with-helpcommand="xterm -e man" -  Avoid installing xiterm
+	# --with-xpm - Contained in xfree
+	# --disable-availability - So we can use complete paths for menuitems
+	# --enable-ascp - The AfterStep ControlPanel is abandoned
+	# LDCONFIG - bug #265841
+
+	LDCONFIG=/bin/true econf \
+		$(use_enable alsa) \
+		$(use_enable cpu_flags_x86_mmx mmx-optimization) \
+		$(use_enable nls i18n) \
+		$(use_enable xinerama) \
+		$(use_with dbus dbus1) \
+		$(use_with gif) \
+		$(use_with gtk) \
+		$(use_with jpeg) \
+		$(use_with png) \
+		$(use_with tiff) \
+		$(use_with svg) \
+		--with-helpcommand="xterm -e man" \
+		--disable-availability \
+		--disable-staticlibs \
+		--enable-ascp=no \
+		${myconf}
+}
+
+src_compile() {
+	# gcc: ../libAfterConf/libAfterConf.a: No such file or directory
+	# make[1]: *** [PrintDesktopEntries] Error 1
+	emake -j1
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# Create a symlink from MonitorWharf to Wharf
+	rm "${D}"/usr/bin/MonitorWharf
+	dosym /usr/bin/Wharf /usr/bin/MonitorWharf
+
+	# Handle the documentation
+	dodoc ChangeLog INSTALL NEW* README* TEAM UPGRADE
+	cp -pPR "${S}"/TODO "${D}"/usr/share/doc/${PF}/
+	dodir /usr/share/doc/${PF}/html
+	cp -pPR "${S}"/doc/* "${D}"/usr/share/doc/${PF}/html
+	rm "${D}"/usr/share/doc/${PF}/html/{Makefile*,afterstepdoc.in}
+
+	insinto /usr/share/xsessions
+	newins "${S}"/AfterStep.desktop.final AfterStep.desktop
+
+	# For desktop managers like GDM or KDE
+	exeinto /etc/X11/Sessions
+	doexe "${FILESDIR}"/afterstep
+}
diff --git a/x11-wm/afterstep/files/afterstep b/x11-wm/afterstep/files/afterstep
new file mode 100644
index 000000000000..22bc4441ea42
--- /dev/null
+++ b/x11-wm/afterstep/files/afterstep
@@ -0,0 +1,2 @@
+#!/bin/sh
+/usr/bin/afterstep
diff --git a/x11-wm/afterstep/files/afterstep-2.2.12-gcc5.patch b/x11-wm/afterstep/files/afterstep-2.2.12-gcc5.patch
new file mode 100644
index 000000000000..9447bcf990d9
--- /dev/null
+++ b/x11-wm/afterstep/files/afterstep-2.2.12-gcc5.patch
@@ -0,0 +1,227 @@
+From: Robert Luberda <robert@debian.org>
+Date: Sun, 22 Mar 2015 16:35:31 +0100
+Subject: 44 Fix build with gcc 5
+
+Remove `inline' keywords from header files, and fix implicit
+declaration warnings to make the code compile with gcc 5, which
+have the c99 standard enabled by default.
+
+Bug-Debian: https://bugs.debian.org/777768
+---
+ libAfterBase/asvector.h     | 2 +-
+ libAfterBase/output.h       | 2 +-
+ libAfterBase/parse.h        | 2 +-
+ libAfterConf/Feel.c         | 2 ++
+ libAfterStep/colorscheme.c  | 2 +-
+ libAfterStep/event.c        | 2 +-
+ libAfterStep/functions.h    | 2 +-
+ libAfterStep/mylook.h       | 8 ++++----
+ libAfterStep/session.h      | 2 +-
+ src/WinList2/WinList.c      | 2 +-
+ src/afterstep/asinternals.h | 9 +++++++--
+ src/afterstep/events.c      | 1 +
+ src/afterstep/menuitem.c    | 2 ++
+ 13 files changed, 24 insertions(+), 14 deletions(-)
+
+diff --git a/libAfterBase/asvector.h b/libAfterBase/asvector.h
+index 242bbb8..ec83231 100644
+--- a/libAfterBase/asvector.h
++++ b/libAfterBase/asvector.h
+@@ -38,7 +38,7 @@ ASVector *append_vector( ASVector *v, void * data, size_t size );
+ /* returns index on success, -1 on failure */
+ int vector_insert_elem( ASVector *v, void *data, size_t size, void *sibling, int before );
+ int vector_relocate_elem (ASVector *v, unsigned int index, unsigned int new_index);
+-inline size_t vector_find_data (ASVector *v, void *data );
++size_t vector_find_data (ASVector *v, void *data );
+ int vector_find_elem( ASVector *v, void *data );
+ /* returns 1 on success, 0 on failure */
+ int vector_remove_elem( ASVector *v, void *data );
+diff --git a/libAfterBase/output.h b/libAfterBase/output.h
+index fd186a7..ef21919 100644
+--- a/libAfterBase/output.h
++++ b/libAfterBase/output.h
+@@ -56,7 +56,7 @@ Bool show_debug( const char *file, const char *func, int line, const char *msg_f
+ 
+ 
+ void nonGNUC_debugout( const char *format, ...);
+-inline void nonGNUC_debugout_stub( const char *format, ...);
++void nonGNUC_debugout_stub( const char *format, ...);
+ /* may be used below in case compilation problems occur.
+  * Please submit a bug report if usage of any of the following generates errors on
+  * your compiler . Thanks!!! */
+diff --git a/libAfterBase/parse.h b/libAfterBase/parse.h
+index 193fbba..e4db499 100644
+--- a/libAfterBase/parse.h
++++ b/libAfterBase/parse.h
+@@ -73,7 +73,7 @@ format_geometry ( int x, int y, unsigned int width, unsigned int height, int fla
+ 
+ double parse_math(const char* str, char** endptr, double size);
+ 
+-inline int unsigned_int2buffer_end (char *buffer, int buffer_size, unsigned int val);
++int unsigned_int2buffer_end (char *buffer, int buffer_size, unsigned int val);
+ char *string_from_int (int param);
+ char *hex_to_buffer_reverse(void *data, size_t bytes, char* buffer);
+ char *hex_to_buffer(void *data, size_t bytes, char* buffer);
+diff --git a/libAfterConf/Feel.c b/libAfterConf/Feel.c
+index 0f2224b..787964d 100644
+--- a/libAfterConf/Feel.c
++++ b/libAfterConf/Feel.c
+@@ -29,6 +29,8 @@
+ 
+ #include "afterconf.h"
+ 
++#include <X11/XKBlib.h>
++
+ 
+ flag_options_xref WindowBoxFlagsXref[] = {
+ 	{ASA_Virtual, WINDOWBOX_Virtual_ID, 0}
+diff --git a/libAfterStep/colorscheme.c b/libAfterStep/colorscheme.c
+index 6cdeb56..5b93107 100644
+--- a/libAfterStep/colorscheme.c
++++ b/libAfterStep/colorscheme.c
+@@ -162,7 +162,7 @@ static inline ARGB32 MAKE_ARGB32_SHADE100 (CARD32 a, int s100)
+ 	return MAKE_ARGB32_GREY8 (a, s8);
+ }
+ 
+-inline void
++static inline void
+ make_mono_grad_argb (ARGB32 * grad, ARGB32 base_alpha16, int shade100,
+ 										 int *val_ret)
+ {
+diff --git a/libAfterStep/event.c b/libAfterStep/event.c
+index a27759b..8c7a449 100644
+--- a/libAfterStep/event.c
++++ b/libAfterStep/event.c
+@@ -202,7 +202,7 @@ void sync_event_queue (Bool forget)
+ /****************************************************************************
+  * Records the time of the last processed event. Used in XSetInputFocus
+  ****************************************************************************/
+-inline Time stash_event_time (XEvent * xevent)
++static inline Time stash_event_time (XEvent * xevent)
+ {
+ 	if (xevent->type < LASTEvent) {
+ 		register Time *ptime =
+diff --git a/libAfterStep/functions.h b/libAfterStep/functions.h
+index fb565f1..a50f4e3 100644
+--- a/libAfterStep/functions.h
++++ b/libAfterStep/functions.h
+@@ -314,7 +314,7 @@ FunctionCode change_func_code (const char *func_name, FunctionCode new_code);
+ void init_func_data (FunctionData * data);
+ void copy_func_data (FunctionData * dst, FunctionData * src);
+ void dup_func_data (FunctionData * dst, FunctionData * src);
+-inline FunctionData *create_named_function( int func, char *name);
++FunctionData *create_named_function( int func, char *name);
+ void set_func_val (FunctionData * data, int arg, int value);
+ int free_func_data (FunctionData * data);
+ void destroy_func_data( FunctionData **pdata );
+diff --git a/libAfterStep/mylook.h b/libAfterStep/mylook.h
+index 7bff0b8..a002aa8 100644
+--- a/libAfterStep/mylook.h
++++ b/libAfterStep/mylook.h
+@@ -397,7 +397,7 @@ void myback_delete( MyBackground **myback, ASImageManager *imman );
+ MyDesktopConfig *create_mydeskconfig( int desk, char *data );
+ void init_deskconfigs_list( MyLook *look );
+ void mydeskconfig_delete( MyDesktopConfig **dc );
+-inline MyDesktopConfig *add_deskconfig_to_list( ASHashTable *list, MyDesktopConfig *dc );
++MyDesktopConfig *add_deskconfig_to_list( ASHashTable *list, MyDesktopConfig *dc );
+ MyDesktopConfig *add_deskconfig( MyLook *look, MyDesktopConfig *dc );
+ 
+ ARGB32 get_random_tint_color();
+@@ -411,9 +411,9 @@ void mylook_set_font_size_var (MyLook * look);
+ 
+ 
+ struct MyStyle *mylook_get_style(MyLook *look, const char *name);
+-inline MyBackground  *mylook_get_desk_back(MyLook *look, long desk);
+-inline MyBackground  *mylook_get_back(MyLook *look, char *name);
+-inline MyDesktopConfig *mylook_get_desk_config(MyLook *look, long desk);
++MyBackground  *mylook_get_desk_back(MyLook *look, long desk);
++MyBackground  *mylook_get_back(MyLook *look, char *name);
++MyDesktopConfig *mylook_get_desk_config(MyLook *look, long desk);
+ 
+ 
+ 
+diff --git a/libAfterStep/session.h b/libAfterStep/session.h
+index 536e225..73945d8 100644
+--- a/libAfterStep/session.h
++++ b/libAfterStep/session.h
+@@ -49,7 +49,7 @@ void 	   destroy_assession (ASSession * session);
+ void       update_default_session ( ASSession *session, int func);
+ 
+ void 	   set_session_override(ASSession * session, const char *overriding_file, int function );
+-inline const char *get_session_override(ASSession * session, int function );
++const char *get_session_override(ASSession * session, int function );
+ 
+ void 	   change_default_session (ASSession * session, const char *new_val, int function);
+ void 	   change_desk_session (ASSession * session, int desk, const char *new_val, int function);
+diff --git a/src/WinList2/WinList.c b/src/WinList2/WinList.c
+index 6db35ac..6c98f38 100644
+--- a/src/WinList2/WinList.c
++++ b/src/WinList2/WinList.c
+@@ -976,7 +976,7 @@ moveresize_main_canvas( int width, int height )
+ void
+ postponed_rearrange_winlist( void *vdata )
+ {
+-    Bool dont_resize_main_canvas  = (Bool)vdata ;   
++    Bool dont_resize_main_canvas  = vdata != NULL;
+     rearrange_winlist_window( dont_resize_main_canvas );    
+ }
+ 
+diff --git a/src/afterstep/asinternals.h b/src/afterstep/asinternals.h
+index 81b3249..9f75fd8 100644
+--- a/src/afterstep/asinternals.h
++++ b/src/afterstep/asinternals.h
+@@ -575,6 +575,7 @@ void asdbus_shutdown();
+ void asdbus_process_messages ();
+ 
+ char *asdbus_RegisterSMClient(const char *sm_client_id);
++void asdbus_UnregisterSMClient (const char *sm_client_path);
+ void asdbus_Notify(const char *summary, const char *body, int timeout);
+ 
+ typedef enum {
+@@ -585,6 +586,10 @@ typedef enum {
+ 
+ Bool asdbus_GetCanLogout ();
+ Bool asdbus_Logout (ASDbusLogoutMode mode, int timeout);
++Bool asdbus_GetCanSuspend ();
++Bool asdbus_Suspend (int timeout);
++Bool asdbus_GetCanHibernate ();
++Bool asdbus_Hibernate (int timeout);
+ Bool asdbus_GetCanShutdown ();
+ Bool asdbus_Shutdown (int timeout);
+ Bool get_gnome_autosave ();
+@@ -689,8 +694,8 @@ void ParsePopupEntry (char *tline, FILE * fd, char **junk, int *junk2);
+ 
+ 
+ /*************************** misc.c *********************************/
+-inline void ungrab_window_buttons( Window w );
+-inline void ungrab_window_keys (Window w );
++void ungrab_window_buttons( Window w );
++void ungrab_window_keys (Window w );
+ void MyXGrabButton ( unsigned button, unsigned modifiers,
+ 				Window grab_window, Bool owner_events, unsigned event_mask,
+ 				int pointer_mode, int keyboard_mode, Window confine_to, Cursor cursor);
+diff --git a/src/afterstep/events.c b/src/afterstep/events.c
+index 5588ffb..19e5441 100644
+--- a/src/afterstep/events.c
++++ b/src/afterstep/events.c
+@@ -46,6 +46,7 @@
+ #include "../../libAfterStep/moveresize.h"
+ 
+ #include <X11/keysym.h>
++#include <X11/XKBlib.h>
+ #ifdef XSHMIMAGE
+ # include <sys/ipc.h>
+ # include <sys/shm.h>
+diff --git a/src/afterstep/menuitem.c b/src/afterstep/menuitem.c
+index 1adcb65..8a35186 100644
+--- a/src/afterstep/menuitem.c
++++ b/src/afterstep/menuitem.c
+@@ -55,6 +55,8 @@
+ 
+ #include "dirtree.h"
+ 
++#include <X11/XKBlib.h>
++
+ /***************************************************************************/
+ /*                      Menu functions                                     */
+ /***************************************************************************/
diff --git a/x11-wm/afterstep/files/afterstep-2.2.9-alpha.patch b/x11-wm/afterstep/files/afterstep-2.2.9-alpha.patch
new file mode 100644
index 000000000000..307180b9bae0
--- /dev/null
+++ b/x11-wm/afterstep/files/afterstep-2.2.9-alpha.patch
@@ -0,0 +1,15 @@
+libAfterStep/alpha_header.h:15: error: conflicting types for 'strlen'
+
+--- libAfterStep/asapp.h
++++ libAfterStep/asapp.h
+@@ -15,10 +15,6 @@
+ #include "sun_headers.h"
+ #endif
+ 
+-#if defined(__alpha)
+-#include "alpha_header.h"
+-#endif /* NEEDS_ALPHA_HEADER */
+-
+ /* Some people say that AIX and AIXV3 need 3 preceding underscores, other say
+  * no. I'll do both */
+ #if defined ___AIX || defined _AIX || defined __QNX__ || defined ___AIXV3 || defined AIXV3 || defined _SEQUENT_
+\ No newline at end of file
diff --git a/x11-wm/afterstep/files/afterstep-2.2.9-ldflags.patch b/x11-wm/afterstep/files/afterstep-2.2.9-ldflags.patch
new file mode 100644
index 000000000000..5d27d7d8293f
--- /dev/null
+++ b/x11-wm/afterstep/files/afterstep-2.2.9-ldflags.patch
@@ -0,0 +1,37 @@
+Respect LDFLAGS
+
+http://bugs.gentoo.org/show_bug.cgi?id=325309
+
+--- autoconf/Makefile.common.lib.in
++++ autoconf/Makefile.common.lib.in
+@@ -245,7 +245,7 @@
+ 	$(LN_S) -f $(LIB_SHARED).$(LIBVER) $(LIB_SHARED).$(LIBVERMAJOR)
+ 
+ $(LIB_SHARED).$(LIBVER): $(LIB_OBJS) $(LIB_INCS)
+-	$(CC) -shared -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \
++	$(CC) -shared $(LDFLAGS) -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \
+ 	 $(LIB_OBJS)
+ 
+ install:	install.lib install.bin
+--- libAfterImage/Makefile.in
++++ libAfterImage/Makefile.in
+@@ -395,7 +395,7 @@
+ 	$(LN_S) -f $(LIB_SHARED).$(LIBVER) $(LIB_SHARED).$(LIBVERMAJOR)
+ 
+ $(LIB_SHARED).$(LIBVER): $(LIB_OBJS) $(LIB_INCS) config.h
+-	$(CC) -shared -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \
++	$(CC) -shared $(LDFLAGS) -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \
+ 	 $(LIB_OBJS)
+ 
+ install.man:
+--- libAfterBase/Makefile.in
++++ libAfterBase/Makefile.in
+@@ -325,7 +325,7 @@
+ 	$(LN_S) -f $(LIB_SHARED).$(LIBVER) $(LIB_SHARED).$(LIBVERMAJOR)
+ 
+ $(LIB_SHARED).$(LIBVER): $(LIB_OBJS) $(LIB_INCS)
+-	$(CC) -shared -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \
++	$(CC) -shared $(LDFLAGS) -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \
+ 	 $(USER_LD_FLAGS) $(LIBS_X) $(LIB_OBJS)
+ 
+ install:	install.lib
diff --git a/x11-wm/afterstep/files/afterstep-2.2.9-libpng15.patch b/x11-wm/afterstep/files/afterstep-2.2.9-libpng15.patch
new file mode 100644
index 000000000000..b420489b3266
--- /dev/null
+++ b/x11-wm/afterstep/files/afterstep-2.2.9-libpng15.patch
@@ -0,0 +1,31 @@
+--- libAfterImage/export.c
++++ libAfterImage/export.c
+@@ -483,7 +483,7 @@
+ 	png_ptr = png_create_write_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL );
+     if ( png_ptr != NULL )
+     	if( (info_ptr = png_create_info_struct(png_ptr)) != NULL )
+-			if( setjmp(png_ptr->jmpbuf) )
++			if( setjmp(png_jmpbuf(png_ptr)) )
+ 			{
+ 				png_destroy_info_struct(png_ptr, (png_infopp) &info_ptr);
+ 				info_ptr = NULL ;
+--- libAfterImage/import.c
++++ libAfterImage/import.c
+@@ -1251,7 +1251,7 @@
+ 			 * the normal method of doing things with libpng).  REQUIRED unless you
+ 			 * set up your own error handlers in the png_create_read_struct() earlier.
+ 			 */
+-			if ( !setjmp (png_ptr->jmpbuf))
++			if ( !setjmp (png_jmpbuf(png_ptr)))
+ 			{
+ 				ASFlagType rgb_flags = ASStorage_RLEDiffCompress|ASStorage_32Bit ;
+ 
+@@ -1468,7 +1468,7 @@
+ 
+ static void asim_png_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
+ {
+-   ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_ptr->io_ptr;
++   ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_get_io_ptr(png_ptr);
+    memcpy(data, buf->buffer, length);
+    buf->buffer += length;
+ }
diff --git a/x11-wm/afterstep/files/afterstep-2.2.9-make_session_data_file.patch b/x11-wm/afterstep/files/afterstep-2.2.9-make_session_data_file.patch
new file mode 100644
index 000000000000..2c2f8bfeee3d
--- /dev/null
+++ b/x11-wm/afterstep/files/afterstep-2.2.9-make_session_data_file.patch
@@ -0,0 +1,14 @@
+http://bugs.gentoo.org/308649
+
+asgtklookedit.c:658:3: warning: implicit declaration of function ‘make_session_data_file’
+
+--- libASGTK/asgtklookedit.c
++++ libASGTK/asgtklookedit.c
+@@ -28,6 +28,7 @@
+ #include "../libAfterStep/parser.h"
+ #include "../libAfterStep/freestor.h"
+ #include "../libAfterStep/mystyle.h"
++#include "../libAfterStep/session.h"
+ #include "../libAfterConf/afterconf.h"
+ 
+ #include <unistd.h>		   
diff --git a/x11-wm/afterstep/files/no-alternatives-2.2.9.patch b/x11-wm/afterstep/files/no-alternatives-2.2.9.patch
new file mode 100644
index 000000000000..4195413c5eed
--- /dev/null
+++ b/x11-wm/afterstep/files/no-alternatives-2.2.9.patch
@@ -0,0 +1,29 @@
+--- Makefile.in.orig	2008-08-08 18:59:39.000000000 +0200
++++ Makefile.in	2008-08-08 19:00:51.000000000 +0200
+@@ -71,7 +71,8 @@
+ 
+ module.clean:
+  
+-install:  install.alternative install.desktop install.wmprops mkdir
++#install:  install.alternative install.desktop install.wmprops mkdir
++install:  install.desktop install.wmprops mkdir
+ 	@for I in ${subdirs} ; do if [ -d $$I ]; then (cd $$I; ${MAKE} install || exit 1); fi; done
+ 
+ install.bin: mkdir.bin
+@@ -86,11 +87,11 @@
+ install.script: mkdir.bin
+ 	@for I in ${subdirs}; do if [ -d $$I ]; then (cd $$I; ${MAKE} install.script || exit 1); fi; done
+ 
+-install.alternative:
+-	@if update-alternatives --version > /dev/null 2>&1 ; then 	\
+-		update-alternatives --install /etc/alternatives/x-window-manager x-window-manager $(AFTER_BIN_DIR)/afterstep 100; \
+-		echo "added AfterStep as an x-window-manager alternative"; \
+-	fi
++#install.alternative:
++#	@if update-alternatives --version > /dev/null 2>&1 ; then 	\
++#		update-alternatives --install /etc/alternatives/x-window-manager x-window-manager $(AFTER_BIN_DIR)/afterstep 100; \
++#		echo "added AfterStep as an x-window-manager alternative"; \
++#	fi
+ 	
+ 
+ install.desktop: AfterStep.desktop.final mkdir.share
diff --git a/x11-wm/afterstep/metadata.xml b/x11-wm/afterstep/metadata.xml
new file mode 100644
index 000000000000..ffe0e9223de5
--- /dev/null
+++ b/x11-wm/afterstep/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">afterstep</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-wm/amiwm/Manifest b/x11-wm/amiwm/Manifest
new file mode 100644
index 000000000000..e7039d587890
--- /dev/null
+++ b/x11-wm/amiwm/Manifest
@@ -0,0 +1,8 @@
+AUX amiwm-0.21_p2-flex-2.6.3-fix.patch 686 SHA256 58dadef7af5fb0d7c58ab91481cffebe32e06e3a0be8a0ef4bfaeaeb48edd183 SHA512 14982dba3c1baf8bbca9daee204c32d3312c2505127bd4e2744eb9348784e927fbf4c2cb7e3f50c84494d62a714313c7bf0762023ad84fdb3707e108e1778693 WHIRLPOOL 01ea0555cb1fcaea70cae7a8ba4ef17c6b8cbc241d9f3f1f028e7d20f12e844f677f2340d6438a82ecdb874c2e956f9cdfbfd700104644fa6b2624d93dd403b6
+AUX amiwm-0.21_p2-gentoo.diff 6030 SHA256 60680ea549e76468d51418d1168c30527696ab8b9b6d97d067422dd8711bcb5e SHA512 0eed752869ab7a46de2925e13e53796d1459d1ce656cd3d96b0367dcb6f17fbb2e98cd58a336e0d6880f9e76ca037c7ac2b91f1670ecc636f5ba8281dc35aa82 WHIRLPOOL a8628b696682f73bfd59c7a5c7e57aefe7a2bca5055399ea63c01578093393a945e93f9fa2fa1d08c97706a684e1521e58e0cabb8d2b00cd932f412deb6f0927
+AUX amiwm-0.21_p2-implicts.patch 1547 SHA256 bd84dba61c5c9fe0c8d1c6a7730d2823230cc0de89d07f2f82c95eeea1b1716b SHA512 19a0983d7de963f75696968918553c362941e437e5f5ebe75ceb0d0b4f28402c00f1df003bd1639ad6001274b670cad97ce1324afa1aae68c1dc93a424422b1a WHIRLPOOL cab8245f0868be39b5c9c0eeb11eb42e01d5d38f64f473e0041d153e87d0d56808ea1854e47dd32aae7fb989e7c4147053f384b7e677d4d08ec41d27d40f8089
+DIST amiwm0.21pl2.tar.gz 195128 SHA256 7d8f83ae15f04fdc2c188e546bf8233974f5e38f2b4724655128ab7b5351c3df SHA512 6504a4fd4c30a571b0c501b46fdc442fcc993c27b4595753f7bfa12a38c0b997a01d939c7a35e6c499aa0f8972bc0fda7cc88a9fe77091f363f8cd5a9e8d50de WHIRLPOOL 180efbcf92a284b2de15f3a815bbbaddacb2fc34bbd3b4b47cde18bfc40c7476c546e09c19516c2a7ce9eafa6b067e8e56511ecc459b3bcae4aaa725e9cead39
+EBUILD amiwm-0.21_p2.ebuild 1262 SHA256 c4703a42c23611ec6cb31b6d24a1ab9e3cd4a082ef0b38bff203d5d2aa44c8eb SHA512 73c2b231bfe238d600d4267595c6a63a24c2481a025f72fc73a2fa6e8145acc19b4eed7f0528bc349430d6adddd8d90e9af7bccc046885bf70aac606507e99a3 WHIRLPOOL 9fba5aa90b963171629a4c92a2e15ea4d37d972ec4c595213fd325b27875a644fc79d04fa9931d988a1f72eaab722ca7f75b0beefd251125e4928bde163e04e9
+MISC ChangeLog 2662 SHA256 7bcb3697faa30e7b9ec70bb2ff6eb79f3ae8419582b38750c33972810f378456 SHA512 67bd8a72a1cf6d1f02c1672c76a5697025ba331c0d8a0c034d81ba032c67f947809bef95570ac0cc240394113e021cd1443bb29367f3870502196966ddd538ff WHIRLPOOL 9f78febd32708d2675f5b1952d98f2cd33c726c8b02d960ddbb80d454310cf981edc5e79fda4267c3080c4fbddc31d0efbde07d6949773cf4c29f8f5500ab42e
+MISC ChangeLog-2015 2059 SHA256 7216a974d32a69ea39047b12a8825d3a713ef27ef7fe309c1ff6b72828ab9550 SHA512 4ed00c8f70b2bff8a39c5a248b4647c2e052dbfaa1df638e1fd07afaa5323c99d40a23a010f30a626b67e6692abdfe6ada4fafa662ef34c14d149f282f4a2f87 WHIRLPOOL 669ebe7cd778fe66aabbbc07d36431bd1430c503731c25d0ca433aa3a3a181f426bc14acc864d7b3c8130e4a54e8f25451d73b2586034ef143ddf22c71675873
+MISC metadata.xml 421 SHA256 fd3f27d05f9bf0c92b95697a4bb104a1a5e0c40412d85a50b9f2672fb0226a40 SHA512 941d314dced43df9951b885f47245c4ca9deff091c8c75727f1cc2b3fcdb485024d4b8e04ebf8d40bebe491bae50522e41ae3cee9f6f600814874f01aae43d90 WHIRLPOOL bf24ca55fe0842f0f6b00c35b01e679ec495ac89f720872d49472ba74c9ac1c79709987b22f936185f642d6c556553e8d86e109348ee96f618adc6af769452e4
diff --git a/x11-wm/amiwm/amiwm-0.21_p2.ebuild b/x11-wm/amiwm/amiwm-0.21_p2.ebuild
new file mode 100644
index 000000000000..3e5a3cf8bacd
--- /dev/null
+++ b/x11-wm/amiwm/amiwm-0.21_p2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils multilib toolchain-funcs
+
+MY_P=${PN}${PV/_p/pl}
+DESCRIPTION="Windowmanager ala Amiga(R) Workbench(R)"
+HOMEPAGE="http://www.lysator.liu.se/~marcus/amiwm.html"
+SRC_URI="ftp://ftp.lysator.liu.se/pub/X11/wm/${PN}/${MY_P}.tar.gz"
+
+LICENSE="amiwm"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+COMMON_DEPEND="x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXext"
+
+RDEPEND="${COMMON_DEPEND}
+	media-gfx/xloadimage
+	x11-apps/xrdb
+	x11-apps/xsetroot
+	x11-terms/xterm"
+DEPEND="${COMMON_DEPEND}
+	x11-proto/xproto
+	x11-proto/xextproto"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-gentoo.diff"
+	"${FILESDIR}/${P}-implicts.patch"
+	"${FILESDIR}/${P}-flex-2.6.3-fix.patch"
+)
+
+pkg_setup() {
+	tc-export CC
+}
+
+src_prepare() {
+	default
+	sed -e "s:\$(exec_prefix)/lib:\$(exec_prefix)/$(get_libdir):" \
+		-e '/^STRIPFLAG/s@-s@@' \
+		-e '/$(LN_S)/s@$(DESTDIR)$(AMIWM_HOME)@../..$(AMIWM_HOME)@' \
+		-i Makefile.in || die
+	sed -i -e "s:/bin/ksh:/bin/sh:g" Xsession{,2}.in || die
+
+	cat <<- EOF > "${T}"/amiwm
+		#!/bin/sh
+		exec /usr/bin/amiwm
+	EOF
+}
+
+src_install() {
+	local DOCS=( README* )
+	default
+
+	exeinto /etc/X11/Sessions
+	doexe "${T}"/amiwm
+}
diff --git a/x11-wm/amiwm/files/amiwm-0.21_p2-flex-2.6.3-fix.patch b/x11-wm/amiwm/files/amiwm-0.21_p2-flex-2.6.3-fix.patch
new file mode 100644
index 000000000000..ae89aafdae86
--- /dev/null
+++ b/x11-wm/amiwm/files/amiwm-0.21_p2-flex-2.6.3-fix.patch
@@ -0,0 +1,31 @@
+--- amiwm0.21pl2/lex.l
++++ amiwm0.21pl2/lex.l
+@@ -1,5 +1,6 @@
++%option noyywrap
+ %{
+ #include <stdio.h>
+ #include "gram.h"
+ extern char *progname;
+ extern int ParseError;
+--- amiwm0.21pl2/kbdlexer.l
++++ amiwm0.21pl2/kbdlexer.l
+@@ -1,5 +1,6 @@
++%option noyywrap
+ %{
+ #include <X11/Xmu/CharSet.h>
+ #include <string.h>
+ 
+ #include "libami.h"
+@@ -134,12 +135,9 @@ int parse_keyword(char *str, YYSTYPE *va
+ 
+ .               { fprintf(stderr, "%s: illegal character \"%s\" ignored\n",
+                           progname, yytext); }
+ %%
+ 
+-#ifndef yywrap
+-int yywrap() { return 1; }
+-#endif
+ #undef input
+ #define input() ((*inptr)?(*inptr++):0)
+ #undef unput
+ #define unput(c) (*--inptr=c)
diff --git a/x11-wm/amiwm/files/amiwm-0.21_p2-gentoo.diff b/x11-wm/amiwm/files/amiwm-0.21_p2-gentoo.diff
new file mode 100644
index 000000000000..fa875a4a43bf
--- /dev/null
+++ b/x11-wm/amiwm/files/amiwm-0.21_p2-gentoo.diff
@@ -0,0 +1,160 @@
+Fix parallel build, don't strip binaries, respect CC LDFLAGS, fix install dirs
+Fix incompatible implicit declaration of built-in function {strlen,memset,strcpy}
+
+http://bugs.gentoo.org/show_bug.cgi?id=248680
+http://bugs.gentoo.org/show_bug.cgi?id=299918
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -14,7 +14,7 @@
+ exec_prefix = @exec_prefix@
+ bindir = $(exec_prefix)/bin
+ libdir = $(exec_prefix)/lib
+-mandir = $(prefix)/man
++mandir = $(prefix)/share/man
+ INSTALL = @INSTALL@
+ LN_S = @LN_S@
+ RM = -rm -f
+@@ -45,13 +45,19 @@
+ 
+ AMIWM_HOME = $(libdir)/amiwm
+ 
++.PHONY: yaccs all clean lib_all lexs
++
++.SUFFIXES: .c
++
+ all : lib_all
+ 	@$(MAKE) local_all
+ 
+ local_all : $(PROGS) $(MODULES)
+ 
++$(OBJS): lexs
++
+ lib_all :
+-	@( cd libami; $(MAKE) all )
++	@$(MAKE) -C libami all
+ 
+ .c.o:
+ 	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $<
+@@ -71,83 +77,75 @@
+ ppmtoinfo.o : ppmtoinfo.c
+ 	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -DAMIWM_HOME=\"$(AMIWM_HOME)\" $<
+ 
+-gram.h gram.c: gram.y
+-	$(YACC) $(YFLAGS) $<
+-	mv y.tab.c gram.c
+-	mv y.tab.h gram.h
++yaccs: gram.c kbdmodule.c
++lexs: yaccs lex.c kbdlexer.c
++
++%.c: %.y
++	$(YACC) $(YFLAGS) $< -o $@
+ 
+-lex.c : lex.l
+-	$(LEX) -t $< > lex.c
+ 
+-kbdmodule.h kbdmodule.c: kbdmodule.y
+-	$(YACC) $(YFLAGS) $<
+-	mv y.tab.c kbdmodule.c
+-	mv y.tab.h kbdmodule.h
++lex.c : lex.l
++	$(LEX) -t $< > lex.c
+ 
+ kbdlexer.c : kbdlexer.l
+ 	$(LEX) -t $< > kbdlexer.c
+ 
+-install : $(PROGS) $(MODULES) Xsession Xsession2 Xinitrc amiwm-init
+-	-mkdir -p $(AMIWM_HOME)
+-	$(INSTALL) $(STRIPFLAG) requestchoice $(AMIWM_HOME)/requestchoice
+-	$(INSTALL) $(STRIPFLAG) executecmd $(AMIWM_HOME)/executecmd
++install : Xsession Xsession2 Xinitrc amiwm-init
++	$(INSTALL) -D requestchoice $(DESTDIR)$(AMIWM_HOME)/requestchoice
++	$(INSTALL) executecmd $(DESTDIR)$(AMIWM_HOME)/executecmd
+ 	for module in $(MODULES); do \
+ 	  if [ "$$module" = "$(srcdir)/Background" ]; then \
+-	    $(INSTALL) $$module $(AMIWM_HOME)/Background; \
++	    $(INSTALL) $$module $(DESTDIR)$(AMIWM_HOME)/Background; \
+ 	  else \
+-	    $(INSTALL) $(STRIPFLAG) $$module $(AMIWM_HOME)/$$module; \
++	    $(INSTALL) $(STRIPFLAG) $$module $(DESTDIR)$(AMIWM_HOME)/$$module; \
+ 	  fi; \
+ 	done
+-	$(INSTALL) -m 644 $(srcdir)/system.amiwmrc $(AMIWM_HOME)/system.amiwmrc
+-	$(INSTALL) -m 644 $(srcdir)/def_tool.info $(AMIWM_HOME)/def_tool.info
+-	$(INSTALL) -m 644 $(srcdir)/system.map $(AMIWM_HOME)/system.map
+-	$(INSTALL) -m 644 $(srcdir)/magicwb.map $(AMIWM_HOME)/magicwb.map
+-	$(INSTALL) -m 644 $(srcdir)/schwartz.map $(AMIWM_HOME)/schwartz.map
+-	$(INSTALL) -m 755 Xsession $(AMIWM_HOME)/Xsession
+-	$(INSTALL) -m 755 Xsession2 $(AMIWM_HOME)/Xsession2
+-	$(INSTALL) -m 755 Xinitrc $(AMIWM_HOME)/Xinitrc
+-	$(INSTALL) -m 755 $(srcdir)/amiwm-init $(AMIWM_HOME)/amiwm-init
+-	-mkdir -p $(bindir)
+-	$(INSTALL) $(STRIPFLAG) amiwm $(bindir)/amiwm
+-	$(INSTALL) $(STRIPFLAG) ppmtoinfo $(bindir)/ppmtoinfo
+-	$(RM) $(bindir)/requestchoice
+-	$(LN_S) $(AMIWM_HOME)/requestchoice $(bindir)/requestchoice
+-	-mkdir -p $(mandir)/man1
+-	$(INSTALL) -m 644 $(srcdir)/amiwm.1 $(mandir)/man1/amiwm.1
++	$(INSTALL) -m 644 $(srcdir)/system.amiwmrc $(DESTDIR)$(AMIWM_HOME)/system.amiwmrc
++	$(INSTALL) -m 644 $(srcdir)/def_tool.info $(DESTDIR)$(AMIWM_HOME)/def_tool.info
++	$(INSTALL) -m 644 $(srcdir)/system.map $(DESTDIR)$(AMIWM_HOME)/system.map
++	$(INSTALL) -m 644 $(srcdir)/magicwb.map $(DESTDIR)$(AMIWM_HOME)/magicwb.map
++	$(INSTALL) -m 644 $(srcdir)/schwartz.map $(DESTDIR)$(AMIWM_HOME)/schwartz.map
++	$(INSTALL) -m 755 Xsession $(DESTDIR)$(AMIWM_HOME)/Xsession
++	$(INSTALL) -m 755 Xsession2 $(DESTDIR)$(AMIWM_HOME)/Xsession2
++	$(INSTALL) -m 755 Xinitrc $(DESTDIR)$(AMIWM_HOME)/Xinitrc
++	$(INSTALL) -m 755 $(srcdir)/amiwm-init $(DESTDIR)$(AMIWM_HOME)/amiwm-init
++	$(INSTALL) -D amiwm $(DESTDIR)$(bindir)/amiwm
++	$(INSTALL) ppmtoinfo $(DESTDIR)$(bindir)/ppmtoinfo
++	$(RM) $(DESTDIR)$(bindir)/requestchoice
++	$(LN_S) $(DESTDIR)$(AMIWM_HOME)/requestchoice $(DESTDIR)$(bindir)/requestchoice
++	$(INSTALL) -D -m 644 $(srcdir)/amiwm.1 $(DESTDIR)$(mandir)/man1/amiwm.1
+ 
+ fs-install : Filesystem
+-	$(INSTALL) $(STRIPFLAG) Filesystem $(AMIWM_HOME)/Filesystem
+-	$(INSTALL) -m 644 def_disk.info $(AMIWM_HOME)/def_disk.info
+-	$(INSTALL) -m 644 def_drawer.info $(AMIWM_HOME)/def_disk.info
++	$(INSTALL) Filesystem $(DESTDIR)$(AMIWM_HOME)/Filesystem
++	$(INSTALL) -m 644 def_disk.info $(DESTDIR)$(AMIWM_HOME)/def_disk.info
++	$(INSTALL) -m 644 def_drawer.info $(DESTDIR)$(AMIWM_HOME)/def_disk.info
+ 
+ cde-install : Xresources.amiwm Amilogo.bm Amilogo.pm
+-	-mkdir -p $(DT_DIR)/config/C/Xresources.d
+-	$(INSTALL) -m 644 Xresources.amiwm $(DT_DIR)/config/C/Xresources.d/Xresources.amiwm
+-	-mkdir -p $(DT_DIR)/appconfig/icons/C
+-	$(INSTALL) -m 644 Amilogo.bm $(DT_DIR)/appconfig/icons/C/Amilogo.bm
++	$(INSTALL) -D -m 644 Xresources.amiwm $(DESTDIR)$(DT_DIR)/config/C/Xresources.d/Xresources.amiwm
++	$(INSTALL) -D -m 644 Amilogo.bm $(DESTDIR)$(DT_DIR)/appconfig/icons/C/Amilogo.bm
+ 	$(INSTALL) -m 644 Amilogo.pm $(DT_DIR)/appconfig/icons/C/Amilogo.pm
+ 
+ 
+ amiwm : $(OBJS) $(LIBAMI)
+-	$(CC) -o amiwm $(OBJS) $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o amiwm $(OBJS) $(LIBS)
+ 
+ requestchoice : requestchoice.o $(LIBAMI)
+-	$(CC) -o requestchoice requestchoice.o $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o requestchoice requestchoice.o $(LIBS)
+ 
+ executecmd : executecmd.o $(LIBAMI)
+-	$(CC) -o executecmd executecmd.o $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o executecmd executecmd.o $(LIBS)
+ 
+ Filesystem : filesystem.o $(LIBAMI)
+-	$(CC) -o Filesystem filesystem.o $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o Filesystem filesystem.o $(LIBS)
+ 
+ Keyboard : kbdmodule.o kbdlexer.o $(LIBAMI)
+-	$(CC) -o Keyboard kbdmodule.o kbdlexer.o $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o Keyboard kbdmodule.o kbdlexer.o $(LIBS)
+ 
+ ppmtoinfo : ppmtoinfo.o
+-	$(CC) -o ppmtoinfo ppmtoinfo.o -lm
++	$(CC) $(CFLAGS) $(LDFLAGS) -o ppmtoinfo ppmtoinfo.o -lm
+ 
+ localetest : localetest.o $(LIBAMI)
+-	$(CC) -o localetest localetest.o $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o localetest localetest.o $(LIBS)
+ 
+ clean :
+ 	$(RM) core $(PROGS) $(LIBAMI) Keyboard *.o libami/*.o
diff --git a/x11-wm/amiwm/files/amiwm-0.21_p2-implicts.patch b/x11-wm/amiwm/files/amiwm-0.21_p2-implicts.patch
new file mode 100644
index 000000000000..4a01347d0e86
--- /dev/null
+++ b/x11-wm/amiwm/files/amiwm-0.21_p2-implicts.patch
@@ -0,0 +1,73 @@
+--- a/main.c
++++ b/main.c
+@@ -131,6 +131,7 @@
+ extern void read_rc_file(char *filename, int manage_all);
+ extern void init_modules();
+ extern void flushmodules();
++extern void closescreen();
+ extern void raiselowerclient(Client *, int);
+ 
+ #ifndef AMIGAOS
+--- a/menu.c
++++ b/menu.c
+@@ -45,6 +45,11 @@
+ extern void mod_menuselect(struct module *, int, int, int);
+ extern void setfocus(Window);
+ extern void flushmodules();
++extern void openscreen(char *, Window);
++extern void realizescreens(void);
++extern void screentoback();
++extern void wberror(Scrn *, char *);
++extern void closescreen();
+ 
+ Scrn *mbdclick=NULL, *mbdscr=NULL;
+ 
+--- a/icc.c
++++ b/icc.c
+@@ -6,6 +6,7 @@
+ #include "prefs.h"
+ 
+ #include <string.h>
++#include <stdlib.h>
+ 
+ #ifdef AMIGAOS
+ #include <pragmas/xlib_pragmas.h>
+--- a/libami/lists.c
++++ b/libami/lists.c
+@@ -1,3 +1,4 @@
++#include <string.h>
+ #include "libami.h"
+ 
+ #ifndef AMIGAOS
+--- a/kbdmodule.y
++++ b/kbdmodule.y
+@@ -2,6 +2,8 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include "libami.h"
++int yyerror(char *);
++int yylex (void);
+ 
+ void docmd(XEvent *e, void *callback)
+ {
+--- a/gram.y
++++ b/gram.y
+@@ -8,6 +8,8 @@
+ #include "screen.h"
+ #include "icc.h"
+ #include "style.h"
++int yyerror(char *);
++int yylex (void);
+ extern void set_sys_palette(void);
+ extern void set_mwb_palette(void);
+ extern void set_schwartz_palette(void);
+--- a/ppmtoinfo.c
++++ b/ppmtoinfo.c
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <time.h>
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
diff --git a/x11-wm/amiwm/metadata.xml b/x11-wm/amiwm/metadata.xml
new file mode 100644
index 000000000000..722041341d07
--- /dev/null
+++ b/x11-wm/amiwm/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+<longdescription>
+	amiwm is an X window manager that tries to make your display look and 
+	feel like an Amiga Workbench screen. It is fully functional and can do 
+	all the usual window manager stuff, like moving and resizing windows.
+	</longdescription>	
+</pkgmetadata>
diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest
new file mode 100644
index 000000000000..71d97283572f
--- /dev/null
+++ b/x11-wm/awesome/Manifest
@@ -0,0 +1,31 @@
+AUX awesome-3.5.5-cflag-cleanup.patch 660 SHA256 5f5c87b343cb989e2cd9db45e89589aca6ef84d5180cf21b2675c79d9b6811f3 SHA512 5711e328839ce32789fe213c2c1d6b56e476d7ba09303d52dc5c307a97b35bbdc1c9c0d673a51b5859a2c0f035002152c762e3cd725c4231bc811dfac5dad79f WHIRLPOOL 3c486db45933634d74e9076d7a4d7d8cc90e65d627718b6a2a27c7b2fe5454c4a1b7b265140c07637a9238957d3eb3c5c283874eb7e56040725b97f23b3417ee
+AUX awesome-3.5.5-util.lua-xdg-icons-fix.patch 1756 SHA256 47491b76393565996f2df29387bd368700e376f08e36cd618129b204567078eb SHA512 8348b51a90ac9f0423de1e5ae81aeee6dc8da8e249bcee09a0ddf89c582b34f1f420ef579d58c717078bbf7eedb6cbe36782bf9cfddbe2bd27e96c726bd493d6 WHIRLPOOL b86b1d93c454e2bd291d86f896f8249df07b3224659e8f373368cf0b500a2eb10a1a66ef459ee29537c028b66198c2e82b0b37a24237a7be26c66a4b73868145
+AUX awesome-3.5.6-fix-multi-instances-focus.patch 944 SHA256 0fb59b14fad5da7023243963a95f56786612f036cb81f12a39b5ca1395981a58 SHA512 8e4ae1841c2cb9c2083d09841f7381d81fd99070a31d6a2a1f83bba7f18180b276b81cc38e12d6c272e60351f05b63a07318d3fe3b5331ab0c8fe915b89b6092 WHIRLPOOL 000ae4f9e5315317b9b8351f09717db8f6e69428f340db5002eb6d701b58185f1e17caedee721875567b42b4cd0644e631e242516da44f6368b1fd32a2a3078f
+AUX awesome-3.5_rc1-convert-path.patch 539 SHA256 955aaa96dc9a1e779fa62f14d91358dc852b8101577c9b2e029cca9f68e07c96 SHA512 b5b8f42ddd21bf851e13fe0a0d844b055795979ae701a418780a2e0282cedd1ae745f00c13e5a0f5b9ac48a70c2ffbf7d9b7dd2856783a4b0434b09683947150 WHIRLPOOL a4dc65d2625e34999b2eea828d3d6889fdea4c8c661713569e298f5500d775205a0df3a6c652d8418f1b7f6baa313db4e09685f2fb88a012bdf822ec135a92c1
+AUX awesome-4.0-cflag-cleanup.patch 395 SHA256 05e07a6af10105205878f1e545be6efd0accd348530f81156df3604ad2d5c039 SHA512 e9ffe2b66046e0ebbc0bb3c0b8f9bd67bd7d8d351792e299730abfbd8f284dd0631e87b27a8ba22587e9059b13d13381902efb4b9423348b735021eaee779e9c WHIRLPOOL 875fb868bfea3697972d8d63cf4342ca5babe6660058cdbaaad4f17d92fc9e9d86d2e68eba60bfd34bd55d95a8ccfd1b6db916fa569a54551aa45b883b95975c
+AUX awesome-4.0-convert-path.patch 257 SHA256 1743bc4485b2339f42a25f49e207e97571b36ed50e2bc91d4b4662fe8da868e9 SHA512 3eadbc1d14a18e3d669bb8ecf3769ff888d4b30328f0167166c8632498ad50bf21f004098960507a1b96c5bd5f76a4fcdc74022d820d2d809175ec2829a26f5d WHIRLPOOL 29cb24b1fdb0a4544933d1e4843a793ad53a2fe335d5de2f361c5bd38da4e29689ed1215eebfff6984b99bacf5ee9b5c7dcd90cc607e43f658ed35c3abe47730
+AUX awesome-gnome-3.session 93 SHA256 66d568b7d0d5f53d62be3f329e955daa863548d56ef9bb9d13df25bfce65fbfd SHA512 0530d7c1f5239cad9cd32bbb37bab449fe79fe6d658037a31d4ab29936dc119a41f8de66bb321a3fbd5fd300b378930466073624d7a30f089dda9c0ad3897829 WHIRLPOOL 4fc3d144f5f8e46016de7ac65afb8cd748c0b47d25b3e0b7e49d39a2a15f32c72923bcdeea7f0496de6f923b97ec548a780bfdba2b712fee85423c4924664250
+AUX awesome-gnome-xsession.desktop 179 SHA256 859d0083cdabf9b40cb00b2ce4e107e536f85e44cfc87206a2f1b7438672d4a3 SHA512 873c70a499bd44874b3399a58f42c69740023b43c17e6548e0c30a54cf64ab37a0ffec240e06dff4a6950b50f7010d48fdd036448f145fed3ac3095d4caf508c WHIRLPOOL 21b0a327c6fdec064552db5e10a94fa46c9a6f59dfa8abdb433a9a5c763d6d88e1fdd6ed51b3c3a6bbbb2f6fec7323aa6e711d95723c4fbe749e7279c9ef3c16
+AUX awesome-gnome.desktop 191 SHA256 cd0b8cc4450127b5363a5e11cfa41245c31bd9ea6b0570da11466a55bbe85e97 SHA512 50570e0bd7c7ef3dc39bcf0dfdbc35d44b67316da7574aaea26dedb89726b40d04e4d509fb798b36c49930f247f0293fdeff2bdc32e6b3067e4f568b30f99fae WHIRLPOOL b4f25229841268cd3aa21956364ebab9476cdc27d45734d895352dc8f8db302d6405ee49a8696c6f9a5657ae292cd6d66ff8f4abdbe292eb7c33eb5b6496933c
+AUX awesome-gnome.session 220 SHA256 e17e3a7e97f569d36f7e35b5e20f5292a2ff56b3036738ee4b1c0b706e2b627a SHA512 86246ddd9db41007c23735d0773b5c6d37eeda33318d9e3e33f57fb46befdd32380aaf9fb6bf539a9080e5f2400ccf5d7de55842c420c458b8e8d62a5edae09b WHIRLPOOL 7b1ed26bca8819863b53d59103dd68a0bdf6f0e0e5e4c8ee0c1aa8ca9d0ad38b9ba15afaa50b8f30e85f33c727462071217eab671168b9fe073dad75124d2139
+AUX awesome-session 1999 SHA256 bee150a5b32a118c905ffe26df3f776f40a2db19230f6600cc2966b6c727838a SHA512 b6e7cc0813569b448b030cb8516d0272ebcf60b96f680b7de43dc4374e6e2d85b9bd841c6f1ab62caca52120c303332653e3de38eca0fe6a813b9bc5b68ac8b7 WHIRLPOOL 467116cc409accea0e2a083536d2933df80ad3b8bd27d02e98473dae9a45f5a7f21090c4244b52f9a1ac919af1d01da5ed6266de9fd8e232b899bc3602b93e2e
+AUX awesome-xsession.patch 291 SHA256 5c91cfa250db132bed365677be53604f37a2cb91c55b64fd8fafb99da27cd363 SHA512 1d19f3ac5e9f8fd1084fd5e092d52ffbabb06fc3dc94f6f8e62834a3a03bd5bcb04adc698ac3a022c5446a07a847be35e3f3003e8bc9e7d35c6c82350517233d WHIRLPOOL 9f70a1fd16a467bfa29f95ca0124aa272ba3ad7ba7c7e2bffdf80191ac46a24446e63efef47f95d55eaa1d173b6ddcc8edb72f14f69df5e2cd6fe66d4d5a2991
+DIST awesome-3.5.6.tar.xz 720112 SHA256 37f49de187825425cb3096fc870959d5fec9302b22ffd0f2874d8a18e85046d7 SHA512 8d89bf46956276a8bcf106bb255c051e8382b08617e17691134a8f3e5db3ec9f7773581c02ce62d23e72499f7b1e60fe4322c211e41219b5bffd1897a96f6cf6 WHIRLPOOL 8ec944f1113f7b7b7c6857c02a6c657aec05ddf23674c75a7cf571d4a65720ed4f5f1d28b0fdac032c12ea5e9a54f655d080c6af4e1d314b8c00bf2b9e806d01
+DIST awesome-3.5.7.tar.xz 722864 SHA256 ba7f92b0ab8b729c569b19b098b0a08339d8654e3c040d07ad02cf99641ceecf SHA512 0b57efa6ba55e28fee56bec96dbf3c47249b2d70b21e1a7760d4367a0ba42d9936c1c6b78afa4aa3050a60cf34189551ea53b208ec8ec9f6563a905463550515 WHIRLPOOL ea368fa058aa1c6a143e6f24231adeb47c5e0d26c462b076d8930a49f72c94097555a542405360c107a9e724f4fcc0993a0ff8b53102dfb072db2a9b04f52d9a
+DIST awesome-3.5.8.tar.xz 723000 SHA256 7c30c96c57bd72cfed630bbccc344054fe44b37c0a79bdd98075c507af672ec6 SHA512 be5604821e256e36067750c341ca6f8669e159527b93654c8fc41bcd161da6d87fa0e3c5fccc51821586d163535ac78363d12d99ed81b6fb14e26da59136d5ef WHIRLPOOL 2abe85d034c40dddc2189e8eac6e80c59ad1b92bebb0e1c08f67e8a07a3b8eb420ad352c2f4bf500f15ff8aaaa54a0c6dfc67aef5c5516a2aada267388d2ac4f
+DIST awesome-3.5.9.tar.xz 723084 SHA256 c7f8b5e4578751688d70ec8c410c55316e22bca8ec1195c622274f1f7254d64f SHA512 6a4c679b293e8cd85d1f7e13f6dea704cbb267e42b9260496a54b657a66d6148aae51521d802d61baaeb23df0d4a8ad0b28d9dc922ea5da2a347b4251cce5e25 WHIRLPOOL 0d2a0b2ad08b07ec8de0150e5e9b8382732b04df3c535d5351ab46d2d7722bc85143d1b00bf47578f7d61d1bc3c3afba5d3e0e6c5ed5ee74f9ad77ea98e3a723
+DIST awesome-4.0.tar.xz 930664 SHA256 5c009730126fcef6bdcb6939084c9736fa02debbe28a5adc1b66297dcc67f333 SHA512 80bdfe5f9166f5e9b0266cd630b48607d17605330d0f172666dbfa3f239ef04aeafafebe8949c3bf1c31a7bd372b60252d56c815048a24e015858585c3d0432b WHIRLPOOL 4a93070fddb7223da14936e77e5e367a426d53e2dd42a56a2fe1eef84883bff43bf8bbf8bd8e3e3d74b267980ef02df0fc20df70f92623502794d92fe3c3e86e
+DIST awesome-4.1.tar.xz 960768 SHA256 27a1db13ef4aa8e104a795e8c11c8611d75d8b0d864c277b8ef7c6f1ab6d04b8 SHA512 e0c1ed5fc8f0455258ec2566e430b24e52b78d1ae54357f5de1bf08f2e44682e9b2c5548905a90cc4526d98d2b6700e087b679abc9e620d3751ea420df9434f6 WHIRLPOOL e3ba1d98a913108c02c661a2f4d77db78cc30d8f470c9a8fa906022a04f7dec40e861db5646fea931e8d23d07893982efbcbc7a259b66a10b57b34d513f25332
+DIST awesome-4.2.tar.xz 987024 SHA256 ac5da1a99f5fad083821993d2b56d1cd9594164eafc0be2beb540598345d974f SHA512 134dd3625c86243861b3d0701cc8bfd8c00986d7027f0832016c3f5e59e6b9a1ef2f677bb0d1d66ece63449533e4b13d8d7388e96e6f9014212030a79f163e09 WHIRLPOOL eae432021fc62ca0c2729eea97578984cff78749cb9f85797ed59487c800e63959004f53f46a995bb4406c346111458b81126c7b2b47817d2b5d943d4d0fff4c
+EBUILD awesome-3.5.6-r2.ebuild 3258 SHA256 d624fb48fda8ebbe646a625c7ee85b639db4c2b362b96ce0df15b84ef2ff59d0 SHA512 1b86f1e13001f9fd0a20638d75d8c4f8ea6bf8bc9377b255ea709859fcecedf3f23293518f9ee856362bf85c7d8af0d9835833eda7bc34f5f872ecfc6aa91e1f WHIRLPOOL a0d76dbeb355617f1bc3a8990f9b04dc15e48b8ea9e4036fa2461b797e1df0db50000a5d77de25a3a8e321526271d84f38054681b856c6dbc42f5840a61137fe
+EBUILD awesome-3.5.7.ebuild 3290 SHA256 8ab2326af5bfa67cd7249ad467b220ca20b0a03e4b0d75578f08924959536a7a SHA512 11e2bb8263f33ae6335ef058bafa726bd1cca3980de27f3e76f3b2a51bb625019a163e0ab8418051a152620605cea68f46487b9495e4c081d5fe7d1a67c597e0 WHIRLPOOL c7030bb1d23e451defe26a521ebabbc7549fba80f68e4d08d7d36d1bbb626d2308c0d66146792f5e7946ab0f682282596753d1c5ef62ba859d376da170d1b176
+EBUILD awesome-3.5.8.ebuild 3290 SHA256 8ab2326af5bfa67cd7249ad467b220ca20b0a03e4b0d75578f08924959536a7a SHA512 11e2bb8263f33ae6335ef058bafa726bd1cca3980de27f3e76f3b2a51bb625019a163e0ab8418051a152620605cea68f46487b9495e4c081d5fe7d1a67c597e0 WHIRLPOOL c7030bb1d23e451defe26a521ebabbc7549fba80f68e4d08d7d36d1bbb626d2308c0d66146792f5e7946ab0f682282596753d1c5ef62ba859d376da170d1b176
+EBUILD awesome-3.5.9.ebuild 3290 SHA256 8ab2326af5bfa67cd7249ad467b220ca20b0a03e4b0d75578f08924959536a7a SHA512 11e2bb8263f33ae6335ef058bafa726bd1cca3980de27f3e76f3b2a51bb625019a163e0ab8418051a152620605cea68f46487b9495e4c081d5fe7d1a67c597e0 WHIRLPOOL c7030bb1d23e451defe26a521ebabbc7549fba80f68e4d08d7d36d1bbb626d2308c0d66146792f5e7946ab0f682282596753d1c5ef62ba859d376da170d1b176
+EBUILD awesome-4.0-r1.ebuild 3038 SHA256 695c3c18c5fc19fe384e59eea0ce9579bc03601bd4b4ada765e9aa1f105afc16 SHA512 0b27b64a823bd8d61214a0d405031b466b0886f351ecbcb3fc02483f88dd1e4e4b2e796c0b6da91d92bba9267cb241723b2f28d61a862a7cba94d49c529db26e WHIRLPOOL f25b08ef05e41ec94c4f44da905613e3d2e2c289fcfeab245aa69590dda027d0334f820c20b86a6937f3aff2154a0f7ec8708182e1ae1f8bf819edb1bdfb3c0b
+EBUILD awesome-4.0.ebuild 2839 SHA256 8cbf1f1c9c5a1179a8ca0245cc37d42f311e8462d7fd2a38aabc267aad624e40 SHA512 a083ed4b9ae277e8e4059031d8fd1e8ed37885bc0019ea8c44155ecfcee5e036432623e07951dcb5f38e3ec431bd7f99b257b42efde949c44a83e08e4eb42674 WHIRLPOOL 4fb2c256877653c2ff67c83b36e33b1e5e724a8f36bea6ebb261a096d8f9de48a8a3ee814a865a937ae8a0e8dac2c836027bd2bd296d4abb1ce6afba61efde21
+EBUILD awesome-4.1.ebuild 3022 SHA256 bfa9660e7c6287e114060588e95d7ef0863b8cc7c87163f4f59653f2fc33b1df SHA512 b42632f71c5075dc83608b7d3b61d430f2e805b777bd1833f93eb1848307c71e4887ba445378cafd50a4c238c0d2290a0436515e7132c7edd16436a6b59dfbaf WHIRLPOOL cbef58901e9415611cf03fd43c4c7900676ee21bb5bf655325083d7f3cb8eb868574bfcf3c20d305de3240c9450e0abd0602910844bd4d7c511a0469c6a0539d
+EBUILD awesome-4.2.ebuild 3022 SHA256 bfa9660e7c6287e114060588e95d7ef0863b8cc7c87163f4f59653f2fc33b1df SHA512 b42632f71c5075dc83608b7d3b61d430f2e805b777bd1833f93eb1848307c71e4887ba445378cafd50a4c238c0d2290a0436515e7132c7edd16436a6b59dfbaf WHIRLPOOL cbef58901e9415611cf03fd43c4c7900676ee21bb5bf655325083d7f3cb8eb868574bfcf3c20d305de3240c9450e0abd0602910844bd4d7c511a0469c6a0539d
+EBUILD awesome-9999.ebuild 2998 SHA256 69efed257cbba4ba27eb9b19eb37cae805847a589a23379f0028342d750f59c1 SHA512 e8c24a3a9a290ae90bc6bde550c564ec85dac3237603e875382c552e6ae3661572732a526f1e02951f187da13b093288550448aadd107dfd3d01ce51f26d1b1c WHIRLPOOL 222e3b0dfc0957a54787960d355d0455d8e0c1a87efaa9780e76c983a62577e1bc1f35490b765ec80da855b4eeb9e7a8ebdb7b088dd044264dc20d59dfe07440
+MISC ChangeLog 5691 SHA256 35d00f56b986f2401740a221d9e2f39271aeccd996024aa101b38af124937af9 SHA512 7b883105b862551fdd8f1d7eff00ec33902e6d8abb962ab4666844631ab66c8fe40bf9a98b31475f8597a4b9eb13f48e5e3e97917d2863bd400d0378e7946158 WHIRLPOOL 05d50555f4c41e840ceafe932d407db73e2d5adf0b95b6adb4b6102b32d04fb409cf876817a8452f147ed479dbc14b42d2a3522d453c2af8c927a2f99d9e2114
+MISC ChangeLog-2015 25678 SHA256 78bbde8d8b8a3b20cefcad163d23d3aa09faa575559ea68e32f44b7318b357f4 SHA512 6de596aa388b0bd17261f6df6c7ba3c8c3342cff524eca63be31678d75da20f189211c8956e0006bb46e399bfcab8c9f9923a1e2131b841fa0a2189668816376 WHIRLPOOL 09082cf05bde708e82be279fbecdb4ba7a38ec6c94c81c4af868eaf536efd410aacdb292ca195d5b6e36e6a91dd4cc01d846db4b8cac404dcbefad3461c5de84
+MISC metadata.xml 678 SHA256 f7af6ae28010fb300714026fd1a7d7916c008298ba8cbaa4301c6ee9037dbf47 SHA512 c50888d616bc887cdf1aec26469da7d8a0041f7f1904e7aeed4b763866827def72f5a06d30ac2da3d04b7d0c05929d87fac60b45c9e6aa5d107e464b92ee6ff9 WHIRLPOOL 32669ba653b226f0fd02fd292b45c7071abdf5dcb7a0538ee3e452ef439b7215de81cd8c344d5398d8c638fd17b949ddc5ecce653239d0c7d8d81d8b9a7fe4c6
diff --git a/x11-wm/awesome/awesome-3.5.6-r2.ebuild b/x11-wm/awesome/awesome-3.5.6-r2.ebuild
new file mode 100644
index 000000000000..ada253ff8f8e
--- /dev/null
+++ b/x11-wm/awesome/awesome-3.5.6-r2.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+inherit cmake-utils eutils
+
+DESCRIPTION="A dynamic floating and tiling window manager"
+HOMEPAGE="http://awesome.naquadah.org/"
+SRC_URI="http://awesome.naquadah.org/download/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-fbsd"
+IUSE="dbus doc elibc_FreeBSD gnome"
+
+COMMON_DEPEND="
+	>=dev-lang/lua-5.1:0
+	dev-libs/glib:2
+	>=dev-libs/libxdg-basedir-1
+	>=dev-lua/lgi-0.7
+	x11-libs/cairo[xcb]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/libxcb-1.6
+	>=x11-libs/pango-1.19.3[introspection]
+	>=x11-libs/startup-notification-0.10_p20110426
+	>=x11-libs/xcb-util-0.3.8
+	x11-libs/xcb-util-cursor
+	x11-libs/libXcursor
+	>=x11-libs/libX11-1.3.99.901
+	dbus? ( >=sys-apps/dbus-1 )
+	elibc_FreeBSD? ( dev-libs/libexecinfo )"
+
+# graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
+DEPEND="${COMMON_DEPEND}
+	>=app-text/asciidoc-8.4.5
+	app-text/xmlto
+	dev-util/gperf
+	virtual/pkgconfig
+	media-gfx/imagemagick[png]
+	>=x11-proto/xcb-proto-1.5
+	>=x11-proto/xproto-7.0.15
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DOCS="AUTHORS BUGS PATCHES README STYLE"
+
+src_prepare() {
+	# bug #408025
+	epatch "${FILESDIR}/${PN}-3.5_rc1-convert-path.patch"
+	epatch "${FILESDIR}/${PN}-xsession.patch"
+
+	# bug #507604
+	epatch "${FILESDIR}/${PN}-3.5.5-util.lua-xdg-icons-fix.patch"
+	# bug #509658
+	epatch "${FILESDIR}/${PN}-3.5.5-cflag-cleanup.patch"
+
+	# bug #571544
+	epatch "${FILESDIR}/${P}-fix-multi-instances-focus.patch"
+
+	epatch_user
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DSYSCONFDIR="${EPREFIX}"/etc
+		$(cmake-utils_use_with dbus DBUS)
+		$(cmake-utils_use doc GENERATE_DOC)
+		)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	local myargs="all"
+
+	if use doc ; then
+		myargs="${myargs} doc"
+	fi
+	cmake-utils_src_make ${myargs}
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use doc ; then
+		(
+			cd "${CMAKE_BUILD_DIR}"/doc
+			mv html doxygen
+			dohtml -r doxygen || die
+		)
+	fi
+	rm -rf "${ED}"/usr/share/doc/${PN} || die "Cleanup of dupe docs failed"
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/${PN}-session ${PN} || die
+
+	# GNOME-based awesome
+	if use gnome ; then
+		# GNOME session
+		insinto /usr/share/gnome-session/sessions
+		newins "${FILESDIR}/${PN}-gnome-3.session" "${PN}-gnome.session" || die
+		# Application launcher
+		domenu "${FILESDIR}/${PN}-gnome.desktop" || die
+		# X Session
+		insinto /usr/share/xsessions/
+		doins "${FILESDIR}/${PN}-gnome-xsession.desktop" || die
+	fi
+}
+
+pkg_postinst() {
+	# bug #447308
+	if use gnome; then
+		elog
+		elog "You have enabled the gnome USE flag."
+		elog "Please note that quitting awesome won't kill your gnome session."
+		elog "To really quit the session, you should bind your quit key"
+		elog "to the following command:"
+		elog "  gnome-session-quit --logout"
+		elog "For more info visit"
+		elog "  https://bugs.gentoo.org/show_bug.cgi?id=447308"
+	fi
+
+	# bug #440724
+	elog
+	elog "If you are having issues with Java application windows being"
+	elog "completely blank, try installing"
+	elog "  x11-misc/wmname"
+	elog "and setting the WM name to LG3D."
+	elog "For more info visit"
+	elog "  https://bugs.gentoo.org/show_bug.cgi?id=440724"
+	elog
+}
diff --git a/x11-wm/awesome/awesome-3.5.7.ebuild b/x11-wm/awesome/awesome-3.5.7.ebuild
new file mode 100644
index 000000000000..c3473fd22bd5
--- /dev/null
+++ b/x11-wm/awesome/awesome-3.5.7.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+inherit cmake-utils eutils
+
+DESCRIPTION="A dynamic floating and tiling window manager"
+HOMEPAGE="http://awesome.naquadah.org/"
+SRC_URI="http://awesome.naquadah.org/download/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="dbus doc elibc_FreeBSD gnome"
+
+COMMON_DEPEND="
+	>=dev-lang/lua-5.1:0
+	dev-libs/glib:2
+	>=dev-libs/libxdg-basedir-1
+	>=dev-lua/lgi-0.7
+	x11-libs/cairo[xcb]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/libxcb-1.6
+	>=x11-libs/pango-1.19.3[introspection]
+	>=x11-libs/startup-notification-0.10_p20110426
+	>=x11-libs/xcb-util-0.3.8
+	x11-libs/xcb-util-cursor
+	x11-libs/libXcursor
+	>=x11-libs/libX11-1.3.99.901
+	dbus? ( >=sys-apps/dbus-1 )
+	elibc_FreeBSD? ( dev-libs/libexecinfo )"
+
+# graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
+DEPEND="${COMMON_DEPEND}
+	>=app-text/asciidoc-8.4.5
+	app-text/xmlto
+	dev-util/gperf
+	virtual/pkgconfig
+	media-gfx/imagemagick[png]
+	>=x11-proto/xcb-proto-1.5
+	>=x11-proto/xproto-7.0.15
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DOCS="AUTHORS BUGS PATCHES README STYLE"
+
+src_prepare() {
+	# bug #408025
+	epatch "${FILESDIR}/${PN}-3.5_rc1-convert-path.patch"
+	epatch "${FILESDIR}/${PN}-xsession.patch"
+
+	# bug #507604
+	epatch "${FILESDIR}/${PN}-3.5.5-util.lua-xdg-icons-fix.patch"
+	# bug #509658
+	epatch "${FILESDIR}/${PN}-3.5.5-cflag-cleanup.patch"
+
+	# bug #571544
+	# Merged upstream
+	#epatch "${FILESDIR}/${PN}-3.5.6-fix-multi-instances-focus.patch"
+
+	epatch_user
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DSYSCONFDIR="${EPREFIX}"/etc
+		$(cmake-utils_use_with dbus DBUS)
+		$(cmake-utils_use doc GENERATE_DOC)
+		)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	local myargs="all"
+
+	if use doc ; then
+		myargs="${myargs} doc"
+	fi
+	cmake-utils_src_make ${myargs}
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use doc ; then
+		(
+			cd "${CMAKE_BUILD_DIR}"/doc
+			mv html doxygen
+			dohtml -r doxygen || die
+		)
+	fi
+	rm -rf "${ED}"/usr/share/doc/${PN} || die "Cleanup of dupe docs failed"
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/${PN}-session ${PN} || die
+
+	# GNOME-based awesome
+	if use gnome ; then
+		# GNOME session
+		insinto /usr/share/gnome-session/sessions
+		newins "${FILESDIR}/${PN}-gnome-3.session" "${PN}-gnome.session" || die
+		# Application launcher
+		domenu "${FILESDIR}/${PN}-gnome.desktop" || die
+		# X Session
+		insinto /usr/share/xsessions/
+		doins "${FILESDIR}/${PN}-gnome-xsession.desktop" || die
+	fi
+}
+
+pkg_postinst() {
+	# bug #447308
+	if use gnome; then
+		elog
+		elog "You have enabled the gnome USE flag."
+		elog "Please note that quitting awesome won't kill your gnome session."
+		elog "To really quit the session, you should bind your quit key"
+		elog "to the following command:"
+		elog "  gnome-session-quit --logout"
+		elog "For more info visit"
+		elog "  https://bugs.gentoo.org/show_bug.cgi?id=447308"
+	fi
+
+	# bug #440724
+	elog
+	elog "If you are having issues with Java application windows being"
+	elog "completely blank, try installing"
+	elog "  x11-misc/wmname"
+	elog "and setting the WM name to LG3D."
+	elog "For more info visit"
+	elog "  https://bugs.gentoo.org/show_bug.cgi?id=440724"
+	elog
+}
diff --git a/x11-wm/awesome/awesome-3.5.8.ebuild b/x11-wm/awesome/awesome-3.5.8.ebuild
new file mode 100644
index 000000000000..c3473fd22bd5
--- /dev/null
+++ b/x11-wm/awesome/awesome-3.5.8.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+inherit cmake-utils eutils
+
+DESCRIPTION="A dynamic floating and tiling window manager"
+HOMEPAGE="http://awesome.naquadah.org/"
+SRC_URI="http://awesome.naquadah.org/download/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="dbus doc elibc_FreeBSD gnome"
+
+COMMON_DEPEND="
+	>=dev-lang/lua-5.1:0
+	dev-libs/glib:2
+	>=dev-libs/libxdg-basedir-1
+	>=dev-lua/lgi-0.7
+	x11-libs/cairo[xcb]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/libxcb-1.6
+	>=x11-libs/pango-1.19.3[introspection]
+	>=x11-libs/startup-notification-0.10_p20110426
+	>=x11-libs/xcb-util-0.3.8
+	x11-libs/xcb-util-cursor
+	x11-libs/libXcursor
+	>=x11-libs/libX11-1.3.99.901
+	dbus? ( >=sys-apps/dbus-1 )
+	elibc_FreeBSD? ( dev-libs/libexecinfo )"
+
+# graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
+DEPEND="${COMMON_DEPEND}
+	>=app-text/asciidoc-8.4.5
+	app-text/xmlto
+	dev-util/gperf
+	virtual/pkgconfig
+	media-gfx/imagemagick[png]
+	>=x11-proto/xcb-proto-1.5
+	>=x11-proto/xproto-7.0.15
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DOCS="AUTHORS BUGS PATCHES README STYLE"
+
+src_prepare() {
+	# bug #408025
+	epatch "${FILESDIR}/${PN}-3.5_rc1-convert-path.patch"
+	epatch "${FILESDIR}/${PN}-xsession.patch"
+
+	# bug #507604
+	epatch "${FILESDIR}/${PN}-3.5.5-util.lua-xdg-icons-fix.patch"
+	# bug #509658
+	epatch "${FILESDIR}/${PN}-3.5.5-cflag-cleanup.patch"
+
+	# bug #571544
+	# Merged upstream
+	#epatch "${FILESDIR}/${PN}-3.5.6-fix-multi-instances-focus.patch"
+
+	epatch_user
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DSYSCONFDIR="${EPREFIX}"/etc
+		$(cmake-utils_use_with dbus DBUS)
+		$(cmake-utils_use doc GENERATE_DOC)
+		)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	local myargs="all"
+
+	if use doc ; then
+		myargs="${myargs} doc"
+	fi
+	cmake-utils_src_make ${myargs}
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use doc ; then
+		(
+			cd "${CMAKE_BUILD_DIR}"/doc
+			mv html doxygen
+			dohtml -r doxygen || die
+		)
+	fi
+	rm -rf "${ED}"/usr/share/doc/${PN} || die "Cleanup of dupe docs failed"
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/${PN}-session ${PN} || die
+
+	# GNOME-based awesome
+	if use gnome ; then
+		# GNOME session
+		insinto /usr/share/gnome-session/sessions
+		newins "${FILESDIR}/${PN}-gnome-3.session" "${PN}-gnome.session" || die
+		# Application launcher
+		domenu "${FILESDIR}/${PN}-gnome.desktop" || die
+		# X Session
+		insinto /usr/share/xsessions/
+		doins "${FILESDIR}/${PN}-gnome-xsession.desktop" || die
+	fi
+}
+
+pkg_postinst() {
+	# bug #447308
+	if use gnome; then
+		elog
+		elog "You have enabled the gnome USE flag."
+		elog "Please note that quitting awesome won't kill your gnome session."
+		elog "To really quit the session, you should bind your quit key"
+		elog "to the following command:"
+		elog "  gnome-session-quit --logout"
+		elog "For more info visit"
+		elog "  https://bugs.gentoo.org/show_bug.cgi?id=447308"
+	fi
+
+	# bug #440724
+	elog
+	elog "If you are having issues with Java application windows being"
+	elog "completely blank, try installing"
+	elog "  x11-misc/wmname"
+	elog "and setting the WM name to LG3D."
+	elog "For more info visit"
+	elog "  https://bugs.gentoo.org/show_bug.cgi?id=440724"
+	elog
+}
diff --git a/x11-wm/awesome/awesome-3.5.9.ebuild b/x11-wm/awesome/awesome-3.5.9.ebuild
new file mode 100644
index 000000000000..c3473fd22bd5
--- /dev/null
+++ b/x11-wm/awesome/awesome-3.5.9.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+inherit cmake-utils eutils
+
+DESCRIPTION="A dynamic floating and tiling window manager"
+HOMEPAGE="http://awesome.naquadah.org/"
+SRC_URI="http://awesome.naquadah.org/download/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="dbus doc elibc_FreeBSD gnome"
+
+COMMON_DEPEND="
+	>=dev-lang/lua-5.1:0
+	dev-libs/glib:2
+	>=dev-libs/libxdg-basedir-1
+	>=dev-lua/lgi-0.7
+	x11-libs/cairo[xcb]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/libxcb-1.6
+	>=x11-libs/pango-1.19.3[introspection]
+	>=x11-libs/startup-notification-0.10_p20110426
+	>=x11-libs/xcb-util-0.3.8
+	x11-libs/xcb-util-cursor
+	x11-libs/libXcursor
+	>=x11-libs/libX11-1.3.99.901
+	dbus? ( >=sys-apps/dbus-1 )
+	elibc_FreeBSD? ( dev-libs/libexecinfo )"
+
+# graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
+DEPEND="${COMMON_DEPEND}
+	>=app-text/asciidoc-8.4.5
+	app-text/xmlto
+	dev-util/gperf
+	virtual/pkgconfig
+	media-gfx/imagemagick[png]
+	>=x11-proto/xcb-proto-1.5
+	>=x11-proto/xproto-7.0.15
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DOCS="AUTHORS BUGS PATCHES README STYLE"
+
+src_prepare() {
+	# bug #408025
+	epatch "${FILESDIR}/${PN}-3.5_rc1-convert-path.patch"
+	epatch "${FILESDIR}/${PN}-xsession.patch"
+
+	# bug #507604
+	epatch "${FILESDIR}/${PN}-3.5.5-util.lua-xdg-icons-fix.patch"
+	# bug #509658
+	epatch "${FILESDIR}/${PN}-3.5.5-cflag-cleanup.patch"
+
+	# bug #571544
+	# Merged upstream
+	#epatch "${FILESDIR}/${PN}-3.5.6-fix-multi-instances-focus.patch"
+
+	epatch_user
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DSYSCONFDIR="${EPREFIX}"/etc
+		$(cmake-utils_use_with dbus DBUS)
+		$(cmake-utils_use doc GENERATE_DOC)
+		)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	local myargs="all"
+
+	if use doc ; then
+		myargs="${myargs} doc"
+	fi
+	cmake-utils_src_make ${myargs}
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use doc ; then
+		(
+			cd "${CMAKE_BUILD_DIR}"/doc
+			mv html doxygen
+			dohtml -r doxygen || die
+		)
+	fi
+	rm -rf "${ED}"/usr/share/doc/${PN} || die "Cleanup of dupe docs failed"
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/${PN}-session ${PN} || die
+
+	# GNOME-based awesome
+	if use gnome ; then
+		# GNOME session
+		insinto /usr/share/gnome-session/sessions
+		newins "${FILESDIR}/${PN}-gnome-3.session" "${PN}-gnome.session" || die
+		# Application launcher
+		domenu "${FILESDIR}/${PN}-gnome.desktop" || die
+		# X Session
+		insinto /usr/share/xsessions/
+		doins "${FILESDIR}/${PN}-gnome-xsession.desktop" || die
+	fi
+}
+
+pkg_postinst() {
+	# bug #447308
+	if use gnome; then
+		elog
+		elog "You have enabled the gnome USE flag."
+		elog "Please note that quitting awesome won't kill your gnome session."
+		elog "To really quit the session, you should bind your quit key"
+		elog "to the following command:"
+		elog "  gnome-session-quit --logout"
+		elog "For more info visit"
+		elog "  https://bugs.gentoo.org/show_bug.cgi?id=447308"
+	fi
+
+	# bug #440724
+	elog
+	elog "If you are having issues with Java application windows being"
+	elog "completely blank, try installing"
+	elog "  x11-misc/wmname"
+	elog "and setting the WM name to LG3D."
+	elog "For more info visit"
+	elog "  https://bugs.gentoo.org/show_bug.cgi?id=440724"
+	elog
+}
diff --git a/x11-wm/awesome/awesome-4.0-r1.ebuild b/x11-wm/awesome/awesome-4.0-r1.ebuild
new file mode 100644
index 000000000000..3dddc28075a9
--- /dev/null
+++ b/x11-wm/awesome/awesome-4.0-r1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils pax-utils
+
+DESCRIPTION="A dynamic floating and tiling window manager"
+HOMEPAGE="https://awesomewm.org/"
+SRC_URI="https://github.com/awesomeWM/awesome-releases/raw/master/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus doc elibc_FreeBSD gnome luajit"
+
+RDEPEND="
+	>=dev-lang/lua-5.1:0
+	dev-libs/glib:2
+	>=dev-libs/libxdg-basedir-1
+	>=dev-lua/lgi-0.7
+	x11-libs/cairo[xcb]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/libxcb-1.6
+	>=x11-libs/pango-1.19.3[introspection]
+	>=x11-libs/startup-notification-0.10_p20110426
+	>=x11-libs/xcb-util-0.3.8
+	x11-libs/xcb-util-cursor
+	>=x11-libs/xcb-util-keysyms-0.3.4
+	>=x11-libs/xcb-util-wm-0.3.8
+	>=x11-libs/xcb-util-xrm-1.0
+	x11-libs/libXcursor
+	x11-libs/libxkbcommon[X]
+	>=x11-libs/libX11-1.3.99.901
+	dbus? ( >=sys-apps/dbus-1 )
+	elibc_FreeBSD? ( dev-libs/libexecinfo )"
+
+# graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
+DEPEND="${RDEPEND}
+	>=app-text/asciidoc-8.4.5
+	app-text/xmlto
+	dev-util/gperf
+	virtual/pkgconfig
+	media-gfx/imagemagick[png]
+	>=x11-proto/xcb-proto-1.5
+	>=x11-proto/xproto-7.0.15
+	doc? ( dev-lua/ldoc )
+	luajit? ( dev-lang/luajit:2 )"
+
+DOCS=( docs/{00-authors,01-readme,02-contributing}.md )
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0-convert-path.patch"  # bug #408025
+	"${FILESDIR}/${PN}-xsession.patch"          # bug #408025
+	"${FILESDIR}/${PN}-4.0-cflag-cleanup.patch" # bug #509658
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DSYSCONFDIR="${EPREFIX}"/etc
+		-DWITH_DBUS=$(usex dbus)
+		-DWITH_GENERATE_DOC=$(usex doc $(usex doc) n)
+	)
+	if [ $(usex luajit) = "yes" ]; then
+		mycmakeargs+=('-DLUA_INCLUDE_DIR=/usr/include/luajit-2.0')
+		mycmakeargs+=('-DLUA_LIBRARY=/usr/lib/libluajit-5.1.so')
+	fi
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	pax-mark m "${ED%/}"/usr/bin/awesome
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/${PN}-session ${PN}
+
+	# GNOME-based awesome
+	if use gnome; then
+		# GNOME session
+		insinto /usr/share/gnome-session/sessions
+		newins "${FILESDIR}"/${PN}-gnome-3.session ${PN}-gnome.session
+
+		# Application launcher
+		domenu "${FILESDIR}"/${PN}-gnome.desktop
+
+		# X Session
+		insinto /usr/share/xsessions
+		doins "${FILESDIR}"/${PN}-gnome-xsession.desktop
+	fi
+}
+
+pkg_postinst() {
+	# bug #447308
+	if use gnome; then
+		elog "You have enabled the gnome USE flag."
+		elog "Please note that quitting awesome won't kill your gnome session."
+		elog "To really quit the session, you should bind your quit key"
+		elog "to the following command:"
+		elog "  gnome-session-quit --logout"
+		elog "For more info visit"
+		elog "  https://bugs.gentoo.org/show_bug.cgi?id=447308"
+	fi
+
+	# bug #440724
+	elog "If you are having issues with Java application windows being"
+	elog "completely blank, try installing"
+	elog "  x11-misc/wmname"
+	elog "and setting the WM name to LG3D."
+	elog "For more info visit"
+	elog "  https://bugs.gentoo.org/show_bug.cgi?id=440724"
+}
diff --git a/x11-wm/awesome/awesome-4.0.ebuild b/x11-wm/awesome/awesome-4.0.ebuild
new file mode 100644
index 000000000000..eed4554091af
--- /dev/null
+++ b/x11-wm/awesome/awesome-4.0.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils pax-utils
+
+DESCRIPTION="A dynamic floating and tiling window manager"
+HOMEPAGE="https://awesomewm.org/"
+SRC_URI="https://github.com/awesomeWM/awesome-releases/raw/master/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus doc elibc_FreeBSD gnome"
+
+RDEPEND="
+	>=dev-lang/lua-5.1:0
+	dev-libs/glib:2
+	>=dev-libs/libxdg-basedir-1
+	>=dev-lua/lgi-0.7
+	x11-libs/cairo[xcb]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/libxcb-1.6
+	>=x11-libs/pango-1.19.3[introspection]
+	>=x11-libs/startup-notification-0.10_p20110426
+	>=x11-libs/xcb-util-0.3.8
+	x11-libs/xcb-util-cursor
+	>=x11-libs/xcb-util-keysyms-0.3.4
+	>=x11-libs/xcb-util-wm-0.3.8
+	>=x11-libs/xcb-util-xrm-1.0
+	x11-libs/libXcursor
+	x11-libs/libxkbcommon[X]
+	>=x11-libs/libX11-1.3.99.901
+	dbus? ( >=sys-apps/dbus-1 )
+	elibc_FreeBSD? ( dev-libs/libexecinfo )"
+
+# graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
+DEPEND="${RDEPEND}
+	>=app-text/asciidoc-8.4.5
+	app-text/xmlto
+	dev-util/gperf
+	virtual/pkgconfig
+	media-gfx/imagemagick[png]
+	>=x11-proto/xcb-proto-1.5
+	>=x11-proto/xproto-7.0.15
+	doc? ( dev-lua/ldoc )"
+
+DOCS=( docs/{00-authors,01-readme,02-contributing}.md )
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0-convert-path.patch"  # bug #408025
+	"${FILESDIR}/${PN}-xsession.patch"          # bug #408025
+	"${FILESDIR}/${PN}-4.0-cflag-cleanup.patch" # bug #509658
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DSYSCONFDIR="${EPREFIX}"/etc
+		-DWITH_DBUS=$(usex dbus)
+		-DWITH_GENERATE_DOC=$(usex doc $(usex doc) n)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	pax-mark m "${ED%/}"/usr/bin/awesome
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/${PN}-session ${PN}
+
+	# GNOME-based awesome
+	if use gnome; then
+		# GNOME session
+		insinto /usr/share/gnome-session/sessions
+		newins "${FILESDIR}"/${PN}-gnome-3.session ${PN}-gnome.session
+
+		# Application launcher
+		domenu "${FILESDIR}"/${PN}-gnome.desktop
+
+		# X Session
+		insinto /usr/share/xsessions
+		doins "${FILESDIR}"/${PN}-gnome-xsession.desktop
+	fi
+}
+
+pkg_postinst() {
+	# bug #447308
+	if use gnome; then
+		elog "You have enabled the gnome USE flag."
+		elog "Please note that quitting awesome won't kill your gnome session."
+		elog "To really quit the session, you should bind your quit key"
+		elog "to the following command:"
+		elog "  gnome-session-quit --logout"
+		elog "For more info visit"
+		elog "  https://bugs.gentoo.org/show_bug.cgi?id=447308"
+	fi
+
+	# bug #440724
+	elog "If you are having issues with Java application windows being"
+	elog "completely blank, try installing"
+	elog "  x11-misc/wmname"
+	elog "and setting the WM name to LG3D."
+	elog "For more info visit"
+	elog "  https://bugs.gentoo.org/show_bug.cgi?id=440724"
+}
diff --git a/x11-wm/awesome/awesome-4.1.ebuild b/x11-wm/awesome/awesome-4.1.ebuild
new file mode 100644
index 000000000000..65af18c4d489
--- /dev/null
+++ b/x11-wm/awesome/awesome-4.1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils pax-utils
+
+DESCRIPTION="A dynamic floating and tiling window manager"
+HOMEPAGE="https://awesomewm.org/"
+SRC_URI="https://github.com/awesomeWM/awesome-releases/raw/master/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus doc elibc_FreeBSD gnome luajit"
+
+RDEPEND="
+	>=dev-lang/lua-5.1:0
+	dev-libs/glib:2
+	>=dev-libs/libxdg-basedir-1
+	>=dev-lua/lgi-0.8
+	x11-libs/cairo[xcb]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/libxcb-1.6
+	>=x11-libs/pango-1.19.3[introspection]
+	>=x11-libs/startup-notification-0.10_p20110426
+	>=x11-libs/xcb-util-0.3.8
+	x11-libs/xcb-util-cursor
+	>=x11-libs/xcb-util-keysyms-0.3.4
+	>=x11-libs/xcb-util-wm-0.3.8
+	>=x11-libs/xcb-util-xrm-1.0
+	x11-libs/libXcursor
+	x11-libs/libxkbcommon[X]
+	>=x11-libs/libX11-1.3.99.901
+	dbus? ( >=sys-apps/dbus-1 )
+	elibc_FreeBSD? ( dev-libs/libexecinfo )"
+
+# graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
+DEPEND="${RDEPEND}
+	>=app-text/asciidoc-8.4.5
+	app-text/xmlto
+	dev-util/gperf
+	virtual/pkgconfig
+	media-gfx/imagemagick[png]
+	>=x11-proto/xcb-proto-1.5
+	>=x11-proto/xproto-7.0.15
+	doc? ( dev-lua/ldoc )
+	luajit? ( dev-lang/luajit:2 )"
+
+DOCS=( docs/{00-authors,01-readme,02-contributing}.md )
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0-convert-path.patch"  # bug #408025
+	"${FILESDIR}/${PN}-xsession.patch"          # bug #408025
+	"${FILESDIR}/${PN}-4.0-cflag-cleanup.patch" # bug #509658
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DSYSCONFDIR="${EPREFIX}"/etc
+		-DWITH_DBUS=$(usex dbus)
+		-DWITH_GENERATE_DOC=$(usex doc $(usex doc) n)
+	)
+	if use luajit; then
+		mycmakeargs+=('-DLUA_INCLUDE_DIR=/usr/include/luajit-2.0')
+		mycmakeargs+=('-DLUA_LIBRARY=/usr/lib/libluajit-5.1.so')
+	fi
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	pax-mark m "${ED%/}"/usr/bin/awesome
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/${PN}-session ${PN}
+
+	# GNOME-based awesome
+	if use gnome; then
+		# GNOME session
+		insinto /usr/share/gnome-session/sessions
+		newins "${FILESDIR}"/${PN}-gnome-3.session ${PN}-gnome.session
+
+		# Application launcher
+		domenu "${FILESDIR}"/${PN}-gnome.desktop
+
+		# X Session
+		insinto /usr/share/xsessions
+		doins "${FILESDIR}"/${PN}-gnome-xsession.desktop
+	fi
+}
+
+pkg_postinst() {
+	# bug #447308
+	if use gnome; then
+		elog "You have enabled the gnome USE flag."
+		elog "Please note that quitting awesome won't kill your gnome session."
+		elog "To really quit the session, you should bind your quit key"
+		elog "to the following command:"
+		elog "  gnome-session-quit --logout"
+		elog "For more info visit"
+		elog "  https://bugs.gentoo.org/show_bug.cgi?id=447308"
+	fi
+
+	# bug #440724
+	elog "If you are having issues with Java application windows being"
+	elog "completely blank, try installing"
+	elog "  x11-misc/wmname"
+	elog "and setting the WM name to LG3D."
+	elog "For more info visit"
+	elog "  https://bugs.gentoo.org/show_bug.cgi?id=440724"
+}
diff --git a/x11-wm/awesome/awesome-4.2.ebuild b/x11-wm/awesome/awesome-4.2.ebuild
new file mode 100644
index 000000000000..65af18c4d489
--- /dev/null
+++ b/x11-wm/awesome/awesome-4.2.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils pax-utils
+
+DESCRIPTION="A dynamic floating and tiling window manager"
+HOMEPAGE="https://awesomewm.org/"
+SRC_URI="https://github.com/awesomeWM/awesome-releases/raw/master/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus doc elibc_FreeBSD gnome luajit"
+
+RDEPEND="
+	>=dev-lang/lua-5.1:0
+	dev-libs/glib:2
+	>=dev-libs/libxdg-basedir-1
+	>=dev-lua/lgi-0.8
+	x11-libs/cairo[xcb]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/libxcb-1.6
+	>=x11-libs/pango-1.19.3[introspection]
+	>=x11-libs/startup-notification-0.10_p20110426
+	>=x11-libs/xcb-util-0.3.8
+	x11-libs/xcb-util-cursor
+	>=x11-libs/xcb-util-keysyms-0.3.4
+	>=x11-libs/xcb-util-wm-0.3.8
+	>=x11-libs/xcb-util-xrm-1.0
+	x11-libs/libXcursor
+	x11-libs/libxkbcommon[X]
+	>=x11-libs/libX11-1.3.99.901
+	dbus? ( >=sys-apps/dbus-1 )
+	elibc_FreeBSD? ( dev-libs/libexecinfo )"
+
+# graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
+DEPEND="${RDEPEND}
+	>=app-text/asciidoc-8.4.5
+	app-text/xmlto
+	dev-util/gperf
+	virtual/pkgconfig
+	media-gfx/imagemagick[png]
+	>=x11-proto/xcb-proto-1.5
+	>=x11-proto/xproto-7.0.15
+	doc? ( dev-lua/ldoc )
+	luajit? ( dev-lang/luajit:2 )"
+
+DOCS=( docs/{00-authors,01-readme,02-contributing}.md )
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0-convert-path.patch"  # bug #408025
+	"${FILESDIR}/${PN}-xsession.patch"          # bug #408025
+	"${FILESDIR}/${PN}-4.0-cflag-cleanup.patch" # bug #509658
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DSYSCONFDIR="${EPREFIX}"/etc
+		-DWITH_DBUS=$(usex dbus)
+		-DWITH_GENERATE_DOC=$(usex doc $(usex doc) n)
+	)
+	if use luajit; then
+		mycmakeargs+=('-DLUA_INCLUDE_DIR=/usr/include/luajit-2.0')
+		mycmakeargs+=('-DLUA_LIBRARY=/usr/lib/libluajit-5.1.so')
+	fi
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	pax-mark m "${ED%/}"/usr/bin/awesome
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/${PN}-session ${PN}
+
+	# GNOME-based awesome
+	if use gnome; then
+		# GNOME session
+		insinto /usr/share/gnome-session/sessions
+		newins "${FILESDIR}"/${PN}-gnome-3.session ${PN}-gnome.session
+
+		# Application launcher
+		domenu "${FILESDIR}"/${PN}-gnome.desktop
+
+		# X Session
+		insinto /usr/share/xsessions
+		doins "${FILESDIR}"/${PN}-gnome-xsession.desktop
+	fi
+}
+
+pkg_postinst() {
+	# bug #447308
+	if use gnome; then
+		elog "You have enabled the gnome USE flag."
+		elog "Please note that quitting awesome won't kill your gnome session."
+		elog "To really quit the session, you should bind your quit key"
+		elog "to the following command:"
+		elog "  gnome-session-quit --logout"
+		elog "For more info visit"
+		elog "  https://bugs.gentoo.org/show_bug.cgi?id=447308"
+	fi
+
+	# bug #440724
+	elog "If you are having issues with Java application windows being"
+	elog "completely blank, try installing"
+	elog "  x11-misc/wmname"
+	elog "and setting the WM name to LG3D."
+	elog "For more info visit"
+	elog "  https://bugs.gentoo.org/show_bug.cgi?id=440724"
+}
diff --git a/x11-wm/awesome/awesome-9999.ebuild b/x11-wm/awesome/awesome-9999.ebuild
new file mode 100644
index 000000000000..243752a5d4a3
--- /dev/null
+++ b/x11-wm/awesome/awesome-9999.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils git-r3 pax-utils
+
+DESCRIPTION="A dynamic floating and tiling window manager"
+HOMEPAGE="https://awesomewm.org/"
+EGIT_REPO_URI="https://github.com/awesomeWM/${PN}.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="dbus doc elibc_FreeBSD gnome luajit"
+
+RDEPEND="
+	>=dev-lang/lua-5.1:0
+	dev-libs/glib:2
+	>=dev-libs/libxdg-basedir-1
+	>=dev-lua/lgi-0.7
+	x11-libs/cairo[xcb]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/libxcb-1.6
+	>=x11-libs/pango-1.19.3[introspection]
+	>=x11-libs/startup-notification-0.10_p20110426
+	>=x11-libs/xcb-util-0.3.8
+	x11-libs/xcb-util-cursor
+	>=x11-libs/xcb-util-keysyms-0.3.4
+	>=x11-libs/xcb-util-wm-0.3.8
+	>=x11-libs/xcb-util-xrm-1.0
+	x11-libs/libXcursor
+	x11-libs/libxkbcommon[X]
+	>=x11-libs/libX11-1.3.99.901
+	dbus? ( >=sys-apps/dbus-1 )
+	elibc_FreeBSD? ( dev-libs/libexecinfo )"
+
+# graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
+DEPEND="${RDEPEND}
+	>=app-text/asciidoc-8.4.5
+	app-text/xmlto
+	dev-util/gperf
+	virtual/pkgconfig
+	media-gfx/imagemagick[png]
+	>=x11-proto/xcb-proto-1.5
+	>=x11-proto/xproto-7.0.15
+	doc? ( dev-lua/ldoc )
+	luajit? ( dev-lang/luajit:2 )"
+
+DOCS=( docs/{00-authors,01-readme,02-contributing}.md )
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0-convert-path.patch"  # bug #408025
+	"${FILESDIR}/${PN}-xsession.patch"          # bug #408025
+	"${FILESDIR}/${PN}-4.0-cflag-cleanup.patch" # bug #509658
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DSYSCONFDIR="${EPREFIX}"/etc
+		-DWITH_DBUS=$(usex dbus)
+		-DWITH_GENERATE_DOC=$(usex doc $(usex doc) n)
+	)
+	if [ $(usex luajit) = "yes" ]; then
+		mycmakeargs+=('-DLUA_INCLUDE_DIR=/usr/include/luajit-2.0')
+		mycmakeargs+=('-DLUA_LIBRARY=/usr/lib/libluajit-5.1.so')
+	fi
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	pax-mark m "${ED%/}"/usr/bin/awesome
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/${PN}-session ${PN}
+
+	# GNOME-based awesome
+	if use gnome; then
+		# GNOME session
+		insinto /usr/share/gnome-session/sessions
+		newins "${FILESDIR}"/${PN}-gnome-3.session ${PN}-gnome.session
+
+		# Application launcher
+		domenu "${FILESDIR}"/${PN}-gnome.desktop
+
+		# X Session
+		insinto /usr/share/xsessions
+		doins "${FILESDIR}"/${PN}-gnome-xsession.desktop
+	fi
+}
+
+pkg_postinst() {
+	# bug #447308
+	if use gnome; then
+		elog "You have enabled the gnome USE flag."
+		elog "Please note that quitting awesome won't kill your gnome session."
+		elog "To really quit the session, you should bind your quit key"
+		elog "to the following command:"
+		elog "  gnome-session-quit --logout"
+		elog "For more info visit"
+		elog "  https://bugs.gentoo.org/show_bug.cgi?id=447308"
+	fi
+
+	# bug #440724
+	elog "If you are having issues with Java application windows being"
+	elog "completely blank, try installing"
+	elog "  x11-misc/wmname"
+	elog "and setting the WM name to LG3D."
+	elog "For more info visit"
+	elog "  https://bugs.gentoo.org/show_bug.cgi?id=440724"
+}
diff --git a/x11-wm/awesome/files/awesome-3.5.5-cflag-cleanup.patch b/x11-wm/awesome/files/awesome-3.5.5-cflag-cleanup.patch
new file mode 100644
index 000000000000..3cfeaba2df36
--- /dev/null
+++ b/x11-wm/awesome/files/awesome-3.5.5-cflag-cleanup.patch
@@ -0,0 +1,12 @@
+diff -u awesome-3.5.5/awesomeConfig.cmake awesome-3.5.5.new/awesomeConfig.cmake
+--- awesome-3.5.5/awesomeConfig.cmake   2014-08-24 23:28:04.178646000 -0400
++++ awesome-3.5.5.new/awesomeConfig.cmake   2014-08-24 23:28:44.204646000 -0400
+@@ -16,7 +16,7 @@
+ option(GENERATE_DOC "generate API documentation" ON)
+ 
+ # {{{ CFLAGS
+-add_definitions(-O1 -std=gnu99 -ggdb3 -rdynamic -fno-strict-aliasing -Wall -Wextra
++add_definitions(-std=gnu99 -fno-strict-aliasing -Wall -Wextra
+     -Wchar-subscripts -Wundef -Wshadow -Wcast-align -Wwrite-strings
+     -Wsign-compare -Wunused -Wno-unused-parameter -Wuninitialized -Winit-self
+     -Wpointer-arith -Wformat-nonliteral
diff --git a/x11-wm/awesome/files/awesome-3.5.5-util.lua-xdg-icons-fix.patch b/x11-wm/awesome/files/awesome-3.5.5-util.lua-xdg-icons-fix.patch
new file mode 100644
index 000000000000..588f9ab9ec52
--- /dev/null
+++ b/x11-wm/awesome/files/awesome-3.5.5-util.lua-xdg-icons-fix.patch
@@ -0,0 +1,46 @@
+From: Uli Schlachter <psychon@znc.in>
+Date: Sat, 12 Apr 2014 14:15:11 +0000 (+0200)
+Subject: Merge git://github.com/Teknocrat/awesome
+X-Git-Url: http://git.naquadah.org/?p=awesome.git;a=commitdiff_plain;h=d76d3e0b6a00b8b289b3801ba197e0dae732a92d;hp=1090719d677c86e90a1394a34f0effb418728493
+
+Merge git://github.com/Teknocrat/awesome
+---
+
+diff --git a/lib/awful/util.lua.in b/lib/awful/util.lua.in
+index 1d35f2f..123c4a6 100644
+--- a/lib/awful/util.lua.in
++++ b/lib/awful/util.lua.in
+@@ -185,21 +185,24 @@ end
+ --             of the dirs are searched first
+ function util.geticonpath(iconname, exts, dirs, size)
+     exts = exts or { 'png', 'gif' }
+-    dirs = dirs or { '/usr/share/pixmaps/' }
++    dirs = dirs or { '/usr/share/pixmaps/', '/usr/share/icons/hicolor/' }
++    icontypes = { 'apps', 'actions',  'categories',  'emblems',
++    'mimetypes',  'status', 'devices', 'extras', 'places', 'stock' }
+     for _, d in pairs(dirs) do
++        local icon
+         for _, e in pairs(exts) do
+-            local icon
+-            if size then
+-                icon = string.format("%s%ux%u/%s.%s",
+-                       d, size, size, iconname, e)
+-                if util.file_readable(icon) then
+-                    return icon
+-                end
+-            end
+             icon = d .. iconname .. '.' .. e
+             if util.file_readable(icon) then
+                 return icon
+             end
++            if size then
++                for _, t in pairs(icontypes) do
++                    icon = string.format("%s%ux%u/%s/%s.%s", d, size, size, t, iconname, e)
++                    if util.file_readable(icon) then
++                        return icon
++                    end
++                end
++            end
+         end
+     end
+ end
diff --git a/x11-wm/awesome/files/awesome-3.5.6-fix-multi-instances-focus.patch b/x11-wm/awesome/files/awesome-3.5.6-fix-multi-instances-focus.patch
new file mode 100644
index 000000000000..da306d1fe493
--- /dev/null
+++ b/x11-wm/awesome/files/awesome-3.5.6-fix-multi-instances-focus.patch
@@ -0,0 +1,29 @@
+commit 1c27a69131428e9e733374c2a3676ca4ecee45d2
+Author: Kimball Thurston <kdt3rd@gmail.com>
+Date:   Tue Dec 22 21:46:17 2015 -0800
+
+    Fix focus handling with multiple awesome instances
+    
+    When there are multiple X11 screens (i.e. :0.0 and :0.1) for zaphod mode
+    style X setups, this triggers a refresh of focus when the instance
+    running on a particular root receives the mouse
+    
+    Fixes https://github.com/awesomeWM/awesome/issues/599.
+
+diff --git a/event.c b/event.c
+index db70e2c..80d6bd6 100644
+--- a/event.c
++++ b/event.c
+@@ -554,6 +554,12 @@ event_handle_enternotify(xcb_enter_notify_event_t *ev)
+         }
+         lua_pop(globalconf.L, 1);
+     }
++    else if (ev->event == globalconf.screen->root) {
++        /* When there are multiple X screens with awesome running separate
++         * instances, reset focus.
++         */
++        globalconf.focus.need_update = true;
++    }
+ }
+
+ /** The focus in event handler.
diff --git a/x11-wm/awesome/files/awesome-3.5_rc1-convert-path.patch b/x11-wm/awesome/files/awesome-3.5_rc1-convert-path.patch
new file mode 100644
index 000000000000..e6c37b0f9c76
--- /dev/null
+++ b/x11-wm/awesome/files/awesome-3.5_rc1-convert-path.patch
@@ -0,0 +1,12 @@
+diff -Nuar --exclude '*.orig' awesome-3.5-rc1.orig/awesomeConfig.cmake awesome-3.5-rc1/awesomeConfig.cmake
+--- awesome-3.5-rc1.orig/awesomeConfig.cmake	2012-11-24 13:51:33.000000000 +0000
++++ awesome-3.5-rc1/awesomeConfig.cmake	2012-11-24 20:42:23.743412441 +0000
+@@ -56,7 +56,7 @@
+ a_find_program(LUA_EXECUTABLE lua FALSE)
+ a_find_program(LDOC_EXECUTABLE ldoc.lua FALSE)
+ # theme graphics
+-a_find_program(CONVERT_EXECUTABLE convert TRUE)
++a_find_program(CONVERT_EXECUTABLE bin/convert TRUE)
+ # doxygen
+ include(FindDoxygen)
+ # pkg-config
diff --git a/x11-wm/awesome/files/awesome-4.0-cflag-cleanup.patch b/x11-wm/awesome/files/awesome-4.0-cflag-cleanup.patch
new file mode 100644
index 000000000000..4b8379437c15
--- /dev/null
+++ b/x11-wm/awesome/files/awesome-4.0-cflag-cleanup.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -98,7 +98,7 @@
+ 
+ # CFLAGS
+ set(AWESOME_C_FLAGS
+-    -O1 -std=gnu99 -ggdb3 -fno-strict-aliasing -Wall -Wextra
++    -std=gnu99 -fno-strict-aliasing -Wall -Wextra
+     -Wchar-subscripts -Wundef -Wshadow -Wcast-align -Wwrite-strings
+     -Wsign-compare -Wunused -Wno-unused-parameter -Wuninitialized -Winit-self
+     -Wpointer-arith -Wformat-nonliteral
diff --git a/x11-wm/awesome/files/awesome-4.0-convert-path.patch b/x11-wm/awesome/files/awesome-4.0-convert-path.patch
new file mode 100644
index 000000000000..1eabf0923afc
--- /dev/null
+++ b/x11-wm/awesome/files/awesome-4.0-convert-path.patch
@@ -0,0 +1,11 @@
+--- a/awesomeConfig.cmake
++++ b/awesomeConfig.cmake
+@@ -51,7 +51,7 @@
+     endif()
+ endif()
+ # theme graphics
+-a_find_program(CONVERT_EXECUTABLE convert TRUE)
++a_find_program(CONVERT_EXECUTABLE bin/convert TRUE)
+ # pkg-config
+ include(FindPkgConfig)
+ # lua
diff --git a/x11-wm/awesome/files/awesome-gnome-3.session b/x11-wm/awesome/files/awesome-gnome-3.session
new file mode 100644
index 000000000000..d1bd6fa9f9f6
--- /dev/null
+++ b/x11-wm/awesome/files/awesome-gnome-3.session
@@ -0,0 +1,3 @@
+[GNOME Session]
+Name=Awesome session
+RequiredComponents=gnome-settings-daemon;awesome-gnome;
diff --git a/x11-wm/awesome/files/awesome-gnome-xsession.desktop b/x11-wm/awesome/files/awesome-gnome-xsession.desktop
new file mode 100644
index 000000000000..148cd3dd30fc
--- /dev/null
+++ b/x11-wm/awesome/files/awesome-gnome-xsession.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Name=Awesome GNOME
+Comment=GNOME with highly configurable window manager awesome
+TryExec=gnome-session
+Exec=gnome-session --session=awesome-gnome
+Type=Application
diff --git a/x11-wm/awesome/files/awesome-gnome.desktop b/x11-wm/awesome/files/awesome-gnome.desktop
new file mode 100644
index 000000000000..8adf5fcc95e5
--- /dev/null
+++ b/x11-wm/awesome/files/awesome-gnome.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Awesome
+Comment=Highly configurable framework window manager
+NoDisplay=true
+TryExec=/etc/X11/Sessions/awesome
+Exec=/etc/X11/Sessions/awesome
diff --git a/x11-wm/awesome/files/awesome-gnome.session b/x11-wm/awesome/files/awesome-gnome.session
new file mode 100644
index 000000000000..dd0c01b55dc1
--- /dev/null
+++ b/x11-wm/awesome/files/awesome-gnome.session
@@ -0,0 +1,6 @@
+[GNOME Session]
+Name=Awesome session
+RequiredComponents=gnome-settings-daemon;
+RequiredProviders=windowmanager;notifications;
+DefaultProvider-windowmanager=awesome-gnome
+DefaultProvider-notifications=notification-daemon
diff --git a/x11-wm/awesome/files/awesome-session b/x11-wm/awesome/files/awesome-session
new file mode 100644
index 000000000000..fe7694671850
--- /dev/null
+++ b/x11-wm/awesome/files/awesome-session
@@ -0,0 +1,90 @@
+#!/bin/sh
+# Awesome Xsession starter, based on Xsession shipped by x11-apps/xinit-1.0.5-r1
+
+# redirect errors to a file in user's home directory if we can
+for errfile in "$HOME/.awesome-errors" "${TMPDIR-/tmp}/awesome-$USER" "/tmp/awesome-$USER"
+do
+	if ( cp /dev/null "$errfile" 2> /dev/null )
+	then
+		chmod 600 "$errfile"
+		exec > "$errfile" 2>&1
+		break
+	fi
+done
+
+userresources=$HOME/.Xresources 
+usermodmap=$HOME/.Xmodmap 
+userxkbmap=$HOME/.Xkbmap
+
+sysresources=/etc/X11/Xresources 
+sysmodmap=/etc/X11/Xmodmap 
+sysxkbmap=/etc/X11/Xkbmap
+
+rh6sysresources=/etc/X11/xinit/Xresources 
+rh6sysmodmap=/etc/X11/xinit/Xmodmap 
+
+
+# merge in defaults
+if [ -f "$rh6sysresources" ]; then
+    xrdb -merge "$rh6sysresources"
+fi
+
+if [ -f "$sysresources" ]; then
+    xrdb -merge "$sysresources"
+fi
+
+if [ -f "$userresources" ]; then
+    xrdb -merge "$userresources"
+fi
+
+# merge in keymaps
+if [ -f "$sysxkbmap" ]; then
+    setxkbmap `cat "$sysxkbmap"`
+    XKB_IN_USE=yes
+fi
+
+if [ -f "$userxkbmap" ]; then
+    setxkbmap `cat "$userxkbmap"`
+    XKB_IN_USE=yes
+fi
+
+#
+# Eeek, this seems like too much magic here
+#
+if [ -z "$XKB_IN_USE" -a ! -L /etc/X11/X ]; then
+    if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then
+       xkbsymbols=`sed -n -e 's/^[     ]*XkbSymbols[   ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config /etc/X11/xorg.conf`
+       if [ -n "$xkbsymbols" ]; then
+           setxkbmap -symbols "$xkbsymbols"
+           XKB_IN_USE=yes
+       fi
+    fi
+fi
+
+# xkb and xmodmap don't play nice together
+if [ -z "$XKB_IN_USE" ]; then
+    if [ -f "$rh6sysmodmap" ]; then
+       xmodmap "$rh6sysmodmap"
+    fi
+
+    if [ -f "$sysmodmap" ]; then
+       xmodmap "$sysmodmap"
+    fi
+
+    if [ -f "$usermodmap" ]; then
+       xmodmap "$usermodmap"
+    fi
+fi
+
+unset XKB_IN_USE
+
+# run all system xinitrc shell scripts.
+if [ -d /etc/X11/xinit/xinitrc.d ]; then
+    for i in /etc/X11/xinit/xinitrc.d/* ; do
+        if [ -x "$i" ]; then
+	    . "$i"
+        fi
+    done
+fi
+
+exec /usr/bin/awesome
diff --git a/x11-wm/awesome/files/awesome-xsession.patch b/x11-wm/awesome/files/awesome-xsession.patch
new file mode 100644
index 000000000000..5a17076683dd
--- /dev/null
+++ b/x11-wm/awesome/files/awesome-xsession.patch
@@ -0,0 +1,9 @@
+--- awesome-3.5.2/awesome.desktop	2013-10-12 12:48:49.000000000 -0400
++++ awesome.desktop	2014-03-29 23:24:01.137547594 -0400
+@@ -3,5 +3,5 @@
+ Name=awesome
+ Comment=Highly configurable framework window manager
+ TryExec=awesome
+-Exec=awesome
++Exec=/etc/X11/Sessions/awesome
+ Type=Application
diff --git a/x11-wm/awesome/metadata.xml b/x11-wm/awesome/metadata.xml
new file mode 100644
index 000000000000..c00247f3126c
--- /dev/null
+++ b/x11-wm/awesome/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>t@tomoyat1.com</email>
+		<name>Tomoya Tabuchi</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Gentoo Proxy Maintainers Project</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>maksbotan@gentoo.org</email>
+		<name>Maxim Koltsov</name>
+	</maintainer>
+	<use>
+		<flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="github">awesomeWM/awesome</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-wm/blackbox/Manifest b/x11-wm/blackbox/Manifest
new file mode 100644
index 000000000000..673d1800161c
--- /dev/null
+++ b/x11-wm/blackbox/Manifest
@@ -0,0 +1,9 @@
+AUX blackbox-0.70.1-asneeded.patch 1239 SHA256 ad1860a953865b3fbbbfc4e93e47e177fa41953f9a1b0b1c07b377e1a2f384a0 SHA512 3cfed71b9fe9baaa490d752230687b67f5f36563425c8b4a155819a26d2842c2c4fe26d649db3b1ac791b59ba6486a93342c635e5b169d03aacb11fa3861f8b7 WHIRLPOOL a69cff6ca9f9308907b454165a01280ffe1dc4314f3a613e2e67d1460b6c308d8406f7ec2b50d33ef8b64de74a5210073ab8fbba1c7d6407df63e0149da17eb8
+AUX blackbox-0.70.1-gcc-4.3.patch 3274 SHA256 4b4f13650bed35666dd27bcd4744e4f9d28f794e6f3e6c5ba5daedf780f16a78 SHA512 3a728a453fd8d982f25ade14d5a3225dc64e13f85070e2d7f577e76982f491c4a0f679918f5bc61faaa5956b077ead7921566b991220fb09a357659bc9b5f6e8 WHIRLPOOL 8b4546b5104391f1a73426cadcc620629739de7e720f59ad08cee8e223d19f853fe0cf9697c05fc0d0ce50bf78c2c3a02b8855a447ee2ae65994f259a9554626
+AUX blackbox-0.70.1-no-LDFLAGS-pc.patch 615 SHA256 46c5939257daf112209412d47fd1792ad20116ad93066e0d2ba2bd5c8b40936b SHA512 5728aad146c8d32d55d72e696c21b5d4381859ecdf38fad064e41c25c9516d91ff965137bf1f9fea0028115b7f08b7d38d5e7760837c009b91e2942598f97c87 WHIRLPOOL 6e20c011b890c8a97a4333acde198f641da9438eda5eb4cbe1447f01338f9785343be2c794280d48fcf0bfce3d810c8365e4b03aa51ca3d9829a703ca653f230
+AUX blackbox.desktop 128 SHA256 abd18ba52d207bd55bce3b495c52d45cbd238b1a0e54a82a7fad3e0ed04c7a1c SHA512 340bf82fdfe40fabe698b0fe9ce371395ab82a0570323663a2d1c3f26a36a2b1628dd91fe691a58d22b599f4cde060a005accc7294b9758cc4220d92f226d28d WHIRLPOOL a89bcf039b997023b0494080d0d703a04146abce2aa4a1f315ef79654fdd858543d95938a3d924dd3f8e47f5e9314fff9dc2b3a4ce76a85a2431ef8e8d468079
+DIST blackbox-0.70.1.tar.bz2 492399 SHA256 92c2be347253f29b10063d579b4267a21516cb322a41b5e83d770fa6d44afd21 SHA512 6e8cf6fd04030a5f97ffd8dbe97aaa0f683f776e7237cdd46f2b93265cd8de665cffce5a352624a2235aa6c42628be13f98d565af765b3f06e95bff404fb0ccb WHIRLPOOL 8cab9c8ff749e4aea11bce5aca53127013cb5e36d791b426dded53dcf3db96590f6c43572df8ccd0f89e33b9ddfaa1f69cc1bda89cb7b85ec21298eba6730606
+EBUILD blackbox-0.70.1-r1.ebuild 1341 SHA256 470292b6538f926eb7b9c1c32467d5df97fc65ec19c2f7d206690b9a8c0fbd66 SHA512 7755948d3a51f9d618996fbcfcd4843d6fdb56751e57232486852ca4f81a6eee979922ec1186984ca17123c497d38b0925f2dc7b5c2f70acfe1ee9eb8b4e8312 WHIRLPOOL ab186780718b501f97d1d203e73a72a8ea31b6361ced4f624104d4cc9d95a22a78f68f704ebe1f3149b363ed8b5a3723f1a370f84297e82d978c0e10c288b635
+MISC ChangeLog 4232 SHA256 2ec82d40d65faa4ffde71990390ee0143050cd8bc0510c827e338013b5295fe0 SHA512 71c4f3e855e27bc1e8b0d8ab319e4b1ae5a43176d2cdd5ee3c0966b42287120375cbb1330485995642181ecfe3b4be98d8674f0f6188996dddf001a7b13319eb WHIRLPOOL 46d13f7d45a5a73d3910c1c84e01c6c3bfeb060abf5457ef01d1a22d316761569ca93e5ef3d3c605208ff48f3adcfc5b6f1bc682219b556753fcb0a2c536a68a
+MISC ChangeLog-2015 10129 SHA256 b670b492e5e63c93d98d2fb4532e0a5dd871e2a83d6ca106ccbf7a0ee7243760 SHA512 726afedd1e76cc5eac7ecd6e7479f51c29cd464fa03c542d7c0b3136b745dc91b93355626a15f87b5653b01f60fbe7951b87b297484dc4a904d7990c25da1309 WHIRLPOOL 2f11590a7d1dbe684969d5ca7272805230d8f00c7d6139a7b83deff676afaaa2f1103c70bd4b9e39d5b4003c0508b7c587c6a3c0da3a90b8c774b9d221278575
+MISC metadata.xml 493 SHA256 7a14c672a48a952d5d2cb10d3052a7c1d8ba2a097fb1716a86b3332ef2932edb SHA512 df0ba91550bc426a0acba235808b3d9df5bc19c21e900d640f3eb14a3be9f89262916afcc17681a44e64bc91f4360cf2ea39473c9e2f0fd8e45082bdaa98bf92 WHIRLPOOL 06d45f8bae65ffd982e8608650680a4ec58dbcbbc7e48b950bd6692bfbab02d334b263c404fd28b9434c7cdf850f557ff47fa1b36f0130b7f79b122de9d2bee4
diff --git a/x11-wm/blackbox/blackbox-0.70.1-r1.ebuild b/x11-wm/blackbox/blackbox-0.70.1-r1.ebuild
new file mode 100644
index 000000000000..112d8fcb051b
--- /dev/null
+++ b/x11-wm/blackbox/blackbox-0.70.1-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils
+
+DESCRIPTION="A small, fast, full-featured window manager for X"
+HOMEPAGE="http://blackboxwm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}wm/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="nls truetype debug"
+
+RDEPEND="x11-libs/libXft
+	x11-libs/libXt
+	nls? ( sys-devel/gettext )
+	truetype? ( media-libs/freetype )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=sys-apps/sed-4
+	x11-proto/xextproto"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc-4.3.patch \
+		"${FILESDIR}"/${P}-asneeded.patch \
+		"${FILESDIR}"/${P}-no-LDFLAGS-pc.patch
+
+	sed -i -e "s/_XUTIL_H_/_X11&/" lib/Util.hh || die #348556
+	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/X11/${PN} \
+		$(use_enable debug) \
+		$(use_enable nls) \
+		$(use_enable truetype xft)
+}
+
+src_install() {
+	dodir /etc/X11/Sessions
+	echo "/usr/bin/blackbox" > "${D}/etc/X11/Sessions/${PN}"
+	fperms a+x /etc/X11/Sessions/${PN}
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}/${PN}.desktop"
+
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog* COMPLIANCE README* TODO
+
+	prune_libtool_files --all
+}
diff --git a/x11-wm/blackbox/files/blackbox-0.70.1-asneeded.patch b/x11-wm/blackbox/files/blackbox-0.70.1-asneeded.patch
new file mode 100644
index 000000000000..a6b1e22e62b5
--- /dev/null
+++ b/x11-wm/blackbox/files/blackbox-0.70.1-asneeded.patch
@@ -0,0 +1,49 @@
+Fixing build with as-needed. Enabling shared libs.
+
+http://bugs.gentoo.org/show_bug.cgi?id=248549
+ 
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -22,7 +22,7 @@
+ 
+ DEFAULT_MENU		= $(pkgdatadir)/menu
+ DEFAULT_STYLE		= $(pkgdatadir)/styles/Gray
+-CPPFLAGS		= @CPPFLAGS@ @SHAPE@ @XFT@ @DEBUG@ @NLS@ \
++AM_CPPFLAGS		= @SHAPE@ @XFT@ @DEBUG@ @NLS@ \
+ 			  -DLOCALEPATH=\"$(pkgdatadir)/nls\" \
+ 			  -DDEFAULTMENU=\"$(DEFAULT_MENU)\" \
+ 			  -DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \
+--- lib/Makefile.am
++++ lib/Makefile.am
+@@ -62,7 +62,8 @@
+ 			Util.hh						\
+ 			XDG.hh
+ 
+-libbt_la_LIBADD =	@ICONV@ @LOCALE@
++libbt_la_LIBADD =	@ICONV@ @LOCALE@ @xft_LIBS@
++libbt_la_CFLAGS = 	@xft_CFLAGS@
+ 
+ pkgconfigdir = 		$(libdir)/pkgconfig
+ nodist_pkgconfig_DATA =	libbt.pc
+--- util/Makefile.am
++++ util/Makefile.am
+@@ -21,7 +21,7 @@
+ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+ # DEALINGS IN THE SOFTWARE.
+ 
+-CPPFLAGS		= @CPPFLAGS@ @DEBUG@ @NLS@ \
++AM_CPPFLAGS		= @DEBUG@ @NLS@ \
+ 			  -I$(top_srcdir)/lib
+ 
+ bin_SCRIPTS		= bsetbg
+--- configure.ac
++++ configure.ac
+@@ -29,7 +29,7 @@
+ AC_PROG_INSTALL
+ 
+ dnl libbt shouldn't be shared by default (yet)
+-AC_DISABLE_SHARED
++dnl AC_DISABLE_SHARED
+ AC_PROG_LIBTOOL
+ AC_SUBST(LIBTOOL_DEPS)
+ 
diff --git a/x11-wm/blackbox/files/blackbox-0.70.1-gcc-4.3.patch b/x11-wm/blackbox/files/blackbox-0.70.1-gcc-4.3.patch
new file mode 100644
index 000000000000..1026bd5c80ee
--- /dev/null
+++ b/x11-wm/blackbox/files/blackbox-0.70.1-gcc-4.3.patch
@@ -0,0 +1,106 @@
+diff -Naupr blackbox-0.70.1.orig/lib/Image.cc blackbox-0.70.1/lib/Image.cc
+--- blackbox-0.70.1.orig/lib/Image.cc	2005-04-08 17:41:09.000000000 +0200
++++ blackbox-0.70.1/lib/Image.cc	2008-02-24 08:31:28.000000000 +0100
+@@ -42,8 +42,9 @@
+ 
+ #include <assert.h>
+ #include <math.h>
+-#include <stdio.h>
+-#include <stdlib.h>
++#include <cstdio>
++#include <cstdlib>
++#include <cstring>
+ 
+ // #define COLORTABLE_DEBUG
+ // #define MITSHM_DEBUG
+diff -Naupr blackbox-0.70.1.orig/lib/Resource.cc blackbox-0.70.1/lib/Resource.cc
+--- blackbox-0.70.1.orig/lib/Resource.cc	2005-04-06 23:16:50.000000000 +0200
++++ blackbox-0.70.1/lib/Resource.cc	2008-02-24 08:33:11.000000000 +0100
+@@ -28,7 +28,8 @@
+ #include <X11/Xlib.h>
+ #include <X11/Xresource.h>
+ 
+-#include <stdio.h>
++#include <cstdio>
++#include <cstring>
+ 
+ 
+ bt::Resource::Resource(void)
+diff -Naupr blackbox-0.70.1.orig/lib/XDG.cc blackbox-0.70.1/lib/XDG.cc
+--- blackbox-0.70.1.orig/lib/XDG.cc	2005-04-06 16:04:38.000000000 +0200
++++ blackbox-0.70.1/lib/XDG.cc	2008-02-24 08:34:11.000000000 +0100
+@@ -25,7 +25,8 @@
+ #include "Util.hh"
+ #include "XDG.hh"
+ 
+-#include <stdlib.h>
++#include <cstdlib>
++#include <algorithm>
+ 
+ 
+ // make sure directory names end with a slash
+diff -Naupr blackbox-0.70.1.orig/src/BlackboxResource.cc blackbox-0.70.1/src/BlackboxResource.cc
+--- blackbox-0.70.1.orig/src/BlackboxResource.cc	2005-10-18 09:34:46.000000000 +0200
++++ blackbox-0.70.1/src/BlackboxResource.cc	2008-02-24 08:34:49.000000000 +0100
+@@ -33,6 +33,8 @@
+ #include <X11/Xutil.h>
+ #include <X11/cursorfont.h>
+ 
++#include <cstring>
++
+ 
+ BlackboxResource::BlackboxResource(const std::string& rc): rc_file(rc) {
+   screen_resources = 0;
+diff -Naupr blackbox-0.70.1.orig/src/main.cc blackbox-0.70.1/src/main.cc
+--- blackbox-0.70.1.orig/src/main.cc	2005-01-03 10:42:57.000000000 +0100
++++ blackbox-0.70.1/src/main.cc	2008-02-24 08:37:16.000000000 +0100
+@@ -34,7 +34,8 @@
+ #include "blackbox.hh"
+ #include "../version.h"
+ 
+-#include <stdio.h>
++#include <cstdio>
++#include <cstring>
+ 
+ 
+ static void showHelp(int exitval) {
+diff -Naupr blackbox-0.70.1.orig/src/Screen.cc blackbox-0.70.1/src/Screen.cc
+--- blackbox-0.70.1.orig/src/Screen.cc	2005-10-18 10:07:22.000000000 +0200
++++ blackbox-0.70.1/src/Screen.cc	2008-02-24 08:35:46.000000000 +0100
+@@ -45,8 +45,9 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <assert.h>
+-#include <ctype.h>
+ #include <dirent.h>
++#include <cctype>
++#include <cstring>
+ 
+ 
+ static bool running = true;
+diff -Naupr blackbox-0.70.1.orig/src/ScreenResource.cc blackbox-0.70.1/src/ScreenResource.cc
+--- blackbox-0.70.1.orig/src/ScreenResource.cc	2005-04-13 07:54:08.000000000 +0200
++++ blackbox-0.70.1/src/ScreenResource.cc	2008-02-24 08:36:31.000000000 +0100
+@@ -33,6 +33,8 @@
+ 
+ #include <assert.h>
+ 
++#include <cstring>
++
+ 
+ static const int iconify_width  = 9;
+ static const int iconify_height = 9;
+diff -Naupr blackbox-0.70.1.orig/util/bsetroot.cc blackbox-0.70.1/util/bsetroot.cc
+--- blackbox-0.70.1.orig/util/bsetroot.cc	2005-03-15 08:01:37.000000000 +0100
++++ blackbox-0.70.1/util/bsetroot.cc	2008-02-24 08:38:41.000000000 +0100
+@@ -30,7 +30,9 @@
+ #include <cctype>
+ 
+ #include <X11/Xatom.h>
+-#include <stdio.h>
++#include <cstdio>
++#include <cstdlib>
++#include <cstring>
+ 
+ 
+ // ignore all X errors
diff --git a/x11-wm/blackbox/files/blackbox-0.70.1-no-LDFLAGS-pc.patch b/x11-wm/blackbox/files/blackbox-0.70.1-no-LDFLAGS-pc.patch
new file mode 100644
index 000000000000..e907b588b158
--- /dev/null
+++ b/x11-wm/blackbox/files/blackbox-0.70.1-no-LDFLAGS-pc.patch
@@ -0,0 +1,14 @@
+Fix LDFGAS leak to .pc file:
+> * QA Notice: pkg-config files with wrong LDFLAGS detected:
+> * /usr/lib64/pkgconfig/libbt.pc:Libs: -L${libdir} -lbt -Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu -L/usr/lib -L/usr/local/lib 
+diff --git a/lib/libbt.pc.in b/lib/libbt.pc.in
+index a2a8869..8246cb0 100644
+--- a/lib/libbt.pc.in
++++ b/lib/libbt.pc.in
+@@ -7,5 +7,5 @@ Name: Blackbox Toolbox
+ Description: Utility class library for writing small applications
+ Requires: @XFT_PKGCONFIG@
+ Version: @VERSION@
+-Libs: -L${libdir} -lbt @LDFLAGS@ @ICONV@ @LOCALE@
++Libs: -L${libdir} -lbt @ICONV@ @LOCALE@
+ Cflags: -I${includedir}/bt
diff --git a/x11-wm/blackbox/files/blackbox.desktop b/x11-wm/blackbox/files/blackbox.desktop
new file mode 100644
index 000000000000..c84ce24a2a53
--- /dev/null
+++ b/x11-wm/blackbox/files/blackbox.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=Blackbox
+Comment=This session logs you into Blackbox
+Exec=blackbox
+TryExec=blackbox
+Icon=
+Type=Application
diff --git a/x11-wm/blackbox/metadata.xml b/x11-wm/blackbox/metadata.xml
new file mode 100644
index 000000000000..eb1e7094d54f
--- /dev/null
+++ b/x11-wm/blackbox/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription>
+	 Blackbox is that fast, light window manager you have been looking for 
+	 without all those annoying library dependencies. If you have a C++ 
+	 compiler and the X Window System you can compile and use it.
+	 </longdescription>
+	<upstream>
+		<remote-id type="sourceforge">blackboxwm</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-wm/bspwm/Manifest b/x11-wm/bspwm/Manifest
new file mode 100644
index 000000000000..d2ecf7250161
--- /dev/null
+++ b/x11-wm/bspwm/Manifest
@@ -0,0 +1,8 @@
+AUX bspwm-session 1876 SHA256 5ebb14b8c96b720f220e709e67c3b37d6880019a6c1d005414654463acdbee21 SHA512 04d89bdd5ca5a9163e576c41dee9420fff8c51ab4a53aca179060b9f6b348537ad96d4257964e7bc4422d836a21c52f82fdc30a6b7b07c229c9934d7620d90ee WHIRLPOOL 9a3929ff7f0a2dd39627b88f6866b268f4f9d588791ac7f45c63014f3b0a4a19e092069796a49bed40e70444c0ada4b0b6b3798eefea61683718e4a3ba1a1c48
+DIST bspwm-0.9.2.tar.gz 92558 SHA256 33689d138d50f42444820b3a76b84fee7fa3af58e33ad589319c84e51fefdcf0 SHA512 fe46d74ecc1ab29caa038d8bb54e13cde8a40e28a014f8b313222db6e8a3323d3ec2103f4ff78008bb0252fa2d560424788ea3be66faaf38a2b8aa3b46b09e2c WHIRLPOOL 70b6f9572225e60e78fd6188644355dde6aca2702d723b1fb9930f9395480833593c38b9f48c7b2d25fa68f0619a68a0de2ac4634c10136f7d9ebfb2a4334f50
+DIST bspwm-0.9.3.tar.gz 95779 SHA256 b356e3ff5754c63c94b36d904274c0ba16f9a8494e78a1c93bb23113f891bc9d SHA512 015ed79af4b31c5fbd10bdf3d6945e3e2575ef3d1ab48dc7ddeb52e99cd6e121991a320515ad05b42b001b524c7ebe38b5d2b2aae0078c6601a36653718ab508 WHIRLPOOL d7ad190008a34e38ac9dee1e264b15613dfea72775c4d3ad0de0c6a3651820e71497d435da5306151b5b0f59e7571a7487eabefcb16d78b27fc222438cebc13e
+EBUILD bspwm-0.9.2.ebuild 956 SHA256 835dec0bac1ac13ebc5a79a16461e3b1984c50c093d7c2cb059e5ccc6f97dba7 SHA512 3f4d71a7d882a57d13bc5d1d06610bcdfc2562d836cbf536af650eefdd923e9cf17d089704836b5873d690af4b414d8b484161744a42c9717a034fde7da433c4 WHIRLPOOL 2c2d4d42bd9f7098a165cf0fd8cc987174988bcd5f397834307db1719f93f21a92e4652e4e30fa736c3a7e684f1e93fef6188cb09f5a0ad0ac7dc6aa240d1ae2
+EBUILD bspwm-0.9.3.ebuild 956 SHA256 835dec0bac1ac13ebc5a79a16461e3b1984c50c093d7c2cb059e5ccc6f97dba7 SHA512 3f4d71a7d882a57d13bc5d1d06610bcdfc2562d836cbf536af650eefdd923e9cf17d089704836b5873d690af4b414d8b484161744a42c9717a034fde7da433c4 WHIRLPOOL 2c2d4d42bd9f7098a165cf0fd8cc987174988bcd5f397834307db1719f93f21a92e4652e4e30fa736c3a7e684f1e93fef6188cb09f5a0ad0ac7dc6aa240d1ae2
+MISC ChangeLog 2702 SHA256 399db512df0176e90268af5eb588c5642f94f2677d3449f9362338887250e600 SHA512 28ba1c6cdb9b6961ceaa43ad5332f9db29d20fc232f3460b9b9699c99e9591a65fcc9d13e9bb570bb03bccf3605877bb433c602753f705fda03b05d8979abfb8 WHIRLPOOL 3a49513ced246143b4db1783aac48535f96ebf902fe946b6fc1023e2128c10899f2e24c2c177c6eaeaacccd534537cf801982be01a1e4e234611e07520001c48
+MISC ChangeLog-2015 791 SHA256 1d54831bb41fea56757d28c3ba66a5305bbb4435d88ab647d76ae0da1df42820 SHA512 6cad6b608ba9b63c225144a25da7b7cb0f868c4b937fa2b03b67be7554f42d95cc3d8801d5c0f620bce4372913cfecbff84d0cc28c3be6b6597ec7177509a245 WHIRLPOOL 39d411e5b09b1cafefe412e94f34a7a21f935f4d9883ebfaf8d2baf12f06c5276a8b9a751c8e7cf0f93fcb6d75dfff51627a99d6d11e632864a1996d66ad54ad
+MISC metadata.xml 328 SHA256 0004a33d9ab3d45ce7bd7e0fc295e04e4c78c558d50a139e8233bf833f81e1fc SHA512 8dccf071f4e82f331d91713b0062c56161b945202da88386c1c21d7f4bb8363ad4b8c164542ad9b68c89b2eb408b8d67a88a322554ccdcc99ccdc046448eba8b WHIRLPOOL 1eb127aba8bf6192a080bd00c2a5464cc46c8227c4e061cc37fe139f10b51df6dce996f72ecf521506d9d2f55e3e81d7f007e37564910ddbae9e7166c4a9cfcb
diff --git a/x11-wm/bspwm/bspwm-0.9.2.ebuild b/x11-wm/bspwm/bspwm-0.9.2.ebuild
new file mode 100644
index 000000000000..c8ded088233e
--- /dev/null
+++ b/x11-wm/bspwm/bspwm-0.9.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="Tiling window manager based on binary space partitioning"
+HOMEPAGE="https://github.com/baskerville/bspwm/"
+SRC_URI="https://github.com/baskerville/bspwm/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND="
+	x11-libs/libxcb
+	x11-libs/xcb-util
+	x11-libs/xcb-util-wm
+"
+RDEPEND="${DEPEND}
+	x11-misc/sxhkd
+"
+
+src_compile() {
+	emake PREFIX=/usr CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+	dodoc doc/{CONTRIBUTING,MISC,TODO}.md
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/${PN}-session ${PN}
+
+	insinto /usr/share/xsessions
+	doins contrib/freedesktop/bspwm.desktop
+
+	insinto /etc/xdg/sxhkd
+	doins examples/sxhkdrc
+
+	if use examples ; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/x11-wm/bspwm/bspwm-0.9.3.ebuild b/x11-wm/bspwm/bspwm-0.9.3.ebuild
new file mode 100644
index 000000000000..c8ded088233e
--- /dev/null
+++ b/x11-wm/bspwm/bspwm-0.9.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="Tiling window manager based on binary space partitioning"
+HOMEPAGE="https://github.com/baskerville/bspwm/"
+SRC_URI="https://github.com/baskerville/bspwm/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND="
+	x11-libs/libxcb
+	x11-libs/xcb-util
+	x11-libs/xcb-util-wm
+"
+RDEPEND="${DEPEND}
+	x11-misc/sxhkd
+"
+
+src_compile() {
+	emake PREFIX=/usr CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+	dodoc doc/{CONTRIBUTING,MISC,TODO}.md
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/${PN}-session ${PN}
+
+	insinto /usr/share/xsessions
+	doins contrib/freedesktop/bspwm.desktop
+
+	insinto /etc/xdg/sxhkd
+	doins examples/sxhkdrc
+
+	if use examples ; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/x11-wm/bspwm/files/bspwm-session b/x11-wm/bspwm/files/bspwm-session
new file mode 100644
index 000000000000..e51ead1b9b54
--- /dev/null
+++ b/x11-wm/bspwm/files/bspwm-session
@@ -0,0 +1,90 @@
+#!/bin/sh
+# bspwm Xsession starter, based on Xsession from x11-apps/xinit
+
+# redirect errors to a file in user's home directory if we can
+for errfile in "$HOME/.bspwm-errors" "${TMPDIR-/tmp}/bspwm-$USER" "/tmp/bspwm-$USER"
+do
+	if ( cp /dev/null "$errfile" 2> /dev/null )
+	then
+		chmod 600 "$errfile"
+		exec > "$errfile" 2>&1
+		break
+	fi
+done
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+userxkbmap=$HOME/.Xkbmap
+
+sysresources=/etc/X11/Xresources
+sysmodmap=/etc/X11/Xmodmap
+sysxkbmap=/etc/X11/Xkbmap
+
+rh6sysresources=/etc/X11/xinit/Xresources
+rh6sysmodmap=/etc/X11/xinit/Xmodmap
+
+# merge in defaults
+if [ -f "$rh6sysresources" ]; then
+	xrdb -merge "$rh6sysresources"
+fi
+
+if [ -f "$sysresources" ]; then
+	xrdb -merge "$sysresources"
+fi
+
+if [ -f "$userresources" ]; then
+	xrdb -merge "$userresources"
+fi
+
+# merge in keymaps
+if [ -f "$sysxkbmap" ]; then
+	setxkbmap `cat "$sysxkbmap"`
+	XKB_IN_USE=yes
+fi
+
+if [ -f "$userxkbmap" ]; then
+	setxkbmap `cat "$userxkbmap"`
+	XKB_IN_USE=yes
+fi
+
+#
+# Eeek, this seems like too much magic here
+#
+if [ -z "$XKB_IN_USE" -a ! -L /etc/X11/X ]; then
+	if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then
+		xkbsymbols=`sed -n -e 's/^[	   ]*XkbSymbols[   ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config /etc/X11/xorg.conf`
+		if [ -n "$xkbsymbols" ]; then
+			setxkbmap -symbols "$xkbsymbols"
+			XKB_IN_USE=yes
+		fi
+	fi
+fi
+
+# xkb and xmodmap don't play nice together
+if [ -z "$XKB_IN_USE" ]; then
+	if [ -f "$rh6sysmodmap" ]; then
+		xmodmap "$rh6sysmodmap"
+	fi
+
+	if [ -f "$sysmodmap" ]; then
+		xmodmap "$sysmodmap"
+	fi
+
+	if [ -f "$usermodmap" ]; then
+		xmodmap "$usermodmap"
+	fi
+fi
+
+unset XKB_IN_USE
+
+# run all system xinitrc shell scripts.
+if [ -d /etc/X11/xinit/xinitrc.d ]; then
+	for i in /etc/X11/xinit/xinitrc.d/* ; do
+		if [ -x "$i" ]; then
+		. "$i"
+		fi
+	done
+fi
+
+exec /usr/bin/sxhkd &
+exec /usr/bin/bspwm
diff --git a/x11-wm/bspwm/metadata.xml b/x11-wm/bspwm/metadata.xml
new file mode 100644
index 000000000000..a744a953bd9f
--- /dev/null
+++ b/x11-wm/bspwm/metadata.xml
@@ -0,0 +1,11 @@
+<?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>
+	<upstream>
+		<remote-id type="github">baskerville/bspwm</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-wm/compiz-fusion/Manifest b/x11-wm/compiz-fusion/Manifest
new file mode 100644
index 000000000000..a3ce005aa0c2
--- /dev/null
+++ b/x11-wm/compiz-fusion/Manifest
@@ -0,0 +1,4 @@
+EBUILD compiz-fusion-0.8.8-r1.ebuild 741 SHA256 9fab54082c495da91139ce6d4874ba1b3822bf04fa51cfbbaaf6686cf282598d SHA512 55ea1d89e96bae8450345a82abf6cfc377cc174f30d01c500b2765451a0397482f75539a7f3658efbb741ff7308c6cc546e63da6d821b6022deed26a7f784c26 WHIRLPOOL 1694b8ee021786c7a301a03569f4b7b1c213edd25d22113168c626ffd2964b579a76838be8274810ad65fa4b83a0792e7c956aa8233f133ae02340b7d409d7c2
+MISC ChangeLog 2912 SHA256 3b1d92973dd4acfcf7da521be6123bc335d3c814c12251f096f53429aab4deb2 SHA512 7fd6f947e8d0d74c768c1bdb31cb42064cef3d9192546681bdc24c99c127750bed3405c7499f9d2efb7e646208d94248c59127166b81e41a8e813c043449bfb6 WHIRLPOOL 87f0dc63f1accee4c19cd7a95d6715e477c9234f75295575f41aedb66ce3ec35f16d4ae24411308c1b6b48c81b7e65ea8bfe3ef88d0dfeaa4368fa19445a5a55
+MISC ChangeLog-2015 3476 SHA256 795b1e82555bb86a976fb808d2f50913a05d994a4c178ccc4110405f9bd455ed SHA512 bdf43f4603f72579e481323cba31470c7c918b2f2ada34f61f12227998d8eaa9c82a0036a2054d95c1cef114d93bfcce80371c0e5b211e54ad7d21acc21425d5 WHIRLPOOL 7e864e853d862a141f85010d3ad5305e676dede38907313487b19dbe07229ea2b83b4c6eec7d7e1a74699003590e54a3b357cd3059519bac455f2163969468ea
+MISC metadata.xml 496 SHA256 e585d99f2360eb4e972239520672be9a2c02bb3bd04b2af20054ddfe52dd2771 SHA512 4319841dc5d6e2bf1f93f451431279d7df82a716654fca252fda3436ac3a7fb9944aac2e906981b18615a86ffdb8f65b579d33034e929b53c97514f8d0a0b0a6 WHIRLPOOL 6f8ec4f66a0f7390e7c2c8d503d422c6d3ba783f31db0acc8707d58b5a1aae72303de9bd0cbd812b0c4249ff5572b2fb5e45584e7d02b94ffed6235d37dcbb38
diff --git a/x11-wm/compiz-fusion/compiz-fusion-0.8.8-r1.ebuild b/x11-wm/compiz-fusion/compiz-fusion-0.8.8-r1.ebuild
new file mode 100644
index 000000000000..115d647215f9
--- /dev/null
+++ b/x11-wm/compiz-fusion/compiz-fusion-0.8.8-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Compiz Fusion (meta)"
+HOMEPAGE="http://www.compiz.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="emerald gnome unsupported"
+
+RDEPEND="
+	>=x11-wm/compiz-${PV}
+	>=x11-plugins/compiz-plugins-main-${PV}
+	>=x11-plugins/compiz-plugins-extra-${PV}
+	>=x11-misc/ccsm-0.8.4
+	emerald? ( >=x11-wm/emerald-${PV} )
+	gnome? ( >=x11-libs/compizconfig-backend-gconf-${PV} )
+	unsupported? ( >=x11-plugins/compiz-plugins-unsupported-${PV} )"
+
+pkg_postinst() {
+	ewarn "If you want to try out simple-ccsm, you'll need to emerge it"
+	ewarn "If you want to use emerald, set the emerald use flag"
+}
diff --git a/x11-wm/compiz-fusion/metadata.xml b/x11-wm/compiz-fusion/metadata.xml
new file mode 100644
index 000000000000..3913b8881187
--- /dev/null
+++ b/x11-wm/compiz-fusion/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+<use>
+  <flag name="emerald">Install the <pkg>x11-wm/emerald</pkg> package.</flag>
+  <flag name="unsupported">Install the <pkg>x11-plugins/compiz-plugins-unsupported</pkg> package.</flag>
+</use>
+<longdescription>
+compiz-fusion is a community-driven project that is aimed at extending the compiz window manager.
+</longdescription>
+</pkgmetadata>
diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
new file mode 100644
index 000000000000..74158e9e8504
--- /dev/null
+++ b/x11-wm/compiz/Manifest
@@ -0,0 +1,9 @@
+AUX compiz-gcc-4.7.patch 999 SHA256 0824c0d32d32dfc8c57fa1afbfc81060e64bdcc4ec016f3ccb751a1956f6325a SHA512 e08563d928578ad74faa29168b3c3442cc0ab4e908ff4f430a7e23bcb2057e3da10f9742e8abbdaad9df6f56a039134e8a32f73ae214e240065d6d4ddd3a92bf WHIRLPOOL b79f08787a9f7d3dc46dc1f2c6645f40965c750122027e39679d783afb0c23bd300ee731bfb45858d6392c69a21b61eb326eb29315e0e4ac0d2655edb7d69f18
+AUX compiz-manager 9835 SHA256 e387ff9f01b84c572f31643316ed2ce2eacd11a92488e745ebcfd659945c6f1d SHA512 5cf4c1023754128c456d48db257a308461de0cbd9ebd427a4c281ada0b77659013723362959ae39fa31f24de36929fdfe6ea96d9788cba568f35d2dc86bc263a WHIRLPOOL 0afb3b62a0e29b9608d2eaf640f7704ffa91a3ea7ea7fc0d7cba5761a04c4a1928007e285344e401030230de506b92cbbbdbe4436eda4ebd44848ebfcad95c97
+AUX compiz-no-gconf.patch 630 SHA256 87467fbe5d4e0d0bb8952f2d5b74d21046d92d49772543aeda137266e055aa67 SHA512 3c3789852db56be06d553dcdddb68c94e68b9290c74e5a9e642f266d1688c18eb4ce01b6835f267c84d3a213ec61266159d5891b10d80cb79e17bc9683163bf9 WHIRLPOOL 7341780992eed62a36bfa8be0e8f22c4f54ecda555f8af87ea76f585f4fcbcb76f31bb79269a01ff5c5eabe7d6796a233d7efa8baf35720a09085f53af3b1da6
+AUX compiz.desktop 258 SHA256 6b3e76f62623ef4d533d25fb714467157827a4ba051d41e1730848266c573f8b SHA512 ab9084fe8d44a9a053e84483774d9db2b1b8def4fbb16ca9c74af18271ec0f7d3d7dbe607fa7e0687bbe6f6d9ef8ee17701e1a88c15adea822f45450f4ebb291 WHIRLPOOL b11117ece42467e06313a73f666c1e1ea2877313d5df1c9f3735a386da453f9d10bc83d4832ea491ac099aa94b1d757d2e8d1a733b9e22df56ce63c8cc48f02e
+DIST compiz-0.8.8.tar.bz2 1123892 SHA256 3ba555b0d6d536850a227d37d6ebc5cd5b15ee5bad83d7956529a27b870977e3 SHA512 6e3bad018835fdbc1b0e5ecb51a46a77a6531d46d77ee3ae4169273632ea9a6839c78300b18e2198c41698517efa65ded75387785b0c5bbbb6da41498451b644 WHIRLPOOL fa1d9b5e443d45a4615201a85a74dd025066620339ebac58b4fd5c71c19db731009c013ceee93f0345b46c413211424bc4c813d48e07d6cea874024a2b562ba2
+EBUILD compiz-0.8.8-r3.ebuild 3466 SHA256 80183a82fdb4215e0d7f19aece728747a7c5e68bdc20470d1f1f79068009b9bb SHA512 6565dc9124563e8dfde7dac09dacfb2d017d937e3aed5982222f4195871984b4b1f3ea089f220dde73355cafe397ff25abba11233b02247cd2714bb423a9f850 WHIRLPOOL 4385c20518591a15a907604615b61ce0c53778c2b6e94374d77c62b39184635a83c2a7340443dc3fa7bbe148580317b32997a4556364d0980a141005acad644a
+MISC ChangeLog 2861 SHA256 e1dc2ea491aa3c874b666466a851f0c3063db334a0ede0b19a17ae909c710129 SHA512 c4b3fc0b7d164531e77185d567482be2ce67283a0eb32ea115de90839e61a106995d3465516bfb568da90dce1a4ad216a24c05ce1a34e2287970898b6ba54017 WHIRLPOOL ebfec3bf08463ea4a14616564a5f4a1984524661cd5dbb05e652a10fd69ee3d7a7f0f24ecb0dbbe4c1b64d83ec69395394818be6047797471820d513c73dbfee
+MISC ChangeLog-2015 15630 SHA256 b298afe2fd4fc44994d5d9bec51162be9b44076842508c8efbd98a8fb300deec SHA512 699981cfe9a9e459d64a8be26e6454c0405cec6f2031c62a717dbbb3ace6fd6e78090f3c5b74ef8ae8f4c0a0962e47e7292a591315d5acbf379cbcbad397f66b WHIRLPOOL 20107127f819ab3825900813fb482d38b4c204d222743cdfa65bd272d122e6cdaccd2b97a29433ca5f2239b507ba23473ebe0f6b5a7e1284a6febbbd40cf95e2
+MISC metadata.xml 630 SHA256 9e017cbbeb254fc5371ccca48b40051b3e267815fb005ca2d70767a58939b59a SHA512 6640ccef9ce07714d737e9dc682177c34e36927082c3a5fb1af1c115c2b173bc914a650f122a5845179b2f927d0b03538c0a3481790a9ea97966f9973309308f WHIRLPOOL ca87b894200015a3b4c73b6d75925225c5d5c33a18910d69fae2c92c12417e72aedba6eaddaf1aab7ffc6b45b74d3be19f9cbce98a22d8fe3d2ea774a0f5893a
diff --git a/x11-wm/compiz/compiz-0.8.8-r3.ebuild b/x11-wm/compiz/compiz-0.8.8-r3.ebuild
new file mode 100644
index 000000000000..36d5c22ae14c
--- /dev/null
+++ b/x11-wm/compiz/compiz-0.8.8-r3.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils gnome2-utils
+
+DESCRIPTION="OpenGL window and compositing manager"
+HOMEPAGE="http://www.compiz.org/"
+SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="+cairo dbus fuse gnome gconf gtk +svg"
+
+COMMONDEPEND="
+	>=dev-libs/glib-2
+	dev-libs/libxml2
+	dev-libs/libxslt
+	media-libs/libpng:0=
+	>=media-libs/mesa-6.5.1-r1
+	>=x11-base/xorg-server-1.1.1-r1
+	>=x11-libs/libX11-1.4
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libICE
+	x11-libs/libSM
+	>=x11-libs/libXrender-0.8.4
+	>=x11-libs/startup-notification-0.7
+	virtual/glu
+	cairo? (
+		x11-libs/cairo[X]
+	)
+	dbus? (
+		>=sys-apps/dbus-1.0
+		dev-libs/dbus-glib
+	)
+	fuse? ( sys-fs/fuse )
+	gnome? (
+		>=gnome-base/gnome-control-center-2.16.1:2
+		gnome-base/gnome-desktop:2
+		gconf? ( gnome-base/gconf:2 )
+	)
+	gtk? (
+		>=x11-libs/gtk+-2.8.0:2
+		>=x11-libs/libwnck-2.18.3:1
+		x11-libs/pango
+	)
+	svg? (
+		>=gnome-base/librsvg-2.14.0:2
+		>=x11-libs/cairo-1.0
+	)
+"
+
+DEPEND="${COMMONDEPEND}
+	virtual/pkgconfig
+	x11-proto/damageproto
+	x11-proto/xineramaproto
+"
+
+RDEPEND="${COMMONDEPEND}
+	x11-apps/mesa-progs
+	x11-apps/xdpyinfo
+	x11-apps/xset
+	x11-apps/xvinfo
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+src_prepare() {
+	echo gtk/gnome/compiz-wm.desktop.in >> po/POTFILES.skip
+	echo metadata/core.xml.in >> po/POTFILES.skip
+
+	# Patch for compatibility with gcc 4.7
+	epatch "${FILESDIR}"/${PN}-gcc-4.7.patch
+
+	if ! use gnome || ! use gconf; then
+		epatch "${FILESDIR}"/${PN}-no-gconf.patch
+	fi
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# We make gconf optional by itself, but only if gnome is also
+	# enabled, otherwise we simply disable it.
+	if use gnome; then
+		myconf="${myconf} $(use_enable gconf)"
+	else
+		myconf="${myconf} --disable-gconf"
+	fi
+
+	econf \
+		--enable-fast-install \
+		--disable-static \
+		--disable-gnome-keybindings \
+		--with-default-plugins \
+		$(use_enable svg librsvg) \
+		$(use_enable cairo annotate) \
+		$(use_enable dbus) \
+		$(use_enable dbus dbus-glib) \
+		$(use_enable fuse) \
+		$(use_enable gnome) \
+		$(use_enable gnome metacity) \
+		$(use_enable gtk) \
+		--disable-kde4 \
+		--disable-kde \
+		${myconf}
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+
+	# Install compiz-manager
+	dobin "${FILESDIR}"/compiz-manager
+
+	# Add the full-path to lspci
+	sed -i "s#lspci#/usr/sbin/lspci#" "${D}/usr/bin/compiz-manager" || die
+
+	# Fix the hardcoded lib paths
+	sed -i "s#/lib/#/$(get_libdir)/#g" "${D}/usr/bin/compiz-manager" || die
+
+	# Create gentoo's config file
+	dodir /etc/xdg/compiz
+
+	cat <<- EOF > "${D}/etc/xdg/compiz/compiz-manager"
+	COMPIZ_BIN_PATH="/usr/bin/"
+	PLUGIN_PATH="/usr/$(get_libdir)/compiz/"
+	LIBGL_NVIDIA="/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.so.1.2"
+	LIBGL_FGLRX="/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.so.1.2"
+	KWIN="$(type -p kwin)"
+	METACITY="$(type -p metacity)"
+	SKIP_CHECKS="yes"
+	EOF
+
+	domenu "${FILESDIR}"/compiz.desktop
+}
+
+pkg_preinst() {
+	use gnome && use gconf && gnome2_gconf_savelist
+}
+
+pkg_postinst() {
+	use gnome && use gconf && gnome2_gconf_install
+
+	ewarn "If you update to x11-wm/metacity-2.24 after you install ${P},"
+	ewarn "gtk-window-decorator will crash until you reinstall ${PN} again."
+}
+
+pkg_prerm() {
+	use gnome && gnome2_gconf_uninstall
+}
diff --git a/x11-wm/compiz/files/compiz-gcc-4.7.patch b/x11-wm/compiz/files/compiz-gcc-4.7.patch
new file mode 100644
index 000000000000..28315baec5b8
--- /dev/null
+++ b/x11-wm/compiz/files/compiz-gcc-4.7.patch
@@ -0,0 +1,38 @@
+--- kde/window-decorator-kde4/window.cpp	2010-05-21 11:18:14.000000000 +0000
++++ kde/window-decorator-kde4/window.cpp	2012-09-12 18:05:00.000000000 +0000
+@@ -59,6 +59,9 @@
+ 
+ #include "paintredirector.h"
+ 
++// header for gcc-4.7 compatibility
++#include "unistd.h"
++
+ KWD::Window::Window (WId  parentId,
+ 		     WId  clientId,
+ 		     WId  frame,
+--- configure.ac.orig	2012-09-12 23:39:54.093812000 +0400
++++ configure.ac	2012-09-12 23:40:37.253686000 +0400
+@@ -72,11 +72,6 @@
+   *) CFLAGS="$CFLAGS -Wnested-externs" ;;
+   esac
+ 
+-  case " $CFLAGS " in
+-  *[[\ \	]]-D_FORTIFY_SOURCE=2[[\ \	]]*) ;;
+-  *) CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2" ;;
+-  esac
+-
+   if test "x$enable_ansi" = "xyes"; then
+     case " $CFLAGS " in
+     *[[\ \	]]-ansi[[\ \	]]*) ;;
+@@ -95,11 +90,6 @@
+   *[[\ \	]]-Wall[[\ \	]]*) ;;
+   *) CXXFLAGS="$CXXFLAGS -Wall" ;;
+   esac
+-
+-  case " $CXXFLAGS " in
+-  *[[\ \	]]-D_FORTIFY_SOURCE=2[[\ \	]]*) ;;
+-  *) CXXFLAGS="$CXXFLAGS -D_FORTIFY_SOURCE=2" ;;
+-  esac
+ fi
+ 
+ AC_C_BIGENDIAN
diff --git a/x11-wm/compiz/files/compiz-manager b/x11-wm/compiz/files/compiz-manager
new file mode 100644
index 000000000000..74d45da2590e
--- /dev/null
+++ b/x11-wm/compiz/files/compiz-manager
@@ -0,0 +1,384 @@
+#!/bin/sh
+# Compiz Manager wrapper script
+# 
+# Copyright (c) 2007 Kristian Lyngstøl <kristian@bohemians.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+#
+# Contributions by: Treviño (3v1n0) <trevi55@gmail.com>, Ubuntu Packages
+#
+# Much of this code is based on Beryl code, also licensed under the GPL.
+# This script will detect what options we need to pass to compiz to get it
+# started, and start a default plugin and possibly window decorator.
+# 
+
+
+COMPIZ_BIN_PATH="/usr/bin/" # For window decorators and compiz
+PLUGIN_PATH="/usr/lib/compiz/" 
+GLXINFO="/usr/bin/glxinfo"
+KWIN="/usr/bin/kwin"
+METACITY="/usr/bin/metacity"
+COMPIZ_NAME="compiz" # Final name for compiz (compiz.real) 
+
+# For Xgl LD_PRELOAD
+LIBGL_NVIDIA="/usr/lib/nvidia/libGL.so.1.2.xlibmesa"
+LIBGL_FGLRX="/usr/lib/fglrx/libGL.so.1.2.xlibmesa"
+
+# Minimum amount of memory (in kilo bytes) that nVidia cards need
+# to be allowed to start
+# Set to 262144 to require 256MB
+NVIDIA_MEMORY="65536" # 64MB
+NVIDIA_SETTINGS="nvidia-settings" # Assume it's in the path by default
+
+# For detecting what driver is in use, the + is for one or more /'s
+XORG_DRIVER_PATH="/usr/lib/xorg/modules/drivers/+"
+
+FALLBACKWM="${METACITY}"
+FALLBACKWM_OPTIONS="--replace $@"
+
+# Driver whitelist
+WHITELIST="nvidia intel ati radeon i810"
+
+# blacklist based on the pci ids 
+# See http://wiki.compiz-fusion.org/Hardware/Blacklist for details
+T="   1002:5954 1002:5854 1002:5955" # ati rs480
+T="$T 1002:4153" # ATI Rv350
+T="$T 8086:2982 8086:2992 8086:29a2 8086:2a02 8086:2a12"  # intel 965
+BLACKLIST_PCIIDS="$T"
+unset T
+
+COMPIZ_OPTIONS="--ignore-desktop-hints --replace"
+COMPIZ_PLUGINS=""
+ENV=""
+
+# Use emerald by default if it exist
+USE_EMERALD="yes"
+
+# No indirect by default
+INDIRECT="no"
+
+# Default X.org log if xset q doesn't reveal it
+XORG_DEFAULT_LOG="/var/log/Xorg.0.log"
+
+# Set to yes to enable verbose
+VERBOSE="yes"
+
+# Echos the arguments if verbose
+verbose()
+{
+	if [ "x$VERBOSE" = "xyes" ]; then
+		printf "$*"
+	fi
+}
+
+# abort script and run fallback windowmanager
+abort_with_fallback_wm()
+{
+	if [ "x$SKIP_CHECKS" = "xyes" ]; then
+		verbose "SKIP_CHECKS is yes, so continuing despite problems.\n"
+		return 0;
+	fi
+
+	verbose "aborting and using fallback: $FALLBACKWM \n"
+
+	if [ -x $FALLBACKWM ]; then
+		exec $FALLBACKWM $FALLBACKWM_OPTIONS
+	else
+		printf "no $FALLBACKWM found, exiting\n"
+		exit 1
+	fi
+}
+
+# Check for non power of two texture support
+check_npot_texture()
+{
+	verbose "Checking for non power of two support: "
+	if glxinfo 2> /dev/null | egrep -q '(GL_ARB_texture_non_power_of_two|GL_NV_texture_rectangle|GL_EXT_texture_rectangle|GL_ARB_texture_rectangle)' ; then
+		verbose "present. \n";
+		return 0;
+	else
+		verbose "Not present. \n"
+		return 1;
+	fi
+
+}
+
+# Check for presence of FBConfig
+check_fbconfig()
+{
+	verbose "Checking for FBConfig: "
+	if [ "$INDIRECT" = "yes" ]; then
+		$GLXINFO -i | grep -q GLX.*fbconfig 
+		FB=$?
+	else
+		$GLXINFO | grep -q GLX.*fbconfig 
+		FB=$?
+	fi
+
+	if [ $FB = "0" ]; then
+		unset FB
+		verbose "present. \n"
+		return 0;
+	else
+		unset FB
+		verbose "not present. \n"
+		return 1;
+	fi
+}
+
+
+# Check for TFP
+check_tfp()
+{
+	verbose "Checking for texture_from_pixmap: "
+	if [ $($GLXINFO 2>/dev/null | grep GLX_EXT_texture_from_pixmap -c) -gt 2 ] ; then
+		verbose "present. \n"
+		return 0;
+	else
+		verbose "not present. \n"
+		if [ "$INDIRECT" = "yes" ]; then
+			unset LIBGL_ALWAYS_INDIRECT
+			INDIRECT="no"
+			return 1;
+		else
+			verbose "Trying again with indirect rendering:\n";
+			INDIRECT="yes"
+			export LIBGL_ALWAYS_INDIRECT=1
+			check_tfp;
+			return $?
+		fi
+	fi
+}
+
+# Check wether the composite extension is present
+check_composite()
+{
+	verbose "Checking for Composite extension: "
+	if xdpyinfo -queryExtensions | grep -q Composite ; then
+		verbose "present. \n";
+		return 0;
+	else
+		verbose "not present. \n";
+		return 1;
+	fi
+}
+
+# Detects if Xgl is running
+check_xgl()
+{
+	verbose "Checking for Xgl: "
+	if xvinfo | grep -q Xgl ; then
+		verbose "present. \n"
+		return 0;
+	else
+		verbose "not present. \n"
+		return 1;
+	fi
+}
+
+# Check if the nVidia card has enough video ram to make sense
+check_nvidia_memory()
+{
+	MEM=$(${NVIDIA_SETTINGS} -q VideoRam | egrep Attribute\ \'VideoRam\'\ .*: | cut -d: -f3 | sed 's/[^0-9]//g')
+	if [ $MEM -lt $NVIDIA_MEMORY ]; then
+		verbose "Less than ${NVIDIA_MEMORY}kb of memory and nVidia";
+		return 1;
+	fi
+	return 0;
+}
+
+# Check for existence if NV-GLX
+check_nvidia()
+{
+	if [ ! -z $NVIDIA_INTERNAL_TEST ]; then
+		return $NVIDIA_INTERNAL_TEST;
+	fi
+	verbose "Checking for nVidia: "
+	if xdpyinfo | grep -q NV-GLX ; then
+		verbose "present. \n"
+		NVIDIA_INTERNAL_TEST=0
+		return 0;
+	else
+		verbose "not present. \n"
+		NVIDIA_INTERNAL_TEST=1
+		return 1;
+	fi
+}
+
+# Check if the max texture size is large enough compared to the resolution
+check_texture_size()
+{
+	TEXTURE_LIMIT=$(glxinfo -l | grep -m1 GL_MAX_TEXTURE_SIZE | sed 's/.*=[^0-9]//g')
+	RESOLUTION=$(xdpyinfo  | grep -i dimensions: | sed 's/[^0-9]*pixels.*(.*).*//' | sed 's/[^0-9x]*//')
+	VRES=$(echo $RESOLUTION | sed 's/.*x//')
+	HRES=$(echo $RESOLUTION | sed 's/x.*//')
+	verbose "Comparing resolution ($RESOLUTION) to maximum 3D texture size ($TEXTURE_LIMIT): ";
+	if [ $VRES -gt $TEXTURE_LIMIT ] || [ $HRES -gt $TEXTURE_LIMIT ]; then
+		verbose "Failed.\n"
+		return 1;
+	fi
+	verbose "Passed.\n"
+	return 0
+}
+
+# check driver whitelist
+running_under_whitelisted_driver()
+{
+	LOG=$(xset q|grep "Log file"|awk '{print $3}')
+	if [ "$LOG" = "" ]; then
+	    verbose "xset q doesn't reveal the location of the log file. Using fallback $XORG_DEFAULT_LOG \n"
+	    LOG=$XORG_DEFAULT_LOG;
+	fi
+	if [ -z "$LOG" ];then
+		verbose "AIEEEEH, no Log file found \n"
+		verbose "$(xset q) \n"
+	return 0
+	fi
+	for DRV in ${WHITELIST}; do
+		if egrep -q "Loading ${XORG_DRIVER_PATH}${DRV}_drv\.so" $LOG &&
+		   ! egrep -q "Unloading ${XORG_DRIVER_PATH}${DRV}_drv\.so" $LOG; 
+		then
+			return 0
+		fi
+	done
+	verbose "No whitelisted driver found\n"
+	return 1
+}
+
+# check pciid blacklist
+have_blacklisted_pciid()
+{
+	OUTPUT=$(lspci -n)
+	for ID in ${BLACKLIST_PCIIDS}; do
+		if echo "$OUTPUT" | egrep -q "$ID"; then
+			verbose "Blacklisted PCIID '$ID' found \n"
+			return 0
+		fi
+	done
+	OUTPUT=$(lspci -vn | grep -i VGA)
+	verbose "Detected PCI ID for VGA: $OUTPUT\n"
+	return 1
+}
+
+build_env()
+{
+	if check_nvidia; then
+		ENV="__GL_YIELD=NOTHING "
+	fi
+	if [ "$INDIRECT" = "yes" ]; then
+		ENV="$ENV LIBGL_ALWAYS_INDIRECT=1 "
+	fi
+	if check_xgl; then
+		if [ -f ${LIBGL_NVIDIA} ]; then
+			ENV="$ENV LD_PRELOAD=${LIBGL_NVIDIA}"
+			verbose "Enabling Xgl with nVidia drivers...\n"
+		fi
+		if [ -f ${LIBGL_FGLRX} ]; then
+			ENV="$ENV LD_PRELOAD=${LIBGL_FGLRX}"
+			verbose "Enabling Xgl with fglrx ATi drivers...\n"
+		fi
+	fi
+
+	ENV="$ENV FROM_WRAPPER=yes"
+
+	if [ -n "$ENV" ]; then
+		export $ENV
+	fi
+}
+
+build_args()
+{
+	if [ $INDIRECT = "yes" ]; then
+		COMPIZ_OPTIONS="$COMPIZ_OPTIONS --indirect-rendering "
+	fi
+	if check_nvidia; then
+		COMPIZ_OPTIONS="$COMPIZ_OPTIONS --loose-binding"
+	fi
+}
+
+####################
+# Execution begins here.
+
+# Read configuration from XDG paths
+if [ -z "$XDG_CONFIG_DIRS" ]; then
+	test -f /etc/xdg/compiz/compiz-manager && . /etc/xdg/compiz/compiz-manager
+else
+	test -f $XDG_CONFIG_DIRS/compiz/compiz-manager && . $XDG_CONFIG_DIRS/compiz/compiz-manager
+fi
+
+if [ -z "$XDG_CONFIG_HOME" ]; then
+	test -f $HOME/.config/compiz/compiz-manager && . $HOME/.config/compiz/compiz-manager
+else
+	test -f $XDG_CONFIG_HOME/compiz/compiz-manager && .  $XDG_CONFIG_HOME/compiz/compiz-manager
+fi
+
+# Don't use compiz when running the failsafe session
+if [ "x$GNOME_DESKTOP_SESSION_ID" = "xFailsafe" ]; then
+	abort_with_fallback_wm
+fi
+
+if [ "x$LIBGL_ALWAYS_INDIRECT" = "x1" ]; then
+	INDIRECT="yes";
+fi
+
+# if we run under Xgl, we can skip some tests here
+if ! check_xgl; then
+	# if vesa or vga are in use, do not even try glxinfo (LP#119341)
+	if ! running_under_whitelisted_driver || have_blacklisted_pciid; then
+		abort_with_fallback_wm
+	fi
+	# check if we have the required bits to run compiz and if not, 
+	# fallback
+	if ! check_tfp || ! check_npot_texture || ! check_composite || ! check_texture_size; then
+		abort_with_fallback_wm
+	fi
+
+	if check_nvidia && ! check_nvidia_memory; then
+		abort_with_fallback_wm
+	fi
+
+	if ! check_fbconfig; then
+		abort_with_fallback_wm
+	fi
+fi
+
+# load the ccp plugin if present and fallback to plain gconf if not
+if [ -f ${PLUGIN_PATH}libccp.so ]; then
+	COMPIZ_PLUGINS="$COMPIZ_PLUGINS ccp"
+elif [ -f ${PLUGIN_PATH}libgconf.so ]; then
+	COMPIZ_PLUGINS="$COMPIZ_PLUGINS glib gconf"
+fi
+
+# get environment
+build_env
+build_args
+
+# start the gtk-window-decorator if present
+if [ -x ${COMPIZ_BIN_PATH}emerald ] && [ "$USE_EMERALD" = "yes" ]; then
+	verbose "Starting emerald\n"
+	${COMPIZ_BIN_PATH}emerald --replace &
+elif [ -x ${COMPIZ_BIN_PATH}gtk-window-decorator ] && [ -n "$GNOME_DESKTOP_SESSION_ID" ]; then
+	verbose "Starting gtk-window-decorator\n"
+	${COMPIZ_BIN_PATH}gtk-window-decorator --replace &
+elif [ -x ${COMPIZ_BIN_PATH}kde-window-decorator ] && [ -n "$KDE_FULL_SESSION" ]; then
+	verbose "Starting kde-window-decorator\n"
+	${COMPIZ_BIN_PATH}kde-window-decorator --replace &
+	FALLBACKWM="${KWIN}"
+fi
+
+${COMPIZ_BIN_PATH}${COMPIZ_NAME} $COMPIZ_OPTIONS "$@" $COMPIZ_PLUGINS || exec $FALLBACKWM $FALLBACKWM_OPTIONS
+
diff --git a/x11-wm/compiz/files/compiz-no-gconf.patch b/x11-wm/compiz/files/compiz-no-gconf.patch
new file mode 100644
index 000000000000..d43e84de6815
--- /dev/null
+++ b/x11-wm/compiz/files/compiz-no-gconf.patch
@@ -0,0 +1,20 @@
+ configure.ac |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7b09153..9c22ea0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -192,10 +192,10 @@ if test "x$use_gconf" = "xyes"; then
+   if test x"$GCONFTOOL" = xno; then
+     AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
+   fi
++else
++  AM_CONDITIONAL(GCONF_SCHEMAS_INSTALL, test "x$use_gconf" = "xyes")
+ fi
+ 
+-AM_GCONF_SOURCE_2
+-
+ AM_CONDITIONAL(USE_GCONF, test "x$use_gconf" = "xyes")
+ if test "$use_gconf" = yes; then
+   AC_DEFINE(USE_GCONF, 1, [Build gconf plugin])
diff --git a/x11-wm/compiz/files/compiz.desktop b/x11-wm/compiz/files/compiz.desktop
new file mode 100644
index 000000000000..22cf642b2360
--- /dev/null
+++ b/x11-wm/compiz/files/compiz.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Name=Compiz
+Name[en_GB]=Compiz
+Exec=compiz ccp
+NoDisplay=true
+# name we put on the WM spec check window
+X-GNOME-WMName=Compiz
+X-GNOME-Autostart-Phase=WindowManager
+X-GNOME-Provides=windowmanager
+X-GNOME-Autostart-Notify=true
diff --git a/x11-wm/compiz/metadata.xml b/x11-wm/compiz/metadata.xml
new file mode 100644
index 000000000000..3c7523d47903
--- /dev/null
+++ b/x11-wm/compiz/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <use>
+    <flag name="fuse">
+      Enables support for the filesystem in userspace plugin through <pkg>sys-fs/fuse</pkg>.
+    </flag>
+    <flag name="gconf">
+      Enable the GConf-based configuration backend; it is not required
+      to work with GNOME, and might actually be faster if it's not
+      used.
+    </flag>
+  </use>
+  <longdescription>
+    compiz is a compositing window manager that uses 3D graphics acceleration via OpenGL.
+  </longdescription>
+</pkgmetadata>
diff --git a/x11-wm/ctwm/Manifest b/x11-wm/ctwm/Manifest
new file mode 100644
index 000000000000..124c2484af03
--- /dev/null
+++ b/x11-wm/ctwm/Manifest
@@ -0,0 +1,11 @@
+DIST ctwm-3.7.tar.gz 1139461 SHA256 fa16dbaef6992cdbcdbe05a9dc12c2c16910f5e51a2df54607aeb74f9b4a5171 SHA512 e3c1e4bed68ffbf3efbc6057743889d706ed16e74bd334ebb689c8283f1288778dc368f0a6064aa7e24a6416592f22d1eeffc09c76cb0cd4ea64467718c62cfd WHIRLPOOL c50f518ffd28057d1e63be3a444e0bde617e88626f70ed55d434f2ddbb3be920289ca15b1fc2f11cb219ebe692bdf4cb893b1506e7e684ef4378a487f4d46a1e
+DIST ctwm-3.8.2.tar.xz 549984 SHA256 574d67a8a69f2f1ebaa71aa40cc50667e814f74b51f5db8886e2def6a3e0900f SHA512 4633b7bf7b8528ecfd2a753f443fd5286fd394df37ebe885138d30a498f0d721076835d135974a2bd11ca9c32ffd288f84788cb0407ae346a29c5f6371dca497 WHIRLPOOL 6416ecff3230e823bf52219ae8538862a6ed8e66506a16111b715431e3dd007e81d4b1ac6b83321ec12ca95926fb7747b1927626458fa51fb3205589c3f07eda
+DIST ctwm-3.8a.tar.gz 738226 SHA256 39322cc6b0d12dc286af0944f9a10d3a099a5f04c5d9c47b75742cdf65dbd4a4 SHA512 df850358ece699af7922c7b0c8a39694d9b1cb835a653665ab826ac9a159bb959ed502c65997b79beaa06542b017e19e3916bdf3c45f71a85f2168bc576de5be WHIRLPOOL 20c985b09f281a3cd9433ee8684e7245ae88caacb9c712ff78b4d82862d633d22a048c6c0095ae9a5e60f0c16c83184929cb8d23fc9f9300ee9824ac0535946e
+DIST ctwm-4.0.1.tar.xz 656776 SHA256 674639f6fe7916a0462ce3b8eae43b95acb26ba2049341bbf7ddd81534f538e1 SHA512 8c5c0bf868ba36cf5acca1ac5dbcea9327f63892698ace5086fabe563632acbb578cefea44ac3de91dc15afdbdce0370169e14156525507b90dc8aca8d305bc6 WHIRLPOOL f45613d63fe20fb1ed5620a84decf338b397a902fa2cf0635a878a7cd785a56bacfbbd1f2653be5b5512a334a38e9639c12c25b2112e70208cee1ec391083a53
+EBUILD ctwm-3.7.ebuild 1204 SHA256 95d388429e0fbb0d07bb09ad7af9ccff8928433a6f4ee7aff2f512a80b932dc2 SHA512 23b3edac816e083fc4ff5d640119ba7ee6a8c07b3b601e38a61f0fcd147d0963b75f5329736ab606ebae1b80ed7b6c5e47225af79ae396980d4636ee605ac037 WHIRLPOOL 2eb81f25a585260c4805a617bf96074b4588533d1b3902cd825f818eff1f4decc4981d8f2850db85e30943b59493ffc0a400e1baec7c310906ec922c503fab0a
+EBUILD ctwm-3.8.2.ebuild 1546 SHA256 053826afdc397b3502809a788b1c6cd272d898faa5541b4107201167741ed21e SHA512 4bdc01a3290cc7293d9c38acbb0c2d6dad77b18d6b57c0b72844fe304c42bb5025af98d7e7ce49187079c4f6ec45d3175f12b7b0921ef73bfebe61057fca00d1 WHIRLPOOL bb07fb17e925194536e4ca64eee98448d36e7be8f0cc0ea23e1fb4eab060fc499ea6015adfd434e33c4c606c2ed8c282b971965580391c917aad9a9661bccc6a
+EBUILD ctwm-3.8a-r1.ebuild 1508 SHA256 09e03e0de582635179a6fe2096dbf15967ed7170e87ed12310a0f6cfac9183f4 SHA512 6ff601ccb3e26e83ea3267c066e075445e6974a6111147b9457188e2b0cf78c7087b98a6ab99b8bf48d65785bc80330341ba20b75a62d7ff817e2e116cce067c WHIRLPOOL 4025d52382b46c10582ed7f87215a2d45a1cc1b18b51693c54139f79fef2cf3c65ec4b6ccfbba800dfc2448d59812a231a4424bb8606246fec2a4bbbf56a77a4
+EBUILD ctwm-4.0.1.ebuild 886 SHA256 877b3aeb2ab18c932fd009c9ae055b04a9b5517f934e53d96be3c78551fe2c77 SHA512 1c945416bf77f8a425e109b73d55165f3b387f47f68366d9451fcaf0256f7bdeb68fc48f5440b69d24eb6b542d22ce5fe7158bc37b0af973e4a83dbbb28abd74 WHIRLPOOL 91ba24a5eeb91c819d90cdad24a3cb77785d9a395f223b87a71652cdea35d6152df75345dbb84264861bd6994128c78ca5cf8490d2a3b0ea7442bbe8815f8fff
+MISC ChangeLog 2637 SHA256 9175235d8cfa97cb5aef1ee667f957a8eb64f44dc1c718cbc8ae5915e76e8696 SHA512 d960b9fa95e382d12abb1f3faaba96e5f74a69f8da985057c63390561e9d3ac12976a33328483d8f329f3535dc4a6fcb1f3d357f6b885719daba774415867041 WHIRLPOOL ce7c49826cc97254580501b0898221ae810d6dcd08ccd0564ca7dd81f44f4aa2bcd831518e518afe6898171101a028058f59c76c52657cba934b04a62810ade1
+MISC ChangeLog-2015 4339 SHA256 3e2f63306f95c5597d6c222fd961f821503d4b0ef80b0bf00bc1e698595cffce SHA512 0ba5b42e85fa2909aab0a2504f9549001df0a91e74f2a75faf2d070221e1181b45f8d1aaa5954ab741d58670487fd69d12d77609cc791b7827c4ef6b87dfe3fd WHIRLPOOL 663f9ea1074515219187bb1ca04d72d530162261728128fbcf7e3b2210ef9128e487d7a0bcaad20101826b356800398201bfacde243fd0a3a92addc707225ec5
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/x11-wm/ctwm/ctwm-3.7.ebuild b/x11-wm/ctwm/ctwm-3.7.ebuild
new file mode 100644
index 000000000000..19787781657a
--- /dev/null
+++ b/x11-wm/ctwm/ctwm-3.7.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils
+
+DESCRIPTION="A clean, light window manager"
+HOMEPAGE="http://ctwm.free.lp.se/"
+SRC_URI="http://ctwm.free.lp.se/dist/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt"
+DEPEND="${RDEPEND}
+	app-text/rman
+	virtual/jpeg
+	x11-misc/imake
+	x11-proto/xextproto
+	x11-proto/xproto"
+
+src_compile() {
+	sed -i -e "s@\(CONFDIR =\).*@\1 /etc/X11/twm@g" Imakefile \
+		|| die "sed failed"
+
+	cp Imakefile.local-template Imakefile.local
+
+	xmkmf || die "xmkmf failed"
+	make TWMDIR=/usr/share/${PN} || die "make failed"
+}
+
+src_install() {
+	make BINDIR=/usr/bin \
+		MANPATH=/usr/share/man \
+		TWMDIR=/usr/share/${PN} \
+		DESTDIR="${D}" install || die "make install failed"
+
+	make MANPATH=/usr/share/man \
+		DOCHTMLDIR=/usr/share/doc/${PF}/html \
+		DESTDIR="${D}" install.man || die "make install.man failed"
+
+	echo "#!/bin/sh" > ${T}/ctwm
+	echo "/usr/bin/ctwm" >> ${T}/ctwm
+
+	exeinto /etc/X11/Sessions
+	doexe "${T}"/ctwm
+
+	dodoc CHANGES README* TODO* PROBLEMS
+	dodoc *.ctwmrc*
+}
diff --git a/x11-wm/ctwm/ctwm-3.8.2.ebuild b/x11-wm/ctwm/ctwm-3.8.2.ebuild
new file mode 100644
index 000000000000..050ce634b582
--- /dev/null
+++ b/x11-wm/ctwm/ctwm-3.8.2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="A clean, light window manager"
+HOMEPAGE="http://ctwm.org/"
+SRC_URI="${HOMEPAGE}dist/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+
+RDEPEND="
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+"
+DEPEND="
+	${RDEPEND}
+	app-arch/xz-utils
+	app-text/rman
+	virtual/jpeg
+	x11-misc/imake
+	x11-proto/xextproto
+	x11-proto/xproto
+"
+
+src_prepare() {
+	# overflow bug 338180
+	sed -i menus.c -e "/char modStr/ s/5/6/" || die
+
+	# implicit 'isspace'
+	sed -i parse.c -e "/<stdio.h>/ a#include <ctype.h>" || die
+
+	sed -i Imakefile -e "/^CONFDIR/s@=.*@= /etc/X11/twm@g" || die
+
+	cp Imakefile.local-template Imakefile.local
+
+	# TODO: Add GNOME support
+	sed -i Imakefile.local -e '/^#define GNOME/d' || die
+}
+
+src_configure() {
+	append-cppflags -DXPM -DJPEG
+	xmkmf || die
+}
+
+src_compile() {
+	emake \
+		CC=$(tc-getCC) \
+		CFLAGS="${CFLAGS}" \
+		EXTRA_LDOPTIONS="${LDFLAGS}" \
+		TWMDIR=/usr/share/${PN}
+}
+
+src_install() {
+	emake BINDIR=/usr/bin \
+		MANPATH=/usr/share/man \
+		TWMDIR=/usr/share/${PN} \
+		DESTDIR="${D}" install
+
+	emake MANPATH=/usr/share/man \
+		DOCHTMLDIR=/usr/share/doc/${PF}/html \
+		DESTDIR="${D}" install.man
+
+	echo "#!/bin/sh" > ${T}/ctwm
+	echo "/usr/bin/ctwm" >> ${T}/ctwm
+
+	exeinto /etc/X11/Sessions
+	doexe "${T}"/ctwm
+
+	dodoc CHANGES README* TODO* PROBLEMS
+	dodoc *.ctwmrc*
+}
diff --git a/x11-wm/ctwm/ctwm-3.8a-r1.ebuild b/x11-wm/ctwm/ctwm-3.8a-r1.ebuild
new file mode 100644
index 000000000000..974916539b90
--- /dev/null
+++ b/x11-wm/ctwm/ctwm-3.8a-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A clean, light window manager"
+HOMEPAGE="http://ctwm.free.lp.se/"
+SRC_URI="http://ctwm.free.lp.se/dist/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt"
+DEPEND="${RDEPEND}
+	app-text/rman
+	virtual/jpeg
+	x11-misc/imake
+	x11-proto/xextproto
+	x11-proto/xproto"
+
+src_prepare() {
+	sed -e "/char modStr/ s/5/6/" -i menus.c || die #overflow bug 338180
+	sed -e "/<stdio.h>/ a#include <ctype.h>" -i parse.c || die #implicit 'isspace'
+	sed -i Imakefile \
+		-e "s@\(CONFDIR =\).*@\1 /etc/X11/twm@g" \
+		|| die
+
+	cp Imakefile.local-template Imakefile.local
+
+	# TODO: Add GNOME support
+	sed -i Imakefile.local \
+		-e '/^#define GNOME/d' \
+		|| die
+}
+
+src_compile() {
+	xmkmf || die
+	emake \
+		CC=$(tc-getCC) \
+		CFLAGS="${CFLAGS}" \
+		EXTRA_LDOPTIONS="${LDFLAGS}" \
+		TWMDIR=/usr/share/${PN} \
+		|| die
+}
+
+src_install() {
+	make BINDIR=/usr/bin \
+		MANPATH=/usr/share/man \
+		TWMDIR=/usr/share/${PN} \
+		DESTDIR="${D}" install || die
+
+	make MANPATH=/usr/share/man \
+		DOCHTMLDIR=/usr/share/doc/${PF}/html \
+		DESTDIR="${D}" install.man || die
+
+	echo "#!/bin/sh" > ${T}/ctwm
+	echo "/usr/bin/ctwm" >> ${T}/ctwm
+
+	exeinto /etc/X11/Sessions
+	doexe "${T}"/ctwm || die
+
+	dodoc CHANGES README* TODO* PROBLEMS || die
+	dodoc *.ctwmrc* || die
+}
diff --git a/x11-wm/ctwm/ctwm-4.0.1.ebuild b/x11-wm/ctwm/ctwm-4.0.1.ebuild
new file mode 100644
index 000000000000..a9b7409c23f6
--- /dev/null
+++ b/x11-wm/ctwm/ctwm-4.0.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="A clean, light window manager"
+HOMEPAGE="http://ctwm.org/"
+SRC_URI="${HOMEPAGE}dist/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+
+RDEPEND="
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+"
+DEPEND="
+	${RDEPEND}
+	app-arch/xz-utils
+	app-text/rman
+	virtual/jpeg
+	x11-proto/xextproto
+	x11-proto/xproto
+"
+
+src_prepare() {
+	default
+
+	# implicit 'isspace'
+	sed -i parse.c -e "/<stdio.h>/ a#include <ctype.h>" || die
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	mv "${D}"/usr/share/doc/${PN} "${D}"/usr/share/doc/${PF} || die
+	mv "${D}"/usr/share/examples/${PN} "${D}"/usr/share/doc/${PF}/examples || die
+}
diff --git a/x11-wm/ctwm/metadata.xml b/x11-wm/ctwm/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/x11-wm/ctwm/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/x11-wm/cwm/Manifest b/x11-wm/cwm/Manifest
new file mode 100644
index 000000000000..fbc77a0b0192
--- /dev/null
+++ b/x11-wm/cwm/Manifest
@@ -0,0 +1,10 @@
+AUX cwm-4.2_p20111229-Makefile.patch 259 SHA256 b9259040e6475363bc9f701ccebde1db330e424bb49089170f01d8145ab0308d SHA512 d943debea5c55430b4304809bd9e0ae15d754dc6abd2a9b895f23186faaad12181f4752bf2c663f73aa99d605050c551e483556a6065e60571dc4b3a269bb610 WHIRLPOOL df8153c37b5c588385c48b4ef5131f41ccf7fe2a9022a5d5242040b3568324f9ae37b33f997c30944c674bc17845f43ba7b238f32b27b19d16e15f6aa0a3a529
+DIST cwm-5.1.tar.gz 44095 SHA256 ea72081e6eafaccf6dd282524f5ce9ed2f4e6f8edc34d5aa88c941e8f398c571 SHA512 6bacd3b76aac4773c77e7216714d64f64f5b810904fb68ea62528e13a7326689ce0320b876086c044eac1cd0e24b71c541843c4c679af1184b93d9a9fe041eda WHIRLPOOL 0cb43dadc0aea17fa42168aae7b0a5bd28bab9d1587c2681a95a30ecff472627bc5d2a96a6fe7201e89c79a70b9ef729578dfbef394afcb69441bfa38d4d65df
+DIST cwm-5.6-chneukirchen.tar.gz 50799 SHA256 006320bb1716cc0f93bac5634dcccd01f21d468263b5fc9d1be2dd11078a0625 SHA512 0bb5f9c69e1ed30ef38ced70008baa347032a0c31ee2d4a88e3b45092969a5427ef160577da4891aba3181067235b244f11fc796815f41448930b438099b5bfc WHIRLPOOL bc1a0d5319e287a21415022c288af8977ff135af0f75f8a0d2b15db837ffd4a0cb94e8e031add366b2ad7852b4b6fb0b514e69cc85d9b842b469e0e69e627645
+DIST cwm-5.6-xmw.tar.gz 53738 SHA256 64d6974b2c3076f69d07bb38058a7e7ddc8a0e0016b191fc9a3bef469f617934 SHA512 cf0174523838dba5997206be904ab667efc5ff7e413e98bb81cc3a69d40a79b54e21405787e088486feb8790d1094a2d3cce0be08d7ee36a2b9b0dadd78466c7 WHIRLPOOL 40b7c8aeb665fdc8393d69eb8dcec220d6ac9b53e4491894f69e31493d5ba136c37d43553b199662b57d603fe71420fd24bb9ddf9240ecc50e6f8d9d3e7f89ab
+EBUILD cwm-5.1.ebuild 765 SHA256 97bf988ee5fb7e0d3e1493e4feb0a997a7e7a35303de6cafc18822d73f276de9 SHA512 2d9dddd03cb2a344af40ebf078468072ae58dbb1cecfc9a75d41beb67be8b8b944e5963c4d456945b0e58ecb8276269f68fa096cba7cb6966c3f4963042fe302 WHIRLPOOL 9ee0915753ecb60031ba4ab39dce86874b4c11a6d3be398e120da71d2ad14627495a831e448e3d0df81ee692e7d9317434666fa3d2b335e165d3cf2541356a4c
+EBUILD cwm-5.6.ebuild 1006 SHA256 f3986bea9084f93c45dbca6940e777ad14d5a08443d38b3951669cc250bae535 SHA512 e7fbee979acdd1c82bc47bfc4e7b1dc1e0a686c5d9bf5e3dbe8bbcd19a4fdc6c77ecfb03418872440c25c4929fbb5491d18e31ac9e7719c392d76866131da498 WHIRLPOOL b23892b010eb70812b4303c43be2fc6fae892de294f92e3a624f64e04262f66d17467073b415784741a27a447f507f93de79ad7ab53c766e66fc25b1a6d98d0e
+EBUILD cwm-9999.ebuild 871 SHA256 d5d2f0d6c5ed0317e624975cc215b4ff34f6b01ddb20813d7ada5d2489c152af SHA512 59c7df88477f281931d02d885291b725bf6dd5857cd77f34187893270113756191faa443b653bead385dc7697b61d0a84aa019b71ca652a460be44a2093fae81 WHIRLPOOL b7b846f6bab878605069214f6d6768efb8c71e548cab24082ecff974dd4c6f4e9158a83aca978481d95456b4e2271d05367fb1b90eb6a301c54d23ad50ea62e5
+MISC ChangeLog 2597 SHA256 73cc7f95fbd45008d9d9c015d31ad8912707933b318b3b778be073ba5b112792 SHA512 f9096a53eadb9c05fb191286319ac2e755346ed32b2bbbfadce916d532e2ba29884a36f505e60b048eb455d5bd60c79f2edff4ad1bbbb17308edfaaabc3050bb WHIRLPOOL e2ed330e188a768f7ca7b87a6725e67da6d271143214214bdfbe9ef3fe7690d0e92c134504f617b068d94c477eb19913ac6f7e30e972e3c91c825779f542d9c0
+MISC ChangeLog-2015 6874 SHA256 80a91c7ce15fb6377316eef89790c8a939cc701fecf4ae67a1a953e98b0cfeda SHA512 89f661d2e33dfd8abc8220fcaf5e966d8cd8a963c33378d4832dab35f562fb4b04f28a2c155f5a3744018fad2b2e8bd2f84aa23ae5d3f39ee880a34fdbe84197 WHIRLPOOL e941dd406621c79094815155e01d0b84317112deee1c9bd5924cf62f487f4398730100ff5b13a4b415bc7a2b6aec9525aa0a5cb0379cfbd61a99ac599382bec0
+MISC metadata.xml 324 SHA256 f6df2d53fc17d447d70c0803e78b404b2ad99699e682e7cd4800f34d53c25702 SHA512 549acd771ebbcb5f82ac43f8ebe578ca6681b1ecf66602dd769b049c9235158e5f59c7605769c0d2642b1ad40235869d35f2f5906d64b0ca0e88d3f5ebe9afcd WHIRLPOOL 7eee57242d68e2e00ae96619cbac7ee24771b5e449f6919ccd4d69246712aa2a4e059b841737a59ffc53c2e8b1c091ee35341fddce59317b22932c0b17cbe4b9
diff --git a/x11-wm/cwm/cwm-5.1.ebuild b/x11-wm/cwm/cwm-5.1.ebuild
new file mode 100644
index 000000000000..0eb7d10256b0
--- /dev/null
+++ b/x11-wm/cwm/cwm-5.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="OpenBSD fork of calmwm, a clean and lightweight window manager"
+HOMEPAGE="http://www.openbsd.org/cgi-bin/cvsweb/xenocara/app/cwm/
+	https://github.com/chneukirchen/cwm"
+SRC_URI="http://chneukirchen.org/releases/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/libXrandr"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/bison"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-4.2_p20111229-Makefile.patch
+	tc-export CC
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+	dodoc README
+	make_session_desktop ${PN} ${PN}
+}
diff --git a/x11-wm/cwm/cwm-5.6.ebuild b/x11-wm/cwm/cwm-5.6.ebuild
new file mode 100644
index 000000000000..8d82e7c8a650
--- /dev/null
+++ b/x11-wm/cwm/cwm-5.6.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="OpenBSD fork of calmwm, a clean and lightweight window manager"
+HOMEPAGE="http://www.openbsd.org/cgi-bin/cvsweb/xenocara/app/cwm/
+	https://github.com/chneukirchen/cwm"
+SRC_URI="vanilla? ( http://chneukirchen.org/releases/${P}.tar.gz -> ${P}-chneukirchen.tar.gz )
+	!vanilla? ( https://github.com/xmw/cwm/tarball/ea9a436 -> ${P}-xmw.tar.gz )"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE="vanilla"
+
+RDEPEND="x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/libXrandr"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/bison"
+
+src_unpack() {
+	default
+	# vcs-snapshot doesn't work with tarball names
+	if ! use vanilla ; then
+		mv *${PN}-* ${P} || die
+	fi
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS} -D_GNU_SOURCE" CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+	dodoc README
+	make_session_desktop ${PN} ${PN}
+}
diff --git a/x11-wm/cwm/cwm-9999.ebuild b/x11-wm/cwm/cwm-9999.ebuild
new file mode 100644
index 000000000000..9362010d5669
--- /dev/null
+++ b/x11-wm/cwm/cwm-9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs git-2
+
+DESCRIPTION="OpenBSD fork of calmwm, a clean and lightweight window manager"
+HOMEPAGE="http://www.openbsd.org/cgi-bin/cvsweb/xenocara/app/cwm/
+	https://github.com/chneukirchen/cwm"
+EGIT_BRANCH=linux
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS=""
+IUSE="vanilla"
+
+RDEPEND="x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/libXrandr"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/bison"
+
+pkg_setup() {
+	if use vanilla ; then
+		EGIT_REPO_URI="https://github.com/chneukirchen/cwm.git"
+	else
+		EGIT_REPO_URI="https://github.com/xmw/cwm.git"
+	fi
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS} -D_GNU_SOURCE" CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+	dodoc README
+	make_session_desktop ${PN} ${PN}
+}
diff --git a/x11-wm/cwm/files/cwm-4.2_p20111229-Makefile.patch b/x11-wm/cwm/files/cwm-4.2_p20111229-Makefile.patch
new file mode 100644
index 000000000000..bb00c017112a
--- /dev/null
+++ b/x11-wm/cwm/files/cwm-4.2_p20111229-Makefile.patch
@@ -0,0 +1,11 @@
+--- cwm-20111229/Makefile
++++ cwm-20111229/Makefile
+@@ -16,7 +16,7 @@
+ 
+ CPPFLAGS+=	`pkg-config --cflags fontconfig x11 xft xinerama xrandr`
+ 
+-CFLAGS=		-Wall -O2 -g
++CFLAGS?=	-Wall -O2 -g
+ 
+ LDFLAGS+=	`pkg-config --libs fontconfig x11 xft xinerama xrandr`
+ 
diff --git a/x11-wm/cwm/metadata.xml b/x11-wm/cwm/metadata.xml
new file mode 100644
index 000000000000..e13fa1e0d223
--- /dev/null
+++ b/x11-wm/cwm/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">chneukirchen/cwm</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-wm/dwm/Manifest b/x11-wm/dwm/Manifest
new file mode 100644
index 000000000000..4cc18dc520a1
--- /dev/null
+++ b/x11-wm/dwm/Manifest
@@ -0,0 +1,9 @@
+AUX dwm-session2 170 SHA256 b25088c71daa7ec759bf1ae758b8ef528dcced6cfb642ccdcb69ffa8644dc5ab SHA512 e882c447824ec430862f9af968aad0f2276b7ab28cf60b8f8e49551e3b9cc2a249429987f4a7d6577eb18182b7709fb4d7c5c4651192a04dc2394ba9afa89f08 WHIRLPOOL 73a201f8e4385bc62fbf1aeb3c54918ef6ec0eeefbf8c100a694d88b5f036b520633f1957b2f3f3b70c95f8e374e90327f306afb0766c8f0dfe715084a02d079
+AUX dwm.desktop 118 SHA256 71e9eb1c58e182ca926db776d537a23838ea7635a47841bcfcc1971fdee13cfc SHA512 6a4ba9a9c80c9a39c181427eb48f28edc7c139c73e8452b4012774d1ea787054cad4996da9c839fa437e6dba3ddba521fea72050e3929d59fcf00988bee28db8 WHIRLPOOL ccd3523a505e51b85bf05fa873f5f953097338ab4a2bf901cafb518faa315a86dfbeef7ca0dc4c3a24863732f4fa9c054c6d942853588b32cff6319657e8bd19
+DIST dwm-6.1.tar.gz 25887 SHA256 c2f6c56167f0acdbe3dc37cca9c1a19260c040f2d4800e3529a21ad7cce275fe SHA512 875644bbc246088f2c87e50debbadd4bc179444b396b1b327149087e8bc5303325ebc9103a7e3c864266ee1ac683ea3cd8f0a08285c8e46fc4389d5b83a555f1 WHIRLPOOL a9ad20a212190dae069764a07a7914a20dd620f07bcef0e1acfada1e1596f842ab37109649dc3c7b9cceef05d618434ec2d98b7d8b90f7e64c856591985ee449
+EBUILD dwm-6.1-r1.ebuild 1506 SHA256 888eac7adf6d3c27317f1bdb614e0143b8bf3bce54aee40926c36021c800d695 SHA512 89a619b6bc8977e2ec7248cfd2d761cfb06ddc22e46f197a78dc0aa4edd447e510a362ae3e89c438db632e2f8617d7cc2b13d5f7ccf4d457b0cc090a7e48130f WHIRLPOOL 48f1210cf83c7fc8a9e2a506043cc48534ff0b336af1a4071a4c763c279c4f461574c33c264f53ac4df319a802699f791ebb66c0391519df795114773dade4ff
+EBUILD dwm-6.1.ebuild 2138 SHA256 3c65391bb24c36da1bb569c73bddada34f9d80aa83b57fbae8fc31dec56af63b SHA512 688324870072ae0d35149dbc78409b1b5fedc4ea9130c358cd5d722f92fa238b0385858bdeebe1f5ee45c521b1ce049c14131947bc9a3cad33cbae403481ac07 WHIRLPOOL 7090abc8e789eb39ea4d8bd032f9480dbe0da129fd5bf190f42a81141fa68db8ba0da61219b0227264c53db9a5aa53bcbc37cdd493b2e1edd38000b6e9b35eb9
+EBUILD dwm-9999.ebuild 1407 SHA256 46684a7f60fd226478e95a2b6e9a55b40408400ea39c94161dacfab4ba783836 SHA512 f56b0c09e3f045c7da029d6114c2889c85871218017841c16a78eef65e87c9d241fe53311bc6c215cf9ac011021fafd12ceb09904e6cc6977f263bcb06f2d5bd WHIRLPOOL 54b0d2edb1b902edea74cbb0f400dd22a68757f7e1d738d432f1e78cdb5168b365b3982001dab763142c0ea62ba961ceaafdffb0fc70db480e5c52305b36b93e
+MISC ChangeLog 3793 SHA256 909f012db82b567d304b082918d6f6db2ad72ceb9d62ba5b067b2cf06f7ec333 SHA512 0a4662f0d4eaab5f63ff39e8648bad971f9fcfde46d4b8b02c86ee20fb52c1cf9dfbe28fce8c1e7426f566d3b9a2dfbb810875267d2d8713d9b77054669ca9d4 WHIRLPOOL 1a4c5edc6958539b661323de6eaa19a943b8a61a353336c5c095aa4a99a40dcf05bd062c0b9cd12bbcad56ffb176e39d6237845f95a7f328a293f137272ee2d8
+MISC ChangeLog-2015 10202 SHA256 6b5426904cd9dd1fe89a81a7901008fa023b687d93209e8c06d356a9328bd1ad SHA512 3cf289e9c3d90ac3bd56f664daf4478e611c634698715d3c667d5591c9d428be84fa174e0abec2a9a8b6cecaf47b1b00e680578506417cbbad7830aff0ca6701 WHIRLPOOL 23eb4400f418b588a9a07212fcdfa07b6b8c4e28b0418bf5bdf7dbb5a30d941a419255cd005d6aa318a6feaa8c61f221d094dbcf24e0d9486c2b20ffa8643df8
+MISC metadata.xml 464 SHA256 b6e66735c2d2bef0e16755ec0bd445bf053c98a328c5a2f6bb6aa8c0924b94bb SHA512 e089b8fee6ede56ac362879d23548bef3aaf5abfcd6fe12c0ad1446b59068fd63ac840154d3d007d5fb0e2a5230bbe9bb84a397c44704e5dc3087cd9b5e3025d WHIRLPOOL dafd3d4e82739b51365584be9f8287597e66f3b0b4f443aca418a850a1c8d9d53e78d3195068d674107ae7433baa67b6697805de54943fa9bac7c7eba8250f87
diff --git a/x11-wm/dwm/dwm-6.1-r1.ebuild b/x11-wm/dwm/dwm-6.1-r1.ebuild
new file mode 100644
index 000000000000..84a3658dd364
--- /dev/null
+++ b/x11-wm/dwm/dwm-6.1-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit savedconfig toolchain-funcs
+
+DESCRIPTION="a dynamic window manager for X11"
+HOMEPAGE="https://dwm.suckless.org/"
+SRC_URI="https://dl.suckless.org/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="xinerama"
+
+RDEPEND="
+	media-libs/fontconfig
+	x11-libs/libX11
+	x11-libs/libXft
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="
+	${RDEPEND}
+	xinerama? ( x11-proto/xineramaproto )
+"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s/CFLAGS = -std=c99 -pedantic -Wall -Os/CFLAGS += -std=c99 -pedantic -Wall/" \
+		-e "/^LDFLAGS/{s|=|+=|g;s|-s ||g}" \
+		-e "s/#XINERAMALIBS =/XINERAMALIBS ?=/" \
+		-e "s/#XINERAMAFLAGS =/XINERAMAFLAGS ?=/" \
+		-e "s@/usr/X11R6/include@${EPREFIX}/usr/include/X11@" \
+		-e "s@/usr/X11R6/lib@${EPREFIX}/usr/lib@" \
+		-e "s@-I/usr/include@@" -e "s@-L/usr/lib@@" \
+		-e "s/\/freetype2/\ -I\/usr\/include\/freetype2/" \
+		config.mk || die
+	sed -i \
+		-e '/@echo CC/d' \
+		-e 's|@${CC}|$(CC)|g' \
+		Makefile || die
+
+	restore_config config.h
+}
+
+src_compile() {
+	if use xinerama; then
+		emake CC=$(tc-getCC) dwm
+	else
+		emake CC=$(tc-getCC) XINERAMAFLAGS="" XINERAMALIBS="" dwm
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/dwm-session2 dwm
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/dwm.desktop
+
+	dodoc README
+
+	save_config config.h
+}
diff --git a/x11-wm/dwm/dwm-6.1.ebuild b/x11-wm/dwm/dwm-6.1.ebuild
new file mode 100644
index 000000000000..305a792c1dd1
--- /dev/null
+++ b/x11-wm/dwm/dwm-6.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils savedconfig toolchain-funcs
+
+DESCRIPTION="a dynamic window manager for X11"
+HOMEPAGE="https://dwm.suckless.org/"
+SRC_URI="https://dl.suckless.org/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd"
+IUSE="xinerama"
+
+RDEPEND="
+	media-libs/fontconfig
+	x11-libs/libX11
+	x11-libs/libXft
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="
+	${RDEPEND}
+	xinerama? ( x11-proto/xineramaproto )
+"
+
+src_prepare() {
+	sed -i \
+		-e "s/CFLAGS = -std=c99 -pedantic -Wall -Os/CFLAGS += -std=c99 -pedantic -Wall/" \
+		-e "/^LDFLAGS/{s|=|+=|g;s|-s ||g}" \
+		-e "s/#XINERAMALIBS =/XINERAMALIBS ?=/" \
+		-e "s/#XINERAMAFLAGS =/XINERAMAFLAGS ?=/" \
+		-e "s@/usr/X11R6/include@${EPREFIX}/usr/include/X11@" \
+		-e "s@/usr/X11R6/lib@${EPREFIX}/usr/lib@" \
+		-e "s@-I/usr/include@@" -e "s@-L/usr/lib@@" \
+		-e "s/\/freetype2/\ -I\/usr\/include\/freetype2/" \
+		config.mk || die
+	sed -i \
+		-e '/@echo CC/d' \
+		-e 's|@${CC}|$(CC)|g' \
+		Makefile || die
+
+	restore_config config.h
+	epatch_user
+}
+
+src_compile() {
+	if use xinerama; then
+		emake CC=$(tc-getCC) dwm
+	else
+		emake CC=$(tc-getCC) XINERAMAFLAGS="" XINERAMALIBS="" dwm
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/dwm-session2 dwm
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/dwm.desktop
+
+	dodoc README
+
+	save_config config.h
+}
+
+pkg_postinst() {
+	einfo "This ebuild has support for user defined configs"
+	einfo "Please read this ebuild for more details and re-emerge as needed"
+	einfo "if you want to add or remove functionality for ${PN}"
+	if ! has_version x11-misc/dmenu; then
+		elog "Installing ${PN} without x11-misc/dmenu"
+		einfo "To have a menu you can install x11-misc/dmenu"
+	fi
+	einfo "You can custom status bar with a script in HOME/.dwm/dwmrc"
+	einfo "the ouput is redirected to the standard input of dwm"
+	einfo "Since dwm-5.4, status info in the bar must be set like this:"
+	einfo "xsetroot -name \"\`date\` \`uptime | sed 's/.*,//'\`\""
+}
diff --git a/x11-wm/dwm/dwm-9999.ebuild b/x11-wm/dwm/dwm-9999.ebuild
new file mode 100644
index 000000000000..4783f3e641b7
--- /dev/null
+++ b/x11-wm/dwm/dwm-9999.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit git-r3 toolchain-funcs
+
+DESCRIPTION="a dynamic window manager for X11"
+HOMEPAGE="https://dwm.suckless.org/"
+EGIT_REPO_URI="https://git.suckless.org/dwm"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE="xinerama"
+
+RDEPEND="
+	media-libs/fontconfig
+	x11-libs/libX11
+	x11-libs/libXft
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="
+	${RDEPEND}
+	xinerama? ( x11-proto/xineramaproto )
+"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s/CFLAGS = -std=c99 -pedantic -Wall -Os/CFLAGS += -std=c99 -pedantic -Wall/" \
+		-e "/^LDFLAGS/{s|=|+=|g;s|-s ||g}" \
+		-e "s/#XINERAMALIBS =/XINERAMALIBS ?=/" \
+		-e "s/#XINERAMAFLAGS =/XINERAMAFLAGS ?=/" \
+		-e "s@/usr/X11R6/include@${EPREFIX}/usr/include/X11@" \
+		-e "s@/usr/X11R6/lib@${EPREFIX}/usr/lib@" \
+		-e "s@-I/usr/include@@" -e "s@-L/usr/lib@@" \
+		-e "s/\/freetype2/\ -I\/usr\/include\/freetype2/" \
+		config.mk || die
+	sed -i \
+		-e '/@echo CC/d' \
+		-e 's|@${CC}|$(CC)|g' \
+		Makefile || die
+}
+
+src_compile() {
+	if use xinerama; then
+		emake CC=$(tc-getCC) dwm
+	else
+		emake CC=$(tc-getCC) XINERAMAFLAGS="" XINERAMALIBS="" dwm
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/dwm-session2 dwm
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/dwm.desktop
+
+	dodoc README
+}
diff --git a/x11-wm/dwm/files/dwm-session2 b/x11-wm/dwm/files/dwm-session2
new file mode 100644
index 000000000000..f886ce9465f5
--- /dev/null
+++ b/x11-wm/dwm/files/dwm-session2
@@ -0,0 +1,11 @@
+#!/bin/sh
+DIR=${HOME}/.dwm
+if [ -f "${DIR}"/dwmrc ]; then
+	/bin/sh "${DIR}"/dwmrc &
+else
+	while true; do
+		xsetroot -name "`date`"
+		sleep 1
+	done &
+fi
+exec /usr/bin/dwm
diff --git a/x11-wm/dwm/files/dwm.desktop b/x11-wm/dwm/files/dwm.desktop
new file mode 100644
index 000000000000..c31a41297eee
--- /dev/null
+++ b/x11-wm/dwm/files/dwm.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=dwm
+Comment=dynamic window manager
+Exec=/etc/X11/Sessions/dwm
+TryExec=dwm
+Icon=
+Type=Application
diff --git a/x11-wm/dwm/metadata.xml b/x11-wm/dwm/metadata.xml
new file mode 100644
index 000000000000..c6b034596a37
--- /dev/null
+++ b/x11-wm/dwm/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>desktop-misc@gentoo.org</email>
+</maintainer>
+<longdescription>
+dwm is a dynamic window manager for X. It manages windows in tiling and
+floating modes. Either mode can be applied dynamically, optimizing the
+environment for the application in use and the task performed.
+</longdescription>
+</pkgmetadata>
diff --git a/x11-wm/echinus/Manifest b/x11-wm/echinus/Manifest
new file mode 100644
index 000000000000..9252f7365fdb
--- /dev/null
+++ b/x11-wm/echinus/Manifest
@@ -0,0 +1,7 @@
+AUX echinus-0.4.9-gentoo.diff 1726 SHA256 25575d810d9c6066aa71511405674600a39b018de73bb4565f9c6bc050d73e93 SHA512 09164473f568385b7989bfb6f1c0529eb224aa7060ca39baa81ec61a545fde58d711092db1a6cd5feef6409bc2031c5d1ba71e2c176c2d527478a331fb84e016 WHIRLPOOL 13e9805d9e42833891cdaf0e81d6c284eb9da5fc990e1bdc96a9af7ca7bfbe7b9d669974f3f6398a95d88429b9f5588549933b725db5ea60dd13b22217eab5e4
+AUX echinus.desktop 100 SHA256 6b813b81f54c1a4e9e83c92884e49fb16a20088cbd08dcade0e2bb5572364bd3 SHA512 df3450598a78a6484323735ee95b8c03e0b8bed40335e495a6c41dafabbccdb1e52987c383093576bfb05fa017c2bf474ec53fff30975ebd07fe6ea08196e566 WHIRLPOOL d3fcf0dea1c9e9e21c2f86d3a3f1a1a7200957298eac45b1f3efe63179d6d97af6a72d6259846932e9f05fd9807a647b106c769366cab6240c5e13c0b568293d
+DIST echinus-0.4.9.tar.gz 32934 SHA256 c57ac8f72845bea02bed0c27256b4023668ae7b41ae3c461d6e9b63e24914d94 SHA512 a735291129bc287c6ed8c0f5d98c3d81db6da19d903a5fd5b44af5ec55d0b90dc7a559fc0cbd3e0dcced4a25783307adbd777a0c79fbd91ed78e9867544c47bf WHIRLPOOL 8375246bcc2d18633fe66f6ec5fe0c02154f52385b5d2f1bee40702cc1d78614b852867a71139befe33977da6c0b2078ea7ac5ae56d61065a37f346fd3b9e498
+EBUILD echinus-0.4.9.ebuild 1615 SHA256 edf6a6929cf7c99473546174a10972fc3899adc60006a169a0fa5f794ef6eacb SHA512 93da49d690429d2722d08dcbe0ae9c74d9ef16b39f804c1fd3518f5d36730ccce14a1db58341728a031c664535151062751b893bb63afc89c966e5085566d372 WHIRLPOOL 837a7e5c4975d2a860c8dc838242a003e2430f257f1d28b74abb1e91adf3963f917fd8ac04a5f2ca15e81365bd753276d5671650ffa8590d63511843b2bcb0da
+MISC ChangeLog 2876 SHA256 165071908dcb23163099ed624af3f674d054d642019d7cfff25ee6f0b6bada3c SHA512 c723b121404ba59a19ea25033317bfa0c068fa36bd67f4200d108882772a15a10db0ade6b41f687a84b3049dbc5a681994ada1020d6a6d9255a740c07a657033 WHIRLPOOL 443465c2c35e8b371deb6d7bb9cfdf2d633394c414053a113e4c9d08b6e5cc7273a2c31030f6c4d06b9dbbdcfd9c27c7e6417e2c7cbe8375f7222b2d964863ec
+MISC ChangeLog-2015 2199 SHA256 3bad21959d6e3862d3f39e3a89ff848373136d79e25153f16cc8f0bbff3c9278 SHA512 dc1132ccd9f0735613de938bc4d433f70020a2a1923c06ca1bb0fbdc738fdcb437a46ec74707a95ddf8fbc599c9dbaf7cb32635a159ed30c1b4bbaadeb9926f9 WHIRLPOOL a65ad514ea45f14416028260323effc660f944dae40a2e2b6e2bc778ff89e63ac29b14c1a55634fa1d37b8880bedb55211834c10c4d3ea94cd7d4026462e2f01
+MISC metadata.xml 457 SHA256 5ac5428eb95596d96358080063766e4f616ce773b05feaf23318100512e0f86b SHA512 afd79ffbdf66611b20a07ba91a7fbe4d026de9f894a18d1013b09c33661552fe7d90c75d4ae39bf325528639ca7f4cd2e0e25b1474629c154c332f6e1e1a32ff WHIRLPOOL d319d5b4299cf3ff605c86d0f9504f49fd01e114a6113fc5c5301cdafa83728b815a3d864d5e41a783fb72fbd8db99ba413dda65a5ac7c6b2d44794ef38a25b4
diff --git a/x11-wm/echinus/echinus-0.4.9.ebuild b/x11-wm/echinus/echinus-0.4.9.ebuild
new file mode 100644
index 000000000000..36cbcd703ef5
--- /dev/null
+++ b/x11-wm/echinus/echinus-0.4.9.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils toolchain-funcs multilib
+
+DESCRIPTION="A window manager for X in the spirit of dwm"
+HOMEPAGE="http://plhk.ru/echinus"
+SRC_URI="http://plhk.ru/static/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="xrandr"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXft
+	xrandr? ( x11-libs/libXrandr )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+DOCS=( README )
+
+pkg_setup() {
+	tc-export CC
+	use xrandr && export MULTIHEAD=1
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.diff
+	sed -i -e "s|CONFDIR|/usr/share/${PN}|g" echinus.1 README || die
+	sed -i -e "s|/usr/lib|/usr/$(get_libdir)|g" config.mk || die
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	dodoc README
+	insinto /usr/share/${PN}
+	doins {close,iconify,max}.xbm ${PN}rc
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/${PN}.desktop
+}
+
+pkg_postinst() {
+	if ! has_version x11-misc/dmenu; then
+		elog "Installing ${PN} without x11-misc/dmenu"
+		elog "To have a menu you can install x11-misc/dmenu"
+		elog "and use \"Echinus*spawn\" in echinusrc"
+		elog "to launch dmenu_run. Check echinus documentation for details."
+		elog ""
+	fi
+	elog "A standard config file with its pixmaps has been installed to:"
+	elog "${EPREFIX}/usr/share/${PN}/examples"
+	elog "Copy this folder to ~/.${PN}/ and modify the echinusrc as you wish."
+	elog ""
+	elog "For changing the modkey you can use \"Echinus*modkey: X\""
+	elog "in echinusrc. Replace the X with A for ALT, W for Winkey (Super),"
+	elog "S for Shift or C for the Control key."
+}
diff --git a/x11-wm/echinus/files/echinus-0.4.9-gentoo.diff b/x11-wm/echinus/files/echinus-0.4.9-gentoo.diff
new file mode 100644
index 000000000000..75b8b48c121a
--- /dev/null
+++ b/x11-wm/echinus/files/echinus-0.4.9-gentoo.diff
@@ -0,0 +1,68 @@
+--- a/config.mk
++++ b/config.mk
+@@ -4,10 +4,10 @@
+ # Customize below to fit your system
+ 
+ # paths
+-PREFIX?= /usr/local
++PREFIX?= /usr
+ BINPREFIX?= ${PREFIX}/bin
+ MANPREFIX?= ${PREFIX}/share/man
+-CONFPREFIX?= ${PREFIX}/share/examples
++CONFPREFIX?= ${PREFIX}/share/echinus
+ DOCPREFIX?= ${PREFIX}/share/doc
+ CONF?= ${CONFPREFIX}
+ 
+@@ -15,14 +15,13 @@
+ X11LIB?= /usr/X11R6/lib
+ 
+ # includes and libs
+-INCS = -I. -I/usr/include -I${X11INC} `pkg-config --cflags xft`
+-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 `pkg-config --libs xft`
+-
+-DEFS = -DVERSION=\"${VERSION}\" -DSYSCONFPATH=\"${CONF}\"
++CFLAGS += -I. -I/usr/include `pkg-config --cflags x11 xft`
++LIBS 	 += -L/usr/lib -lc `pkg-config --libs x11 xft`
++CPPFLAGS += -DVERSION=\"${VERSION}\" -DSYSCONFPATH=\"${CONF}\"
+ 
+ # flags
+-CFLAGS = -Os ${INCS} ${DEFS}
+-LDFLAGS = -s ${LIBS}
++#CFLAGS = -Os ${INCS} ${DEFS}
++#LDFLAGS = -s ${LIBS}
+ # debug flags
+ #CFLAGS = -g3 -ggdb3 -std=c99 -pedantic -O0 ${INCS} -DDEBUG ${DEFS}
+ #LDFLAGS = -g3 -ggdb3 ${LIBS}
+@@ -35,9 +34,11 @@
+ #CFLAGS += -save-temps    # Keep precompiler output (great for debugging).
+ 
+ # XRandr (multihead support). Comment out to disable.
+-CFLAGS += -DXRANDR=1
+-LIBS += -lXrandr
+-
++ifdef MULTIHEAD
++CPPFLAGS += -DXRANDR=1
++LIBS += `pkg-config --libs xrandr`
++CCFLAGS += `pkg-config --libs xrandr`
++endif
+ # Solaris
+ #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
+ #LDFLAGS = ${LIBS}
+--- a/Makefile
++++ b/Makefile
+@@ -19,13 +19,13 @@
+ 
+ .c.o:
+ 	@echo CC $<
+-	@${CC} -c ${CFLAGS} $<
++	${CC} ${CPPFLAGS} -c ${CFLAGS} $<
+ 
+ ${OBJ}: config.mk ${HEADERS}
+ 
+ echinus: ${OBJ} ${SRC} ${HEADERS}
+ 	@echo CC -o $@
+-	@${CC} -o $@ ${OBJ} ${LDFLAGS}
++	${CC} ${CFLAGS} ${LDFLAGS} -o $@ ${OBJ} ${LIBS}
+ 
+ clean:
+ 	@echo cleaning
diff --git a/x11-wm/echinus/files/echinus.desktop b/x11-wm/echinus/files/echinus.desktop
new file mode 100644
index 000000000000..7a13be918bf9
--- /dev/null
+++ b/x11-wm/echinus/files/echinus.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=echinus
+Comment=echinus wm
+Exec=echinus
+TryExec=echinus
+Icon=
+Type=Application
diff --git a/x11-wm/echinus/metadata.xml b/x11-wm/echinus/metadata.xml
new file mode 100644
index 000000000000..0dbfba6f09dd
--- /dev/null
+++ b/x11-wm/echinus/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>nico@lifeisabug.com</email>
+		<name>Nico R. Wohlgemuth</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="xrandr">Enable support for multihead configuration</flag>
+	</use>
+</pkgmetadata>
diff --git a/x11-wm/emerald/Manifest b/x11-wm/emerald/Manifest
new file mode 100644
index 000000000000..67e4ceabc35f
--- /dev/null
+++ b/x11-wm/emerald/Manifest
@@ -0,0 +1,7 @@
+AUX emerald-0.8.8-fix-cairo-crash.patch 460 SHA256 b447112b5bc203c6094132fc09d42674f6b5040c48a636efce35175bca64dd8d SHA512 64859292aa31c52ae7ee02a650d5a156404aa595567a24b4b3ae8098f670f663fbaea5e69f9526ffef4dd8111326bf1900937ed239aefce4c13bb7e6c1029ab8 WHIRLPOOL 680b9a2ef209d7a08f30c5ad1cf0993b756ac2a7534319c41a4704ecd92f35fc6930b035c86e5205cc187da646e7bfe932d245d35115e35794449de3c975332c
+AUX emerald-0.8.8-pkgconfig-pollution.patch 357 SHA256 31f5d103ef2b6aa78980b1934ff97ca94ea42c10ccd683d1cd1435f3635288c5 SHA512 f3041aeb5e00476e6cf2f612427f33a28d28718fd20352f4bfc7cc19d246769b2db254f02bf3f2f26ecc2f47c7b6a9e945846a9b56a40dc8ff96bd904bc6d2bf WHIRLPOOL 9ff0cd93ada5ffbceadaea78474aa03f5214e29bc2c1b4c0655d4ea79ba21963dc011610ba07ea422f8d0964e5e7a8873278677c46932c4a292e86b304f503e3
+DIST emerald-0.8.8.tar.bz2 528715 SHA256 239285ced20e817f5303e935d922236f828ca905b264833005a330df2089e8a3 SHA512 c19300ed03b168a01d3c8b7fd90e9f594d5a8165b04d5228de2294301f31619f1126e9ce618e49d666e5b5609eb52ea1434f165f67dc6843ae17b6664305427e WHIRLPOOL d420c2022c2a98263b8e50c1fd51ce8d80c2dca70d161b7864ba706850d3bbb68ebd3baac111999d7c3c7a058fd9cbc1c67eeebc51eca0067edad4481f65b15c
+EBUILD emerald-0.8.8-r1.ebuild 1205 SHA256 03bb9872089b1a8d957161fab0e8a72867930d670d53228ac5b7dd0238f9b0cb SHA512 c018167e65d74b8faf0cd03e7f115208601c265ee5bcc49abc54dfcdabb0d14dd78c088c3a6590ce0bf996c1773c5e794b2aaad5320d4bd1bbed4d1d8eedada7 WHIRLPOOL 4fff72d0728fec5571821e3b6b884b7e245631520a300414bed0aabdfdecbc5da9cb34a26f8407336a3944542d8c8f14e9fad180b72cc175e974c5c355949f69
+MISC ChangeLog 2907 SHA256 fd4737b7edee720d316aee4e2c0675746734a054049bd899675e66e8436ae76a SHA512 d77587027d5c3eb4c03a8bfb330a89558d770537550a6b2c425f457b7121bb1d530f346f1264ad082d9dc179ae601d87d98985576f0c9199159dd96a261d1767 WHIRLPOOL 98b118e07348ceccd96f57e03a5501cfe696af7fc4371c060cd3726dc270fa7fa00659ea8893966570ba9b9505a2f41f33017caad2ff86f5c3251d887ed25aa1
+MISC ChangeLog-2015 7108 SHA256 5fb70dd95a7a804642f80fd0b6b23be4eb1836d5f8f1697636c9f38e7fed4af9 SHA512 61a28c22a0476bdd625cff977236de854bcafce74ff403985ee0c6525061ff4d7f012c7748283139be652a06fac14c1370352fef432c103d2d5cfbabdb57fcad WHIRLPOOL 6764d5567562a807544f24c86a5b664bd502667e4d4d1d513fee715f0c719df3b5c1926fd040b17fd4e0d6fc95f96ffb1a8040fcf84fb082dbbaed7c7ee9c909
+MISC metadata.xml 294 SHA256 604662bb59781ac3cd12eb2e4b07d0470635ab3c5be07123065f767e69ae8a2c SHA512 f242070859c227a491ff306797f546b70e4ebbcc8c2d4753dec4df9db92fd3daedde225da9b5dd8391af1ecc45b6378dc3c22d2bc763e2b8d6859767089c51ac WHIRLPOOL 9d1fbfce278f7bae8709e0057d913fd6182831b66b63ed57de22b724c9d167753f28a45fc6d4cecd941479a7fdeccf3a839fafd6edd9eee0e7f2af5612edae41
diff --git a/x11-wm/emerald/emerald-0.8.8-r1.ebuild b/x11-wm/emerald/emerald-0.8.8-r1.ebuild
new file mode 100644
index 000000000000..0c2f0e94a1af
--- /dev/null
+++ b/x11-wm/emerald/emerald-0.8.8-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic
+
+THEMES_RELEASE=0.5.2
+
+DESCRIPTION="Emerald Window Decorator"
+HOMEPAGE="http://www.compiz.org/"
+SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+PDEPEND="~x11-themes/emerald-themes-${THEMES_RELEASE}"
+
+RDEPEND="
+	>=x11-libs/gtk+-2.8.0:2
+	>=x11-libs/libwnck-2.14.2:1
+	>=x11-wm/compiz-${PV}
+"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.15
+"
+
+DOCS=( AUTHORS ChangeLog INSTALL NEWS README TODO )
+
+src_prepare() {
+	# Fix pkg-config file pollution wrt #380197
+	eapply "${FILESDIR}/${P}-pkgconfig-pollution.patch"
+	# Fix crashes with some UTF-8 characters in window title
+	eapply "${FILESDIR}/${P}-fix-cairo-crash.patch"
+	# fix build with gtk+-2.22 - bug 341143
+	sed -i -e '/#define G[DT]K_DISABLE_DEPRECATED/s:^://:' \
+		include/emerald.h || die
+	# Fix underlinking
+	append-libs -ldl -lm
+
+	eapply_user
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		--enable-fast-install \
+		--disable-mime-update
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/x11-wm/emerald/files/emerald-0.8.8-fix-cairo-crash.patch b/x11-wm/emerald/files/emerald-0.8.8-fix-cairo-crash.patch
new file mode 100644
index 000000000000..34ba3585c963
--- /dev/null
+++ b/x11-wm/emerald/files/emerald-0.8.8-fix-cairo-crash.patch
@@ -0,0 +1,12 @@
+https://github.com/compiz-reloaded/emerald/commit/7f712c5f4fb2dbc8bbe298acc8fef239815aea08
+
+--- a/src/main.c	2011-04-21 16:06:20.000000000 +0400
++++ b/src/main.c	2016-09-01 14:35:08.142020100 +0300
+@@ -1644,6 +1644,7 @@
+ 
+ 	    /* ===================active text colors */
+ 	    cairo_set_source_alpha_color(cr, &fs->text_halo);
++	    pango_cairo_update_layout(cr, d->layout);
+ 	    pango_cairo_layout_path(cr, d->layout);
+ 	    cairo_stroke(cr);
+ 
diff --git a/x11-wm/emerald/files/emerald-0.8.8-pkgconfig-pollution.patch b/x11-wm/emerald/files/emerald-0.8.8-pkgconfig-pollution.patch
new file mode 100644
index 000000000000..7d8a784853fd
--- /dev/null
+++ b/x11-wm/emerald/files/emerald-0.8.8-pkgconfig-pollution.patch
@@ -0,0 +1,12 @@
+--- a/libengine/emeraldengine.pc.in
++++ b/libengine/emeraldengine.pc.in
+@@ -7,6 +7,7 @@
+ Description: Library for Emerald Engines
+ Version: @VERSION@
+ 
+-Requires: @EMERALD_REQUIRES@
+-Libs: @EMERALD_LIBS@
++Requires.private: @EMERALD_REQUIRES@
++Libs: -L${libdir} -lemeraldengine
++Libs.private: @EMERALD_LIBS@
+ Cflags: @EMERALD_CFLAGS@ -I${includedir}/emerald
diff --git a/x11-wm/emerald/metadata.xml b/x11-wm/emerald/metadata.xml
new file mode 100644
index 000000000000..8243e00ccf6b
--- /dev/null
+++ b/x11-wm/emerald/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">Emerald is a 3D window decorator for compositing window managers such as compiz.</longdescription>
+</pkgmetadata>
diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
new file mode 100644
index 000000000000..5381e3114053
--- /dev/null
+++ b/x11-wm/enlightenment/Manifest
@@ -0,0 +1,15 @@
+AUX gentoo-sysactions.conf 3056 SHA256 5939973a9fbaaba81751e936fb541d6aebd7ec1c599174ea568f5a579356939f SHA512 688f02cbff0d50a847eb08ca7832699b836adca9b22e15a780943a8e5a8213aac04b335cfdf3cb96adbff238f681ae8954a720153e8e35b2afaba3225d53206a WHIRLPOOL 0c05e0d295ede8b2f436a87c4b98876fed64d5cc780f13bb6bde1a74a3c87847f2f90ab482a61c2b39f20894572329f5497e5da22537261eef2f0a9fb33ce56d
+AUX quickstart.diff 474 SHA256 9201674d2f8707f216e18c471f0a4a5a7366b3dd32cb8ec131ca1795a10bb3e6 SHA512 b8df654dd1246ea6391017fe9856e38d209b250625f8343aa4943a4eeed980447eb52c6a15fe170bcab90b76e5670ee9c7f98358bb87990877e312cc4cea8f6c WHIRLPOOL 7ea473b01d46ab1ae10ed50d9991de652e3c2945390a71dfa3cba4bf7c6d8ae526dbd18a275db7bd714be7e48414b90ea470c46d2460c68512ede070025b9c49
+DIST e16-1.0.17.tar.gz 2417299 SHA256 41ed67b648acc9b570cc681cf69d0accf38b69fd5d0af6b8ea8a6eacbf87659d SHA512 d6ad565cf638de5240fbcd0f1cd37977c69e6af31a4ff9127e9c570fdf57a56bde50978620fbc34508d02661effa17f0c8b91ca23faebc0b77f9d40e166ba021 WHIRLPOOL d4996798db0ce676c0cdce8bc6a354fcb6649ee4a9c579dc4c51beaeb96d7dcd2dfe0f063ead6724b21bb9f7f66608596412a251df0c2670b944f7376cb3e504
+DIST enlightenment-0.20.5.tar.xz 25039672 SHA256 22749584d2fdf62d5a63c64dd9e57a1e318837a48f10fb9cdd2097769aa802d0 SHA512 0d66d23b3462d6bf293229256d88d486d05135ff7bc7ab4258c3923c853f1935a1850b3a3ff0dabb1aae99a31dafb578f5cbb5678d08df490d3c6837b874a911 WHIRLPOOL 5bfa8e6cc2d5d17fc61a08fc9edbc8970f60cb9e44fcfaf7035b764d21525b375ce9f4060ac33a45627cc3a1f2eb21335e322f88f8a79709fce9284aa668d983
+DIST enlightenment-0.20.6.tar.xz 25030572 SHA256 f21fbace15b8ea0e47c7aeb16a3f4d1e8a41cb85bc0035491091518b0ca55085 SHA512 97179929c039535f6f03fbd1272bde59e25f62b35e17e859379258dac771183562348f7a5c0148c76bcb05b86c21c24950117901f0c2800ac070ba7a27aeee29 WHIRLPOOL 2f475dde50e16bad656d4cad87fc6972003cc4fcc9174e55c2309e1781b4f039da1eb5727ff14708837d8cbf3ec3f55f4a984cecdd73a744208b81502609da25
+DIST enlightenment-0.21.7.tar.xz 25307500 SHA256 7643f7fd4aadaca44c886f21063987624c50d4c50266e87600e902a59b7c76f7 SHA512 9d10116990f83b6a2f066b81fab08a9b49779df22d92b5823bf579d786a3f4602094cf8c4d08b3e23a1cfc0cd7032004b2e389e234a189fb2479d23287bf1277 WHIRLPOOL 05bc214bdef9f8bf55e8b8ee4d22f10442c63c0fece870dffe3fc5d0077b5e6457ed985b5b96aec9d4f0bb23f694ddf9e11dc29fb694e795f9b9009acd4098e9
+EBUILD enlightenment-0.16.9999.ebuild 1851 SHA256 26f56ea0c1ea1f13609f9623e19285d9bdad088c771e5022ae5830b8e3ddf6a9 SHA512 01e4a05fe7ebfb33adc667fd763bb4e6d016e1907d2a121e05e6c51fdc2b1b1931620472e5d4e5efda9f68e6001bbd22b4181fa9a264594d07e2540916fe4284 WHIRLPOOL 175e91b8c943d7ab7078ee64b8cecb275515f988dabd59618d7ce6d1e8af3b618144fe1dc2f1504bcf35b11b400ca016666273da96e6904d1f458768102f99d8
+EBUILD enlightenment-0.17.9999.ebuild 3263 SHA256 d26f9e815f9c81a90d8d93442bf07c814ebfeb77db552cb397dd6f690724aa9c SHA512 cec82b46e34d02e9fb7854749aed6481c82ebfae38aa1299ba798c60728195d8ff412cf4b8e43ab2eb9f08acfeb364ed5091d0cbcc708372bca535568c6129d1 WHIRLPOOL ecd197e572ff60e2f22229b862833940c82dcbfda7135e7c6317ad4d611d16a0cfdf2f1e3fae5b920f4243717c930b7053c64f483870430d3c27493ad74fe959
+EBUILD enlightenment-0.20.5.ebuild 3294 SHA256 83752a6347162d068818376371bed72aed0f560d80f96e11c06672cb39145a59 SHA512 8f08dd7c512c44b63d4355392d6935a841117d97a3ee14cbbbb1b41e338324132cf5747761bb405e4ad92da39ab1ef6fdbfc67c1a3e8d5325f5191b2603f0a6f WHIRLPOOL d48dae37bc473831aef26af113da881d5fcb3148903d9c4e034a304f8141171ada4fa209782ab836a29c8acb747600bd4feb0f663c9d15ad762bd533fd91431d
+EBUILD enlightenment-0.20.6.ebuild 3297 SHA256 e201d3297c64ad54a8b5e753d08d766956fe2c4b6c59445ff1c5e759b36bd043 SHA512 41ac5f4141df2d3830c9bf53453858ce5a6b994c4e301a821c23e70cff71902404c2c41b090269fe79d7445e51dbe9b761c5f108b4df5f40af72a163ac1874bc WHIRLPOOL b1babc2ee073a91b4507f5f9b32b6679624eb5fc15e938fb1b2b4321912eb26ca23cb8acc9eb62cdeee7697590607534b89fc9f335b8a9b961a320344861d5db
+EBUILD enlightenment-0.21.7.ebuild 3263 SHA256 d26f9e815f9c81a90d8d93442bf07c814ebfeb77db552cb397dd6f690724aa9c SHA512 cec82b46e34d02e9fb7854749aed6481c82ebfae38aa1299ba798c60728195d8ff412cf4b8e43ab2eb9f08acfeb364ed5091d0cbcc708372bca535568c6129d1 WHIRLPOOL ecd197e572ff60e2f22229b862833940c82dcbfda7135e7c6317ad4d611d16a0cfdf2f1e3fae5b920f4243717c930b7053c64f483870430d3c27493ad74fe959
+EBUILD enlightenment-1.0.17.ebuild 1841 SHA256 8df2d3b5133da81ae0d61a80166fcd0919d41494fcfd38df41e2f5d5dde200b2 SHA512 cb6fc5767e5ba5de5914047c0a620156f8dedf957d62596ee415d3c622bdbef8113924b9aa36afc6467f59359f45227bb7fc31a87eabf5ac9825cb1f9511d4a6 WHIRLPOOL 1a59476dbc3543442c3bf7b3ed9c47da0caa9322f008403ed7baaa2379da6b0b04ec87c0412192fb015772842e6e95f5929f5a8f0181c6504eed2d20c2c1991d
+MISC ChangeLog 9103 SHA256 d69042f23159fbd219547b01e8c52e297f674882677cda4f71dbd328c7a6de59 SHA512 65e0e88903485f39e6248ba0d90529829c2649b2060db00fd212d38e732d7445924746597f109875b9649ac42edc3f32c2baacaf6bb04333e1961c0298a9fa85 WHIRLPOOL 045c58123db63425ae55aaee5bee34e712c074fdea55fc229fa3bf734cc38479d9e148a55ae7af936ba3468d18dd6717241783a2791a85886e0ead0f933a0935
+MISC ChangeLog-2015 29989 SHA256 1944e28b7fb260dba63712adb24fd5574d15257abdb2dc2a7888e95a0884191a SHA512 31f4da6a6f5ba9e3daf038df724b4daabdbd198ad02cea0abb64d19c6f22486eef81d2e118824f7049c149cfe2b6a65fd4f40dbbae386619cc5eff5b9a84edff WHIRLPOOL bc2584d5a9186168d6067e7401f9df1374bfb6d55b0bbab0a967176ba6c3b9778533e1253247243d6c879ce624aa3e92ad2d9c7001db6c1eb7184ab0b15a08f5
+MISC metadata.xml 7248 SHA256 78662ce23c9e609d83dda759c47476ac92f8548c4dc663f0bfac868fde165ec5 SHA512 c64c60511636472d6f6ddf52378436017e969d0b6a6e4d9c422ae1deb5c88fcd04ba6b1e5a748dcd0ebf47c576e57545b4c27ed0e49a1e0dcbe3b8426d849527 WHIRLPOOL 7453c76bdf3c58be0c8b789147b0045ad219fbfad2b582ebed54d358e9d3bde73be8a8ac5ae1503d9a1f1b04c48f18564219b1a265d9256316f919ff491fbab3
diff --git a/x11-wm/enlightenment/enlightenment-0.16.9999.ebuild b/x11-wm/enlightenment/enlightenment-0.16.9999.ebuild
new file mode 100644
index 000000000000..21b1f0d3160f
--- /dev/null
+++ b/x11-wm/enlightenment/enlightenment-0.16.9999.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+if [[ ${PV} == *9999 ]] ; then
+	ESVN_REPO_URI="https://svn.enlightenment.org/svn/e/trunk/E16/e"
+	inherit subversion autotools
+	SRC_URI=""
+	#KEYWORDS=""
+	S=${WORKDIR}/e16/e
+else
+	SRC_URI="mirror://sourceforge/enlightenment/e16-${PV/_/-}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+	S=${WORKDIR}/e16-${PV/_pre?}
+fi
+inherit eutils
+
+DESCRIPTION="Enlightenment Window Manager (e16)"
+HOMEPAGE="https://www.enlightenment.org/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="dbus doc nls pango pulseaudio xcomposite xinerama xrandr"
+
+RDEPEND="pulseaudio? ( media-sound/pulseaudio )
+	dbus? ( sys-apps/dbus )
+	pango? ( x11-libs/pango )
+	=media-libs/freetype-2*
+	>=media-libs/imlib2-1.3.0[X]
+	x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXdamage
+	x11-libs/libXxf86vm
+	x11-libs/libXft
+	xrandr? ( x11-libs/libXrandr )
+	x11-libs/libXrender
+	x11-misc/xbitmaps
+	xinerama? ( x11-libs/libXinerama )
+	xcomposite? ( x11-libs/libXcomposite )
+	nls? ( virtual/libintl )
+	virtual/libiconv"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-proto/xextproto
+	x11-proto/xf86vidmodeproto
+	xinerama? ( x11-proto/xineramaproto )
+	xcomposite? ( x11-proto/compositeproto )
+	x11-proto/xproto
+	nls? ( sys-devel/gettext )"
+PDEPEND="doc? ( app-doc/edox-data )"
+
+src_prepare() {
+	if [[ ! -e configure ]] ; then
+		eautopoint
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable dbus) \
+		$(use_enable pulseaudio sound pulse) \
+		$(use_enable pango) \
+		$(use_enable xinerama) \
+		$(use_enable xrandr) \
+		$(use_enable xcomposite composite) \
+		--disable-docs \
+		--enable-zoom
+}
+
+src_install() {
+	default
+	dodoc COMPLIANCE sample-scripts/*
+	dohtml docs/e16.html
+}
diff --git a/x11-wm/enlightenment/enlightenment-0.17.9999.ebuild b/x11-wm/enlightenment/enlightenment-0.17.9999.ebuild
new file mode 100644
index 000000000000..42602fa69e5d
--- /dev/null
+++ b/x11-wm/enlightenment/enlightenment-0.17.9999.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+MY_P=${P/_/-}
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_SUB_PROJECT="core"
+	EGIT_URI_APPEND="${PN}"
+else
+	SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+
+inherit enlightenment
+
+DESCRIPTION="Enlightenment DR17 window manager"
+
+LICENSE="BSD-2"
+SLOT="0.17/${PV%%_*}"
+
+__CONF_MODS=(
+	applications bindings dialogs display
+	interaction intl menus
+	paths performance randr shelves theme
+	window-manipulation window-remembers
+)
+__NORM_MODS=(
+	appmenu backlight bluez4 battery
+	clock conf connman cpufreq everything
+	fileman fileman-opinfo gadman geolocation
+	ibar ibox lokker
+	mixer msgbus music-control notification
+	pager packagekit pager-plain policy-mobile quickaccess
+	shot start syscon systray tasks teamwork temperature tiling time
+	winlist wireless wizard wl-desktop-shell wl-drm wl-text-input
+	wl-weekeyboard wl-wl wl-x11 xkbswitch xwayland
+)
+IUSE_E_MODULES=(
+	${__CONF_MODS[@]/#/enlightenment_modules_conf-}
+	${__NORM_MODS[@]/#/enlightenment_modules_}
+)
+
+IUSE="pam spell static-libs systemd ukit wayland ${IUSE_E_MODULES[@]/#/+}"
+
+RDEPEND="
+	pam? ( sys-libs/pam )
+	systemd? ( sys-apps/systemd )
+	wayland? (
+		dev-libs/efl[wayland]
+		>=dev-libs/wayland-1.10.0
+		>=x11-libs/pixman-0.31.1
+		>=x11-libs/libxkbcommon-0.3.1
+	)
+	>=dev-libs/efl-1.18[X]
+	x11-libs/xcb-util-keysyms"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/quickstart.diff
+	enlightenment_src_prepare
+}
+
+# Sanity check to make sure module lists are kept up-to-date.
+check_modules() {
+	local detected=$(
+		awk -F'[\\[\\](, ]' '$1 == "AC_E_OPTIONAL_MODULE" { print $3 }' \
+		configure.ac | sed 's:_:-:g' | LC_COLLATE=C sort
+	)
+	local sorted=$(
+		printf '%s\n' ${IUSE_E_MODULES[@]/#enlightenment_modules_} | \
+		LC_COLLATE=C sort
+	)
+	if [[ ${detected} != "${sorted}" ]] ; then
+		local out new old
+		eerror "The ebuild needs to be kept in sync."
+		echo "${sorted}" > ebuild-iuse
+		echo "${detected}" > configure-detected
+		out=$(diff -U 0 ebuild-iuse configure-detected | sed -e '1,2d' -e '/^@@/d')
+		new=$(echo "${out}" | sed -n '/^+/{s:^+::;p}')
+		old=$(echo "${out}" | sed -n '/^-/{s:^-::;p}')
+		eerror "Add these modules: $(echo ${new})"
+		eerror "Drop these modules: $(echo ${old})"
+		die "please update the ebuild"
+	fi
+}
+
+src_configure() {
+	check_modules
+
+	E_ECONF=(
+		--disable-install-sysactions
+		$(use_enable doc)
+		$(use_enable nls)
+		$(use_enable pam)
+		$(use_enable systemd)
+		--enable-device-udev
+		$(use_enable ukit mount-udisks)
+		$(use_enable wayland)
+	)
+	local u c
+	for u in ${IUSE_E_MODULES[@]} ; do
+		c=${u#enlightenment_modules_}
+		# Disable modules by hand since we default to enabling them all.
+		case ${c} in
+		wl-*|xwayland)
+			if ! use wayland ; then
+				E_ECONF+=( --disable-${c} )
+				continue
+			fi
+			;;
+		esac
+		E_ECONF+=( $(use_enable ${u} ${c}) )
+	done
+	enlightenment_src_configure
+}
+
+src_install() {
+	enlightenment_src_install
+	insinto /etc/enlightenment
+	newins "${FILESDIR}"/gentoo-sysactions.conf sysactions.conf
+}
diff --git a/x11-wm/enlightenment/enlightenment-0.20.5.ebuild b/x11-wm/enlightenment/enlightenment-0.20.5.ebuild
new file mode 100644
index 000000000000..a4be7a1d9fbd
--- /dev/null
+++ b/x11-wm/enlightenment/enlightenment-0.20.5.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+MY_P=${P/_/-}
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_SUB_PROJECT="core"
+	EGIT_URI_APPEND="${PN}"
+else
+	SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${MY_P}.tar.xz"
+	EKEY_STATE="snap"
+fi
+
+inherit enlightenment
+
+DESCRIPTION="Enlightenment DR17 window manager"
+
+LICENSE="BSD-2"
+SLOT="0.17/${PV%%_*}"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+__CONF_MODS=(
+	applications bindings dialogs display
+	interaction intl menus
+	paths performance randr shelves theme
+	window-manipulation window-remembers
+)
+__NORM_MODS=(
+	appmenu backlight bluez4 battery
+	clock conf connman cpufreq everything
+	fileman fileman-opinfo gadman geolocation
+	ibar ibox lokker
+	mixer msgbus music-control notification
+	pager packagekit pager-plain policy-mobile quickaccess
+	shot start syscon systray tasks teamwork temperature tiling
+	winlist wizard wl-desktop-shell wl-drm wl-text-input
+	wl-weekeyboard wl-wl wl-x11 xkbswitch xwayland
+)
+IUSE_E_MODULES=(
+	${__CONF_MODS[@]/#/enlightenment_modules_conf-}
+	${__NORM_MODS[@]/#/enlightenment_modules_}
+)
+
+IUSE="pam spell static-libs systemd ukit wayland ${IUSE_E_MODULES[@]/#/+}"
+
+RDEPEND="
+	pam? ( sys-libs/pam )
+	systemd? ( sys-apps/systemd )
+	wayland? (
+		dev-libs/efl[wayland]
+		>=dev-libs/wayland-1.8.0
+		>=x11-libs/pixman-0.31.1
+		>=x11-libs/libxkbcommon-0.3.1
+	)
+	>=dev-libs/efl-1.17[X]
+	>=media-libs/elementary-1.17
+	x11-libs/xcb-util-keysyms"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/quickstart.diff
+	enlightenment_src_prepare
+}
+
+# Sanity check to make sure module lists are kept up-to-date.
+check_modules() {
+	local detected=$(
+		awk -F'[\\[\\](, ]' '$1 == "AC_E_OPTIONAL_MODULE" { print $3 }' \
+		configure.ac | sed 's:_:-:g' | LC_COLLATE=C sort
+	)
+	local sorted=$(
+		printf '%s\n' ${IUSE_E_MODULES[@]/#enlightenment_modules_} | \
+		LC_COLLATE=C sort
+	)
+	if [[ ${detected} != "${sorted}" ]] ; then
+		local out new old
+		eerror "The ebuild needs to be kept in sync."
+		echo "${sorted}" > ebuild-iuse
+		echo "${detected}" > configure-detected
+		out=$(diff -U 0 ebuild-iuse configure-detected | sed -e '1,2d' -e '/^@@/d')
+		new=$(echo "${out}" | sed -n '/^+/{s:^+::;p}')
+		old=$(echo "${out}" | sed -n '/^-/{s:^-::;p}')
+		eerror "Add these modules: $(echo ${new})"
+		eerror "Drop these modules: $(echo ${old})"
+		die "please update the ebuild"
+	fi
+}
+
+src_configure() {
+	check_modules
+
+	E_ECONF=(
+		--disable-install-sysactions
+		$(use_enable doc)
+		$(use_enable nls)
+		$(use_enable pam)
+		$(use_enable systemd)
+		--enable-device-udev
+		$(use_enable ukit mount-udisks)
+		$(use_enable wayland)
+	)
+	local u c
+	for u in ${IUSE_E_MODULES[@]} ; do
+		c=${u#enlightenment_modules_}
+		# Disable modules by hand since we default to enabling them all.
+		case ${c} in
+		wl-*|xwayland)
+			if ! use wayland ; then
+				E_ECONF+=( --disable-${c} )
+				continue
+			fi
+			;;
+		esac
+		E_ECONF+=( $(use_enable ${u} ${c}) )
+	done
+	enlightenment_src_configure
+}
+
+src_install() {
+	enlightenment_src_install
+	insinto /etc/enlightenment
+	newins "${FILESDIR}"/gentoo-sysactions.conf sysactions.conf
+}
diff --git a/x11-wm/enlightenment/enlightenment-0.20.6.ebuild b/x11-wm/enlightenment/enlightenment-0.20.6.ebuild
new file mode 100644
index 000000000000..a8fec36e41b7
--- /dev/null
+++ b/x11-wm/enlightenment/enlightenment-0.20.6.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+MY_P=${P/_/-}
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_SUB_PROJECT="core"
+	EGIT_URI_APPEND="${PN}"
+else
+	SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${MY_P}.tar.xz"
+	EKEY_STATE="snap"
+fi
+
+inherit enlightenment
+
+DESCRIPTION="Enlightenment DR17 window manager"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+LICENSE="BSD-2"
+SLOT="0.17/${PV%%_*}"
+
+__CONF_MODS=(
+	applications bindings dialogs display
+	interaction intl menus
+	paths performance randr shelves theme
+	window-manipulation window-remembers
+)
+__NORM_MODS=(
+	appmenu backlight bluez4 battery
+	clock conf connman cpufreq everything
+	fileman fileman-opinfo gadman geolocation
+	ibar ibox lokker
+	mixer msgbus music-control notification
+	pager packagekit pager-plain policy-mobile quickaccess
+	shot start syscon systray tasks teamwork temperature tiling
+	winlist wizard wl-desktop-shell wl-drm wl-text-input
+	wl-weekeyboard wl-wl wl-x11 xkbswitch xwayland
+)
+IUSE_E_MODULES=(
+	${__CONF_MODS[@]/#/enlightenment_modules_conf-}
+	${__NORM_MODS[@]/#/enlightenment_modules_}
+)
+
+IUSE="pam spell static-libs systemd ukit wayland ${IUSE_E_MODULES[@]/#/+}"
+
+RDEPEND="
+	pam? ( sys-libs/pam )
+	systemd? ( sys-apps/systemd )
+	wayland? (
+		dev-libs/efl[wayland]
+		>=dev-libs/wayland-1.10.0
+		>=x11-libs/pixman-0.31.1
+		>=x11-libs/libxkbcommon-0.3.1
+	)
+	>=dev-libs/efl-1.17[X]
+	>=media-libs/elementary-1.17
+	x11-libs/xcb-util-keysyms"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/quickstart.diff
+	enlightenment_src_prepare
+}
+
+# Sanity check to make sure module lists are kept up-to-date.
+check_modules() {
+	local detected=$(
+		awk -F'[\\[\\](, ]' '$1 == "AC_E_OPTIONAL_MODULE" { print $3 }' \
+		configure.ac | sed 's:_:-:g' | LC_COLLATE=C sort
+	)
+	local sorted=$(
+		printf '%s\n' ${IUSE_E_MODULES[@]/#enlightenment_modules_} | \
+		LC_COLLATE=C sort
+	)
+	if [[ ${detected} != "${sorted}" ]] ; then
+		local out new old
+		eerror "The ebuild needs to be kept in sync."
+		echo "${sorted}" > ebuild-iuse
+		echo "${detected}" > configure-detected
+		out=$(diff -U 0 ebuild-iuse configure-detected | sed -e '1,2d' -e '/^@@/d')
+		new=$(echo "${out}" | sed -n '/^+/{s:^+::;p}')
+		old=$(echo "${out}" | sed -n '/^-/{s:^-::;p}')
+		eerror "Add these modules: $(echo ${new})"
+		eerror "Drop these modules: $(echo ${old})"
+		die "please update the ebuild"
+	fi
+}
+
+src_configure() {
+	check_modules
+
+	E_ECONF=(
+		--disable-install-sysactions
+		$(use_enable doc)
+		$(use_enable nls)
+		$(use_enable pam)
+		$(use_enable systemd)
+		--enable-device-udev
+		$(use_enable ukit mount-udisks)
+		$(use_enable wayland)
+	)
+	local u c
+	for u in ${IUSE_E_MODULES[@]} ; do
+		c=${u#enlightenment_modules_}
+		# Disable modules by hand since we default to enabling them all.
+		case ${c} in
+		wl-*|xwayland)
+			if ! use wayland ; then
+				E_ECONF+=( --disable-${c} )
+				continue
+			fi
+			;;
+		esac
+		E_ECONF+=( $(use_enable ${u} ${c}) )
+	done
+	enlightenment_src_configure
+}
+
+src_install() {
+	enlightenment_src_install
+	insinto /etc/enlightenment
+	newins "${FILESDIR}"/gentoo-sysactions.conf sysactions.conf
+}
diff --git a/x11-wm/enlightenment/enlightenment-0.21.7.ebuild b/x11-wm/enlightenment/enlightenment-0.21.7.ebuild
new file mode 100644
index 000000000000..42602fa69e5d
--- /dev/null
+++ b/x11-wm/enlightenment/enlightenment-0.21.7.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+MY_P=${P/_/-}
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_SUB_PROJECT="core"
+	EGIT_URI_APPEND="${PN}"
+else
+	SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+
+inherit enlightenment
+
+DESCRIPTION="Enlightenment DR17 window manager"
+
+LICENSE="BSD-2"
+SLOT="0.17/${PV%%_*}"
+
+__CONF_MODS=(
+	applications bindings dialogs display
+	interaction intl menus
+	paths performance randr shelves theme
+	window-manipulation window-remembers
+)
+__NORM_MODS=(
+	appmenu backlight bluez4 battery
+	clock conf connman cpufreq everything
+	fileman fileman-opinfo gadman geolocation
+	ibar ibox lokker
+	mixer msgbus music-control notification
+	pager packagekit pager-plain policy-mobile quickaccess
+	shot start syscon systray tasks teamwork temperature tiling time
+	winlist wireless wizard wl-desktop-shell wl-drm wl-text-input
+	wl-weekeyboard wl-wl wl-x11 xkbswitch xwayland
+)
+IUSE_E_MODULES=(
+	${__CONF_MODS[@]/#/enlightenment_modules_conf-}
+	${__NORM_MODS[@]/#/enlightenment_modules_}
+)
+
+IUSE="pam spell static-libs systemd ukit wayland ${IUSE_E_MODULES[@]/#/+}"
+
+RDEPEND="
+	pam? ( sys-libs/pam )
+	systemd? ( sys-apps/systemd )
+	wayland? (
+		dev-libs/efl[wayland]
+		>=dev-libs/wayland-1.10.0
+		>=x11-libs/pixman-0.31.1
+		>=x11-libs/libxkbcommon-0.3.1
+	)
+	>=dev-libs/efl-1.18[X]
+	x11-libs/xcb-util-keysyms"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/quickstart.diff
+	enlightenment_src_prepare
+}
+
+# Sanity check to make sure module lists are kept up-to-date.
+check_modules() {
+	local detected=$(
+		awk -F'[\\[\\](, ]' '$1 == "AC_E_OPTIONAL_MODULE" { print $3 }' \
+		configure.ac | sed 's:_:-:g' | LC_COLLATE=C sort
+	)
+	local sorted=$(
+		printf '%s\n' ${IUSE_E_MODULES[@]/#enlightenment_modules_} | \
+		LC_COLLATE=C sort
+	)
+	if [[ ${detected} != "${sorted}" ]] ; then
+		local out new old
+		eerror "The ebuild needs to be kept in sync."
+		echo "${sorted}" > ebuild-iuse
+		echo "${detected}" > configure-detected
+		out=$(diff -U 0 ebuild-iuse configure-detected | sed -e '1,2d' -e '/^@@/d')
+		new=$(echo "${out}" | sed -n '/^+/{s:^+::;p}')
+		old=$(echo "${out}" | sed -n '/^-/{s:^-::;p}')
+		eerror "Add these modules: $(echo ${new})"
+		eerror "Drop these modules: $(echo ${old})"
+		die "please update the ebuild"
+	fi
+}
+
+src_configure() {
+	check_modules
+
+	E_ECONF=(
+		--disable-install-sysactions
+		$(use_enable doc)
+		$(use_enable nls)
+		$(use_enable pam)
+		$(use_enable systemd)
+		--enable-device-udev
+		$(use_enable ukit mount-udisks)
+		$(use_enable wayland)
+	)
+	local u c
+	for u in ${IUSE_E_MODULES[@]} ; do
+		c=${u#enlightenment_modules_}
+		# Disable modules by hand since we default to enabling them all.
+		case ${c} in
+		wl-*|xwayland)
+			if ! use wayland ; then
+				E_ECONF+=( --disable-${c} )
+				continue
+			fi
+			;;
+		esac
+		E_ECONF+=( $(use_enable ${u} ${c}) )
+	done
+	enlightenment_src_configure
+}
+
+src_install() {
+	enlightenment_src_install
+	insinto /etc/enlightenment
+	newins "${FILESDIR}"/gentoo-sysactions.conf sysactions.conf
+}
diff --git a/x11-wm/enlightenment/enlightenment-1.0.17.ebuild b/x11-wm/enlightenment/enlightenment-1.0.17.ebuild
new file mode 100644
index 000000000000..f9484337d7c7
--- /dev/null
+++ b/x11-wm/enlightenment/enlightenment-1.0.17.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+if [[ ${PV} == *9999 ]] ; then
+	ESVN_REPO_URI="https://svn.enlightenment.org/svn/e/trunk/E16/e"
+	inherit subversion autotools
+	SRC_URI=""
+	#KEYWORDS=""
+	S=${WORKDIR}/e16/e
+else
+	SRC_URI="mirror://sourceforge/enlightenment/e16-${PV/_/-}.tar.gz"
+	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
+	S=${WORKDIR}/e16-${PV/_pre?}
+fi
+inherit eutils
+
+DESCRIPTION="Enlightenment Window Manager (e16)"
+HOMEPAGE="https://www.enlightenment.org/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="dbus doc nls pango pulseaudio xcomposite xinerama xrandr"
+
+RDEPEND="pulseaudio? ( media-sound/pulseaudio )
+	dbus? ( sys-apps/dbus )
+	pango? ( x11-libs/pango )
+	=media-libs/freetype-2*
+	>=media-libs/imlib2-1.3.0[X]
+	x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXdamage
+	x11-libs/libXxf86vm
+	x11-libs/libXft
+	xrandr? ( x11-libs/libXrandr )
+	x11-libs/libXrender
+	x11-misc/xbitmaps
+	xinerama? ( x11-libs/libXinerama )
+	xcomposite? ( x11-libs/libXcomposite )
+	nls? ( virtual/libintl )
+	virtual/libiconv"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-proto/xextproto
+	x11-proto/xf86vidmodeproto
+	xinerama? ( x11-proto/xineramaproto )
+	xcomposite? ( x11-proto/compositeproto )
+	x11-proto/xproto
+	nls? ( sys-devel/gettext )"
+PDEPEND="doc? ( app-doc/edox-data )"
+
+src_prepare() {
+	if [[ ! -e configure ]] ; then
+		eautopoint
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable dbus) \
+		$(use_enable pulseaudio sound pulse) \
+		$(use_enable pango) \
+		$(use_enable xinerama) \
+		$(use_enable xrandr) \
+		$(use_enable xcomposite composite) \
+		--disable-docs \
+		--enable-zoom
+}
+
+src_install() {
+	default
+	dodoc COMPLIANCE sample-scripts/*
+	dohtml docs/e16.html
+}
diff --git a/x11-wm/enlightenment/files/gentoo-sysactions.conf b/x11-wm/enlightenment/files/gentoo-sysactions.conf
new file mode 100644
index 000000000000..fe676238b907
--- /dev/null
+++ b/x11-wm/enlightenment/files/gentoo-sysactions.conf
@@ -0,0 +1,76 @@
+# ENLIGHTENMENT SYSTEM ACTIONS CONFIGURATION
+#
+# This is a system configuration for allowing or denying certain users or
+# groups to be able to do certain actions that involve system restricted
+# actions such as halt, reboot, suspend, hibernate etc.
+# 
+# This file is read in order from top to bottom - the first rule to MATCH
+# will be used for a user or a group, and nothing after that is read.
+#
+# You must put all the ACTION definitons BEFORE user and group rule matches.
+# Any action definitons after a rule match has been found will be ignored.
+# This allows actions to be re-defined for different user groups, so matches
+# so the command for an action can change for matches to the rules later on.
+# 
+# Any user or group NOT matched by an allow or a deny will be ALLOWED to
+# perform the action by default (system administrators should be aware of
+# this and implement whatever policies they see fit). Generally speaking
+# a user of a workstation, desktop or laptop is intended to have such abilities
+# to perform these actions, thus the default of allow. For multi-user systems
+# the system administrator is considerd capable enough to restrict what they
+# see they need to.
+# 
+# A WARNING to admins: do NOT allow access for users to this system remotely
+# UNLESS you fully trust them or you have locked down permissions to halt/reboot
+# suspend etc. here first. You have been warned.
+#
+# FORMAT:
+#
+# action:   halt      /sbin/shutdown -h now
+# action:   reboot    /sbin/shutdown -r now
+# action:   suspend   /etc/acpi/sleep.sh force
+# action:   hibernate /etc/acpi/hibernate.sh force
+#
+# user:  username  allow: halt reboot suspend hibernate
+# group: groupname deny:  *
+# group: *         deny:  *
+# user:  *         allow: suspend
+# user:  billy     allow: halt reboot
+# group: staff     deny:  halt suspend hibernate
+#
+# etc.
+#
+# user and group name can use glob matches (* == all for example) like the
+# shell. as can action names allowed or denied. 
+
+action:   halt      /sbin/shutdown -h now
+action:   reboot    /sbin/shutdown -r now
+action:   suspend   /usr/sbin/pm-suspend
+action:   hibernate /usr/sbin/pm-hibernate
+
+# on FreeBSD use this instead of the above.
+#action suspend  /usr/sbin/zzz 
+
+# root is allowed to do anything - but it needs to be here explicitly anyway
+user:     root      allow: *
+# members of operator, staff and admin groups should be able to do all
+group:    operator  allow: *
+group:    staff     allow: *
+group:    admin     allow: *
+group:    sys       allow: *
+group:    wheel     allow: *
+# common "user" groups for "console users" on desktops/laptops
+group:    dialout   allow: *
+group:    disk      allow: *
+group:    adm       allow: *
+group:    cdrom     allow: *
+group:    floppy    allow: *
+group:    audio     allow: *
+group:    dip       allow: *
+group:    plugdev   allow: *
+# put in a list of other users and groups here that are allowed or denied etc.
+# e.g.
+# user:     myuser     allow:  *
+# user:     another    allow:  suspend hibernate
+# deny everyone else by default
+user:     *         deny:  *
diff --git a/x11-wm/enlightenment/files/quickstart.diff b/x11-wm/enlightenment/files/quickstart.diff
new file mode 100644
index 000000000000..c7d3f38086c3
--- /dev/null
+++ b/x11-wm/enlightenment/files/quickstart.diff
@@ -0,0 +1,13 @@
+Index: src/bin/e_main.c
+===================================================================
+--- src/bin/e_main.c	(revision 61690)
++++ src/bin/e_main.c	(working copy)
+@@ -93,7 +93,7 @@
+ static Eina_Bool _e_main_cb_startup_fake_end(void *data __UNUSED__);
+ 
+ /* local variables */
+-static Eina_Bool really_know = EINA_FALSE;
++static Eina_Bool really_know = EINA_TRUE;
+ static Eina_Bool locked = EINA_FALSE;
+ static Eina_Bool inloop = EINA_FALSE;
+ static jmp_buf x_fatal_buff;
diff --git a/x11-wm/enlightenment/metadata.xml b/x11-wm/enlightenment/metadata.xml
new file mode 100644
index 000000000000..c586c606ffe9
--- /dev/null
+++ b/x11-wm/enlightenment/metadata.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>enlightenment@gentoo.org</email>
+	<name>Project Enlightenment</name>
+</maintainer>
+<use>
+	<flag name="pango">Enable pango font rendering</flag>
+	<flag name="xrandr">Enable support for the X xrandr extension</flag>
+	<flag name="ukit">Use upower/udisks to automount devices</flag>
+	<flag name="enlightenment_modules_appmenu">Gadget that hold the toolbar of the foreground application</flag>
+	<flag name="enlightenment_modules_backlight">Backlight control slider gadget</flag>
+	<flag name="enlightenment_modules_battery">A gadget to visualize your battery status</flag>
+	<flag name="enlightenment_modules_bluez4">Configure Bluetooth devices</flag>
+	<flag name="enlightenment_modules_clock">Nice clock gadget to show current time</flag>
+	<flag name="enlightenment_modules_connman">Control Wifi and wired networks as a user</flag>
+	<flag name="enlightenment_modules_cpufreq">Gadget to monitor and change the CPU frequency</flag>
+	<flag name="enlightenment_modules_everything">The run command module provides an application launcher dialog</flag>
+	<flag name="enlightenment_modules_fileman">Enlightenment's integrated file manager</flag>
+	<flag name="enlightenment_modules_fileman-opinfo">Can be placed on the desktop or in a shelf</flag>
+	<flag name="enlightenment_modules_gadman">Module to manage gadgets on the desktop</flag>
+	<flag name="enlightenment_modules_geolocation">Geolocation</flag>
+	<flag name="enlightenment_modules_ibar">Iconic application launcher</flag>
+	<flag name="enlightenment_modules_ibox">A home for your iconified applications</flag>
+	<flag name="enlightenment_modules_lokker">Screen locker</flag>
+	<flag name="enlightenment_modules_mixer">A module to provide a mixer for changing volume</flag>
+	<flag name="enlightenment_modules_msgbus">DBus Extension</flag>
+	<flag name="enlightenment_modules_music-control">Control your music in your shelf</flag>
+	<flag name="enlightenment_modules_notification">notification-daemon alternative. Popup if an event occur</flag>
+	<flag name="enlightenment_modules_packagekit">Package manager integration</flag>
+	<flag name="enlightenment_modules_pager">Gadget to allow you to visualize your virtual desktops and the windows they contain</flag>
+	<flag name="enlightenment_modules_pager-plain">A simpler desktop pager</flag>
+	<flag name="enlightenment_modules_policy-mobile"/>
+	<flag name="enlightenment_modules_quickaccess">Enlightenment Quickaccess Launcher</flag>
+	<flag name="enlightenment_modules_shot">Simple screenshot+save/upload module</flag>
+	<flag name="enlightenment_modules_start">Enlightenment's 'Start' button equivalent</flag>
+	<flag name="enlightenment_modules_syscon">This module provides a unified popup dialog for all the system actions in Enlightenment</flag>
+	<flag name="enlightenment_modules_systray">system tray that hold applications icons like Skype, Pidgin, Kopete and others</flag>
+	<flag name="enlightenment_modules_tasks">Gadget to allow you to switch tasks</flag>
+	<flag name="enlightenment_modules_teamwork">Enable teamwork module</flag>
+	<flag name="enlightenment_modules_temperature">Temperature monitor</flag>
+	<flag name="enlightenment_modules_time">Time related gadgets</flag>
+	<flag name="enlightenment_modules_tiling">Positions/resizes your windows tilingly</flag>
+	<flag name="enlightenment_modules_winlist">A module to show the list of client applications presently running</flag>
+	<flag name="enlightenment_modules_wizard">First Run Wizard</flag>
+	<flag name="enlightenment_modules_wireless">WiFi monitoring</flag>
+	<flag name="enlightenment_modules_wl-desktop-shell">Enlightenment Wayland Desktop Shell</flag>
+	<flag name="enlightenment_modules_wl-drm">Wayland DRM (Direct Rendering Manager) compositing module</flag>
+	<flag name="enlightenment_modules_wl-text-input">Wayland text input support</flag>
+	<flag name="enlightenment_modules_wl-weekeyboard">Wayland virtual keyboard</flag>
+	<flag name="enlightenment_modules_wl-wl">Wayland-in-Wayland module</flag>
+	<flag name="enlightenment_modules_wl-x11">Wayland-in-X11 module</flag>
+	<flag name="enlightenment_modules_xkbswitch">Keyboard layout configuration and switcher</flag>
+	<flag name="enlightenment_modules_xwayland">X/Wayland integration</flag>
+	<flag name="enlightenment_modules_conf">Settings Panel</flag>
+	<flag name="enlightenment_modules_conf-applications">Allows configuration of Ibar, Restart, and Startup applications</flag>
+	<flag name="enlightenment_modules_conf-bindings">Input Control Settings</flag>
+	<flag name="enlightenment_modules_conf-dialogs">Configure default dialog properties</flag>
+	<flag name="enlightenment_modules_conf-display">Used to configure your screen</flag>
+	<flag name="enlightenment_modules_conf-interaction">Configure Mouse and Touch input</flag>
+	<flag name="enlightenment_modules_conf-intl">Used to select a default language</flag>
+	<flag name="enlightenment_modules_conf-menus">Configures menu behavior</flag>
+	<flag name="enlightenment_modules_conf-paths">Specifies the Enlightenment search paths and default directories</flag>
+	<flag name="enlightenment_modules_conf-performance">Used to configure certain performance related items as frame rates and cache settings</flag>
+	<flag name="enlightenment_modules_conf-randr">Used to configure your screen's resolution</flag>
+	<flag name="enlightenment_modules_conf-shelves">Shelf configuration dialog</flag>
+	<flag name="enlightenment_modules_conf-theme">Used to configure your theme preferences</flag>
+	<flag name="enlightenment_modules_conf-window-manipulation">Configures window raise, resistance, and maximize policies</flag>
+	<flag name="enlightenment_modules_conf-window-remembers">Delete existing window remembers</flag>
+</use>
+<longdescription>
+Enlightenment is a completely themeable, highly configurable Window Manager for 
+the X Window System, traditionally used in Unix environments.
+
+Enlightenment Features:
+* Fully configurable window borders
+* Iconboxes to store icons in
+* Graphical Pager that also does miniature snapshots of your screen
+* IPC mechanism to remote-control Enlightenment
+* Theme support
+* Menus
+* Translucent moving of windows
+* Window groups
+* Virtual Desktops
+* Multiple Desktops (more than one desktop of Virtual Desktops)
+* Desktop Background selection and management
+* Sound support
+* Multiple focus modes
+* Many resize and move mode settings
+* Manual placement of windows option
+* Autoraising of windows option
+* Tooltips
+* Configurable keybindings
+* Configurable desktop bindings
+* DGA support for fullscreen client zoom
+* Window shading
+* Miniature snapshot icons
+* Multiple border styles at once
+* Window layers
+* Array menus
+* Internal configuration dialogs
+* Auto-scrolling menus
+* KDE hint support
+* GNOME hint support
+* Primitive Windowmaker/Afterstep dock App support.
+* X11R6 session management support
+* Internal per-app based session and property management.
+* Background auto scanning support
+* Truetype anti-aliased font support
+* Window auto-cleanup support
+* Graphical on-line help.
+</longdescription>
+<upstream>
+	<remote-id type="sourceforge">enlightenment</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/x11-wm/evilwm/Manifest b/x11-wm/evilwm/Manifest
new file mode 100644
index 000000000000..fb2c323835a3
--- /dev/null
+++ b/x11-wm/evilwm/Manifest
@@ -0,0 +1,8 @@
+AUX evilwm.desktop 167 SHA256 19be54307231e1939ccefbd973f920d53c20696a750335702167a2702b892c92 SHA512 b4f4d2e237c4e7fa55a1eaab9e3aa3182b0d90eeb34cc5691707a1f4a4ae394553e4bf8231511c3bc0cb56bd3448153f8a7ed1dd6c0273535199df3fe11b8288 WHIRLPOOL 3312fbb236beeae4da700af094b44c8d88d559331af6356174972cb7a8f7a61e5719ff2f5a937d38ea61ca77ca1876d45d5949f5dda84a8cc80d9ac1d55cbae6
+DIST evilwm-1.0.1.tar.gz 31468 SHA256 79640a68f6dd7e67a1767767aba486e192d7663ccb2588154d2419b47b9ec457 SHA512 f9a5abe13ce7ae9fa9a72962316dd7a847419f29a6ab7270315da5a71058c51bde620d34fa690f9de29838490e1da68efe72c6ef33745d69e3e026de98ed3938 WHIRLPOOL f2fc038588baa78703e3cd73e5666e622087757aa5fbd73ec61784ffd35ff34d6ed19ddfbf130675dcdafe90d0d641229ed70ab97cad5dc8c7bdd311dec5b82d
+DIST evilwm-1.1.1.tar.gz 40150 SHA256 79589c296a5915ee0bae1d231e8912601fc794d9f0a9cacb6b648ff9a5f2602a SHA512 a11af475f057bf18adef339f4772ff1291a25a19c86b7f18a4ce7821e70b039c256151232da6cca616ceea7d9242a60b055d654ce26e85384c6ba687ede7898d WHIRLPOOL 0b44393f0b62cc1396b3ad92c0ca3c618082532d2364a915a9cc33a0058b4c334e98c43a57a818c081b666a2edfb78e58410d4b2f3ae9d6ef092e4ced0972448
+EBUILD evilwm-1.0.1.ebuild 1332 SHA256 347bdb5f6f67686ca4c6d3e4604711eb474d89f1b2db52a4278d432d4afcb369 SHA512 d79f38d23703cf536cc940a8a41cf10f659bf95519ba4f63f85dcf3d5fb6cc9334d0fc6bc270be836c58ca83f01c76dc92a999732a1545f93d21247467d28f18 WHIRLPOOL 63d9831270ed195dbf9b71e1528f2d24887fd8a6597f9ab2bcf15fd1c71bdd95ab052968935b44bade94c85f04accb661c939d2504f97fcec524ef350cf25bbc
+EBUILD evilwm-1.1.1.ebuild 1062 SHA256 6bf70a989db269cb0a03e57cd4cade0b856cfc171aff922f792daa3e14809fbe SHA512 06a4a73ff067eb3e2740730e2e753aef6d1aff861d421961a5f490010db87128fd04e286c4f1bcb9353e3294909c2f1d5db73fdcf0db53e025cd908aafffb1bd WHIRLPOOL 09d45cc291b9f34b9e41d865fbfe526a8d6edf691ac165e5be638019cebbe411ff8d2df3539679f9c2f63a684720820570e854c21b6c3a228990f31d7425d4d3
+MISC ChangeLog 3283 SHA256 d615de2aa7ed448f45c8c855b3a7dc3992707814d9cb7df0739b4be99b401805 SHA512 d77f3002dd8482568ffc51e63059587d5aebd1feba54c6a64a344d3285bca58a242fb0861f2353445e4f81b51a2939f08ac31ef64488235cd456eb8eb7b93359 WHIRLPOOL 9deff147f564131446f571f822557efbf16ae1383032ab3a79c9336c0e5945e404d56d28b60837b31945ad655705a078664ced515e902ccc93c564b2cd0a1f2b
+MISC ChangeLog-2015 7292 SHA256 ffd8e42d2b4edbf768774ddbef3c39f11645e1625286eef3de25ed2b054518ef SHA512 b41183a01d9c931fa367d0e300fb68808f11b5f0e5a947dbfb836838cf7c6682403f35efef460aa912df4c490fd0dee9d0d000375aa6af64467782abe8834ca4 WHIRLPOOL 4345fbaff835daa4a3e4c3f4b3b4ebc3b728ca2840b15898a2b15058a5c9d7376467dd60986e7830a01a45bce32a9e41a4ffd43dcd890283f2019c853a6e4235
+MISC metadata.xml 695 SHA256 34ab29de7e5b07f11e602071dc9f0812eb8862e73616676f8a433649e03f6099 SHA512 dbd50d051ed652fea10abaeb714aa1270e82c0a2b5a6f2cb34693bbfa86c787158d3f6ece8bef096bd64f9703fdc4bc6c1d379f4e0fe74a3fd2274addc3bc33a WHIRLPOOL 9e5bc6097f8914a97762bea344370e6ce420f53983317482983c7ca18f5888e21272efbfc483e74468c605ba9f0e1b2bd0308b070e5ca4849c25ccaf7b31e8ca
diff --git a/x11-wm/evilwm/evilwm-1.0.1.ebuild b/x11-wm/evilwm/evilwm-1.0.1.ebuild
new file mode 100644
index 000000000000..e495e9fde6b9
--- /dev/null
+++ b/x11-wm/evilwm/evilwm-1.0.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=3
+inherit toolchain-funcs multilib
+
+DESCRIPTION="A minimalist, no frills window manager for X"
+SRC_URI="http://www.6809.org.uk/evilwm/${P}.tar.gz"
+HOMEPAGE="http://evilwm.sourceforge.net"
+
+LICENSE="MIT 9wm"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libXext
+	x11-libs/libXrandr"
+
+DEPEND="${RDEPEND}
+	x11-proto/xextproto
+	x11-proto/xproto"
+
+src_prepare() {
+	sed -i 's/^#define DEF_FONT.*/#define DEF_FONT "fixed"/' evilwm.h \
+		|| die "sed font failed"
+	sed -i -e '/^CFLAGS/s/ -Os/ /' \
+		-e 's/install -s /install /' Makefile || die "sed opt failed"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" prefix="\$(DESTDIR)/${EPREFIX}/usr" XROOT="${EPREFIX}/usr" LDPATH="-L${EPREFIX}/usr/$(get_libdir)" || die
+}
+
+src_install () {
+	make DESTDIR="${D}" prefix="\$(DESTDIR)/${EPREFIX}/usr" install || die "make install failed"
+
+	dodoc ChangeLog README TODO || die "dodoc failed"
+
+	echo -e "#!${EPREFIX}/bin/sh\nexec \"${EPREFIX}/usr/bin/${PN}\"" > "${T}/${PN}"
+	exeinto /etc/X11/Sessions
+	doexe "${T}/${PN}" || die "/etc/X11/Sessions failed"
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}/${PN}.desktop" || die "${PN}.desktop failed."
+}
diff --git a/x11-wm/evilwm/evilwm-1.1.1.ebuild b/x11-wm/evilwm/evilwm-1.1.1.ebuild
new file mode 100644
index 000000000000..f7bf3c01701e
--- /dev/null
+++ b/x11-wm/evilwm/evilwm-1.1.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit toolchain-funcs
+
+MY_P=${P/_}
+
+DESCRIPTION="A minimalist, no frills window manager for X"
+HOMEPAGE="http://www.6809.org.uk/evilwm/"
+SRC_URI="http://www.6809.org.uk/${PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT 9wm"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXrandr
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	sed -e 's/^#define DEF_FONT.*/#define DEF_FONT "fixed"/' \
+		-i evilwm.h || die
+
+	sed -e '/Encoding/d' \
+		-i ${PN}.desktop || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" INSTALL_STRIP="" install || die
+	dodoc ChangeLog README TODO || die
+
+	echo -e "#!${EPREFIX}/bin/sh\nexec \"${EPREFIX}/usr/bin/${PN}\"" > "${T}"/${PN}
+	exeinto /etc/X11/Sessions
+	doexe "${T}"/${PN} || die
+}
diff --git a/x11-wm/evilwm/files/evilwm.desktop b/x11-wm/evilwm/files/evilwm.desktop
new file mode 100644
index 000000000000..419d1ec1110e
--- /dev/null
+++ b/x11-wm/evilwm/files/evilwm.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=evilwm
+Comment=A minimalist window manager
+Exec=evilwm
+TryExec=evilwm
+# no icon yet, only the top three are currently used
+Icon=
+Type=Application
diff --git a/x11-wm/evilwm/metadata.xml b/x11-wm/evilwm/metadata.xml
new file mode 100644
index 000000000000..e91a07af8e65
--- /dev/null
+++ b/x11-wm/evilwm/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>jaco@uls.co.za</email>
+		<name>Jaco Kroon</name>
+		<description>Proxy-Maintainer. Assign bugs to him</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+	A minimalist window manager for the X Window System. It maximises screen 
+	real estate and provides good keyboard control. It is currently based on 
+	aewm.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">evilwm</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest
new file mode 100644
index 000000000000..d385a4a8834c
--- /dev/null
+++ b/x11-wm/fluxbox/Manifest
@@ -0,0 +1,19 @@
+AUX 1.3.5-generate_menu-printf-fix.patch 1188 SHA256 5eabe84b84a5476595d5b1bdb02d375753e2aa7b3fe20d7c8034e9f0cd14db99 SHA512 78949c35a153d21f98e640e67abc73b124346fcbd31dbc200b6892bfc0af7bab22a5383759482864721644c5cff3cf423914861212390ab96dbebb09c5ba7e38 WHIRLPOOL 30ca248bee5e96f1701425bc5d0d93ed1a0bf9f147abdf76f66afa7620f81ae9b02baa0e3e421ecd19acfd8dec8014c3490e8267d8e1e2efaa46b6feb58ec8d8
+AUX fix-hidden-toolbar.patch 5403 SHA256 81bfb72f60c76be5c4d803ddd141dcef49cd156686c949528682d393b2defcfe SHA512 69705c1c24bb7696c59a82dc20ef5319562cfd67b4e9b6903cd5de02744c48bfce132949ed7eae4879bf89a08bebeb592d35d0ce77b24c17ad172740a15215b1 WHIRLPOOL 61c14d04ac6ae2a5070545648adc0b2de50725a86961ce69225460d2faf985805265c8f18a92b6013e43613fe87475e45e208430e0e719e72ff8459c1103cfd2
+AUX fluxbox.desktop 187 SHA256 d0709698a96bef34f0984c203d26f976ed401448821285fa5f74907070244948 SHA512 217baf54698bb553dabfdc5565827eb10e897728a2ff2595f0eb03aaf049784a094c48b7e698b34ce374dd9f81036bebc77cf7136ec7aa9651eeaf8a0b751dd0 WHIRLPOOL 6aa0cb435bb75e3aa5f94da156662f95398f3b15924972ddf0ce0493fcf3f695f5669756a43eb47228aece8f6c24f801a1d5e4f907ec5eaee3ec6b17098ea6b5
+AUX fluxbox.xsession 2004 SHA256 dbff4840a2c32c8ab837e4f34cb002f810dccca107f5e04a28c22d33db2a59bd SHA512 ec50e1472af22fc34d2bd7124a63246b3b3c84fd1d6b334888165c7a3e91581065603d63f5742ea555822bf16505117b4d6b5de3c583c85a9cb37befde341f72 WHIRLPOOL 22d8456c114b770e46feb917b3422e75991b9c14c93507e493c4379b58385c5a06e9fb206ed5656db70a208e91604cdb08f33dbf44d51b767be08f601b020d0b
+AUX gentoo_style_location-1.1.x.patch 735 SHA256 d3031c3ebdd05c23a243e1ec2c0173206bb56a85ef3129ed70c5d7de434f65d9 SHA512 0ee58758e7a9c76b0bba1cf252250406ab3fe3a9d50a84d3a485b9fe8e86c88b52b3cc2ae3cca730644af0ff818305e5f5beddd9003abb5fcd74d6914168e220 WHIRLPOOL ff7410973045285f40c292184f4fbdb8e2012b6be5416e270b2ea61a4491f32a70157457152471be3610a979095ce360c15ef0fb24ed988f2c54ca921d9d0004
+AUX osx-has-otool.patch 472 SHA256 e21d837d6e244e61f00f1dc732eeafe0d5eaa59e333449f19d7e4ebfeeee63ec SHA512 50758ff5729bfdd74011106f95eb9cf72c4e1ba3ec5fc462017172b7b4f8f9e7763416e8c9243fdb59f699175c5ca18711e05e4be1a95ad973e76daa3814d17a WHIRLPOOL bcf97d5e8dbac0d75af0cb83f728e8416cc9819bd42062ed3e1c2a4fc076f2b5db389165c5b7bd2643903882cebdd53b4c698c150f0c9122d2134ae6c618e90e
+AUX styles-menu-commonbox 127 SHA256 44a56b182b0da9bf26ac41ff7e5ea8da3ddb7c5cbca0f554e3c74f15c72a3d98 SHA512 116876f0edb60b993738b367f5c6a25a401cfd26a9062416e6d4e58dd92e814f79c43357352a1fddf9e52b6274914efa4b41479643557a38295b0d9e5c2c9dee WHIRLPOOL 1191e39ce909dcf6bbd6d7c28d6badacf08e8968d82472abe45e1935b7fb883eb972bf726f2c9cc93a4541409bb8404f3f5787e39d2c09ba79f70e6440bf04bf
+AUX styles-menu-fluxbox 117 SHA256 f5829a442d8653941e2741ab73f49e9d9c95fc8129531e4197730c0bbb2f2989 SHA512 fd68d1d7ceefc70d222e92b3958fe408ebb8bef394d4601a9b8187e53a69fdd0141e83e1b982f2111b5f40c25b26abc7f00a4eb90494c07aaa2ee1e62831e622 WHIRLPOOL 48e609de77393de670fccdc91d6291dbe13559a6fea824822266850155b84b42e86ae0001926ad7d64f1b67ee9328d9993b6904d0ac4df9ae280f7adc7734b02
+AUX styles-menu-user 93 SHA256 5f708a443c602485d958cb21cf55d9680e86aa3369215552c35ed9f46429e946 SHA512 c4d7ff6f0b074cbf3c0cea1548be63e65953d528cf3aa909371f3650bb1067ce0556cbf390fd7f53d2ea4e5d01c49ba241607682d06478dd41eab97d9e523094 WHIRLPOOL 57fca7ee543c74bf8cc0157c3965cc0b820673168c6fcec66afac9af2b78e54ad9a7c7960c7f66444e68da7ec9f7814e5cdedb1487818aeb08610c2f11c025c4
+DIST fluxbox-1.3.6.tar.xz 793144 SHA256 fa09ad8d30841021a1e5147efa944eb509201fa3619da5b6608d94cbbf55bf33 SHA512 66257f00b3f92cb3b87990610e0b5d6c7191c75997bbcba6744d581ccec36da2d1724767575dcde81be4fdbf39e2e25c8530013ee52a28d4775230fdf04b2f9a WHIRLPOOL 198a3972a81287a1fa6346a708bf461cd9b5262adb7cb17504077e9d154c582947b05f7508d151363f36f78d822fa9fbf9797ee4cc6f7f76a8cc5b7a69db4c52
+DIST fluxbox-1.3.7.tar.xz 786492 SHA256 fc8c75fe94c54ed5a5dd3fd4a752109f8949d6df67a48e5b11a261403c382ec0 SHA512 ab8adb8b5a5e396b6df814c93d7fe5aca3eaaa347ca45c1572ad7da0185dbe1e8981190af9b814112f9831b560e31ba0b7dec7e6af5e3e3e3d9d20f2bd463e01 WHIRLPOOL ebf8352dfd6a92ba589c0224a7b50a7a6b1692ca760b551959885e2bcaf59a82657598288ac14ed947763891d939f9c227a8a6fde3a6bd0684b7d9478026a727
+EBUILD fluxbox-1.3.6-r1.ebuild 3147 SHA256 59418c642b22a0786be13a3eb0e8518d5d956bf6e1204e2562c2f006c4dcc7d5 SHA512 cda36abf7e37c650ab8248cc3817b437820360a81db9932d21b744bed482bdbc29ca359bdb43e9cfca6142f553e7c687cfd68494f925b5f081c2f99f491f21d2 WHIRLPOOL 7c67dce16f7e4ecf95f2e7ce9bef7f107e789558dfa07779aab39bc4b5d0dff59f8e8e815e99288acd013514661102d2e7973f954fe7f2d2349617184894efb0
+EBUILD fluxbox-1.3.7-r2.ebuild 3173 SHA256 af756e557d923aff6f00c50d220907bb7aa2378a7b19fa93e254f99c757d20fe SHA512 28e6a6c5146c417c9e7ac8ca4eb60aee7fbd0b2c952c433f5a974d05f8f31dea44039932888088b79484b08e33da229dab58e2542eb9be1666df0b8a15cc3252 WHIRLPOOL 46686ea8fd412a819aa112fdfc12abb2d40a6859c25479027ed08391b4557c29db4c637e52d68605aae3b9e526121c993cbf9219d221aa302bf416e0ad656ea2
+EBUILD fluxbox-1.3.7-r3.ebuild 3175 SHA256 bc921db389a0e49d840f769755aaeaf8fd4e59fdb35e8bc108fdba190dfdd42b SHA512 0419913064ad2d4edfe00c429b74936fc4284cd208f6db1004fce7cf8eb3fe2cd18ff8422c9232f49ef52e24a8c48c3ee4d92cc1d9e10cc8795f0adf3bb93bc0 WHIRLPOOL 2e1f812a15f53222a1f605f002faad0e9c7bd5b1fd5ea88648fd03f4e6abd07d320f5ada29bb0ccba73d7771034a5097e679dd1c23b63dd913985539058fdbaf
+EBUILD fluxbox-1.3.7-r4.ebuild 3217 SHA256 73f38696a9a8823a2458cab175f09dd83149ef1bf9a14674c92c73188d1664f7 SHA512 16ca60b87181b516bb6d76e6cea2c7507e4a0a435f567c8758fb660a521f4168d92d8ec9a41ed9d6d44878278856bb53b1d9700d52f0767cd45c3788a3096207 WHIRLPOOL 01a2a3b0e0a9b79c00de90b651fff51e931cc09ed8d32a6461a9f42f28dc84568fa39aa5ecd16bca1c625f730710c9e86ee6eb0105aa48ae3ea6063b35e5dab6
+EBUILD fluxbox-9999.ebuild 3003 SHA256 448798e660730d7ba002de6a8963188ee41f5dd757a6e9d90309db6d4121071a SHA512 d9cff50cad586aafb16b9de11f581a81405f35c85523965f89a079e9fcdfab6484addc06d2280ea6f923e2f3597960605eb154b67ccb811823fe2516c7e32026 WHIRLPOOL d65ec559558b49c25a3858313c123eaecc5a6af0ab263e4e34a90296c65b7727e39a10d672900aa05275f093467d23a50a2a8a04e341a409d990e37be2710de8
+MISC ChangeLog 4681 SHA256 e2ae7d9e371cf242d82ddc09ade8f370c49ef64e967725668e909d863d7293bd SHA512 37225a26418d2b1b309c937f1d05584f4096d98c92ee13f8b51591f37f352faf582e4a92452534e1546ddb5abf9bf38451e959fcefec1c6a6fd06bece6a864d5 WHIRLPOOL 907f0a4de2fe5636f4fdc8b841925670e4da3e099553280ab0c5507b6202eeba9fadb64f239932559d5d697ab81166509203ca6f5492f78018bb4835280c4d93
+MISC ChangeLog-2015 62229 SHA256 77ace1985e0eee1dde1cab0db729134840afc842637341d071c4f1a72b3f7514 SHA512 ce04b4872632b65a3c94f25f6a359e1937cd19c0bb4ff80b3586691fd50df7ff287a058a9dae1171a55737934363bf9a94048820b02bad1ab0156b69653f0831 WHIRLPOOL f16df1cc901db3bdc2c093f1d0a0494fbb97f5c8c05baa8eb582955d26194945a12ff0a3c9f222a4ed16096b234599c3c45a7a802c6c3eab97d7f838262448b6
+MISC metadata.xml 1177 SHA256 7bde8cb7441f307433df423c692614945a9f810becdc9f3761df79d5299b2bbd SHA512 7b3ba2c7db2d7fcfb6bc1170842928aceaa8b6868c8f242164742864741453a940c72298d1f1d3d7db7768c95c0910e80de5cb822f137496916114dc784b9ec8 WHIRLPOOL 2073389deac2f03e724a2a57b8ade4503f5989f7ff153acced579f8d7b28262f9f36bb069e99a28aaf174c906cd2f69ceff75c736140cb2dd696537e7bf44e44
diff --git a/x11-wm/fluxbox/files/1.3.5-generate_menu-printf-fix.patch b/x11-wm/fluxbox/files/1.3.5-generate_menu-printf-fix.patch
new file mode 100644
index 000000000000..f9246f159076
--- /dev/null
+++ b/x11-wm/fluxbox/files/1.3.5-generate_menu-printf-fix.patch
@@ -0,0 +1,22 @@
+https://github.com/fluxbox/fluxbox/commit/fc245408d6975d0813cd4440e7089d987b54d42e
+diff --git a/util/fluxbox-generate_menu.in b/util/fluxbox-generate_menu.in
+index 525315c..33b0153 100755
+--- a/util/fluxbox-generate_menu.in
++++ b/util/fluxbox-generate_menu.in
+@@ -330,13 +330,13 @@ searchForIcon(){
+     # echo "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" 
+     if [ -f "$entry_icon" ]; then
+     # if icon exists and entry does not already exists, add it
+-        if ! grep -q -m 1 "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" $ICONMAPPING 2> /dev/null; then
+-            printf "\"${entry_exec}\" \t <${entry_icon}>\n" >> $ICONMAPPING
++        if ! grep -q -m 1 "^.${execname}.[[:space:]]*<.*/${icon_base}\....>" $ICONMAPPING 2> /dev/null; then
++            printf "\"${execname}\" \t <${entry_icon}>\n" >> $ICONMAPPING
+         else 
+-            : echo "#    mapping already exists for ${entry_exec}" >> $ICONMAPPING
++            : echo "#    mapping already exists for ${execname}" >> $ICONMAPPING
+         fi
+     else
+-        echo "# No icon file found for $entry_exec" >> $ICONMAPPING
++        echo "# No icon file found for $execname" >> $ICONMAPPING
+     fi
+ }
diff --git a/x11-wm/fluxbox/files/fix-hidden-toolbar.patch b/x11-wm/fluxbox/files/fix-hidden-toolbar.patch
new file mode 100644
index 000000000000..e5e5a552c392
--- /dev/null
+++ b/x11-wm/fluxbox/files/fix-hidden-toolbar.patch
@@ -0,0 +1,92 @@
+--- a/src/Toolbar.cc
++++ b/src/Toolbar.cc
+@@ -80,18 +80,18 @@ const struct {
+     unsigned int shape;
+ } _values[] = {
+     { /* unused */ },
+-    { Toolbar::TOPLEFT,      "TopLeft",      FbTk::ROT0,   FbTk::Shape::BOTTOMRIGHT | FbTk::Shape::BOTTOMLEFT},
+-    { Toolbar::TOPCENTER,    "TopCenter",    FbTk::ROT0,   FbTk::Shape::TOPRIGHT | FbTk::Shape::TOPLEFT},
+-    { Toolbar::TOPRIGHT,     "TopRight",     FbTk::ROT0,   FbTk::Shape::BOTTOMRIGHT | FbTk::Shape::BOTTOMLEFT},
+-    { Toolbar::BOTTOMLEFT,   "BottomLeft",   FbTk::ROT0,   FbTk::Shape::TOPRIGHT | FbTk::Shape::TOPLEFT},
+-    { Toolbar::BOTTOMCENTER, "BottomCenter", FbTk::ROT0,   FbTk::Shape::TOPRIGHT | FbTk::Shape::TOPLEFT},
+-    { Toolbar::BOTTOMRIGHT,  "BottomRight",  FbTk::ROT0,   FbTk::Shape::TOPRIGHT | FbTk::Shape::TOPLEFT},
+-    { Toolbar::LEFTBOTTOM,   "LeftBottom",   FbTk::ROT270, FbTk::Shape::TOPRIGHT | FbTk::Shape::BOTTOMRIGHT},
+-    { Toolbar::LEFTCENTER,   "LeftCenter",   FbTk::ROT270, FbTk::Shape::TOPRIGHT | FbTk::Shape::BOTTOMRIGHT},
+-    { Toolbar::LEFTTOP,      "LeftTop",      FbTk::ROT270, FbTk::Shape::TOPRIGHT | FbTk::Shape::BOTTOMRIGHT},
+-    { Toolbar::RIGHTBOTTOM,  "RightBottom",  FbTk::ROT90,  FbTk::Shape::TOPLEFT | FbTk::Shape::BOTTOMLEFT},
+-    { Toolbar::RIGHTCENTER,  "RightCenter",  FbTk::ROT90,  FbTk::Shape::TOPLEFT | FbTk::Shape::BOTTOMLEFT},
+-    { Toolbar::RIGHTTOP,     "RightTop",     FbTk::ROT90,  FbTk::Shape::TOPLEFT | FbTk::Shape::BOTTOMLEFT},
++    { Toolbar::TOPLEFT,      "TopLeft",      FbTk::ROT0,   FbTk::Shape::BOTTOMRIGHT                            },
++    { Toolbar::TOPCENTER,    "TopCenter",    FbTk::ROT0,   FbTk::Shape::BOTTOMRIGHT | FbTk::Shape::BOTTOMLEFT  },
++    { Toolbar::TOPRIGHT,     "TopRight",     FbTk::ROT0,   FbTk::Shape::BOTTOMLEFT                             },
++    { Toolbar::BOTTOMLEFT,   "BottomLeft",   FbTk::ROT0,   FbTk::Shape::TOPRIGHT                               },
++    { Toolbar::BOTTOMCENTER, "BottomCenter", FbTk::ROT0,   FbTk::Shape::TOPRIGHT    | FbTk::Shape::TOPLEFT     },
++    { Toolbar::BOTTOMRIGHT,  "BottomRight",  FbTk::ROT0,   FbTk::Shape::TOPLEFT                                },
++    { Toolbar::LEFTBOTTOM,   "LeftBottom",   FbTk::ROT270, FbTk::Shape::TOPRIGHT                               },
++    { Toolbar::LEFTCENTER,   "LeftCenter",   FbTk::ROT270, FbTk::Shape::TOPRIGHT    | FbTk::Shape::BOTTOMRIGHT },
++    { Toolbar::LEFTTOP,      "LeftTop",      FbTk::ROT270, FbTk::Shape::BOTTOMRIGHT                            },
++    { Toolbar::RIGHTBOTTOM,  "RightBottom",  FbTk::ROT90,  FbTk::Shape::TOPLEFT                                },
++    { Toolbar::RIGHTCENTER,  "RightCenter",  FbTk::ROT90,  FbTk::Shape::TOPLEFT     | FbTk::Shape::BOTTOMLEFT  },
++    { Toolbar::RIGHTTOP,     "RightTop",     FbTk::ROT90,  FbTk::Shape::BOTTOMLEFT                             },
+ };
+ 
+ }
+@@ -648,24 +648,29 @@ void Toolbar::setPlacement(Toolbar::Placement where) {
+         break;
+     case TOPCENTER:
+         frame.x += (head_w - static_cast<int>(frame.width))/2 - bw;
++        frame.x_hidden = frame.x;
+         frame.y_hidden += pixel - bw - static_cast<int>(frame.height);
+         break;
+     case TOPRIGHT:
+         frame.x += head_w - static_cast<int>(frame.width) - bw*2;
++        frame.x_hidden = frame.x;
+         frame.y_hidden += pixel - bw - static_cast<int>(frame.height);
+         break;
+     case BOTTOMRIGHT:
+         frame.x += head_w - static_cast<int>(frame.width) - bw*2;
+         frame.y += head_h - static_cast<int>(frame.height) - bw*2;
++        frame.x_hidden = frame.x;
+         frame.y_hidden += head_h - bw - pixel;
+         break;
+     case BOTTOMCENTER: // default is BOTTOMCENTER
+         frame.x += (head_w - static_cast<int>(frame.width))/2 - bw;
+         frame.y += head_h - static_cast<int>(frame.height) - bw*2;
++        frame.x_hidden = frame.x;
+         frame.y_hidden += head_h - bw - pixel;
+         break;
+     case LEFTCENTER:
+         frame.y += (head_h - static_cast<int>(frame.height))/2 - bw;
++        frame.y_hidden = frame.y;
+         frame.x_hidden += pixel - static_cast<int>(frame.width) - bw;
+         break;
+     case LEFTTOP:
+@@ -673,21 +678,24 @@ void Toolbar::setPlacement(Toolbar::Placement where) {
+         break;
+     case LEFTBOTTOM:
+         frame.y = head_h - static_cast<int>(frame.height) - bw*2;
++        frame.y_hidden = frame.y;
+         frame.x_hidden += pixel - static_cast<int>(frame.width) - bw;
+         break;
+     case RIGHTCENTER:
+         frame.x += head_w - static_cast<int>(frame.width) - bw*2;
+-        frame.y += (head_h - static_cast<int>(frame.height))/2 * bw;
+-        frame.x_hidden += static_cast<int>(frame.width) + bw - pixel;
++        frame.y += (head_h - static_cast<int>(frame.height))/2 - bw;
++        frame.x_hidden += head_w - bw - pixel;
++        frame.y_hidden = frame.y;
+         break;
+     case RIGHTTOP:
+         frame.x += head_w - static_cast<int>(frame.width) - bw*2;
+-        frame.x_hidden += static_cast<int>(frame.width) + bw - pixel;
++        frame.x_hidden += head_w - bw - pixel;
+         break;
+     case RIGHTBOTTOM:
+         frame.x += head_w - static_cast<int>(frame.width) - bw*2;
+         frame.y += head_h - static_cast<int>(frame.height) - bw*2;
+-        frame.x_hidden +=   static_cast<int>(frame.width) + bw - pixel;
++        frame.x_hidden += head_w - bw - pixel;
++        frame.y_hidden = frame.y;
+         break;
+     }
+ 
diff --git a/x11-wm/fluxbox/files/fluxbox.desktop b/x11-wm/fluxbox/files/fluxbox.desktop
new file mode 100644
index 000000000000..975d121c877a
--- /dev/null
+++ b/x11-wm/fluxbox/files/fluxbox.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Fluxbox
+Comment=This session logs you into Fluxbox
+Exec=startfluxbox
+TryExec=startfluxbox
+# no icon yet, only the top three are currently used
+Icon=
+Type=Application
diff --git a/x11-wm/fluxbox/files/fluxbox.xsession b/x11-wm/fluxbox/files/fluxbox.xsession
new file mode 100644
index 000000000000..0fb9dcd6c77c
--- /dev/null
+++ b/x11-wm/fluxbox/files/fluxbox.xsession
@@ -0,0 +1,90 @@
+#!/bin/sh
+# Fluxbox Xsession starter, based on Xsession shipped by x11-apps/xinit-1.0.5-r1
+
+# redirect errors to a file in user's home directory if we can
+for errfile in "$HOME/.fluxbox-errors" "${TMPDIR-/tmp}/fluxbox-$USER" "/tmp/fluxbox-$USER"
+do
+	if ( cp /dev/null "$errfile" 2> /dev/null )
+	then
+		chmod 600 "$errfile"
+		exec > "$errfile" 2>&1
+		break
+	fi
+done
+
+userresources=$HOME/.Xresources 
+usermodmap=$HOME/.Xmodmap 
+userxkbmap=$HOME/.Xkbmap
+
+sysresources=/etc/X11/Xresources 
+sysmodmap=/etc/X11/Xmodmap 
+sysxkbmap=/etc/X11/Xkbmap
+
+rh6sysresources=/etc/X11/xinit/Xresources 
+rh6sysmodmap=/etc/X11/xinit/Xmodmap 
+
+
+# merge in defaults
+if [ -f "$rh6sysresources" ]; then
+    xrdb -merge "$rh6sysresources"
+fi
+
+if [ -f "$sysresources" ]; then
+    xrdb -merge "$sysresources"
+fi
+
+if [ -f "$userresources" ]; then
+    xrdb -merge "$userresources"
+fi
+
+# merge in keymaps
+if [ -f "$sysxkbmap" ]; then
+    setxkbmap `cat "$sysxkbmap"`
+    XKB_IN_USE=yes
+fi
+
+if [ -f "$userxkbmap" ]; then
+    setxkbmap `cat "$userxkbmap"`
+    XKB_IN_USE=yes
+fi
+
+#
+# Eeek, this seems like too much magic here
+#
+if [ -z "$XKB_IN_USE" -a ! -L /etc/X11/X ]; then
+    if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then
+       xkbsymbols=`sed -n -e 's/^[     ]*XkbSymbols[   ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config /etc/X11/xorg.conf`
+       if [ -n "$xkbsymbols" ]; then
+           setxkbmap -symbols "$xkbsymbols"
+           XKB_IN_USE=yes
+       fi
+    fi
+fi
+
+# xkb and xmodmap don't play nice together
+if [ -z "$XKB_IN_USE" ]; then
+    if [ -f "$rh6sysmodmap" ]; then
+       xmodmap "$rh6sysmodmap"
+    fi
+
+    if [ -f "$sysmodmap" ]; then
+       xmodmap "$sysmodmap"
+    fi
+
+    if [ -f "$usermodmap" ]; then
+       xmodmap "$usermodmap"
+    fi
+fi
+
+unset XKB_IN_USE
+
+# run all system xinitrc shell scripts.
+if [ -d /etc/X11/xinit/xinitrc.d ]; then
+    for i in /etc/X11/xinit/xinitrc.d/* ; do
+        if [ -x "$i" ]; then
+	    . "$i"
+        fi
+    done
+fi
+
+exec /usr/bin/startfluxbox
diff --git a/x11-wm/fluxbox/files/gentoo_style_location-1.1.x.patch b/x11-wm/fluxbox/files/gentoo_style_location-1.1.x.patch
new file mode 100644
index 000000000000..dfa4f2eab48f
--- /dev/null
+++ b/x11-wm/fluxbox/files/gentoo_style_location-1.1.x.patch
@@ -0,0 +1,19 @@
+diff --git a/util/fluxbox-generate_menu.in b/util/fluxbox-generate_menu.in
+index aca8b08..b229046 100755
+--- a/util/fluxbox-generate_menu.in
++++ b/util/fluxbox-generate_menu.in
+@@ -1794,12 +1794,8 @@ fi
+ append_submenu "${FBSETTINGSMENU}"
+     append "[config] (${CONFIGUREMENU})"
+ 
+-    append_menu "[submenu] (${SYSTEMSTYLES}) {${STYLEMENUTITLE}}"
+-        append "[stylesdir] (${PREFIX}/share/fluxbox/styles)"
+-    append_menu_end
+-
+-    append_menu "[submenu] (${USERSTYLES}) {${STYLEMENUTITLE}}"
+-        append "[stylesdir] (~/.@pkgprefix@fluxbox@pkgsuffix@/styles)"
++    append_submenu "Styles"
++        append "[include] (@GENTOO_PORTAGE_EPREFIX@/usr/share/fluxbox/menu.d/styles/)"
+     append_menu_end
+ 
+     # Backgroundmenu
diff --git a/x11-wm/fluxbox/files/osx-has-otool.patch b/x11-wm/fluxbox/files/osx-has-otool.patch
new file mode 100644
index 000000000000..7671dd83647c
--- /dev/null
+++ b/x11-wm/fluxbox/files/osx-has-otool.patch
@@ -0,0 +1,12 @@
+--- util/fbsetbg
++++ util/fbsetbg
+@@ -356,7 +356,8 @@
+             if [ ! "$wpsetter" = Esetroot ]; then
+                 WPSETTER=$wpsetter
+                 break
+-            elif ldd `which Esetroot`|grep libImlib 2>&1 > /dev/null; then
++            elif ldd `which Esetroot`|grep libImlib 2>&1 > /dev/null || \
++                otool -L `which Esetroot`|grep libImlib 2>&1 > /dev/null; then
+                 WPSETTER=$wpsetter
+                 break
+             else
diff --git a/x11-wm/fluxbox/files/styles-menu-commonbox b/x11-wm/fluxbox/files/styles-menu-commonbox
new file mode 100644
index 000000000000..742e587e4f48
--- /dev/null
+++ b/x11-wm/fluxbox/files/styles-menu-commonbox
@@ -0,0 +1,5 @@
+[begin] (Legacy Commonbox Styles)
+[submenu] (Legacy Commonbox Styles)
+   [stylesdir] (/usr/share/commonbox/styles)
+[end]
+[end]
diff --git a/x11-wm/fluxbox/files/styles-menu-fluxbox b/x11-wm/fluxbox/files/styles-menu-fluxbox
new file mode 100644
index 000000000000..d2e0d580339f
--- /dev/null
+++ b/x11-wm/fluxbox/files/styles-menu-fluxbox
@@ -0,0 +1,5 @@
+[begin] (Fluxbox Core Styles)
+[submenu] (Fluxbox Core Styles)
+   [stylesdir] (/usr/share/fluxbox/styles)
+[end]
+[end]
diff --git a/x11-wm/fluxbox/files/styles-menu-user b/x11-wm/fluxbox/files/styles-menu-user
new file mode 100644
index 000000000000..3d011d27ed23
--- /dev/null
+++ b/x11-wm/fluxbox/files/styles-menu-user
@@ -0,0 +1,5 @@
+[begin] (User Styles)
+[submenu] (User Styles)
+   [stylesdir] (~/.fluxbox/styles)
+[end]
+[end]
diff --git a/x11-wm/fluxbox/fluxbox-1.3.6-r1.ebuild b/x11-wm/fluxbox/fluxbox-1.3.6-r1.ebuild
new file mode 100644
index 000000000000..0368c77fcfbd
--- /dev/null
+++ b/x11-wm/fluxbox/fluxbox-1.3.6-r1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils flag-o-matic toolchain-funcs prefix
+
+IUSE="nls xinerama bidi +truetype +imlib +slit +toolbar vim-syntax"
+
+DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar"
+
+SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.xz"
+HOMEPAGE="http://www.fluxbox.org"
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	!!<=x11-misc/fbdesk-1.2.1
+	!!<=x11-misc/fluxconf-0.9.9
+	!!<x11-themes/fluxbox-styles-fluxmod-20040809-r1
+	bidi? ( >=dev-libs/fribidi-0.19.2 )
+	imlib? ( >=media-libs/imlib2-1.2.0[X] )
+	truetype? ( media-libs/freetype )
+	vim-syntax? ( app-vim/fluxbox-syntax )
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXpm
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	xinerama? ( x11-libs/libXinerama )
+	|| ( x11-misc/gxmessage x11-apps/xmessage )
+"
+DEPEND="
+	${RDEPEND}
+	bidi? ( virtual/pkgconfig )
+	nls? ( sys-devel/gettext )
+	x11-proto/xextproto
+"
+
+src_prepare() {
+	# We need to be able to include directories rather than just plain
+	# files in menu [include] items. This patch will allow us to do clever
+	# things with style ebuilds.
+	epatch "${FILESDIR}"/gentoo_style_location-1.1.x.patch
+	# Fix the semantic issue of icon paths, bug #536370
+	epatch "${FILESDIR}"/1.3.5-generate_menu-printf-fix.patch
+
+	eprefixify util/fluxbox-generate_menu.in
+
+	epatch "${FILESDIR}"/osx-has-otool.patch
+
+	# Add in the Gentoo -r number to fluxbox -version output.
+	if [[ "${PR}" == "r0" ]] ; then
+		suffix="gentoo"
+	else
+		suffix="gentoo-${PR}"
+	fi
+	sed -i \
+		-e "s~\(__fluxbox_version .@VERSION@\)~\1-${suffix}~" \
+		version.h.in || die "version sed failed"
+}
+
+src_configure() {
+	use bidi && append-cppflags "$($(tc-getPKG_CONFIG) --cflags fribidi)"
+
+	econf ${myconf} \
+		$(use_enable bidi fribidi ) \
+		$(use_enable imlib imlib2) \
+		$(use_enable nls) \
+		$(use_enable slit ) \
+		$(use_enable toolbar ) \
+		$(use_enable toolbar systray ) \
+		$(use_enable truetype xft) \
+		$(use_enable xinerama) \
+		--sysconfdir="${EPREFIX}"/etc/X11/${PN} \
+		--with-style="${EPREFIX}"/usr/share/fluxbox/styles/Emerge
+}
+
+src_compile() {
+	default
+
+	ebegin "Creating a menu file (may take a while)"
+	mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed"
+	# Call fluxbox-generate_menu through bash since it lacks +x
+	# chmod 744 may be an equal fix
+	MENUFILENAME="${S}/data/menu" MENUTITLE="Fluxbox ${PV}" \
+		CHECKINIT="no. go away." HOME="${T}/home" \
+		bash "${S}/util/fluxbox-generate_menu" -is -ds \
+		|| die "menu generation failed"
+	eend $?
+}
+
+src_install() {
+	emake DESTDIR="${D}" STRIP="" install
+	dodoc README* AUTHORS TODO* ChangeLog NEWS
+
+	# Install the generated menu
+	insinto /usr/share/fluxbox
+	doins data/menu
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/${PN}.desktop
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/${PN}.xsession fluxbox
+
+	# Styles menu framework
+	insinto /usr/share/fluxbox/menu.d/styles
+	doins "${FILESDIR}"/styles-menu-fluxbox
+	doins "${FILESDIR}"/styles-menu-commonbox
+	doins "${FILESDIR}"/styles-menu-user
+}
diff --git a/x11-wm/fluxbox/fluxbox-1.3.7-r2.ebuild b/x11-wm/fluxbox/fluxbox-1.3.7-r2.ebuild
new file mode 100644
index 000000000000..0af7d5b91c24
--- /dev/null
+++ b/x11-wm/fluxbox/fluxbox-1.3.7-r2.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils flag-o-matic toolchain-funcs prefix
+
+IUSE="nls xinerama bidi +truetype +imlib +slit +systray +toolbar vim-syntax"
+
+REQUIRED_USE="systray? ( toolbar )"
+
+DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar"
+
+SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.xz"
+HOMEPAGE="http://www.fluxbox.org"
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	!!<=x11-misc/fbdesk-1.2.1
+	!!<=x11-misc/fluxconf-0.9.9
+	!!<x11-themes/fluxbox-styles-fluxmod-20040809-r1
+	bidi? ( >=dev-libs/fribidi-0.19.2 )
+	imlib? ( >=media-libs/imlib2-1.2.0[X] )
+	truetype? ( media-libs/freetype )
+	vim-syntax? ( app-vim/fluxbox-syntax )
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXpm
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	xinerama? ( x11-libs/libXinerama )
+	|| ( x11-misc/gxmessage x11-apps/xmessage )
+"
+DEPEND="
+	${RDEPEND}
+	bidi? ( virtual/pkgconfig )
+	nls? ( sys-devel/gettext )
+	x11-proto/xextproto
+"
+
+src_prepare() {
+	# We need to be able to include directories rather than just plain
+	# files in menu [include] items. This patch will allow us to do clever
+	# things with style ebuilds.
+	epatch "${FILESDIR}"/gentoo_style_location-1.1.x.patch
+
+	eprefixify util/fluxbox-generate_menu.in
+
+	epatch "${FILESDIR}"/osx-has-otool.patch
+
+	# Fix bug #551522; 1.3.8 will render this obsolete
+	epatch "${FILESDIR}"/fix-hidden-toolbar.patch
+
+	# Add in the Gentoo -r number to fluxbox -version output.
+	if [[ "${PR}" == "r0" ]] ; then
+		suffix="gentoo"
+	else
+		suffix="gentoo-${PR}"
+	fi
+	sed -i \
+		-e "s~\(__fluxbox_version .@VERSION@\)~\1-${suffix}~" \
+		version.h.in || die "version sed failed"
+}
+
+src_configure() {
+	use bidi && append-cppflags "$($(tc-getPKG_CONFIG) --cflags fribidi)"
+
+	econf $(use_enable bidi fribidi ) \
+		$(use_enable imlib imlib2) \
+		$(use_enable nls) \
+		$(use_enable slit ) \
+		$(use_enable systray ) \
+		$(use_enable toolbar ) \
+		$(use_enable truetype xft) \
+		$(use_enable xinerama) \
+		--sysconfdir="${EPREFIX}"/etc/X11/${PN} \
+		--with-style="${EPREFIX}"/usr/share/fluxbox/styles/Emerge
+}
+
+src_compile() {
+	default
+
+	ebegin "Creating a menu file (may take a while)"
+	mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed"
+	# Call fluxbox-generate_menu through bash since it lacks +x
+	# chmod 744 may be an equal fix
+	MENUFILENAME="${S}/data/menu" MENUTITLE="Fluxbox ${PV}" \
+		CHECKINIT="no. go away." HOME="${T}/home" \
+		bash "${S}/util/fluxbox-generate_menu" -is -ds \
+		|| die "menu generation failed"
+	eend $?
+}
+
+src_install() {
+	emake DESTDIR="${D}" STRIP="" install
+	dodoc README* AUTHORS TODO* ChangeLog NEWS
+
+	# Install the generated menu
+	insinto /usr/share/fluxbox
+	doins data/menu
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/${PN}.desktop
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/${PN}.xsession fluxbox
+
+	# Styles menu framework
+	insinto /usr/share/fluxbox/menu.d/styles
+	doins "${FILESDIR}"/styles-menu-fluxbox
+	doins "${FILESDIR}"/styles-menu-commonbox
+	doins "${FILESDIR}"/styles-menu-user
+}
diff --git a/x11-wm/fluxbox/fluxbox-1.3.7-r3.ebuild b/x11-wm/fluxbox/fluxbox-1.3.7-r3.ebuild
new file mode 100644
index 000000000000..c4f2aee10842
--- /dev/null
+++ b/x11-wm/fluxbox/fluxbox-1.3.7-r3.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils flag-o-matic toolchain-funcs prefix xdg
+
+IUSE="nls xinerama bidi +truetype +imlib +slit +systray +toolbar vim-syntax"
+
+REQUIRED_USE="systray? ( toolbar )"
+
+DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar"
+
+SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.xz"
+HOMEPAGE="http://www.fluxbox.org"
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	!!<=x11-misc/fbdesk-1.2.1
+	!!<=x11-misc/fluxconf-0.9.9
+	!!<x11-themes/fluxbox-styles-fluxmod-20040809-r1
+	bidi? ( >=dev-libs/fribidi-0.19.2 )
+	imlib? ( >=media-libs/imlib2-1.2.0[X] )
+	truetype? ( media-libs/freetype )
+	vim-syntax? ( app-vim/fluxbox-syntax )
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXpm
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	xinerama? ( x11-libs/libXinerama )
+	|| ( x11-misc/gxmessage x11-apps/xmessage )
+"
+DEPEND="
+	${RDEPEND}
+	bidi? ( virtual/pkgconfig )
+	nls? ( sys-devel/gettext )
+	x11-proto/xextproto
+"
+
+src_prepare() {
+	# We need to be able to include directories rather than just plain
+	# files in menu [include] items. This patch will allow us to do clever
+	# things with style ebuilds.
+	epatch "${FILESDIR}"/gentoo_style_location-1.1.x.patch
+
+	eprefixify util/fluxbox-generate_menu.in
+
+	epatch "${FILESDIR}"/osx-has-otool.patch
+
+	# Fix bug #551522; 1.3.8 will render this obsolete
+	epatch "${FILESDIR}"/fix-hidden-toolbar.patch
+
+	# Add in the Gentoo -r number to fluxbox -version output.
+	if [[ "${PR}" == "r0" ]] ; then
+		suffix="gentoo"
+	else
+		suffix="gentoo-${PR}"
+	fi
+	sed -i \
+		-e "s~\(__fluxbox_version .@VERSION@\)~\1-${suffix}~" \
+		version.h.in || die "version sed failed"
+}
+
+src_configure() {
+	use bidi && append-cppflags "$($(tc-getPKG_CONFIG) --cflags fribidi)"
+
+	econf $(use_enable bidi fribidi ) \
+		$(use_enable imlib imlib2) \
+		$(use_enable nls) \
+		$(use_enable slit ) \
+		$(use_enable systray ) \
+		$(use_enable toolbar ) \
+		$(use_enable truetype xft) \
+		$(use_enable xinerama) \
+		--sysconfdir="${EPREFIX}"/etc/X11/${PN} \
+		--with-style="${EPREFIX}"/usr/share/fluxbox/styles/Emerge
+}
+
+src_compile() {
+	default
+
+	ebegin "Creating a menu file (may take a while)"
+	mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed"
+	# Call fluxbox-generate_menu through bash since it lacks +x
+	# chmod 744 may be an equal fix
+	MENUFILENAME="${S}/data/menu" MENUTITLE="Fluxbox ${PV}" \
+		CHECKINIT="no. go away." HOME="${T}/home" \
+		bash "${S}/util/fluxbox-generate_menu" -is -ds \
+		|| die "menu generation failed"
+	eend $?
+}
+
+src_install() {
+	emake DESTDIR="${D}" STRIP="" install
+	dodoc README* AUTHORS TODO* ChangeLog NEWS
+
+	# Install the generated menu
+	insinto /usr/share/fluxbox
+	doins data/menu
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/${PN}.desktop
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/${PN}.xsession fluxbox
+
+	# Styles menu framework
+	insinto /usr/share/fluxbox/menu.d/styles
+	doins "${FILESDIR}"/styles-menu-fluxbox
+	doins "${FILESDIR}"/styles-menu-commonbox
+	doins "${FILESDIR}"/styles-menu-user
+}
diff --git a/x11-wm/fluxbox/fluxbox-1.3.7-r4.ebuild b/x11-wm/fluxbox/fluxbox-1.3.7-r4.ebuild
new file mode 100644
index 000000000000..2edfed184eaf
--- /dev/null
+++ b/x11-wm/fluxbox/fluxbox-1.3.7-r4.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils flag-o-matic toolchain-funcs prefix xdg xdg-utils
+
+IUSE="nls xinerama bidi +truetype +imlib +slit +systray +toolbar vim-syntax"
+
+REQUIRED_USE="systray? ( toolbar )"
+
+DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar"
+
+SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.xz"
+HOMEPAGE="http://www.fluxbox.org"
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	!!<=x11-misc/fbdesk-1.2.1
+	!!<=x11-misc/fluxconf-0.9.9
+	!!<x11-themes/fluxbox-styles-fluxmod-20040809-r1
+	bidi? ( >=dev-libs/fribidi-0.19.2 )
+	imlib? ( >=media-libs/imlib2-1.2.0[X] )
+	truetype? ( media-libs/freetype )
+	vim-syntax? ( app-vim/fluxbox-syntax )
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXpm
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	xinerama? ( x11-libs/libXinerama )
+	|| ( x11-misc/gxmessage x11-apps/xmessage )
+"
+DEPEND="
+	${RDEPEND}
+	bidi? ( virtual/pkgconfig )
+	nls? ( sys-devel/gettext )
+	x11-proto/xextproto
+"
+
+src_prepare() {
+	# We need to be able to include directories rather than just plain
+	# files in menu [include] items. This patch will allow us to do clever
+	# things with style ebuilds.
+	epatch "${FILESDIR}"/gentoo_style_location-1.1.x.patch
+
+	eprefixify util/fluxbox-generate_menu.in
+
+	epatch "${FILESDIR}"/osx-has-otool.patch
+
+	# Fix bug #551522; 1.3.8 will render this obsolete
+	epatch "${FILESDIR}"/fix-hidden-toolbar.patch
+
+	# Add in the Gentoo -r number to fluxbox -version output.
+	if [[ "${PR}" == "r0" ]] ; then
+		suffix="gentoo"
+	else
+		suffix="gentoo-${PR}"
+	fi
+	sed -i \
+		-e "s~\(__fluxbox_version .@VERSION@\)~\1-${suffix}~" \
+		version.h.in || die "version sed failed"
+}
+
+src_configure() {
+	xdg_environment_reset
+	use bidi && append-cppflags "$($(tc-getPKG_CONFIG) --cflags fribidi)"
+
+	econf $(use_enable bidi fribidi ) \
+		$(use_enable imlib imlib2) \
+		$(use_enable nls) \
+		$(use_enable slit ) \
+		$(use_enable systray ) \
+		$(use_enable toolbar ) \
+		$(use_enable truetype xft) \
+		$(use_enable xinerama) \
+		--sysconfdir="${EPREFIX}"/etc/X11/${PN} \
+		--with-style="${EPREFIX}"/usr/share/fluxbox/styles/Emerge
+}
+
+src_compile() {
+	default
+
+	ebegin "Creating a menu file (may take a while)"
+	mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed"
+	# Call fluxbox-generate_menu through bash since it lacks +x
+	# chmod 744 may be an equal fix
+	MENUFILENAME="${S}/data/menu" MENUTITLE="Fluxbox ${PV}" \
+		CHECKINIT="no. go away." HOME="${T}/home" \
+		bash "${S}/util/fluxbox-generate_menu" -is -ds \
+		|| die "menu generation failed"
+	eend $?
+}
+
+src_install() {
+	emake DESTDIR="${D}" STRIP="" install
+	dodoc README* AUTHORS TODO* ChangeLog NEWS
+
+	# Install the generated menu
+	insinto /usr/share/fluxbox
+	doins data/menu
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/${PN}.desktop
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/${PN}.xsession fluxbox
+
+	# Styles menu framework
+	insinto /usr/share/fluxbox/menu.d/styles
+	doins "${FILESDIR}"/styles-menu-fluxbox
+	doins "${FILESDIR}"/styles-menu-commonbox
+	doins "${FILESDIR}"/styles-menu-user
+}
diff --git a/x11-wm/fluxbox/fluxbox-9999.ebuild b/x11-wm/fluxbox/fluxbox-9999.ebuild
new file mode 100644
index 000000000000..7d8e0f9002ab
--- /dev/null
+++ b/x11-wm/fluxbox/fluxbox-9999.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils flag-o-matic toolchain-funcs git-2 prefix
+
+IUSE="nls xinerama bidi +truetype +imlib +slit +systray +toolbar vim-syntax"
+
+REQUIRED_USE="systray? ( toolbar )"
+
+DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar"
+
+EGIT_REPO_URI="git://git.fluxbox.org/fluxbox.git"
+SRC_URI=""
+HOMEPAGE="http://www.fluxbox.org"
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS=""
+
+RDEPEND="
+	!!<=x11-misc/fbdesk-1.2.1
+	!!<=x11-misc/fluxconf-0.9.9
+	!!<x11-themes/fluxbox-styles-fluxmod-20040809-r1
+	bidi? ( >=dev-libs/fribidi-0.19.2 )
+	imlib? ( >=media-libs/imlib2-1.2.0[X] )
+	truetype? ( media-libs/freetype )
+	vim-syntax? ( app-vim/fluxbox-syntax )
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXpm
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	xinerama? ( x11-libs/libXinerama )
+	|| ( x11-misc/gxmessage x11-apps/xmessage )
+"
+DEPEND="
+	${RDEPEND}
+	bidi? ( virtual/pkgconfig )
+	nls? ( sys-devel/gettext )
+	x11-proto/xextproto
+"
+
+src_prepare() {
+	./autogen.sh
+
+	# We need to be able to include directories rather than just plain
+	# files in menu [include] items. This patch will allow us to do clever
+	# things with style ebuilds.
+	epatch "${FILESDIR}/gentoo_style_location-1.1.x.patch"
+	eprefixify util/fluxbox-generate_menu.in
+
+	epatch "${FILESDIR}"/osx-has-otool.patch
+
+	# Add in the Gentoo -r number to fluxbox -version output.
+	if [[ "${PR}" == "r0" ]] ; then
+		suffix="gentoo"
+	else
+		suffix="gentoo-${PR}"
+	fi
+	sed -i \
+		-e "s~\(__fluxbox_version .@VERSION@\)~\1-${suffix}~" \
+		version.h.in || die "version sed failed"
+}
+
+src_configure() {
+	use bidi && append-cppflags "$($(tc-getPKG_CONFIG) --cflags fribidi)"
+
+	econf $(use_enable bidi fribidi ) \
+		$(use_enable imlib imlib2) \
+		$(use_enable nls) \
+		$(use_enable slit ) \
+		$(use_enable systray) \
+		$(use_enable toolbar ) \
+		$(use_enable truetype xft) \
+		$(use_enable xinerama) \
+		--sysconfdir="${EPREFIX}"/etc/X11/${PN} \
+		--with-style="${EPREFIX}"/usr/share/fluxbox/styles/Emerge
+}
+
+src_compile() {
+	default
+
+	ebegin "Creating a menu file (may take a while)"
+	mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed"
+	# Call fluxbox-generate_menu through bash since it lacks +x
+	# chmod 744 may be an equal fix
+	MENUFILENAME="${S}/data/menu" MENUTITLE="Fluxbox ${PV}" \
+		CHECKINIT="no. go away." HOME="${T}/home" \
+		bash "${S}/util/fluxbox-generate_menu" -is -ds \
+		|| die "menu generation failed"
+	eend $?
+}
+
+src_install() {
+	emake DESTDIR="${D}" STRIP="" install
+	dodoc README* AUTHORS TODO* ChangeLog NEWS
+
+	# Install the generated menu
+	insinto /usr/share/fluxbox
+	doins data/menu
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/${PN}.desktop
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/${PN}.xsession fluxbox
+
+	# Styles menu framework
+	insinto /usr/share/fluxbox/menu.d/styles
+	doins "${FILESDIR}"/styles-menu-fluxbox
+	doins "${FILESDIR}"/styles-menu-commonbox
+	doins "${FILESDIR}"/styles-menu-user
+}
diff --git a/x11-wm/fluxbox/metadata.xml b/x11-wm/fluxbox/metadata.xml
new file mode 100644
index 000000000000..2bb00c096216
--- /dev/null
+++ b/x11-wm/fluxbox/metadata.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zlg@gentoo.org</email>
+		<name>Daniel Campbell</name>
+		<description>Maintainer. Assign bugs to him</description>
+	</maintainer>
+	<maintainer type="person">
+		<email>pchrist@gentoo.org</email>
+		<name>Panagiotis Christopoulos</name>
+	</maintainer>
+	<longdescription>
+		Fluxbox is yet another windowmanager for X. Originally based upon the
+		Blackbox 0.61.1 code, Fluxbox has been extended to include a new tabbed
+		window handling mechanism, an improved configurable window title bar,
+		better KDE and GNOME integration, an integrated key grabber and
+		countless additional features.
+	</longdescription>
+	<use>
+		<flag name="bidi">
+			Enable bidirectional language support with
+			<pkg>dev-libs/fribidi</pkg>
+		</flag>
+		<flag name="slit">Enables the Fluxbox slit (or dock)</flag>
+		<flag name="systray">Enables the system tray in the Fluxbox toolbar</flag>
+		<flag name="toolbar">Enables the Fluxbox toolbar</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">fluxbox</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
new file mode 100644
index 000000000000..55b9fd93b8f1
--- /dev/null
+++ b/x11-wm/fvwm/Manifest
@@ -0,0 +1,9 @@
+AUX README.translucency 3723 SHA256 099c57f9f323ba44e03b9edcfc17da7da08b0438dd5be3c6830f283030e75fe6 SHA512 a64ef5147e52e07d4cec8a2f3ebd1340827d0139031ef7ddaf27fc144fcc58858c3ec40eee854034423f853b2c7bdd813f66236c8a9679977084f4a2176a8ffa WHIRLPOOL a7d04082474adba36ca85703b177ac1b9df12646018a76b31409f7bf94a380bb63c1d79b826546ec754ff644c9677273038c36da14f4c91d48cb74cc773694f4
+AUX fvwm-2.5.27-translucent-menus.diff 15765 SHA256 ad59f0aa1b73fb128143bf5a390185289c296e0d31a4e6e6ca5f046f414752cf SHA512 92f78b624ea2bfddb88f825f40930a0a7e4bb1d284276e62985f189cd5b72ee8a92131f7d2a91efdbf508fc8ef002f5b4168188b12b0e23e28fb1ebec471969d WHIRLPOOL 6a2b6cedf94c070a53401b94a66877514f81ce6924cac9bf66d56baeb5e4ed410d258bea5f129f48582290fe55cc513e766064f284d85eab0c4329a162e358db
+AUX fvwm-2.6.5-ar.patch 1077 SHA256 e0c6d11efdb98680a666cde5fd16353e70e4331e735ac59276ffa433f51fcbe6 SHA512 fc66ee5c79b96860705d72b18aab3f8c8f8ad84fead47c4f8f944474a6bfbe0569ee08aa51e8a4d7982541eecd5c302499f99ebf8568f4b4fb1c9e2369233e45 WHIRLPOOL b64715514ee33d5fce990da7f3716c880c1f801b107b28263a9d01f9d4dbfbe6a1e0df45659b78a05e1914f0bb1fff2d58aa03d9480a306560a8809f0bd1f888
+AUX fvwm-2.6.5-mouse-buttons.patch 519 SHA256 7513ae33c11058f78fce5a922d95f7f5cfbafd542e95c35f32cc0469887aa1e0 SHA512 d28a9724697859ca7beac1cc2813c12413654e1c0749297c34fb0ef8bbf97369ac8039d2a82ec673d885b39e1544259b70cecf292639caa9ff99c1b42d34c196 WHIRLPOOL 819ed1c4eda6cb30a47aef8e0d12f2716b8a003fa6cb4c4f0234ca54fbbd680dd171d18131e4d621129f3515a203b8080bea9ee0a80d25d93cc69753eecebc65
+DIST fvwm-2.6.5.tar.bz2 2582655 SHA256 21549995c53906be5533746a1cf61b1ecf8dd8ef6816a0b20615d45ff78b48cf SHA512 a1b8cf5a5124b939441834a2fb44c885c579939e4099cf2c8178ea2c4261258df4e565068593699f9446e363135a2666c9288c1bce551a6cf5c6c79287104698 WHIRLPOOL 65ff02fb9f0c9ac5803a77be5b61621393ebb0a772acd32370c7796340726cbe3bfc125a56852272ec4fe619031bf12cb7fb8bc7ed1852b3addffaa355221e68
+EBUILD fvwm-2.6.5-r1.ebuild 4840 SHA256 72b1f5c49cc72cef73e3bd73a8763dd8c69c6d7e4eaad033524d4942733888a1 SHA512 6330e511bac5e014fc3170a74d001cf9c1afea7b8c17fe0981ee2f42e59dd99fd8758c54d096b5655e1b3b698f5daf315e1853bd083b5fcaeb12a4e458eb3181 WHIRLPOOL 4d2ae143c546f84212919918596b41fe94acb5110005fab3594521bb9cecb234d396038d39ee87eb870b9068b96f80046cfe6db1de9e9671cfa3f3edb614c291
+MISC ChangeLog 2919 SHA256 def1c85016b992e18b291228e104a1e49255332a3e024456f1b83604828caec9 SHA512 a2b03495699d7cfb5a4737db013fbb0c27db2ff32a2f2d6890b9b1ba83c92d0e676ce40f2a75e0ed3c86aad41c4130af44357887793f7727f0b5d61a14db2818 WHIRLPOOL 772e9ca26cfd2cecd0fb8e45e933a12e6b0c3c65a8272604890db1085b17f4c3cbd0dee124b19e1109af6cadd99786a089cbba1096d4817c73114dcc2d4aa36d
+MISC ChangeLog-2015 29975 SHA256 577f181d91d17b6dd9ad2804248aac140099ae922591d9aead2363abcb424651 SHA512 af94192c3eb5cc5daeb19b7e6824864960a19e3230774e084a4ab6d939df88b877f9d527e934a75a024f49f49dd720cdb6966965be1753401408e3a84c9b23f8 WHIRLPOOL 697e527c407bb88b300cb812ca5ff3194b325286bb0002ba6702c89172ea515b06a538a5d4f82100a7c5f40ffe0b6d2a363789251d5ad31592156bd4c2925181
+MISC metadata.xml 779 SHA256 67afd169ee462a85d8ba8f36ef2c8f5c0e2340c0b9bf19970e573e63dcfd0a3f SHA512 bfe326504d814b71059aef279136b602a7ff99a49ac8f70073a5d29fcebde258eb369e9c00316df076ea90005e2158e29b10b6af2c638b4a124d4b6286fc4cf4 WHIRLPOOL c054717720e5646a8be8dd1466f7d307799d45ca1a129653df156425139dc75b9a7f21512227ca071a05bb72286f81c6ff06bc04fbac1a76f43046169bdedc5f
diff --git a/x11-wm/fvwm/files/README.translucency b/x11-wm/fvwm/files/README.translucency
new file mode 100644
index 000000000000..a60b5f668acd
--- /dev/null
+++ b/x11-wm/fvwm/files/README.translucency
@@ -0,0 +1,94 @@
+From owner-fvwm@hpc.uh.edu  Sun Aug 31 22:52:59 2003
+Received: from sina.hpc.uh.edu ([129.7.128.10] ident=lists)
+	by malifon.math.uh.edu with esmtp (Exim 3.20 #1)
+	id 19tb0F-0006NY-00; Sun, 31 Aug 2003 17:48:59 -0500
+Received: by sina.hpc.uh.edu (TLB v0.09a (1.20 tibbs 1996/10/09 22:03:07)); Sun, 31 Aug 2003 17:50:31 -0500 (CDT)
+Received: from epithumia.math.uh.edu (epithumia.math.uh.edu [129.7.128.2])
+	by sina.hpc.uh.edu (8.9.3/8.9.3) with ESMTP id RAA16575
+	for <fvwm@hpc.uh.edu>; Sun, 31 Aug 2003 17:50:24 -0500 (CDT)
+Received: from epithumia.math.uh.edu (epithumia.math.uh.edu [127.0.0.1])
+	by epithumia.math.uh.edu (8.12.8/8.12.5) with ESMTP id h7VMml6M025095
+	for <fvwm@hpc.uh.edu>; Sun, 31 Aug 2003 17:48:47 -0500
+Received: (from tibbs@localhost)
+	by epithumia.math.uh.edu (8.12.8/8.12.8/Submit) id h7VMmlVC025093
+	for fvwm@hpc.uh.edu; Sun, 31 Aug 2003 17:48:47 -0500
+Received: from util2.math.uh.edu (util2.math.uh.edu [129.7.128.23])
+	by sina.hpc.uh.edu (8.9.3/8.9.3) with ESMTP id QAA16418
+	for <fvwm@hpc.uh.edu>; Sun, 31 Aug 2003 16:02:07 -0500 (CDT)
+Received: from postfix4-2.free.fr ([213.228.0.176])
+	by util2.math.uh.edu with esmtp (Exim 4.20)
+	id 19tZIm-00079F-6t
+	for fvwm@fvwm.org; Sun, 31 Aug 2003 16:00:00 -0500
+Received: from snoopy.folie (nas-p19-3-62-147-221-172.dial.proxad.net [62.147.221.172])
+	by postfix4-2.free.fr (Postfix) with ESMTP id 59DE6C386
+	for <fvwm@fvwm.org>; Sun, 31 Aug 2003 22:59:34 +0200 (CEST)
+Received: by snoopy.folie (Postfix, from userid 501)
+	id A4D1D48784; Sun, 31 Aug 2003 22:39:19 +0200 (CEST)
+Date: Sun, 31 Aug 2003 22:39:19 +0200
+From: Olivier Chapuis <olivier.chapuis@free.fr>
+To: fvwm@fvwm.org
+Subject: Re: FVWM: Transparency/Translucency revisited...
+Message-ID: <20030831203919.GA6205@snoopy.folie>
+Mail-Followup-To: fvwm@fvwm.org
+References: <Pine.LNX.4.44.0308251817370.1980-100000@atlantis.ssw.krakow.pl>
+Mime-Version: 1.0
+Content-Type: multipart/mixed; boundary="Nq2Wo0NMKNjxTN9z"
+Content-Disposition: inline
+In-Reply-To: <Pine.LNX.4.44.0308251817370.1980-100000@atlantis.ssw.krakow.pl>
+User-Agent: Mutt/1.4i
+X-Spam-Score: -9.3 (---------)
+Sender: owner-fvwm@hpc.uh.edu
+Precedence: list
+X-Majordomo: 1.94.jlt7
+Status: RO
+Content-Length: 6519
+Lines: 122
+
+
+--Nq2Wo0NMKNjxTN9z
+Content-Type: text/plain; charset=us-ascii
+Content-Disposition: inline
+
+On Mon, Aug 25, 2003 at 09:00:32PM +0200, Dawid Kuroczko wrote:
+> Hello. :-)
+> 
+> I did manage to make pseudo-transparent menus, but now I'd like
+> to make something more "real".  What I'd like to do is to have
+> something like there is in KDE.
+> 
+> It should work like this:
+>  1. user clicks thus calling a Menu.
+>  2. current screen dump is taken (with all the windows, but
+>     without a menu just as yet).
+>  3. this screen dump is made available to Menu as
+>     root background pixmap.
+>  4. Menu is displayed with tinted real background.
+> 
+> This way it's pretty easy to make an illusion of real
+> transparency (and looks "l33t", as some may say).
+>
+
+Here a new version of the patch for current cvs/snapshot.
+This patch add a new options to Colorset: Translucent/NoTranslucent.
+These options has effects only with (non tear-off) menu.
+Also menu animation is "handled".
+
+For example with:
+
+  Colorset 5 fg yellow, bg blue, HGradient 200 lightblue darkblue, \
+	  Translucent blue 60
+  Style * MenuColorset 5, PopupOffset 0 100, AnimationOff
+
+you get translucent menus (with a 60% blue tint) and if you tear-off
+a menu the menu use the gradient.
+
+Regards, Olivier
+
+<snip patch>
+
+--
+Visit the official FVWM web page at <URL: http://www.fvwm.org/>.
+To unsubscribe from the list, send "unsubscribe fvwm" in the body of a
+message to majordomo@fvwm.org.
+To report problems, send mail to fvwm-owner@fvwm.org.
+
diff --git a/x11-wm/fvwm/files/fvwm-2.5.27-translucent-menus.diff b/x11-wm/fvwm/files/fvwm-2.5.27-translucent-menus.diff
new file mode 100644
index 000000000000..1c49f69007d0
--- /dev/null
+++ b/x11-wm/fvwm/files/fvwm-2.5.27-translucent-menus.diff
@@ -0,0 +1,528 @@
+Index: fvwm/colorset.c
+===================================================================
+RCS file: /home/cvs/fvwm/fvwm/fvwm/colorset.c,v
+retrieving revision 1.52
+diff -u -r1.52 colorset.c
+--- fvwm/colorset.c	27 Jan 2007 11:33:15 -0000	1.52
++++ fvwm/colorset.c	5 Feb 2007 19:15:51 -0000
+@@ -164,6 +164,8 @@
+ 	"NoIconTint",
+ 	"IconAlpha",
+ 
++	"Translucent",
++	"NoTranslucent",
+ 	NULL
+ };
+ 
+@@ -625,6 +627,7 @@
+ 	char *fg_tint = NULL;
+ 	char *bg_tint = NULL;
+ 	char *icon_tint = NULL;
++	char *translucent_tint = NULL;
+ 	Bool have_pixels_changed = False;
+ 	Bool has_icon_pixels_changed = False;
+ 	Bool has_fg_changed = False;
+@@ -637,6 +640,7 @@
+ 	Bool has_fg_tint_changed = False;
+ 	Bool has_bg_tint_changed = False;
+ 	Bool has_icon_tint_changed = False;
++	Bool has_translucent_tint_changed = False;
+ 	Bool has_pixmap_changed = False;
+ 	Bool has_shape_changed = False;
+ 	Bool has_image_alpha_changed = False;
+@@ -763,6 +767,10 @@
+ 		case 21: /* Plain */
+ 			has_pixmap_changed = True;
+ 			free_colorset_background(cs, True);
++			cs->is_translucent = False;
++			cs->translucent_tint_percent = 0;
++			cs->color_flags &= ~TRANSLUCENT_TINT_SUPPLIED;
++			has_translucent_tint_changed = True;
+ 			break;
+ 		case 22: /* NoShape */
+ 			has_shape_changed = True;
+@@ -929,6 +937,24 @@
+ 				cs->icon_alpha_percent = tmp;
+ 			}
+ 			break;
++		case 42: /* Translucent */
++			cs->is_translucent = True;
++			parse_simple_tint(
++				cs, args, &translucent_tint,
++				TRANSLUCENT_TINT_SUPPLIED,
++				&has_translucent_tint_changed, &percent,
++				"Translucent");
++			if (has_translucent_tint_changed)
++			{
++				cs->translucent_tint_percent = percent;
++			}
++			break;
++		case 43: /* NoTranslucent */
++			cs->is_translucent = False;
++			cs->translucent_tint_percent = 0;
++			cs->color_flags &= ~TRANSLUCENT_TINT_SUPPLIED;
++			has_translucent_tint_changed = True;
++			break;
+ 		default:
+ 			/* test for ?Gradient */
+ 			if (option[0] && StrEquals(&option[1], "Gradient"))
+@@ -1615,6 +1641,27 @@
+ 	}
+ 
+ 	/*
++	 * ---------- change the translucent tint colour ----------
++	 */
++	if (has_translucent_tint_changed)
++	{
++		/* user specified colour */
++		if (translucent_tint != NULL)
++		{
++			PictureFreeColors(
++				dpy, Pcmap, &cs->translucent_tint, 1, 0, True);
++			cs->translucent_tint = GetColor(translucent_tint);
++		}
++		else
++		{
++			/* default */
++			PictureFreeColors(
++				dpy, Pcmap, &cs->translucent_tint, 1, 0, True);
++			cs->translucent_tint = GetColor(black);
++		}
++	}
++
++	/*
+ 	 * ---------- send new colorset to fvwm and clean up ----------
+ 	 */
+ 	/* make sure the server has this to avoid races */
+@@ -1710,6 +1757,7 @@
+ 			ncs->fgsh = GetColor(white);
+ 			ncs->tint = GetColor(black);
+ 			ncs->icon_tint = GetColor(black);
++			ncs->translucent_tint = GetColor(black);
+ 			ncs->pixmap = XCreatePixmapFromBitmapData(
+ 				dpy, Scr.NoFocusWin,
+ 				&g_bits[4 * (nColorsets % 3)], 4, 4,
+@@ -1727,6 +1775,7 @@
+ 			ncs->fgsh = GetForeShadow(ncs->fg, ncs->bg);
+ 			ncs->tint = GetColor(black);
+ 			ncs->icon_tint = GetColor(black);
++			ncs->translucent_tint = GetColor(black);
+ 		}
+ 		ncs->fg_tint = ncs->bg_tint = GetColor(black);
+ 		/* set flags for fg contrast, bg average */
+@@ -1738,6 +1787,7 @@
+ 		ncs->icon_alpha_percent = 100;
+ 		ncs->tint_percent = 0;
+ 		ncs->icon_tint_percent = 0;
++		ncs->translucent_tint_percent = 0;
+ 		ncs->fg_tint_percent = ncs->bg_tint_percent = 0;
+ 		ncs->dither = (PictureDitherByDefault())? True:False;
+ 		nColorsets++;
+Index: fvwm/menuroot.h
+===================================================================
+RCS file: /home/cvs/fvwm/fvwm/fvwm/menuroot.h,v
+retrieving revision 1.3
+diff -u -r1.3 menuroot.h
+--- fvwm/menuroot.h	13 Jan 2007 15:07:14 -0000	1.3
++++ fvwm/menuroot.h	5 Feb 2007 19:17:37 -0000
+@@ -146,6 +146,9 @@
+ 		int d_npixels;
+ 	} stored_pixels;
+ 	/* alloc pixels when dithering is used for gradients */
++	/* x,y XMapRaise */
++	int x;
++	int y;
+ } MenuRootDynamic;
+ 
+ /* access macros to dynamic menu members */
+Index: fvwm/menus.c
+===================================================================
+RCS file: /home/cvs/fvwm/fvwm/fvwm/menus.c,v
+retrieving revision 1.409
+diff -u -r1.409 menus.c
+--- fvwm/menus.c	27 Jan 2007 11:51:15 -0000	1.409
++++ fvwm/menus.c	5 Feb 2007 19:17:50 -0000
+@@ -75,6 +75,19 @@
+ 
+ /* ---------------------------- local macros ------------------------------- */
+ 
++#define MENU_IS_TRANSLUCENT(mr,cs) \
++	(!MR_IS_TEAR_OFF_MENU(mr) && CSET_IS_TRANSLUCENT(cs))
++#define MENU_IS_TRANSPARENT(mr,cs) \
++	(MENU_IS_TRANSLUCENT(mr,cs) || CSET_IS_TRANSPARENT(cs))
++#define MR_IS_TRANSLUCENT_MENU(mr)  \
++	(!MR_IS_TEAR_OFF_MENU(mr) && MR_STYLE(mr) && \
++	ST_HAS_MENU_CSET(MR_STYLE(mr)) && CSET_IS_TRANSLUCENT( \
++						ST_CSET_MENU(MR_STYLE(mr))))
++#define MR_IS_TRANSPARENT_MENU(mr) \
++	(MR_IS_TRANSLUCENT_MENU(mr) || (MR_STYLE(mr) && \
++	ST_HAS_MENU_CSET(MR_STYLE(mr)) && CSET_IS_TRANSPARENT( \
++						ST_CSET_MENU(MR_STYLE(mr)))))
++
+ /* ---------------------------- imports ------------------------------------ */
+ 
+ /* This external is safe. It's written only during startup. */
+@@ -188,6 +201,8 @@
+ } mloop_static_info_t;
+ 
+ /* ---------------------------- forward declarations ----------------------- */
++static MenuRoot *seek_submenu_instance(
++	MenuRoot *parent_menu, MenuItem *parent_item);
+ 
+ /* ---------------------------- local variables ---------------------------- */
+ 
+@@ -353,12 +368,22 @@
+ 		Bool transparent_bg = False;
+ 
+ 		/* move it back */
+-		if (ST_HAS_MENU_CSET(MR_STYLE(mr)) &&
+-		    CSET_IS_TRANSPARENT(ST_CSET_MENU(MR_STYLE(mr))))
++		if (MR_IS_TRANSPARENT_MENU(mr))
+ 		{
+ 			transparent_bg = True;
+ 			get_menu_repaint_transparent_parameters(
+ 				&mrtp, mr, fw);
++			if (MR_IS_TRANSLUCENT_MENU(mr) && MR_SUBMENU_ITEM(mr))
++			{
++				MenuRoot *smr;
++				smr = seek_submenu_instance(
++					mr, MR_SUBMENU_ITEM(mr));
++				if (smr)
++				{
++					/* just unmap it here, popdown later */
++					XUnmapWindow(dpy, MR_WINDOW(smr));
++				}
++			}
+ 		}
+ 		AnimatedMoveOfWindow(
+ 			MR_WINDOW(mr), act_x, act_y, act_x - MR_XANIMATION(mr),
+@@ -1779,6 +1804,7 @@
+ 				/* Doh.  Use the standard display instead. */
+ 				MR_CREATE_DPY(mr) = dpy;
+ 			}
++			MR_IS_TEAR_OFF_MENU(mr) = 1;
+ 		}
+ 		else
+ 		{
+@@ -2594,7 +2620,37 @@
+ 	}
+ 	MR_IS_PAINTED(mr) = 1;
+ 	/* paint the menu background */
+-	if (ms && ST_HAS_MENU_CSET(ms))
++	if (MR_IS_TRANSLUCENT_MENU(mr))
++	{
++		Pixmap trans = None;
++		FvwmRenderAttributes fra;
++		colorset_t *colorset = &Colorset[ST_CSET_MENU(ms)];
++	
++		fra.mask = 0;
++		if (colorset->translucent_tint_percent > 0)
++		{
++			fra.mask = FRAM_HAVE_TINT;
++			fra.tint = colorset->translucent_tint;
++			fra.tint_percent = colorset->translucent_tint_percent;
++		}
++		if (MR_IS_BACKGROUND_SET(mr) == False)
++		{
++			trans = PGraphicsCreateTranslucent(
++				dpy, MR_WINDOW(mr), &fra,
++				BACK_GC(ST_MENU_INACTIVE_GCS(ms)),
++				MR_X(mr), MR_Y(mr), MR_WIDTH(mr), MR_HEIGHT(mr));
++			XMapRaised(dpy, MR_WINDOW(mr));
++			if (trans != None)
++			{
++				XSetWindowBackgroundPixmap(
++					dpy, MR_WINDOW(mr), trans);
++				MR_IS_BACKGROUND_SET(mr) = True;
++				clear_expose_menu_area(MR_WINDOW(mr), pevent);
++				XFreePixmap(dpy, trans);
++			}
++		}
++	}
++	else if (ms && ST_HAS_MENU_CSET(ms))
+ 	{
+ 		if (MR_IS_BACKGROUND_SET(mr) == False)
+ 		{
+@@ -3401,10 +3457,7 @@
+ 					MR_HAS_POPPED_UP_RIGHT(mr) = 0;
+ 				}
+ 				MR_XANIMATION(parent_menu) += end_x - prev_x;
+-				if (ST_HAS_MENU_CSET(MR_STYLE(parent_menu)) &&
+-				    CSET_IS_TRANSPARENT(
+-					    ST_CSET_MENU(
+-						    MR_STYLE(parent_menu))))
++				if (MR_IS_TRANSPARENT_MENU(parent_menu))
+ 				{
+ 					transparent_bg = True;
+ 					get_menu_repaint_transparent_parameters(
+@@ -3583,10 +3636,21 @@
+ 	 */
+ 
+ 	XMoveWindow(dpy, MR_WINDOW(mr), x, y);
++	MR_X(mr) = x;
++	MR_Y(mr) = y;
+ 	XSelectInput(dpy, MR_WINDOW(mr), event_mask);
+-	XMapRaised(dpy, MR_WINDOW(mr));
+-	if (popdown_window)
+-		XUnmapWindow(dpy, popdown_window);
++	if (MR_IS_TRANSLUCENT_MENU(mr))
++	{
++		if (popdown_window)
++			XUnmapWindow(dpy, popdown_window);
++		paint_menu(mr, NULL, fw);
++	}
++	else
++	{
++		XMapRaised(dpy, MR_WINDOW(mr));
++		if (popdown_window)
++			XUnmapWindow(dpy, popdown_window);
++	}
+ 	XFlush(dpy);
+ 	MR_MAPPED_COPIES(mr)++;
+ 	MST_USAGE_COUNT(mr)++;
+@@ -6123,16 +6187,122 @@
+ 	{
+ 		last = True;
+ 	}
+-	if (!last && CSET_IS_TRANSPARENT_PR_TINT(ST_CSET_MENU(ms)))
++	if (!last &&
++	    (CSET_IS_TRANSPARENT_PR_TINT(ST_CSET_MENU(ms)) ||
++	     MR_IS_TRANSLUCENT_MENU(mr)))
+ 	{
+ 		/* too slow ... */
+ 		return;
+ 	}
+-	SetWindowBackgroundWithOffset(
+-		dpy, MR_WINDOW(mr), step_x - current_x, step_y - current_y,
+-		MR_WIDTH(mr), MR_HEIGHT(mr),
+-		&Colorset[ST_CSET_MENU(ms)], Pdepth,
+-		FORE_GC(MST_MENU_INACTIVE_GCS(mr)), False);
++	if (MR_IS_TRANSLUCENT_MENU(mr))
++	{
++		Pixmap trans, tmp;
++		FvwmRenderAttributes fra;
++		colorset_t *colorset = &Colorset[ST_CSET_MENU(ms)];
++
++		fra.mask = 0;
++		if (colorset->translucent_tint_percent > 0)
++		{
++			fra.mask = FRAM_HAVE_TINT;
++			fra.tint = colorset->translucent_tint;
++			fra.tint_percent = colorset->translucent_tint_percent;
++		}
++		if (current_x == step_x) 
++		{
++			/* Reuse the old pixmap for the part of the menu 
++			 * that has not moved. (This can be extended to get
++			 * two new rectangles, one in each direction)
++			 * 
++			 * It saves the unmapping of the window and makes 
++			 * Things less flickering.
++			 */
++			GC my_gc;
++			unsigned long valuemask = GCSubwindowMode;
++			XGCValues values;
++			int out_y=0;
++			values.subwindow_mode = IncludeInferiors;
++			if (step_y < 0)
++			{
++				out_y = -step_y;
++			}
++			trans = XCreatePixmap(dpy, MR_WINDOW(mr), MR_WIDTH(mr),
++					      MR_HEIGHT(mr), Pdepth);
++			my_gc = fvwmlib_XCreateGC(dpy,  MR_WINDOW(mr), 0, NULL);
++			XChangeGC(dpy, my_gc, valuemask, &values);
++
++			XClearWindow(dpy, MR_WINDOW(mr));
++
++			if (current_y < step_y)
++			{
++				XCopyArea(dpy, MR_WINDOW(mr), trans, my_gc, 0, 
++					  step_y-current_y, MR_WIDTH(mr), 
++					  MR_HEIGHT(mr)-(step_y-current_y),
++					  0,0);
++				tmp = PGraphicsCreateTranslucent(
++					dpy, MR_WINDOW(mr), &fra,
++					BACK_GC(ST_MENU_INACTIVE_GCS(ms)),
++					current_x, current_y+MR_HEIGHT(mr), 
++					MR_WIDTH(mr), step_y-current_y);
++
++				XCopyArea(dpy, tmp, trans, my_gc, 0, 0,
++					  MR_WIDTH(mr), step_y-current_y,0,
++					  MR_HEIGHT(mr)-(step_y-current_y));
++			}
++			else 
++			{
++				XCopyArea(dpy, MR_WINDOW(mr), trans, my_gc, 0, 
++					  0, MR_WIDTH(mr), 
++					  MR_HEIGHT(mr)-(current_y-step_y), 0,
++					  current_y-step_y);
++				tmp = PGraphicsCreateTranslucent(
++					dpy, MR_WINDOW(mr), &fra,
++					BACK_GC(ST_MENU_INACTIVE_GCS(ms)),
++					current_x,step_y, MR_WIDTH(mr),
++					current_y-step_y);
++				XCopyArea(dpy, tmp, trans, my_gc, 0, 0,
++					  MR_WIDTH(mr), current_y-step_y,0,
++					  out_y);
++			}
++			MR_X(mr) = step_x;
++			MR_Y(mr) = step_y;
++			XFreePixmap(dpy, tmp);
++			XFreeGC(dpy,my_gc);
++		}		
++		else
++		{
++			XUnmapWindow(dpy, MR_WINDOW(mr));
++			MR_X(mr) = step_x;
++			MR_Y(mr) = step_y;
++			trans = PGraphicsCreateTranslucent(
++				dpy, MR_WINDOW(mr), &fra,
++				BACK_GC(ST_MENU_INACTIVE_GCS(ms)),
++				step_x, step_y, MR_WIDTH(mr), 
++				MR_HEIGHT(mr));
++			XMapRaised(dpy, MR_WINDOW(mr));
++		}
++		XSetWindowBackgroundPixmap(
++			dpy, MR_WINDOW(mr), trans);
++		XFreePixmap(dpy, trans);
++		if (current_x == step_x)
++		{
++			/* Redraw the border */
++			RelieveRectangle(
++				dpy, MR_WINDOW(mr), 0, 0, MR_WIDTH(mr) - 1,
++				MR_HEIGHT(mr) - 1, (Pdepth < 2) ?
++				SHADOW_GC(MST_MENU_INACTIVE_GCS(mr)) :
++				HILIGHT_GC(MST_MENU_INACTIVE_GCS(mr)),
++				SHADOW_GC(MST_MENU_INACTIVE_GCS(mr)), 
++				MST_BORDER_WIDTH(mr));
++		}
++	}
++	else
++	{
++		SetWindowBackgroundWithOffset(
++			dpy, MR_WINDOW(mr), step_x - current_x,
++			step_y - current_y, MR_WIDTH(mr), MR_HEIGHT(mr),
++			&Colorset[ST_CSET_MENU(ms)], Pdepth,
++			FORE_GC(MST_MENU_INACTIVE_GCS(mr)), False);
++	}
+ }
+ 
+ 
+@@ -6173,10 +6343,7 @@
+ 	}
+ 	if (!is_bg_set)
+ 	{
+-		SetWindowBackground(
+-			dpy, MR_WINDOW(mr), MR_WIDTH(mr), MR_HEIGHT(mr),
+-			&Colorset[ST_CSET_MENU(ms)], Pdepth,
+-			FORE_GC(MST_MENU_INACTIVE_GCS(mr)), False);
++		update_transparent_menu_bg(prtm, x, y, x, y, end_x, end_y);
+ 	}
+ 	/* redraw the background of non active item */
+ 	for (mi = MR_FIRST_ITEM(mr); mi != NULL; mi = MI_NEXT_ITEM(mi))
+@@ -6813,10 +6980,12 @@
+ 				SetWindowBackground(
+ 					dpy, MR_WINDOW(mr), MR_WIDTH(mr),
+ 					MR_HEIGHT(mr),
+-					&Colorset[ST_CSET_MENU(ms)],
+-					Pdepth,
++					&Colorset[ST_CSET_MENU(ms)], Pdepth,
+ 					FORE_GC(MST_MENU_INACTIVE_GCS(mr)),
+-					True);
++					False);
++				XClearArea(
++					dpy, MR_WINDOW(mr), 0, 0, MR_WIDTH(mr),
++					MR_HEIGHT(mr), True);
+ 			}
+ 			else if ((ST_HAS_ACTIVE_CSET(ms) &&
+ 				  ST_CSET_ACTIVE(ms) == cset) ||
+Index: fvwm/menus.h
+===================================================================
+RCS file: /home/cvs/fvwm/fvwm/fvwm/menus.h,v
+retrieving revision 1.111
+diff -u -r1.111 menus.h
+--- fvwm/menus.h	27 Jan 2007 11:51:15 -0000	1.111
++++ fvwm/menus.h	5 Feb 2007 19:17:50 -0000
+@@ -15,6 +15,9 @@
+ #define IS_MENU_RETURN(x) \
+   ((x)==MENU_DONE || (x)==MENU_ABORTED || (x)==MENU_SUBMENU_TORN_OFF)
+ 
++#define MR_X(m)                     ((m)->d->x)
++#define MR_Y(m)                     ((m)->d->y)
++
+ struct MenuRoot;
+ struct MenuStyle;
+ struct MenuReturn;
+Index: libs/Colorset.h
+===================================================================
+RCS file: /home/cvs/fvwm/fvwm/libs/Colorset.h,v
+retrieving revision 1.38
+diff -u -r1.38 Colorset.h
+--- libs/Colorset.h	10 Jan 2007 00:34:27 -0000	1.38
++++ libs/Colorset.h	5 Feb 2007 19:19:00 -0000
+@@ -51,6 +51,10 @@
+ 	Bool dither;
+ 	Bool allows_buffered_transparency;
+ 	Bool is_maybe_root_transparent;
++	/* only use by fvwm menu (non tear-off) */
++	Bool is_translucent;
++	Pixel translucent_tint;
++	unsigned int translucent_tint_percent : 7;
+ #endif
+ } colorset_t;
+ 
+@@ -78,6 +82,7 @@
+ #define FG_TINT_SUPPLIED  0x100
+ #define BG_TINT_SUPPLIED  0x200
+ #define ICON_TINT_SUPPLIED 0x400
++#define TRANSLUCENT_TINT_SUPPLIED 0x800
+ #endif
+ 
+ /* colorsets are stored as an array of structs to permit fast dereferencing */
+@@ -153,6 +158,11 @@
+     (cset != NULL && cset->pixmap == ParentRelative && \
+      cset->tint_percent > 0)
+ 
++#define CSET_IS_TRANSLUCENT(cset) \
++    (cset >= 0 && Colorset[cset].is_translucent)
++#define CSETS_IS_TRANSLUCENT(cset) \
++    (cset && cset->is_translucent)
++
+ #ifndef FVWM_COLORSET_PRIVATE
+ /* Create n new colorsets, fvwm/colorset.c does its own thing (different size)
+  */
+Index: libs/PictureGraphics.c
+===================================================================
+RCS file: /home/cvs/fvwm/fvwm/libs/PictureGraphics.c,v
+retrieving revision 1.29
+diff -u -r1.29 PictureGraphics.c
+--- libs/PictureGraphics.c	27 Jan 2007 11:33:16 -0000	1.29
++++ libs/PictureGraphics.c	5 Feb 2007 19:19:49 -0000
+@@ -1340,7 +1340,7 @@
+ 	}
+ }
+ 
+-#if 0 /* humm... maybe useful one day with menus */
++#if 1 /* humm... maybe useful one day with menus */
+ Pixmap PGraphicsCreateTranslucent(
+ 	Display *dpy, Window win, FvwmRenderAttributes *fra, GC gc,
+ 	int x, int y, int width, int height)
+Index: libs/PictureGraphics.h
+===================================================================
+RCS file: /home/cvs/fvwm/fvwm/libs/PictureGraphics.h,v
+retrieving revision 1.13
+diff -u -r1.13 PictureGraphics.h
+--- libs/PictureGraphics.h	9 May 2006 20:46:29 -0000	1.13
++++ libs/PictureGraphics.h	5 Feb 2007 19:19:49 -0000
+@@ -122,7 +122,9 @@
+ 	Display *dpy, Window win, Pixel tint, int tint_percent,
+ 	Drawable dest, Bool dest_is_a_window, GC gc, GC mono_gc, GC alpha_gc,
+ 	int dest_x, int dest_y, int dest_w, int dest_h);
+-
++Pixmap PGraphicsCreateTranslucent(
++	Display *dpy, Window win, FvwmRenderAttributes *fra, GC gc,
++	int x, int y, int width, int height);
+ /* never used ! */
+ Pixmap PGraphicsCreateDitherPixmap(
+ 	Display *dpy, Window win, Drawable src, Pixmap mask, int depth, GC gc,
diff --git a/x11-wm/fvwm/files/fvwm-2.6.5-ar.patch b/x11-wm/fvwm/files/fvwm-2.6.5-ar.patch
new file mode 100644
index 000000000000..b1d62006967f
--- /dev/null
+++ b/x11-wm/fvwm/files/fvwm-2.6.5-ar.patch
@@ -0,0 +1,35 @@
+--- configure.ac	2012-04-20 12:58:29.000000000 +0200
++++ configure_new.ac	2013-07-21 18:26:17.513904607 +0200
+@@ -209,6 +209,10 @@
+ # optional libraries.
+ AC_PROG_CC
+ AC_PROG_CPP
++AN_MAKEVAR([AR], [AC_PROG_AR])
++AN_PROGRAM([ar], [AC_PROG_AR])
++AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)])
++AC_PROG_AR
+ 
+ # added -Wall for gcc, what about for others?
+ if test "x$GCC" = "xyes"; then
+--- libs/Makefile.in	2012-04-20 13:03:55.000000000 +0200
++++ libs/Makefile_new.in	2013-07-21 18:27:17.443992505 +0200
+@@ -48,7 +48,7 @@
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+ LIBRARIES = $(noinst_LIBRARIES)
+-AR = ar
++AR = @AR@
+ ARFLAGS = cru
+ libfvwm_a_AR = $(AR) $(ARFLAGS)
+ libfvwm_a_DEPENDENCIES = @LIBOBJS@ @ALLOCA@
+--- modules/FvwmScript/Widgets/Makefile.in	2012-04-20 13:03:56.000000000 +0200
++++ modules/FvwmScript/Widgets/Makefile_new.in	2013-07-21 18:27:23.844001892 +0200
+@@ -46,7 +46,7 @@
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+ LIBRARIES = $(noinst_LIBRARIES)
+-AR = ar
++AR = @AR@
+ ARFLAGS = cru
+ libWidgets_a_AR = $(AR) $(ARFLAGS)
+ libWidgets_a_LIBADD =
diff --git a/x11-wm/fvwm/files/fvwm-2.6.5-mouse-buttons.patch b/x11-wm/fvwm/files/fvwm-2.6.5-mouse-buttons.patch
new file mode 100644
index 000000000000..7eaa3e20b7c7
--- /dev/null
+++ b/x11-wm/fvwm/files/fvwm-2.6.5-mouse-buttons.patch
@@ -0,0 +1,11 @@
+--- libs/defaults.h	2011-08-15 18:25:40.000000000 +0200
++++ libs/defaults.h	2012-04-12 21:13:47.000000000 +0200
+@@ -25,7 +25,7 @@
+ /* The "extended" buttons do not provide the full functionality because X has
+  * no bit mask value for them.  Things like dragging windows don't work with
+  * them. */
+-#define NUMBER_OF_EXTENDED_MOUSE_BUTTONS   9
++#define NUMBER_OF_EXTENDED_MOUSE_BUTTONS   15
+ #if NUMBER_OF_EXTENDED_MOUSE_BUTTONS > 31
+ #error No more than 31 mouse buttons can be supported on 32 bit platforms
+ #endif
diff --git a/x11-wm/fvwm/fvwm-2.6.5-r1.ebuild b/x11-wm/fvwm/fvwm-2.6.5-r1.ebuild
new file mode 100644
index 000000000000..202190bfb62f
--- /dev/null
+++ b/x11-wm/fvwm/fvwm-2.6.5-r1.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="An extremely powerful ICCCM-compliant multiple virtual desktop window manager"
+HOMEPAGE="http://www.fvwm.org/"
+SRC_URI="ftp://ftp.fvwm.org/pub/fvwm/version-2/${P}.tar.bz2"
+
+LICENSE="GPL-2 FVWM"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+IUSE="bidi debug doc gtk2-perl netpbm nls perl png readline rplay stroke svg tk truetype +vanilla xinerama lock"
+
+COMMON_DEPEND="
+	sys-libs/zlib
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libxcb
+	x11-libs/libXcursor
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXpm
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	bidi? ( dev-libs/fribidi )
+	png? ( media-libs/libpng:0= )
+	readline? (
+		sys-libs/ncurses:0=
+		sys-libs/readline:0=
+	)
+	stroke? ( dev-libs/libstroke )
+	svg? ( gnome-base/librsvg )
+	truetype? (
+		media-libs/fontconfig
+		x11-libs/libXft
+	)
+	xinerama? (
+		x11-proto/xineramaproto
+		x11-libs/libXinerama
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-lang/perl
+	gtk2-perl? ( dev-perl/Gtk2 )
+	perl? ( tk? (
+			dev-lang/tk
+			dev-perl/Tk
+			>=dev-perl/X11-Protocol-0.56
+		)
+	)
+	rplay? ( media-sound/rplay )
+	lock? ( x11-misc/xlockmore )
+	userland_GNU? ( sys-apps/debianutils )
+	!x86-fbsd? ( netpbm? ( media-libs/netpbm ) )
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	doc? ( dev-libs/libxslt )
+	x11-proto/xextproto
+	x11-proto/xproto
+"
+
+src_prepare() {
+	if ! use vanilla; then
+		# Enables fast translucent menus; patch from fvwm-user mailing list.
+		epatch "${FILESDIR}/${PN}-2.5.27-translucent-menus.diff"
+
+		# Allow more mouse buttons, bug #411811
+		epatch "${FILESDIR}/${PN}-2.6.5-mouse-buttons.patch"
+
+		# Apply user-provided patches to the source tree, bug #411811
+		epatch_user
+	fi
+
+	epatch "${FILESDIR}/${PN}-2.6.5-ar.patch" #474528
+	eautoreconf
+}
+
+src_configure() {
+	local myconf="--libexecdir=/usr/lib --with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm --enable-package-subdirs --without-gnome"
+
+	# Non-upstream email where bugs should be sent; used in fvwm-bug.
+	export FVWM_BUGADDR="desktop-wm@gentoo.org"
+
+	# Recommended by upstream.
+	append-flags -fno-strict-aliasing
+
+	# Signed chars are required.
+	use ppc && append-flags -fsigned-char
+
+	myconf="${myconf} --disable-gtk"
+
+	use readline && myconf="${myconf} --without-termcap-library"
+
+	econf ${myconf} \
+		$(use_enable bidi) \
+		$(use_enable debug debug-msgs) \
+		$(use_enable debug command-log) \
+		$(use_enable doc htmldoc) \
+		$(use_enable nls) \
+		$(use_enable nls iconv) \
+		$(use_enable perl perllib) \
+		$(use_with png png-library) \
+		$(use_with readline readline-library) \
+		$(use_with rplay rplay-library) \
+		$(use_with stroke stroke-library) \
+		$(use_enable svg rsvg) \
+		$(use_enable truetype xft) \
+		$(use_enable xinerama) \
+		--docdir="/usr/share/doc/${P}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" docdir="/usr/share/doc/${P}" install
+
+	# These are always removed, because gentoo doesn't have anymore
+	# a dev-perl/gtk-perl package, so, these modules are pointless.
+	rm -f "${D}/usr/share/fvwm/perllib/FVWM/Module/Gtk.pm"
+	find "${D}" -name '*FvwmGtkDebug*' -exec rm -f '{}' \; 2>/dev/null
+
+	if ! use lock; then
+		find "${D}" -name '*fvwm-menu-xlock' -exec rm -f '{}' \; 2>/dev/null
+	fi
+
+	if use perl; then
+		if ! use tk; then
+			rm -f "${D}/usr/share/fvwm/perllib/FVWM/Module/Tk.pm"
+			if ! use gtk2-perl; then # no tk and no gtk2 bindings
+				rm -f "${D}/usr/share/fvwm/perllib/FVWM/Module/Toolkit.pm"
+				find "${D}/usr/share/fvwm/perllib" -depth -type d -exec rmdir '{}' \; 2>/dev/null
+			fi
+		fi
+
+		# Now, the Gtk2.pm file, it will require dev-perl/Gtk2
+		# so it implies gtk2 as well. That's why we need another use flag.
+		if ! use gtk2-perl; then
+			rm -f "${D}/usr/share/fvwm/perllib/FVWM/Module/Gtk2.pm"
+		fi
+	else
+		# Completely wipe it if ! use perl
+		rm -rf "${D}/usr/bin/fvwm-perllib" \
+			"${D}/usr/share/man/man1/fvwm-perllib.1"
+	fi
+
+	# Utility for testing FVWM behaviour by creating a simple window with
+	# configurable hints.
+	if use debug; then
+		dobin "${S}/tests/hints/hints_test"
+		newdoc "${S}/tests/hints/README" README.hints
+	fi
+
+	dodir /etc/X11/Sessions
+	echo "/usr/bin/fvwm" > "${D}/etc/X11/Sessions/${PN}" || die
+	fperms a+x /etc/X11/Sessions/${PN} || die
+
+	dodoc AUTHORS ChangeLog NEWS README \
+		docs/{ANNOUNCE,BUGS,COMMANDS,CONVENTIONS} \
+		docs/{DEVELOPERS,error_codes,FAQ,TODO,fvwm.lsm}
+
+	# README file for translucent menus patch.
+	if ! use vanilla; then
+		dodoc "${FILESDIR}"/README.translucency
+		ewarn "You are using a patched build, so, please, don't"
+		ewarn "report bugs at the fvwm-workers list unless you are"
+		ewarn "also able to reproduce them with a vanilla build (USE=vanilla)."
+	fi
+}
diff --git a/x11-wm/fvwm/metadata.xml b/x11-wm/fvwm/metadata.xml
new file mode 100644
index 000000000000..434919c67111
--- /dev/null
+++ b/x11-wm/fvwm/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <longdescription lang="en">
+		fvwm is an ICCCM-compliant X window manager providing a 3D look for
+		window decorations, multiple discontiguous virtual desktops, a high
+		degree of configurability, and an external module interface for
+		implementing functional extensions.
+	</longdescription>
+  <use>
+    <flag name="gtk2-perl">Enable GTK2 Perl bindings</flag>
+    <flag name="lock">Enable screen locking</flag>
+    <flag name="netpbm">Enable NetPBM support (used by FvwmScript-ScreenDump)</flag>
+    <flag name="rplay">Enable rplay support</flag>
+    <flag name="stroke">Mouse Gesture support</flag>
+  </use>
+</pkgmetadata>
diff --git a/x11-wm/goomwwm/Manifest b/x11-wm/goomwwm/Manifest
new file mode 100644
index 000000000000..514372293e22
--- /dev/null
+++ b/x11-wm/goomwwm/Manifest
@@ -0,0 +1,8 @@
+DIST goomwwm-1.0.0-github.tar.gz 406143 SHA256 952be1f588e01850175387d534faa39ea27e1196cd7473d8e4c2ea5e038a6b72 SHA512 e37d80c8ea47fe136172c392521ec8d4dab361c3469d3d1626ed7c30385513301983c0ffde39f4c2e6f2dee8709da6a34f14f7bb89776f1ccde5103ab1a26764 WHIRLPOOL 69ad51218a4188fe096a9eb66dfd335288b3edd8bcba98cb9e6ced3ee74f125fc55541d4baf65292cc27aa1a4138d213fcea5d596234fd99c4d28a6fe1f88bf2
+DIST goomwwm-1.0.0.tar.gz 69967 SHA256 2c65c9002e8254bc51f86c8bdf8b1a04f24c2c6006bbe6244cc85e9e8b9679ae SHA512 a2d486e7b97ef3dd0c6eb0702a21e51853ed1456aee7c1d11c90561a62218a4970a61ebb9ba7551428d72035066d7be445a952083baf9c53957e351ad8f4b5de WHIRLPOOL 6b86018714f4752e3250d8bc495290142d723fbfaaf0e36a426f84f5c31ca2aab38409f84e543d5844c121265ce49137c01d5263d8090eb398d0ddb9564c5e4a
+EBUILD goomwwm-1.0.0-r1.ebuild 777 SHA256 86cf81f8ebecd952826f9da38b4614684a1b470edf2ed437597a2be1a21b7b02 SHA512 99afd8a7c13481ab5e59646e9b95203abab16d8186d225ffb49d557f1100fbfbf90d9b1c7f865ef1c91fe8619fcfc319cc27c43bf5841e6e46ea40ed4c141fb6 WHIRLPOOL ff9e398ff37c4d47f50743e0ce931925569f498227feb257f67fd9784c39ac07666cd038fd44484f9404fc150698db79ae4874e2df55429733ca5639aa1716f0
+EBUILD goomwwm-1.0.0.ebuild 752 SHA256 9fb1158a9709d9b4fe559005a16c5e88cd52ee18c4fb3a2db58128e4a41d8510 SHA512 fc12401a7de7addff12651fe02f0df83778444f26dce2b9d5db395efd848d69f647240e083d65f730335e0b4268c4b474a9e5be69f6dce0dae0f00fca04f234a WHIRLPOOL 10bed4866d652daf8d7c464b4e700a7dbeb4bde0bba0a3a67fcb6b8573c0ca162ac6f08b58c8cfd0a67ec41ec6a664c2bb8192a711a7d6428c3205c47f2784fc
+EBUILD goomwwm-9999.ebuild 736 SHA256 2c34e78085f66ebda6e8bc1f6c8bfac2b56354512901e5efd8a6d73955e2130a SHA512 b66c355a7b6a8223f28b6d8eda5ecf9ec9befe9d41007c6d2b5df144bd91381b628752e96f02934a4ac543c7f44b39110d40bfed1d53f6ada9c1f83f588ec602 WHIRLPOOL 378bd44c58fada889a73b2b4e3d67b82ad836eabaa2adceb317ffe55f9fc415d22f950b6cf311ff4e22493f692f503dc2e72783b7b3ba0eec01864493e4621e8
+MISC ChangeLog 2567 SHA256 f477f8dee43e333f43f09f70f61c4c536bfcfee2a333e7a30fbc025cf4b3819a SHA512 cb239ecd8b7f4120eea56aa9a31d741d6d286ad5c9f007839be61e51769ae002f6d060b6c78d34366926a0cbc641cac5a61338de445cd4a17c8422e5f5460a52 WHIRLPOOL f7e01276cca159339cee0c4ab9d029e12ca4dbf33ce0e159f6f7a9e9b02cac2052903458bcfed77777083a37467e6e2576e95569c25d88698bbcace661a625ac
+MISC ChangeLog-2015 581 SHA256 8c1d80bc811b33b3d90d897666340f270412a27e6c34dddf813a4fe4fdb572c9 SHA512 e701399dc2f2cc717b7d9c3c74d799ec1abf2d03468fc2ad974d552902a7770df98268ef5fb81fffa723ea4ffa8b812e36c82c89848d07618db0c4869a298ee4 WHIRLPOOL 7e0a2950a76232227aef49ff608e2a471cc8995658d638448bfb8385237d2e0166f6cc90f2416615ad2d723e41040c4b9acca8827161f0dae15564d89e05f7aa
+MISC metadata.xml 328 SHA256 ec07a59995a446582d77600adffe41ee5dccd450bb6fa7aed334a4352829683c SHA512 e2a9ef6e4d4867c0a8188d08300444aa9f7e126fa60b1b811ddf2096c43b847cfb4dfda36b0e5f7fe9413ec5b5ac7677f953a10d9f824dc031673a7ca25628d6 WHIRLPOOL ac609f6e601f9747cb0d8401afa66c90494aec013b3bffea82ea6b69510e02f6ae4dbc132be954cee373c7dae3c19994b01128b0d666aafada44be90a7f61fb9
diff --git a/x11-wm/goomwwm/goomwwm-1.0.0-r1.ebuild b/x11-wm/goomwwm/goomwwm-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..8e769cfdc2c4
--- /dev/null
+++ b/x11-wm/goomwwm/goomwwm-1.0.0-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="Get out of my way, Window Manager!"
+HOMEPAGE="https://github.com/seanpringle/goomwwm"
+SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}-github.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	x11-libs/libXft
+	x11-libs/libX11
+	x11-libs/libXinerama
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-proto/xineramaproto
+	x11-proto/xproto
+"
+
+src_prepare() {
+	default
+	sed -i -e 's|$(LDADD) $(LDFLAGS)|$(LDFLAGS) $(LDADD)|g' Makefile || die
+}
+
+src_configure() {
+	use debug && append-cflags -DDEBUG
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) proto normal
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+}
diff --git a/x11-wm/goomwwm/goomwwm-1.0.0.ebuild b/x11-wm/goomwwm/goomwwm-1.0.0.ebuild
new file mode 100644
index 000000000000..27d7d564db68
--- /dev/null
+++ b/x11-wm/goomwwm/goomwwm-1.0.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Get out of my way, Window Manager!"
+HOMEPAGE="http://aerosuidae.net/goomwwm/"
+SRC_URI="http://aerosuidae.net/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	x11-libs/libXft
+	x11-libs/libX11
+	x11-libs/libXinerama
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-proto/xineramaproto
+	x11-proto/xproto
+"
+
+src_prepare() {
+	sed -i -e 's|$(LDADD) $(LDFLAGS)|$(LDFLAGS) $(LDADD)|g' Makefile || die
+}
+
+src_configure() {
+	use debug && append-cflags -DDEBUG
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) proto normal
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+}
diff --git a/x11-wm/goomwwm/goomwwm-9999.ebuild b/x11-wm/goomwwm/goomwwm-9999.ebuild
new file mode 100644
index 000000000000..92024280f4e8
--- /dev/null
+++ b/x11-wm/goomwwm/goomwwm-9999.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit git-r3 toolchain-funcs
+
+DESCRIPTION="Get out of my way, Window Manager!"
+HOMEPAGE="https://github.com/seanpringle/goomwwm"
+EGIT_REPO_URI="${HOMEPAGE}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE="debug"
+
+RDEPEND="
+	x11-libs/libXft
+	x11-libs/libX11
+	x11-libs/libXinerama
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-proto/xineramaproto
+	x11-proto/xproto
+"
+
+src_prepare() {
+	default
+	sed -i -e 's|$(LDADD) $(LDFLAGS)|$(LDFLAGS) $(LDADD)|g' Makefile || die
+}
+
+src_configure() {
+	use debug && append-cflags -DDEBUG
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) proto normal
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+}
diff --git a/x11-wm/goomwwm/metadata.xml b/x11-wm/goomwwm/metadata.xml
new file mode 100644
index 000000000000..c4b90b2e86cb
--- /dev/null
+++ b/x11-wm/goomwwm/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>jer@gentoo.org</email>
+		<name>Jeroen Roovers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">seanpringle/goomwwm</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest
new file mode 100644
index 000000000000..3fe04a876179
--- /dev/null
+++ b/x11-wm/herbstluftwm/Manifest
@@ -0,0 +1,6 @@
+DIST herbstluftwm-0.7.0.tar.gz 247469 SHA256 7e2ffc30b7911407230a5eeb61e044cea78557999107d372bc2dbc3d82d0ae27 SHA512 792e517dff5cfb075b8b5a42b076a7809e983953620212de6d571d3d606c573c83606a0f7694e25d3351c288473f5129191a416fe8977db8438c1016503eacd8 WHIRLPOOL 4343d7efcf1eb6b3a9c9c5bed033063b6a4a46a2f78dccc9f64011503c3af1835ed22d63a140f37e007560b988f8fb11c8bbc09875d9bf373c5e41f292271652
+EBUILD herbstluftwm-0.7.0.ebuild 1549 SHA256 51047889437d489dcbbb2530b9b4b6bac75284a0dfbc6201dc3ec6a698c98be1 SHA512 cf2f3cf5d89c51a6776428533f2f2db60176e4fc1018efc4eaab26ca019a6b59faf841e1f35c556689d350521ff44a25e6033ce2cb1076bddcfa23feb0088597 WHIRLPOOL be8d57465dc8a3589d0c52b662cc897c563fa472fa00af707835ca68eb4582181b64d7afa2dd368e8a572152533221c267cada45093448b63a05c3796fdf56a6
+EBUILD herbstluftwm-9999.ebuild 1551 SHA256 770e4c29d75a189433bae658fdd5bdaed0d294f99fba38e786d053ab541217aa SHA512 6cb19087cc90c9a93121d544d28a4ad221c061c2cfad1f00b90b98935ac81f2429cb74e1506e1e115fb5e3a2306adbf201dd702a6c8e4c753713f0c2d2106736 WHIRLPOOL c730d0bb90e39de0a76a284ba6657dfb7f9827f20380d242e6d880af47076df7c425cff7b489d26c2c4b76cb6d7e2413f8b6e0fc3fee3d5514d6bf3fa0af6b38
+MISC ChangeLog 2626 SHA256 cc63da4fc6ab7b1619c3c63c413333ad75140f87a1917daec2ff8f13b1d2b9c4 SHA512 fc8b4ee6e4a6bf34a062acf328aa1bebdf075751ff3c11eb78ed45489aa9dcbc46260f68adfafe8ecf17ce0d00db3a0b80ddee66fda5b43de1132f98d785eb44 WHIRLPOOL d17d5f5bc9e9f28dfe8ed0f22f0c5ccf5d4ff75f922a048be8d508601aa7566c17aaea78a34c7d4cf3d371b449f242c505a7e2569b952c6271b33bf5f507ca60
+MISC ChangeLog-2015 3437 SHA256 145dee6229d05273a688435f862f83c9f43a46e51f492a25da46848793e608d0 SHA512 0811fd4758c45811a328b553db382856be764548a7e2aff79900925e5c360ab6c3c2ad54ff37210f6a2780c76cb44778e6ac2ff99d821ad42691f94fc5e5e194 WHIRLPOOL 82e3ba2e4850f0e69fdb3cd0c43601a59613ff582937b7cadc34189ed2e2b4bedef16e182ba5869f9f1c017ed62a1b6ad7f843e3d5fa820c8ddba912ac6e8a39
+MISC metadata.xml 246 SHA256 92d5540a2f0904365eafb8ce96e6320cfc14e08f22e124d721521ef77ddbf6f6 SHA512 ca07e0609b698c2b53062b71008fee49b91af78fc2ef25997311e37985d79283d333f5b842257a16e7dee36ce34c07d405e1f93742f341f10ca70904e9f9a4e6 WHIRLPOOL d15a33750d6ada278082c675223992c98cccf98af92ec04ab5b908816381ab6965714988fac87a795265973c6fb81a588a08c385ac6fb66046d14d119e0c236c
diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.7.0.ebuild b/x11-wm/herbstluftwm/herbstluftwm-0.7.0.ebuild
new file mode 100644
index 000000000000..3bf863251308
--- /dev/null
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.7.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+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"
+else
+	SRC_URI="http://herbstluftwm.org/tarballs/${P}.tar.gz"
+	KEYWORDS="amd64 x86"
+	EXTRA_DEPEND=""
+fi
+
+DESCRIPTION="A manual tiling window manager for X"
+HOMEPAGE="http://herbstluftwm.org"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="examples xinerama zsh-completion"
+
+CDEPEND=">=dev-libs/glib-2.24:2
+	x11-libs/libX11
+	x11-libs/libXext
+	xinerama? ( x11-libs/libXinerama )"
+RDEPEND="${CDEPEND}
+	app-shells/bash
+	zsh-completion? ( app-shells/zsh )"
+DEPEND="${CDEPEND}
+	${EXTRA_DEPEND}
+	virtual/pkgconfig"
+
+src_compile() {
+	emake CC="$(tc-getCC)" LD="$(tc-getCC)" 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
new file mode 100644
index 000000000000..ee1ebe872762
--- /dev/null
+++ b/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+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"
+else
+	SRC_URI="http://herbstluftwm.org/tarballs/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	EXTRA_DEPEND=""
+fi
+
+DESCRIPTION="A manual tiling window manager for X"
+HOMEPAGE="http://herbstluftwm.org"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="examples xinerama zsh-completion"
+
+CDEPEND=">=dev-libs/glib-2.24:2
+	x11-libs/libX11
+	x11-libs/libXext
+	xinerama? ( x11-libs/libXinerama )"
+RDEPEND="${CDEPEND}
+	app-shells/bash
+	zsh-completion? ( app-shells/zsh )"
+DEPEND="${CDEPEND}
+	${EXTRA_DEPEND}
+	virtual/pkgconfig"
+
+src_compile() {
+	emake CC="$(tc-getCC)" LD="$(tc-getCC)" 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/metadata.xml b/x11-wm/herbstluftwm/metadata.xml
new file mode 100644
index 000000000000..78e64a5cf1ad
--- /dev/null
+++ b/x11-wm/herbstluftwm/metadata.xml
@@ -0,0 +1,8 @@
+<?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>
+</pkgmetadata>
diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
new file mode 100644
index 000000000000..921270732c54
--- /dev/null
+++ b/x11-wm/i3/Manifest
@@ -0,0 +1,10 @@
+AUX i3-4.13-remove-git-polling.patch 580 SHA256 17e814965acd6754a21a4a6d3eed5eb23e0211f9ec0f5e62e6f051b927739f39 SHA512 169eafa91f9499944f65c3b016d6760780d7ada21d718bb96e3bd822741f0d5b30e13dd7493233338e193f1f565872cf896e3e4344a1228fed596c33ed68db8b WHIRLPOOL 87570c35cbe2829b644dff950bfde9b5142dbbcb44ab7dff5714bff44f5bd051d39bd2eaec5baf39ea1b604d92f92ea6c357c1a479d0968ac232aff5908ddd65
+AUX i3-musl-GLOB_TILDE.patch 2828 SHA256 a340666827528e6ae4eed0eda911823143373cd429ae0597677c8f5e8ed1ffe3 SHA512 8ccf5c558327f099ac6881bc3a5b2006aac491f21fea429a4b7184594974815836f3eea517a33b8e852ba30b913bcd3637b08ea92c0bc1f5d3d9f778c2ce087a WHIRLPOOL f30115371147fd08352e6bce816176f4e3da95ea5be7cfd92845922932775f138b793a4179ffeb31259618d4f92777592d082d831eb48f7ac02a473285962dea
+DIST i3-4.13.tar.bz2 1121298 SHA256 94c13183e527a984132a3b050c8bf629626502a6e133e07b413641aec5f8cf8a SHA512 1bb1044e8d86e78d3ccb79d49f0eb26665dcd05a348058a5e57138151d74f57d77830efc3025893170fe1b8ec612f739f75247a427410f96286b09afd2c5f14c WHIRLPOOL c0e9b205837e30d214d525af6ceb8adcc4cbbba42d9aa0eab4e7639cbd8884d827c5783590eb23a6790e8d8d87fb81884afa369e48a7ae474613392dc6f9b371
+DIST i3-4.14.tar.gz 3936748 SHA256 6807a578275be936289986a77f77320e1581dad9e752f2fc7c443b6aeaa0d14c SHA512 fe3db78813987a15ed93d182968bcd5139e1d03f29d3e8effd9fce59f87bc8309407af0b2fa5f1cd83b8583e50ea0ade6b8eafc5dda6dea9161832dc9cebfdfe WHIRLPOOL 57aa268c52a4271a6170042c31b8e4cba82486ffce96981c96a305e2d7c613f2abc6e5f395c598fc93acfffdf34d45c8f131b79deedc2d2fc7cb5d1dd5ae2499
+EBUILD i3-4.13-r1.ebuild 1898 SHA256 3ece09a41674ada0a8d955219580a2e09a4062e9d342b4a7efc5d439498b7c25 SHA512 fa0fc10c2989175051e86ff329a560ad07ba0aac2c16e19f9e7426d7a74b96be4dda9146a899f4498858fdc9558ba27b3281c7df9ad936988310a441002aee0d WHIRLPOOL eb9be4f4ac16cc8a9302b5da249c42044d2b097ef4fa0a8c3cce7bfcba1403c33d909e0d834afd7f9eedd865dd74d4a6eea9b8632541b02b0a8bff917fe70a01
+EBUILD i3-4.14.ebuild 2018 SHA256 25e4d9505db9b8a8536f110cf9d6f681f5d7fb5288fd2ba077812bcd45343b0a SHA512 1f6e635f080952aa55416e367f9bbbca4929a73cde2080e121fd76dd1396f01d43199871d09fed71f5b6680f0d94cef5d07c2b8f86675d63763464b6e3d95c2d WHIRLPOOL 0170df92e1bb341c8f51137e854798fb56807637d8a8e5287dce482b5b321029d2640164288d0cb448d0693a884afb1d8f8db204ce9f5dbf348fa821915b17d4
+EBUILD i3-9999.ebuild 1689 SHA256 9c4bdf6fd2b9f9a98d40db15b505d33726b04eda86c39819b8e2d81d4d7509de SHA512 2b74003b82295124fbab9f86f312d6d56ac75d5191e04fb914758ef81e4a974fb78a68bffc3b18372aeb50401c8ddae90d3dc85c7c77ebfbc12db7472b5d665c WHIRLPOOL 27408aa7f8c346f8119c0a5122d0c37ffefd6180485247cbc457286097bd95e37eda8481795275b86bd7198d3ccf34542934c419e4d742e3ac71e2f6edba7a35
+MISC ChangeLog 4902 SHA256 26b0f0d0478b00a4e7ee73dd1f1eaecce6b8d80c9e00345882cea497448e5103 SHA512 2b1f63b8028ba4afeea68a9c95260a3dcd841f598b7a973acdb2bbf052f99902f56ff159d81846281220d5a6c0f9700d873c2f0dcd99df0981438ef7ed55b9e5 WHIRLPOOL 7d3f253668af39441304613cf97fb9617b732900c200f496675325e67eb20012552fe5080216c44ebcc3f3ffca0f065bd6fec304d1455cf52fe060fc1764d046
+MISC ChangeLog-2015 10069 SHA256 3f2250a4551bb6d5d07cfed1e206a2b8f17a974f242847ce83b310e400b98c87 SHA512 cb79f98aa954092a42996909bedae6551faf36a100f6ec7ca0974a3dd68a044d441605c7d865018a656b6f6167b7ba00b77b887e1f8ab2eb27672a11702dd43e WHIRLPOOL 665af3e363892774d9b0bad20787754c857d67052e40a2983099b42bd881e92abb578c935acd99f644533be8135f98af1e855f816556efd1aa296947a4cdaa42
+MISC metadata.xml 578 SHA256 2156136e34d074b2911d2f6f536c82424d60caa38a69c1b9cbe3fa604c342aa1 SHA512 b0585d5a5d421e8176d1f47e250e049e41cbd375a19f4769d291108e81847dff71c1ded0cd22b25df50af69896941cb439c4c39317414784df57cfeb33dc946e WHIRLPOOL 943dbac094c28e8c1b48e2690af00b0403aadb43c5a10ccdb3d66c32430eb51e84b9c7990120ab7c7466d4b98bdf6318aa4ef170e17c275000fb35ba6fc7917f
diff --git a/x11-wm/i3/files/i3-4.13-remove-git-polling.patch b/x11-wm/i3/files/i3-4.13-remove-git-polling.patch
new file mode 100644
index 000000000000..ca226378ed7f
--- /dev/null
+++ b/x11-wm/i3/files/i3-4.13-remove-git-polling.patch
@@ -0,0 +1,19 @@
+diff -Naur a/configure.ac b/configure.ac
+--- a/configure.ac	2017-01-13 13:31:25.250216293 +0100
++++ b/configure.ac	2017-01-13 13:31:55.930217956 +0100
+@@ -146,15 +146,6 @@
+ 	print_BUILD_MANS=no
+ fi
+ 
+-git_dir=`git rev-parse --git-dir 2>/dev/null`
+-if test -n "$git_dir"; then
+-	srcdir=`dirname "$git_dir"`
+-	exclude_dir=`pwd | sed "s,^$srcdir,,g"`
+-	if ! grep -q "^$exclude_dir" "$git_dir/info/exclude"; then
+-		echo "$exclude_dir" >> "$git_dir/info/exclude"
+-	fi
+-fi
+-
+ echo \
+ "--------------------------------------------------------------------------------
+ build configured:
diff --git a/x11-wm/i3/files/i3-musl-GLOB_TILDE.patch b/x11-wm/i3/files/i3-musl-GLOB_TILDE.patch
new file mode 100644
index 000000000000..d241a748186e
--- /dev/null
+++ b/x11-wm/i3/files/i3-musl-GLOB_TILDE.patch
@@ -0,0 +1,86 @@
+From: Natanael Copa <ncopa@alpinelinux.org>
+Patch-Source: https://git.alpinelinux.org/cgit/aports/tree/community/i3wm/musl.patch
+Project-Bug-URL: https://github.com/i3/i3/issues/1859
+Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=609306
+
+Musl doesn't implement GLOB_TILDE, which is used by i3 when expanding paths.
+
+This patch replaces usage of GLOB_TILDE in glob() by replacing tilde
+with the content of $HOME - if set - manually.
+
+As mentioned in the i3 bugtracker this is an issue that should be solved by musl.
+
+A patch has been sent to musl upstream, but it hasn't been merged yet:
+http://www.openwall.com/lists/musl/2017/01/17/1
+---
+--- i3-4.11/i3bar/src/main.c
++++ i3-4.11/i3bar/src/main.c
+@@ -45,14 +45,20 @@ void debuglog(char *fmt, ...) {
+  *
+  */
+ char *expand_path(char *path) {
+-    static glob_t globbuf;
+-    if (glob(path, GLOB_NOCHECK | GLOB_TILDE, NULL, &globbuf) < 0) {
+-        ELOG("glob() failed\n");
+-        exit(EXIT_FAILURE);
++    char *home, *expanded;
++
++    if (strncmp(path, "~/", 2) == 0) {
++        home = getenv("HOME");
++        if (home != NULL) {
++            /* new length: sum - 1 (omit '~') + 1 (for '\0') */
++            expanded = scalloc(strlen(home)+strlen(path), 1);
++            strcpy(expanded, home);
++            strcat(expanded, path+1);
++            return expanded;
++        }
+     }
+-    char *result = sstrdup(globbuf.gl_pathc > 0 ? globbuf.gl_pathv[0] : path);
+-    globfree(&globbuf);
+-    return result;
++
++    return sstrdup(path);
+ }
+
+ void print_usage(char *elf_name) {
+--- i3-4.11/libi3/resolve_tilde.c
++++ i3-4.11/libi3/resolve_tilde.c
+@@ -19,27 +19,18 @@
+  *
+  */
+ char *resolve_tilde(const char *path) {
+-    static glob_t globbuf;
+-    char *head, *tail, *result;
++    char *home, *expanded;
+
+-    tail = strchr(path, '/');
+-    head = sstrndup(path, tail ? (size_t)(tail - path) : strlen(path));
+-
+-    int res = glob(head, GLOB_TILDE, NULL, &globbuf);
+-    free(head);
+-    /* no match, or many wildcard matches are bad */
+-    if (res == GLOB_NOMATCH || globbuf.gl_pathc != 1)
+-        result = sstrdup(path);
+-    else if (res != 0) {
+-        err(EXIT_FAILURE, "glob() failed");
+-    } else {
+-        head = globbuf.gl_pathv[0];
+-        result = scalloc(strlen(head) + (tail ? strlen(tail) : 0) + 1, 1);
+-        strncpy(result, head, strlen(head));
+-        if (tail)
+-            strncat(result, tail, strlen(tail));
++    if (strncmp(path, "~/", 2) == 0) {
++        home = getenv("HOME");
++        if (home != NULL) {
++            /* new length: sum - 1 (omit '~') + 1 (for '\0') */
++            expanded = scalloc(strlen(home)+strlen(path), 1);
++            strcpy(expanded, home);
++            strcat(expanded, path+1);
++            return expanded;
++        }
+     }
+-    globfree(&globbuf);
+
+-    return result;
++    return sstrdup(path);
+ }
diff --git a/x11-wm/i3/i3-4.13-r1.ebuild b/x11-wm/i3/i3-4.13-r1.ebuild
new file mode 100644
index 000000000000..acfef3313c8a
--- /dev/null
+++ b/x11-wm/i3/i3-4.13-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="An improved dynamic tiling window manager"
+HOMEPAGE="https://i3wm.org/"
+SRC_URI="https://i3wm.org/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE="doc"
+
+CDEPEND="dev-libs/libev
+	dev-libs/libpcre
+	>=dev-libs/yajl-2.0.3
+	x11-libs/libxcb[xkb]
+	x11-libs/libxkbcommon[X]
+	x11-libs/startup-notification
+	x11-libs/xcb-util
+	x11-libs/xcb-util-cursor
+	x11-libs/xcb-util-keysyms
+	x11-libs/xcb-util-wm
+	x11-libs/xcb-util-xrm
+	>=x11-libs/cairo-1.14.4[X,xcb]
+	>=x11-libs/pango-1.30.0[X]"
+DEPEND="${CDEPEND}
+	doc? ( app-text/asciidoc app-text/xmlto dev-lang/perl )
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	dev-lang/perl
+	dev-perl/AnyEvent-I3
+	dev-perl/JSON-XS"
+
+DOCS=( RELEASE-NOTES-${PV} )
+PATCHES=(
+	"${FILESDIR}/${P}-remove-git-polling.patch"
+	"${FILESDIR}/${PN}-musl-GLOB_TILDE.patch"
+)
+
+src_prepare() {
+	default
+	if ! use doc ; then
+		sed -e '/AC_PATH_PROG(\[PATH_ASCIIDOC/d' -i configure.ac || die
+		eautoreconf
+	fi
+	cat <<- EOF > "${T}"/i3wm
+		#!/bin/sh
+		exec /usr/bin/i3
+	EOF
+}
+
+src_configure() {
+	local myeconfargs=( --enable-debug=no )  # otherwise injects -O0 -g
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake -C "${CBUILD}"
+}
+
+src_install() {
+	emake -C "${CBUILD}" DESTDIR="${D}" install
+	if ! use doc ; then
+		# install docs shipped with source tarball
+		# local HTML_DOCS=( docs/. ) # TODO: install unconditionally?
+		doman man/*.1
+	fi
+	einstalldocs
+
+	exeinto /etc/X11/Sessions
+	doexe "${T}"/i3wm
+}
+
+pkg_postinst() {
+	einfo "There are several packages that you may find useful with ${PN} and"
+	einfo "their usage is suggested by the upstream maintainers, namely:"
+	einfo "  x11-misc/dmenu"
+	einfo "  x11-misc/i3status"
+	einfo "  x11-misc/i3lock"
+	einfo "Please refer to their description for additional info."
+}
diff --git a/x11-wm/i3/i3-4.14.ebuild b/x11-wm/i3/i3-4.14.ebuild
new file mode 100644
index 000000000000..b98df36f9270
--- /dev/null
+++ b/x11-wm/i3/i3-4.14.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="An improved dynamic tiling window manager"
+HOMEPAGE="https://i3wm.org/"
+# iw3m.org tarball for 4.14 is broken, see https://github.com/i3/i3/issues/2905
+SRC_URI="https://github.com/i3/i3/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc debug test"
+
+CDEPEND="dev-libs/libev
+	dev-libs/libpcre
+	>=dev-libs/yajl-2.0.3
+	x11-libs/libxcb[xkb]
+	x11-libs/libxkbcommon[X]
+	x11-libs/startup-notification
+	x11-libs/xcb-util
+	x11-libs/xcb-util-cursor
+	x11-libs/xcb-util-keysyms
+	x11-libs/xcb-util-wm
+	x11-libs/xcb-util-xrm
+	>=x11-libs/cairo-1.14.4[X,xcb]
+	>=x11-libs/pango-1.30.0[X]"
+DEPEND="${CDEPEND}
+	app-text/asciidoc
+	doc? ( app-text/xmlto dev-lang/perl )
+	test? (
+		dev-perl/Module-Install
+	)
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	dev-lang/perl
+	dev-perl/AnyEvent-I3
+	dev-perl/JSON-XS"
+
+# Test without debug will apply optimization levels, which results
+# in type-punned pointers - which in turn causes test failures.
+REQUIRED_USE="test? ( debug )"
+
+DOCS=(
+	"RELEASE-NOTES-${PV}"
+	docs
+)
+PATCHES=(
+	"${FILESDIR}/${PN}-musl-GLOB_TILDE.patch"
+)
+
+src_test() {
+	emake -C "${CBUILD}" check
+}
+
+src_prepare() {
+	default
+
+	cat <<- EOF > "${T}"/i3wm
+		#!/bin/sh
+		exec /usr/bin/i3
+	EOF
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable debug)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake -C "${CBUILD}"
+}
+
+src_install() {
+	emake -C "${CBUILD}" DESTDIR="${D}" install
+	doman "${CBUILD}"/man/*.1
+
+	use doc && einstalldocs
+
+	exeinto /etc/X11/Sessions
+	doexe "${T}/i3wm"
+}
+
+pkg_postinst() {
+	einfo "There are several packages that you may find useful with ${PN} and"
+	einfo "their usage is suggested by the upstream maintainers, namely:"
+	einfo "  x11-misc/dmenu"
+	einfo "  x11-misc/i3status"
+	einfo "  x11-misc/i3lock"
+	einfo "Please refer to their description for additional info."
+}
diff --git a/x11-wm/i3/i3-9999.ebuild b/x11-wm/i3/i3-9999.ebuild
new file mode 100644
index 000000000000..1775d348c34c
--- /dev/null
+++ b/x11-wm/i3/i3-9999.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools git-r3
+
+DESCRIPTION="An improved dynamic tiling window manager"
+HOMEPAGE="https://i3wm.org/"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/i3/i3"
+EGIT_BRANCH="next"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc"
+
+CDEPEND="dev-libs/libev
+	dev-libs/libpcre
+	>=dev-libs/yajl-2.0.3
+	x11-libs/libxcb[xkb]
+	x11-libs/libxkbcommon[X]
+	x11-libs/startup-notification
+	x11-libs/xcb-util
+	x11-libs/xcb-util-cursor
+	x11-libs/xcb-util-keysyms
+	x11-libs/xcb-util-wm
+	x11-libs/xcb-util-xrm
+	>=x11-libs/cairo-1.14.4[X,xcb]
+	>=x11-libs/pango-1.30.0[X]"
+DEPEND="${CDEPEND}
+	doc? ( app-text/asciidoc app-text/xmlto dev-lang/perl )
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	dev-lang/perl
+	dev-perl/AnyEvent-I3
+	dev-perl/JSON-XS"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-musl-GLOB_TILDE.patch"
+)
+
+src_prepare() {
+	default
+
+	if ! use doc ; then
+		sed -e '/AC_PATH_PROG(\[PATH_ASCIIDOC/d' -i configure.ac || die
+	fi
+	eautoreconf
+
+	cat <<- EOF > "${T}"/i3wm
+		#!/bin/sh
+		exec /usr/bin/i3
+	EOF
+}
+
+src_configure() {
+	local myeconfargs=( --enable-debug=no )  # otherwise injects -O0 -g
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake -C "${CBUILD}"
+}
+
+src_install() {
+	emake -C "${CBUILD}" DESTDIR="${D}" install
+	einstalldocs
+
+	exeinto /etc/X11/Sessions
+	doexe "${T}"/i3wm
+}
+
+pkg_postinst() {
+	einfo "There are several packages that you may find useful with ${PN} and"
+	einfo "their usage is suggested by the upstream maintainers, namely:"
+	einfo "  x11-misc/dmenu"
+	einfo "  x11-misc/i3status"
+	einfo "  x11-misc/i3lock"
+	einfo "Please refer to their description for additional info."
+}
diff --git a/x11-wm/i3/metadata.xml b/x11-wm/i3/metadata.xml
new file mode 100644
index 000000000000..1068c94323ac
--- /dev/null
+++ b/x11-wm/i3/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>nelo@wallus.de</email>
+		<name>Nelo-Thara Wallus</name>
+		<description>Proxied by Polynomial-C</description>
+	</maintainer>
+	<maintainer type="person">
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+		<description>Proxy maintainer for Nelo</description>
+	</maintainer>
+	<use>
+		<flag name="doc">Build and install the HTML documentation and regenerate the man pages</flag>
+	</use>
+</pkgmetadata>
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
new file mode 100644
index 000000000000..15649b12a008
--- /dev/null
+++ b/x11-wm/icewm/Manifest
@@ -0,0 +1,28 @@
+AUX IceWM.desktop 185 SHA256 925914dcf680538c11a8d6468d30a21c5eac8408c58d665f914a7f7faf1e835a SHA512 9e44391fa20f02f8aa0495c0d77ec10799e7b7097fff495dbabed457a88c17e00fd53a295b0e0293e8aae275b424928f83cac4e2313afa1cb2b8a1e7ac24c711 WHIRLPOOL 958ae99e9c1b2abaf5f642c6e67bcc86c4d72d06edb88e488eabed73ede6536f8d1adda3e8ff3daf0fe9356d2d7d54e8ab18a933abc5bf9c2c4ca5a38e54d3e4
+AUX icewm 33 SHA256 9c227d5676372166707902073337c0610ea0e1e0bb1c5d8881bd4e3b44919df1 SHA512 3fe619e59cc5d354242ccd85d3b1982dd7db6d0f6170f46f9d33975872f6d5a342a08d69db763162dc43681eedb96e9ba5075455bf54adf4fb86bf19887bf6e0 WHIRLPOOL 7248377faae7454d1695d0c094829c47edad23b6bec84197bfeeda6500eb418dc9b627f3d4fe811ebffce2f91c508af66478d7177bfaa0013371f1cc0a4f391b
+AUX icewm-1.3.10-menu.patch 821 SHA256 22ea5c203f75dc41b63cebd026c8964de7d67831a8a958e72a08508231bc65a4 SHA512 15ad0cd80fa358ef823ad747b873afab7ce07114590cba90710b91daa6421a8b8030c7ce7bd8af245c85983d75583c2701de85809de3059fe3e838e2f88f016e WHIRLPOOL 60b6778b930c2751029d0a62d59cfb1cd4f3ec429c6e29d9fdf976646304845742615d37269475c7198bb7f1a7873ecc902f0950bc47758e3b31f454a1704b46
+AUX icewm-1.3.7-dso.patch 376 SHA256 4c8108800ad05a88011a7e4dbe9ed009a3ff314a434afa0d832ab74785887223 SHA512 e2ca26ef3bf1f1e1ffb452cebdf3cc5cdb8b84c47b5409e68923c0ad6cac8ea399274fd4d0bf71f6a6929445b0f8a1d35edbc2233b90594f05acd6a03e6a8f8a WHIRLPOOL 3eef2a86500b03cba9c08b3159ff21bfe8ffdd6bdfc2747f4a2a2fc62ab0b021a48158ac7f6bf3648d922ab4b9f52f877c3b7894a76cc7c02a213a153c65e9cf
+AUX icewm-1.3.7-gcc44.patch 434 SHA256 60e421ae6de444cacd4e854991b43029422cf1ed1f03a37c17271fb971d0ba76 SHA512 12acc47b5938234bfa76e38f2c6f7ff0e2528aa4feac8bd19eec6743d994f7b5465373ff708232fc3ddcc5fe3cb8c21fda34d1ea6e0e860bb86c58503b2f8d65 WHIRLPOOL 9bd83695f7d13cb8e446a460526f1fff51bc51caef32b56e9fb269259e42de1a5c059785906c4f5bd70617c6ef505aaed2e71af6989e0f7520e33cc1566d72eb
+AUX icewm-1.3.7-menuiconsize.patch 2435 SHA256 ba77282c9b952d0e9f780244edbc708e63bd7bb39e8c583ad3490f025050cebc SHA512 ee56ff65a74d9a4cf4a03bc7e1324c6f0ea180fadc2232ba46a5f467d2b4f6f9e57ca73a658d5f7ed0acce4f399e1c7491ef54a29516da2fef081e7671dd1e3d WHIRLPOOL e3274f791b7081721e77a9cd3207b67b4fd6cb74b741e979ddae7b32c524e4a6c32d1bfa997385ba1faa65bb6001d579a80a4a9a805d9117348a327bb2ebe443
+AUX icewm-1.3.7-thermal.patch 1335 SHA256 fe69b7994764e1c3fbf90ec3547e85e8dc92a305570291201c456b7cc4efcd9e SHA512 3d6cfce4980a19cc16a1c56737300157f73261e0f8e512063f3ac43ac177acbe635d9e9456cdfd2e177899091e620caf0cfad1f651e533cfa5c1712e71b90650 WHIRLPOOL ab2e0279bbb792a2df31221e32b8874a4646894e28cde28615fbfc8c4974f7bd151b5fe15263ed365869bd755eb50f205f3209d1c008bf021b15e13a0ebb410c
+AUX icewm-1.3.8-build-fixes.patch 3821 SHA256 243db61d3c5b27a70061fb806387e18c1418d7b6b526cc37c7c3e7027089edbf SHA512 7fce22f361dbff6635acbcb91b91235221b1d85f9639a38f12c081305a3b1eb1de7e8825048d39a84495bb6b443e78eff5b9af315a9beb2b20d4205646e47362 WHIRLPOOL e0971a26dde9b74cdd3b259fab32fd5569f838ec8c17fd1674cf08264385a1b5109411716ff375a574647f1cd964645622cb334f1153eb98bbbb8e8f49b03d60
+AUX icewm-1.3.8-deprecated.patch 317 SHA256 05c464c0abbf65a1ea01f81a514c3022939ec0f0a3152583969f6c022dd38451 SHA512 7f0649853c78ea553a20d07bb3d88c3481a033d0fc143585f3bc2e39e9b66572b068f2ffd1660fcbf7d805c7d2f064d6d8900ddf01b61244a84aa13466061aaa WHIRLPOOL 5653fbabd227438b754371daf4a8d483d5d84a2e34be831b400591bf32630616cf9cdafacf15351a54f3953c33ca53cccb29b34a5b617d9e7833f04685effc2c
+AUX icewm-1.3.8-menu.patch 928 SHA256 22d1929f34f377eeb776e993d3052bed06987922b8f6fffb9183c8c986b5ea8e SHA512 837720dc620a02d225f5df82f8fc8b8bb8512e846f6360b058c02fb1e2483186bdccbeaf997bb690c6d8482555f710494a0d534a4add1009ecc3060e180f8baa WHIRLPOOL 50c07457c67802c67b789a42f489c4dace8cf2f912cecf7abe2d1551a951ef25c4d0c66970adb277b37a0041b630c77250c13ac741884ed198e1b51618c7c3b1
+AUX icewm-1.3.8-uclibc.patch 1830 SHA256 7ee3a62e956d1c8c1b2563a1a85356405cc11b06d8f67e65b63d364355acab52 SHA512 ed3abce7aabb21e5fb516f02a6860d140b2d74f288daf8a7edd14f8d70cd377f5bcf9b4172da4c8ca30b176c79e7500ba2c253004ca59a1ab6e9258b6b8a6f2e WHIRLPOOL 5e5b89cdb7b76f06541001b9f72b7da0cde8235528b57fc2fb7d6d7c816aefea82a314b34959e3987145228ae98c0e9dfa2c9575cefedc3aa95acfb7731e21cd
+AUX icewm-defaults.patch 694 SHA256 ce43d1a20428cecf2198422e87f5092c6378d97e3987925b2c494ea87323bf8c SHA512 41832e4d23af4790991703a502e3c5f5b0189bceac34b3e2e133ed60efd164f0521a90c39aab6fbac81ffb00a07313e1607cd7fb961bda9c5062bd1623a37919 WHIRLPOOL d243a0434ec9217ba8ccd29d9160d8028ce2db8b727e1619021b96304edac10f0969fa581749d387e6ebf7a1ef595a2ff3bb9a49109d3fb416487059140ad0ab
+AUX icewm-fribidi.patch 2168 SHA256 15865e8642ccc9fc5da221cc803176db2acc4a7afc500d199bc33c893a703649 SHA512 85f1f6f12a68f0e64d847ade924755e7f5eac3e443a8c8efeb44400e6403c10d5739b178f540d4337687c0c55159e81ebaaf6c53ae5c14d73a1e4352bd5d1fb5 WHIRLPOOL 9801fde474805e825e0f88a32560192fd45444d194c76e32dc5e82f7d0045022c695713b5d93babbc3a14ee8944c53ea0ef2efc4d618ea6d4c9d6bd12f9824c6
+AUX icewm-keys.patch 1870 SHA256 8e64cf50489fc27b0ddd44faa1e04651981e2d13c8a48bb6270636e7c7d3d7c7 SHA512 c5206e2c4e98d89e71ccd46c3838941101e009036abd6026cf445b2e01315d9d70d6835b45def978d101d575e0c4dc48514883406c0bef67f11f24e4404daf43 WHIRLPOOL 517e63604d1730a3f9895e6d20d3c8b6d9d2b9c79b565e486190682417cff82245292211f09ff6b2659cdd830dde06f6eee8535887da11696370bffd7991823d
+AUX icewm-startup 177 SHA256 2da3eb74acb1ad4fbfdbb7ced872c0ced4248b56d098ef8506ca9aaf625a6145 SHA512 512edf9e94a8bb240e932fa3be7fd4bc78635a0fe0e41ed96de520be188f23d2e03115868f4b3610d190eff50f011531e61ca8eaccbbf194a232e991713580d9 WHIRLPOOL abf6f33d23277b6fa5659a10c539397816817a798f549b50e54e3b5313fb1ad6d7e74fe4503170d7b141d1965b0554409b6b4ef797fb6f85932fcaf58200bf15
+AUX icewm-toolbar.patch 476 SHA256 b855be8a37177cbd4604b92b8f0f55f086c81c6529f7220b3c52d6cd00bce0ad SHA512 66c434c385454e139e495bc9f475f403e0c2f2b241ee2dc4903ab1975198152211b21f836c39338d5a796b2ac8a40f6ce4cb09a6878467bab50177fc105eb9fe WHIRLPOOL 8cf5b8c714ddc96894ec69b4cc274b17b0192a0558416f0aa103ad6a8881a33983af59ef23e406005a988b967bd460622add14249a7b6a359685cc190ce2d406
+AUX icewm-xdg-menu 4380 SHA256 115f081152fe8d376b884402bd8af24f678e68bbf4d6717690678df92eba2c22 SHA512 edbb196bae0c6aff3d5cfa31c50486e0ac9ffc5d287a11221e0a16ab27e176c9c6e724bc00725c5e3eba71df9afa12e5a8132eb0f154c4bc38c3150242f5d9c3 WHIRLPOOL e7380eeab8965d297ef7e16c5deb6d5dccb25e1077197ef0e2c6123d8559e36bd156b9fe2eeef630ff12951c78749ac2051a2d548a69aaf578687ead5db7e213
+DIST icewm-1.3.12.tar.gz 944617 SHA256 e7e0fe0fb07e297fa40f0c9d149c0cf6da19e13b98178fc779dca9ed81b3b232 SHA512 b2704ab69a1910cab6711ca11b79fa32f66747fe04468eff86813812fa855423ed43144ab0290e245221520a919755c0e153b60ff238ace60f9546af595063ee WHIRLPOOL bc7ec26e2a9de14e2b67da60de741205e2716233074a77465ce490e291d9a19deee61fa896ac31c1489d181b5929a325c1df7b30a0e3c428b0b6bf6bcd8fdccf
+DIST icewm-1.3.8.tar.gz 905680 SHA256 17588d9e0bbbb23587bc04c83da9dd94fd4da6894ecfee6d7f3ed50d780dcd18 SHA512 ce9bf3e736a2f3fad4bbf731647b4e4ad0168cd2c4af66b1c43beef9ceeee39d14909714d2fc73ab13f6c285a74dfe31fffc9677ae8bd2d1077716cd6d6afb72 WHIRLPOOL 5bb0f6fa830ea10978bb8fd31805596c849a370d619626736e1218e844de72e142ed1aaa87b2f2aeb40603fcf2cfaa88ffae242c726ae1151045c6a792d5cf6c
+DIST icewm-1.4.0.tar.gz 1732329 SHA256 2b9b9781d10e6691d1a233c6f5c8f629ae4873457dad49aa1879f5338486a81f SHA512 ee0a80912bce5c94121f8c9b4e2f914e6a47dc810fe83528544f8644d9e5c4c61573c5a604d22af737be653fcfa1c64c10e0be0e663ce02cf982ba19dae7396e WHIRLPOOL 834b2f0525e992c43b115a5bd07d5cf7fab8a49a8969cc2eb69767a0f3d1ec754efe92e4b9ba77925316d6451c13d20019c02d9c6475bc67ffa9d0802d86a175
+DIST icewm-1.4.2.tar.gz 1709850 SHA256 7c05a742a175c31fd3e3362649163e08b1033284f589460b90c49265a5fc9015 SHA512 c01661a7b07b4f42a32b20ecc9e45fb1e9c84c27d33105ec165e75aa9ac84129d55e992cac0d53fb10298bae28bc93ef07f68e874c1c2fccd9adecceb987a872 WHIRLPOOL 978b248d8e4b00db5a6eb0dd2d4873befc726a003f7e95f8635cae867295718dc12b3c9a521bf88030f1c8129e86923fe48ba3ba7190dd3c9cf63b79951c2c06
+EBUILD icewm-1.3.12-r1.ebuild 2557 SHA256 3c06174df3e0e025ddc7ce9361baf6baea0242bedd2ee1aa7439b7bf823c6ba1 SHA512 3f80f6085819384fd0cc9d35a61213491f47a07462a39e027ea97ef6fd49a624e4bc4ff6eb62f76b1839ddec75cdb53f65421b19f7be7523c6ee45994f7e87f9 WHIRLPOOL bf90fe6ff489cab40f5458151bcac1ed23fc36098c2592ad36f3da346dd91d1ad405a92375f63ebe1d9e60f667e11613992e036a4e1456972ccf7035e50d3a0f
+EBUILD icewm-1.3.8.ebuild 3324 SHA256 cf5a83f242a451a06980f7391b643b80f9931e32ec11663f159ebe0e7c3f9b7b SHA512 ae33e9f3d4ddab0b46eba920e851c0a1efcfe5b77606aad380d1a2d734a47e373b208e5e2401d9c457dcee3ca2aa792eec2cf4856322e034af3e26eed2bb7786 WHIRLPOOL b19b18a24b55cfe3f8341b9c6413c8eee969cbfc394bcd4e9b6d8f9afd2a3cb60df4f9a1c91536cb6089c5378426038000352cfcb20f69c5a65ad24888ebbdee
+EBUILD icewm-1.4.0.ebuild 2515 SHA256 69e7aea266d78ca8839e3d0f45f9c87a6260329577bb17a9eca5dbb57414982c SHA512 ed1eb8975e258ae8de64d1110f22b9b4510dd533cd3de5a15aea2093b9a0021b92450aaa05437bb32819990b5b29475ad67fcf0cafe309a40a05e51b8fc6cdc1 WHIRLPOOL 0104819f36a0f5ae24ac571153f5b79d37c67919e6956af7543f6c50ab5dda3188f103b2811628ff139e235d719f7c96d7926148055c3c24801e4a1005df9ae9
+EBUILD icewm-1.4.2.ebuild 2515 SHA256 69e7aea266d78ca8839e3d0f45f9c87a6260329577bb17a9eca5dbb57414982c SHA512 ed1eb8975e258ae8de64d1110f22b9b4510dd533cd3de5a15aea2093b9a0021b92450aaa05437bb32819990b5b29475ad67fcf0cafe309a40a05e51b8fc6cdc1 WHIRLPOOL 0104819f36a0f5ae24ac571153f5b79d37c67919e6956af7543f6c50ab5dda3188f103b2811628ff139e235d719f7c96d7926148055c3c24801e4a1005df9ae9
+MISC ChangeLog 4794 SHA256 e2a61821e07ca43d25f497dbeb9d401e4184bb29108380153dd4c0bfead200ad SHA512 73079562751262e169a95ce8104a868659ddad8ff8f8c4fee8880c21cde9b74c1e4856e0b02d0b7264decb7e1802f95b58df9bbe68707ef3f04cdad0cc2c69e0 WHIRLPOOL 52592ac6de5439fab7a8009674282385fcd6ee5b64e495c9d8e99f097206758f18719ad7a6468c7b5db93b7986944d773797a174a24a71683da5b77320a1a1bd
+MISC ChangeLog-2015 27191 SHA256 2ad937c90af5bf87c800d8fccba4149528d50fee6e5f290ed9fd01c8bf6bed4a SHA512 53180240c2e686ab08061684ddf1dc4be00011db8fd1ac7600da35645dd34efcefaf3bcfcc0b5bf28c7e5eb164d3d5ff7f60d6aef745eb7146e016a8f5280bcd WHIRLPOOL 6a050d2c8ddf763506afa3058bf6bca0b3af677987b14e84cdb76c1635dbed0a2384371e04fd8dd2647593118cc78af6a836a7a2cf75332ae070d271f0cdac60
+MISC metadata.xml 619 SHA256 287d5904d23d518ba885a16735e3e3203c8cdc8057cdd6d2cb2df54b39a51214 SHA512 5beee59a4a9d6785a338f2a18b0f4906681dbcff463ddb3bb273634416c297ad646e0a4247d94f367352b4a063d1858953827d775a01e100f1a769941d2d9cb2 WHIRLPOOL 6888d23a8422adbe2ee0d069a46879b3fbcb4c29fb63643cefb2cc990f98b20737d82ef5785e68727c9f9832978121fe9242bc5ed286f9b84340076fe7e8d959
diff --git a/x11-wm/icewm/files/IceWM.desktop b/x11-wm/icewm/files/IceWM.desktop
new file mode 100644
index 000000000000..087384ee1308
--- /dev/null
+++ b/x11-wm/icewm/files/IceWM.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=IceWM
+Comment=This session logs you into IceWM
+Exec=icewm-session
+TryExec=icewm-session
+# no icon yet, only the top three are currently used
+Icon=
+Type=Application
diff --git a/x11-wm/icewm/files/icewm b/x11-wm/icewm/files/icewm
new file mode 100644
index 000000000000..90905960d1a2
--- /dev/null
+++ b/x11-wm/icewm/files/icewm
@@ -0,0 +1,2 @@
+#!/bin/sh
+/usr/bin/icewm-session
diff --git a/x11-wm/icewm/files/icewm-1.3.10-menu.patch b/x11-wm/icewm/files/icewm-1.3.10-menu.patch
new file mode 100644
index 000000000000..721a15d25ee3
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-1.3.10-menu.patch
@@ -0,0 +1,22 @@
+--- icewm-1.3.10/lib/menu.in
++++ icewm-1.3.10/lib/menu.in
+@@ -4,14 +4,9 @@
+ # since modifications to this file will be discarded when you
+ # (re)install icewm.
+ #
+-prog xterm xterm xterm
+-prog rxvt xterm rxvt -bg black -cr green -fg white -C -fn 9x15 -sl 500
+-prog fte fte fte
+-prog NEdit nedit nedit
+-prog Mozilla mozilla mozilla
+-prog XChat xchat xchat
+-prog Gimp gimp gimp
++prog xterm /usr/share/icons/gnome/16x16/apps/terminal.png xterm
++"Web browser" /usr/share/icons/gnome/16x16/apps/web-browser.png xdg-open about:blank
+ separator
+-menuprog "Desktop Apps" folder icewm-menu-fdo
+-menufile Programs folder programs
+-menufile Tool_bar folder toolbar
++prog "Rebuild program menu" /usr/share/icons/gnome/16x16/actions/edit-find-replace.png /usr/share/icewm/startup
++separator
++menufile Programs folder programs.autogen
diff --git a/x11-wm/icewm/files/icewm-1.3.7-dso.patch b/x11-wm/icewm/files/icewm-1.3.7-dso.patch
new file mode 100644
index 000000000000..55100d5f62a6
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-1.3.7-dso.patch
@@ -0,0 +1,10 @@
+--- configure.in.old	2011-11-23 15:44:52.121654867 +0200
++++ configure.in	2011-11-23 15:47:09.514411391 +0200
+@@ -494,6 +494,7 @@
+     AC_DEFINE(CONFIG_COREFONTS, 1, [Define to enable X11 core conts.])
+     features="${features} corefonts"
+   fi
++  CORE_LIBS="${CORE_LIBS} -lfontconfig"
+ 
+ dnl ============================================================= GUI Events ===
+ dnl
diff --git a/x11-wm/icewm/files/icewm-1.3.7-gcc44.patch b/x11-wm/icewm/files/icewm-1.3.7-gcc44.patch
new file mode 100644
index 000000000000..d500f64004bc
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-1.3.7-gcc44.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/show_bug.cgi?id=376451
+
+--- a/src/wmapp.cc
++++ b/src/wmapp.cc
+@@ -337,7 +337,7 @@
+             char ** fontPath(XGetFontPath(xapp->display(), &ndirs));
+ 
+             char ** newFontPath = new char *[ndirs + 1];
+-            newFontPath[ndirs] = fontsdir;
++            newFontPath[ndirs] = (char *)fontsdir;
+ 
+             if (fontPath)
+                 memcpy(newFontPath, fontPath, ndirs * sizeof (char *));
diff --git a/x11-wm/icewm/files/icewm-1.3.7-menuiconsize.patch b/x11-wm/icewm/files/icewm-1.3.7-menuiconsize.patch
new file mode 100644
index 000000000000..d051d5bc5f19
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-1.3.7-menuiconsize.patch
@@ -0,0 +1,73 @@
+diff -Naur icewm-1.3.7.bak/src/yicon.cc icewm-1.3.7/src/yicon.cc
+--- icewm-1.3.7.bak/src/yicon.cc	2010-10-31 15:09:36.000000000 +0100
++++ icewm-1.3.7/src/yicon.cc	2011-11-07 19:41:52.841910531 +0100
+@@ -270,6 +270,10 @@
+         iconCache.getItem(0)->removeFromCache();
+ }
+ 
++int YIcon::menuSize() {
++    return menuIconSize;
++}
++
+ int YIcon::smallSize() {
+     return smallIconSize;
+ }
+diff -Naur icewm-1.3.7.bak/src/yicon.h icewm-1.3.7/src/yicon.h
+--- icewm-1.3.7.bak/src/yicon.h	2010-10-31 15:09:36.000000000 +0100
++++ icewm-1.3.7/src/yicon.h	2011-11-07 19:41:28.555296033 +0100
+@@ -25,6 +25,7 @@
+     bool isCached() { return fCached; }
+     void setCached(bool cached) { fCached = cached; }
+ 
++    static int menuSize();
+     static int smallSize();
+     static int largeSize();
+     static int hugeSize();
+diff -Naur icewm-1.3.7.bak/src/ymenu.cc icewm-1.3.7/src/ymenu.cc
+--- icewm-1.3.7.bak/src/ymenu.cc	2010-10-31 15:09:36.000000000 +0100
++++ icewm-1.3.7/src/ymenu.cc	2011-11-07 19:42:40.498474049 +0100
+@@ -153,8 +153,8 @@
+ 
+ #ifndef LITE
+         if (getItem(selItem)->getIcon() != null &&
+-            YIcon::smallSize() > h)
+-            h = YIcon::smallSize();
++            YIcon::menuSize() > h)
++            h = YIcon::menuSize();
+ #endif
+ 
+         if (x <= int(width() - h - 4))
+@@ -1023,8 +1023,8 @@
+                     mitem->getIcon()->draw(g,
+                                l + 1 + delta, t + delta + top + pad +
+                                (eh - top - pad * 2 - bottom -
+-                                YIcon::smallSize()) / 2,
+-                                YIcon::smallSize());
++                                YIcon::menuSize()) / 2,
++                                YIcon::menuSize());
+ #endif
+                 }
+ 
+diff -Naur icewm-1.3.7.bak/src/ymenuitem.cc icewm-1.3.7/src/ymenuitem.cc
+--- icewm-1.3.7.bak/src/ymenuitem.cc	2010-10-31 15:09:36.000000000 +0100
++++ icewm-1.3.7/src/ymenuitem.cc	2011-11-07 19:50:04.458316916 +0100
+@@ -86,8 +86,8 @@
+         int ih = fontHeight;
+ 
+ #ifndef LITE
+-        if (YIcon::smallSize() > ih)
+-            ih = YIcon::smallSize();
++        if (YIcon::menuSize() > ih)
++            ih = YIcon::menuSize();
+ #endif
+ 
+         if (wmLook == lookWarp4 || wmLook == lookWin95) {
+@@ -123,7 +123,7 @@
+     return 0;
+ #else
+     ref<YIcon> icon = getIcon();
+-    return icon != null ? YIcon::smallSize(): 0;
++    return icon != null ? YIcon::menuSize(): 0;
+ #endif
+ }
+ 
diff --git a/x11-wm/icewm/files/icewm-1.3.7-thermal.patch b/x11-wm/icewm/files/icewm-1.3.7-thermal.patch
new file mode 100644
index 000000000000..f6b2cf71f0f5
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-1.3.7-thermal.patch
@@ -0,0 +1,41 @@
+diff -uprN a/src/acpustatus.cc b/src/acpustatus.cc
+--- a/src/acpustatus.cc	2010-10-31 15:09:36.000000000 +0100
++++ b/src/acpustatus.cc	2013-01-17 21:12:19.085715083 +0100
+@@ -315,6 +315,37 @@ int CPUStatus::getAcpiTemp(char *tempbuf
+         }
+         closedir(dir);
+     } 
++    else if ((dir = opendir("/sys/class/thermal")) != NULL) {
++        struct dirent *de;
++
++        while ((de = readdir(dir)) != NULL) {
++
++            int fd, seglen;
++
++            if (strcmp(de->d_name, ".") == 0 || strcmp(de->d_name, "..") == 0)
++                continue;
++
++            sprintf(namebuf, "/sys/class/thermal/%s/temp", de->d_name);
++            fd = open(namebuf, O_RDONLY);
++            if (fd != -1) {
++                int len = read(fd, buf, sizeof(buf) - 1);
++                buf[len - 4] = '\0';
++                seglen = strlen(buf) + 4;
++                if (retbuflen + seglen >= buflen) {
++                    retbuflen = -retbuflen;
++                    close(fd);
++                    closedir(dir);
++                    break;
++                }
++                retbuflen += seglen;
++                strcat(tempbuf, "  ");
++                strncat(tempbuf, buf, seglen);
++                strcat(tempbuf, " C");
++                close(fd);
++            }
++        }
++        closedir(dir);
++    }
+     return retbuflen;
+ }
+ 
diff --git a/x11-wm/icewm/files/icewm-1.3.8-build-fixes.patch b/x11-wm/icewm/files/icewm-1.3.8-build-fixes.patch
new file mode 100644
index 000000000000..cec27a79ad0a
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-1.3.8-build-fixes.patch
@@ -0,0 +1,113 @@
+--- icewm-1.3.8/Makefile.in
++++ icewm-1.3.8/Makefile.in
+@@ -35,7 +35,7 @@
+ 
+ ################################################################################
+ 
+-BINFILES    = @BINFILES@ icewm-set-gnomewm
++BINFILES    = @BINFILES@ "$(srcdir)/icewm-set-gnomewm"
+ LIBFILES    = lib/preferences lib/winoptions lib/keys \
+               lib/menu lib/toolbar # lib/programs
+ DOCFILES    = README BUGS CHANGES COPYING AUTHORS INSTALL VERSION icewm.lsm
+@@ -83,21 +83,23 @@
+ 	@echo ------------------------------------------
+ 	@echo "Installing binaries in $(DESTDIR)$(BINDIR)"
+ 	@$(INSTALLDIR) "$(DESTDIR)$(BINDIR)"
++#generated files, relative to the build directory
+ 	@for bin in $(BINFILES); do \
+              $(INSTALLBIN) "$${bin}" "$(DESTDIR)$(BINDIR)"; \
+          done
+ 	
+ 	@echo "Installing presets and icons in $(DESTDIR)$(LIBDIR)"
+ 	@$(INSTALLDIR) "$(DESTDIR)$(LIBDIR)"
++# data files from the source directory
+ 	#-@$(INSTALLDIR) "$(DESTDIR)$(CFGDIR)"
+ 	@for lib in $(LIBFILES); do \
+-             $(INSTALLLIB) "$${lib}" "$(DESTDIR)$(LIBDIR)"; \
++             $(INSTALLLIB) "$(top_srcdir)/$${lib}" "$(DESTDIR)$(LIBDIR)"; \
+          done
+ 
+ 	@for xpmdir in $(XPMDIRS); do \
+-	     if test -d "lib/$${xpmdir}"; then \
++	     if test -d "$(top_srcdir)/lib/$${xpmdir}"; then \
+ 		$(INSTALLDIR) "$(DESTDIR)$(LIBDIR)/$${xpmdir}"; \
+-		for pixmap in "lib/$${xpmdir}/"*.xpm; do \
++		for pixmap in "$(top_srcdir)/lib/$${xpmdir}/"*.xpm; do \
+ 		    $(INSTALLLIB) "$${pixmap}" "$(DESTDIR)$(LIBDIR)/$${xpmdir}"; \
+ 		done; \
+ 	    fi; \
+--- icewm-1.3.8/po/Makefile.in
++++ icewm-1.3.8/po/Makefile.in
+@@ -20,6 +20,7 @@
+ XGETTEXT =	@XGETTEXT@
+ MSGMERGE =	@MSGMERGE@
+ MSGFMT =	@MSGFMT@
++VPATH = .:po:@srcdir@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .po .mo
+--- icewm-1.3.8/src/Makefile.in
++++ icewm-1.3.8/src/Makefile.in
+@@ -11,7 +11,7 @@
+ 
+ CXX =           @CXX@
+ HOSTCXX =       @HOSTCXX@
+-LD =            @CXX_LINK@
++LD =            gcc
+ HOSTLD =        @HOSTCXX_LINK@
+ EXEEXT =        @EXEEXT@
+ 
+@@ -32,12 +32,12 @@
+                 -DICEWMBGEXE='"icewmbg$(EXEEXT)"' \
+                 -DICESMEXE='"icewm-session$(EXEEXT)"' \
+                 -DICEHELPEXE='"icehelp$(EXEEXT)"' \
+-                -DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"'
++                -DICEHELPIDX='"$(DOCDIR)/icewm-common/icewm.html"'
+ 
+ CXXFLAGS =      @CXXFLAGS@ $(DEBUG) $(DEFS) `pkg-config gdk-pixbuf-xlib-2.0 --cflags` \
+ 	        @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ `pkg-config fontconfig --cflags`
+ LFLAGS =	@LDFLAGS@ 
+-LIBS =          @LIBS@ `pkg-config gdk-pixbuf-xlib-2.0 --libs` 
++LIBS =          @LIBS@ `pkg-config gdk-pixbuf-xlib-2.0 --libs` -lfontconfig -lm -lsupc++
+ 
+ CORE_LIBS =     @CORE_LIBS@ `pkg-config fontconfig --libs`
+ IMAGE_LIBS =    @IMAGE_LIBS@
+@@ -188,6 +188,8 @@
+ TESTCASES = @TESTCASES@
+ OBJECTS = @BASEOBJS@ @TESTOBJS@
+ BINARIES = @BASEBINS@ @TESTBINS@
++BASEOBJS = @BASEOBJS@
++VPATH = .:@srcdir@
+ 
+ ################################################################################
+ 
+@@ -205,7 +207,8 @@
+ 	@echo "  CXX     " $@
+ 	@$(CXX) $(CXXFLAGS) $(GCCDEP) -c $<
+ 
+-$(BINARIES):
++$(BINARIES): $(BASEOBJS)
++#	@$(MAKE) --no-print-directory build-dep DEPLIST="$($(@:$(EXEEXT)=)_OBJS)"
+ 	@echo "  LD      " $@
+ 	@$(LD) -o $@ $($(@:$(EXEEXT)=)_OBJS) $(LFLAGS) $($(@:$(EXEEXT)=)_LFLAGS) $(LIBS) $($(@:$(EXEEXT)=)_LIBS)
+ 
+@@ -217,6 +220,8 @@
+ 	@echo "  HOSTLD  " $@
+ 	@$(HOSTLD) -o $@ $(genpref_OBJS)
+ 
++build-dep: $(DEPLIST)
++
+ ################################################################################
+ 
+ gnome2.o: gnome2.cc
+--- icewm-1.3.8/src/WinMgr.h
++++ icewm-1.3.8/src/WinMgr.h
+@@ -128,7 +128,7 @@
+  * this where WIN_WORKSPACE_COUNT comes into play.
+  */
+ 
+-#define WinWorkspaceInvalid    (-1L)
++#define WinWorkspaceInvalid    ((unsigned long)-1)
+ 
+ /* workspaces */
+ #define XA_WIN_WORKSPACES "_WIN_WORKSPACES"
diff --git a/x11-wm/icewm/files/icewm-1.3.8-deprecated.patch b/x11-wm/icewm/files/icewm-1.3.8-deprecated.patch
new file mode 100644
index 000000000000..b956180627bc
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-1.3.8-deprecated.patch
@@ -0,0 +1,12 @@
+--- icewm-1.3.8/src/base.h
++++ icewm-1.3.8/src/base.h
+@@ -2,7 +2,9 @@
+ #define __BASE_H
+ 
+ #if ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3
++#if ( __GNUC__ == 4 && __GNUC_MINOR__ > 7 ) || __GNUC__ > 3
+ #define _icewm_deprecated __attribute__((deprecated))
++#endif
+ #else
+ #define _icewm_deprecated
+ #endif
diff --git a/x11-wm/icewm/files/icewm-1.3.8-menu.patch b/x11-wm/icewm/files/icewm-1.3.8-menu.patch
new file mode 100644
index 000000000000..e4bab5c5ffc3
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-1.3.8-menu.patch
@@ -0,0 +1,23 @@
+--- icewm-1.3.8/lib/menu.in
++++ icewm-1.3.8/lib/menu.in
+@@ -4,15 +4,9 @@
+ # since modifications to this file will be discarded when you
+ # (re)install icewm.
+ #
+-prog xterm xterm xterm
+-prog rxvt xterm rxvt -bg black -cr green -fg white -C -fn 9x15 -sl 500
+-prog fte fte fte
+-prog NEdit nedit nedit
+-prog Mozilla mozilla mozilla
+-prog XChat xchat xchat
+-prog Gimp gimp gimp
++prog xterm /usr/share/icons/gnome/16x16/apps/terminal.png xterm
++prog "Web browser" /usr/share/icons/gnome/16x16/apps/web-browser.png xdg-open about:blank
+ separator
+-menuprog Gnome folder icewm-menu-gnome2 --list @CONFIG_GNOME2_MENU_DIR@
+-menuprog KDE folder icewm-menu-gnome@GNOME_VER@ --list @CONFIG_KDE_MENU_DIR@
+-menufile Programs folder programs
+-menufile Tool_bar folder toolbar
++prog "Rebuild program menu" /usr/share/icons/gnome/16x16/actions/edit-find-replace.png /usr/share/icewm/startup
++separator
++menufile Programs folder programs.autogen
diff --git a/x11-wm/icewm/files/icewm-1.3.8-uclibc.patch b/x11-wm/icewm/files/icewm-1.3.8-uclibc.patch
new file mode 100644
index 000000000000..e790842faed8
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-1.3.8-uclibc.patch
@@ -0,0 +1,64 @@
+diff -Naur icewm-1.3.7.orig/configure.in icewm-1.3.7/configure.in
+--- icewm-1.3.7.orig/configure.in	2010-10-31 10:09:37.000000000 -0400
++++ icewm-1.3.7/configure.in	2013-10-19 06:20:22.947520430 -0400
+@@ -113,6 +113,7 @@
+ AC_CHECK_HEADERS(libgen.h)	dnl --  basename() for FreeBSD
+ AC_CHECK_HEADERS(machine/apmvar.h)
+ AC_CHECK_HEADERS(machine/apm_bios.h)
++AC_CHECK_HEADERS(execinfo.h)
+ 
+ AC_CHECK_HEADERS(kstat.h,
+   [ CORE_LIBS="${CORE_LIBS} -lkstat"
+diff -Naur icewm-1.3.7.orig/src/acpustatus.cc icewm-1.3.7/src/acpustatus.cc
+--- icewm-1.3.7.orig/src/acpustatus.cc	2010-10-31 10:09:36.000000000 -0400
++++ icewm-1.3.7/src/acpustatus.cc	2013-10-19 06:20:18.355519888 -0400
+@@ -25,17 +25,12 @@
+ #include "sysdep.h"
+ #include "default.h"
+ 
+-#if defined(linux)
+-//#include <linux/kernel.h>
+-#include <sys/sysinfo.h>
+-#endif
+ #if defined(sun) && defined(SVR4)
+ #include <sys/loadavg.h>
+ #endif
+ #ifdef HAVE_KSTAT_H
+ #include <sys/resource.h>
+ #include <kstat.h>
+-#include <sys/sysinfo.h>
+ #endif
+ 
+ #ifdef HAVE_SYS_PARAM_H
+@@ -56,6 +51,10 @@
+ #include <dirent.h>
+ #include "intl.h"
+ 
++#if defined(linux) || defined(HAVE_KSTAT_H)
++#include <sys/sysinfo.h>
++#endif
++
+ #if (defined(linux) || defined(HAVE_KSTAT_H)) || defined(HAVE_SYSCTL_CP_TIME)
+ 
+ extern ref<YPixmap> taskbackPixmap;
+diff -Naur icewm-1.3.7.orig/src/misc.cc icewm-1.3.7/src/misc.cc
+--- icewm-1.3.7.orig/src/misc.cc	2010-10-31 10:09:36.000000000 -0400
++++ icewm-1.3.7/src/misc.cc	2013-10-19 06:20:22.947520430 -0400
+@@ -15,7 +15,7 @@
+ #include <libgen.h>
+ #endif
+ 
+-#ifdef linux
++#if defined(linux) && defined(HAVE_EXECINFO_H)
+ #include <execinfo.h>
+ #endif
+ 
+@@ -503,7 +503,7 @@
+ }
+ 
+ void show_backtrace() {
+-#ifdef linux
++#if defined(linux) && defined(HAVE_EXECINFO_H)
+     const char head[] = "\nbacktrace:\n";
+     const char tail[] = "end\n";
+     void *array[20];
diff --git a/x11-wm/icewm/files/icewm-defaults.patch b/x11-wm/icewm/files/icewm-defaults.patch
new file mode 100644
index 000000000000..72e5410db4fe
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-defaults.patch
@@ -0,0 +1,13 @@
+--- src/default.h.old	2011-11-23 18:04:22.429626938 +0200
++++ src/default.h	2011-11-23 18:04:38.416824083 +0200
+@@ -161,8 +161,8 @@
+ #endif
+ 
+ XSV(const char *, mailBoxPath,                  0)
+-XSV(const char *, mailCommand,                  "xterm -name pine -title PINE -e pine")
+-XSV(const char *, mailClassHint,                "pine.XTerm")
++XSV(const char *, mailCommand,                  "xterm -name alpine -title ALPINE -e alpine")
++XSV(const char *, mailClassHint,                "alpine.XTerm")
+ XSV(const char *, newMailCommand,               0)
+ XSV(const char *, lockCommand,                  0)
+ XSV(const char *, clockCommand,                 "xclock -name icewm -title Clock")
diff --git a/x11-wm/icewm/files/icewm-fribidi.patch b/x11-wm/icewm/files/icewm-fribidi.patch
new file mode 100644
index 000000000000..66691d78a3ff
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-fribidi.patch
@@ -0,0 +1,83 @@
+--- src/yfontxft.cc.old	2009-09-25 00:07:51.000000000 +0300
++++ src/yfontxft.cc	2009-09-25 00:18:09.000000000 +0300
+@@ -6,6 +6,11 @@
+ #include "ypaint.h"
+ #include "yxapp.h"
+ #include "intl.h"
++#include <stdio.h>
++
++#ifdef CONFIG_FRIBIDI
++    #include <fribidi/fribidi.h>
++#endif
+ 
+ /******************************************************************************/
+ 
+@@ -68,10 +73,45 @@
+                            char_t * str, size_t len)
+     {
+         XftColor *c = *g.color();
++
++#ifdef CONFIG_FRIBIDI
++
++#define STATIS_STRING_SIZE	256
++
++		// Based around upstream (1.3.2) patch with some optimization
++		//   on my end. (reduce unnecessary memory allocation)
++		// - Gilboa
++
++		char_t static_str[STATIS_STRING_SIZE];
++		char_t *vis_str = static_str;
++
++		if (len >= STATIS_STRING_SIZE)
++		{
++			vis_str = new char_t[len+1];
++			if (!vis_str)
++				return;
++		}
++
++		FriBidiCharType pbase_dir = FRIBIDI_TYPE_N;
++		fribidi_log2vis(str, len, &pbase_dir, //input
++						vis_str, // output
++						NULL, NULL, NULL // "statistics" that we don't need
++						);
++		str = vis_str;
++#endif
++
+         XftDrawString(g.handleXft(), c, font,
+                       x - g.xorigin(),
+                       y - g.yorigin(),
+                       str, len);
++
++#ifdef CONFIG_FRIBIDI
++
++		if (vis_str != static_str)
++			delete[] str;
++
++#endif
++
+     }
+ 
+     static void textExtents(XftFont * font, char_t * str, size_t len,
+--- configure.in.old	2009-09-25 00:05:08.000000000 +0300
++++ configure.in	2009-09-25 00:07:14.000000000 +0300
+@@ -307,6 +307,20 @@
+       features="${features} i18n"
+ fi
+ 
++dnl =================================================== Right to left support ===
++dnl
++AC_ARG_ENABLE(fribidi,
++  [  --disable-fribidi       Disable right to left support])
++      
++if test "$enable_fribidi" != "no" && test "$enable_i18n" != "no"; then
++  PKG_CHECK_MODULES(FRIBIDI, fribidi)
++
++  AC_DEFINE(CONFIG_FRIBIDI,1, [Define to enable fribidi support])
++        
++  CORE_CFLAGS="${CORE_CFLAGS} ${FRIBIDI_CFLAGS}"
++  CORE_LIBS="${CORE_LIBS} ${FRIBIDI_LIBS}"
++fi
++
+ dnl ============================================================ NLS Support ===
+ dnl
+ AC_ARG_ENABLE(nls,
diff --git a/x11-wm/icewm/files/icewm-keys.patch b/x11-wm/icewm/files/icewm-keys.patch
new file mode 100644
index 000000000000..7e136bb93288
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-keys.patch
@@ -0,0 +1,43 @@
+--- icewm-1.2.30/lib/keys.in.old	2007-01-18 13:55:20.000000000 +0200
++++ icewm-1.2.30/lib/keys.in	2007-01-18 16:07:07.000000000 +0200
+@@ -9,28 +9,21 @@
+ # You'll have to omit XK_ prefixs and to replace XF86XK_ prefixes by
+ # XF86. Valid modifiers are Alt, Ctrl, Shift, Meta, Super and Hyper.
+ #
+-key "Alt+Ctrl+t"		xterm
+-key "Alt+Ctrl+f"		fte
+-key "Alt+Ctrl+e"		nedit
+-key "Alt+Ctrl+g"		gimp
+-key "Alt+Ctrl+n"		netscape -noraise -remote openBrowser
+-key "Alt+Ctrl+b"		netscape -noraise -remote openBookmarks
+-key "Alt+Ctrl+m"		netscape -noraise -remote openURL(mailto:,new-window) 
++key "Alt+Ctrl+t"			xterm
++key "Alt+Ctrl+b"			xdg-open about:blank
++key "Alt+Ctrl+s"			xdg-open http://www.google.com
+ 
+-key "Alt+Ctrl+KP_Divide"	aumix -v -5		# lower volume
+-key "Alt+Ctrl+KP_Multiply"	aumix -v +5		# raise volume
++key "Super+KP_Subtract"		amixer sset PCM 5%-
++key "Super+KP_Add"			amixer sset PCM 5%+
+ 
+ # "Multimedia key" bindings for XFree86. Gather the keycodes of your
+ # advanced function keys by watching the output of the xev command whilest
+ # pressing those keys and map those symbols by using xmodmap.
+ 
+-key "XF86Standby"		killall -QUIT icewm
+-key "XF86AudioLowerVolume"	aumix -v -5
+-key "XF86AudioRaiseVolume"	aumix -v +5
+-key "XF86AudioMute"		aumix -v 0
+-key "XF86AudioPlay"		cdplay play 1
+-key "XF86AudioStop"		cdplay stop
+-key "XF86HomePage"		netscape -noraise -remote openHomepage
+-key "XF86Mail"			netscape -noraise -remote openURL(mailto:,new-window) 
+-key "XF86Search"		netscape -noraise -remote openURL(http://www.google.com/)
+-key "XF86Eject"			eject
++key "XF86Standby"			killall -QUIT icewm
++key "XF86AudioLowerVolume"	amixer sset PCM 5%-
++key "XF86AudioRaiseVolume"	amixer sset PCM 5%+
++key "XF86AudioMute"			amixer sset PCM 0%
++key "XF86HomePage"			xdg-open about:blank
++key "XF86Search"			xdg-open http://www.google.com
++key "XF86Eject"				eject
diff --git a/x11-wm/icewm/files/icewm-startup b/x11-wm/icewm/files/icewm-startup
new file mode 100644
index 000000000000..048ab5938486
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-startup
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ ! -d ~/.icewm ] && mkdir ~/.icewm
+XDG_MENU_PREFIX="gnome-" icewm-xdg-menu --entire-menu --with-theme-paths --icon-size 16 --theme gnome > ~/.icewm/programs.autogen
+
diff --git a/x11-wm/icewm/files/icewm-toolbar.patch b/x11-wm/icewm/files/icewm-toolbar.patch
new file mode 100644
index 000000000000..a6f0f15f52d3
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-toolbar.patch
@@ -0,0 +1,12 @@
+--- icewm-1.2.30/lib/toolbar.in.old	2007-01-18 18:51:55.000000000 +0200
++++ icewm-1.3.7/lib/toolbar.in	2012-06-10 09:36:00.000000000 +0200
+@@ -4,6 +4,6 @@
+ # since modifications to this file will be discarded when you
+ # (re)install icewm.
+ #
+-prog XTerm xterm xterm
+-prog FTE fte fte
+-prog Netscape netscape netscape
++prog xterm /usr/share/icons/gnome/16x16/apps/terminal.png xterm
++prog "Web browser" /usr/share/icons/gnome/16x16/apps/web-browser.png xdg-open about:blank
++
diff --git a/x11-wm/icewm/files/icewm-xdg-menu b/x11-wm/icewm/files/icewm-xdg-menu
new file mode 100644
index 000000000000..529f9e2ab3b4
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-xdg-menu
@@ -0,0 +1,128 @@
+#!/usr/bin/python2
+"""
+This script generates FreeDesktop application menu for IceWM window manager.
+
+Written by Konstantin Korikov <lostclus@ua.fm>, put in the public domain
+
+Requires pyxdg http://cvs.freedesktop.org/cgi-bin/viewcvs.cgi/pyxdg/
+
+USAGE EXAMPLE
+
+Add to $HOME/.icewm/menu this line:
+
+	menuprog Applications - icewm-xdg-menu
+
+and restart IceWM.
+"""
+
+import sys
+import locale
+import getopt
+import re
+import xdg.Menu
+import xdg.DesktopEntry
+import xdg.IconTheme
+import xdg.Config
+
+version = "0.3"
+
+def print_usage(exit_code = 1):
+  print """Usage: %s [options]
+Options:
+  --locale=locale               set output languege and encoding
+  --root-folder folder          folder to generate (for example: /Games)
+  --terminal command            set terminal emulator command (default: xterm -e %%s)
+  --default-folder-icon icon    icon for folders that not provide Icon option
+  --default-entry-icon icon     icon for entries that not provide Icon option
+  --with-theme-paths            convert icon base names to icon absolute paths
+                                using icon theme
+  --entire-menu                 print entire menu
+  --icon-size                   set default icon size
+  --theme theme                 set icon theme
+  --help                        print this help and exit
+  --version                     print version and exit
+""" % sys.argv[0]
+  sys.exit(exit_code)
+  
+def print_version():
+  print "%s version %s" % (
+    os.path.basename(sys.argv[0]), version)
+  sys.exit(0)
+
+root_folder = ""
+terminal = "xterm -e %s"
+default_folder_icon = "folder"
+default_entry_icon = "-"
+entire_menu = False
+with_theme_paths = False
+icon_size = 16
+
+exec_clean1_re = re.compile(r'%[a-zA-Z]')
+exec_clean2_re = re.compile(r'%%')
+encoding = None
+locale_str = None
+
+def find_icon(entry):
+  icon = entry.getIcon()
+  if icon and with_theme_paths:
+    icon = xdg.IconTheme.getIconPath(icon, icon_size) or icon
+  return icon
+
+def process_menu(menu):
+  for entry in menu.getEntries():
+    if isinstance(entry, xdg.Menu.Menu):
+      name = entry.getName() or entry.DesktopFileID
+      icon = find_icon(entry) or default_folder_icon
+
+      if entire_menu:
+        print ("menu \"%s\" \"%s\" {" % (name, icon)).encode(encoding)
+        process_menu(entry)
+        print "}".encode(encoding)
+      else:
+        print (("menuprog \"%s\" \"%s\" %s" % (name, icon, sys.argv[0])) +
+            (" --root-folder \"%s\"" % entry.getPath(org=True)) +
+            (" --terminal \"%s\"" % terminal) +
+            (" --default-folder-icon \"%s\"" % default_folder_icon) +
+            (" --default-entry-icon \"%s\"" % default_entry_icon) +
+            (" --theme \"%s\"" % xdg.Config.icon_theme) +
+            (" --icon-size \"%d\"" % icon_size) +
+            (with_theme_paths and " --with-theme-paths" or "")).encode(encoding),
+        if locale_str:
+          print (" --locale \"%s\"" % locale_str).encode(encoding),
+        print
+    elif isinstance(entry, xdg.Menu.MenuEntry):
+      de = entry.DesktopEntry
+      name = de.getName() or entry.DesktopFileID
+      icon = find_icon(de) or default_entry_icon
+      execute = exec_clean2_re.sub('%', exec_clean1_re.sub('', de.getExec()))
+      if de.getTerminal(): execute = terminal % execute      
+      print ("prog \"%s\" \"%s\" %s" % (name, icon, execute)).encode(encoding)
+
+try: opts, args = getopt.getopt(sys.argv[1:], "", 
+  ("help", "version", "locale=",
+   "root-folder=", "terminal=", "default-folder-icon=", 
+   "default-entry-icon=", "entire-menu", "theme=", "with-theme-paths",
+   "icon-size="))
+except getopt.GetoptError: print_usage()
+
+locale.setlocale(locale.LC_ALL, "")
+
+for o, v in opts:
+  if o == "--locale":
+    locale_str = v
+    locale.setlocale(locale.LC_ALL, locale_str)
+  if o == "--root-folder": root_folder = v
+  elif o == "--terminal": terminal = v
+  elif o == "--default-folder-icon": default_folder_icon = v
+  elif o == "--default-entry-icon": default_entry_icon = v
+  elif o == "--entire-menu" : entire_menu = True
+  elif o == "--with-theme-paths" : with_theme_paths = True
+  elif o == "--icon-size": icon_size = int(v)
+  elif o == "--theme" : xdg.Config.setIconTheme(v)
+  elif o in ("-h", "-?", "--help"): print_usage(0)
+  elif o in ("-v", "--version"): print_version()
+
+encoding = locale.getlocale()[1] or 'UTF-8'
+menu = xdg.Menu.parse()
+if root_folder: menu = menu.getMenu(root_folder)
+process_menu(menu)
diff --git a/x11-wm/icewm/icewm-1.3.12-r1.ebuild b/x11-wm/icewm/icewm-1.3.12-r1.ebuild
new file mode 100644
index 000000000000..37e3971bb7e2
--- /dev/null
+++ b/x11-wm/icewm/icewm-1.3.12-r1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils
+
+DESCRIPTION="Ice Window Manager with Themes"
+HOMEPAGE="http://www.icewm.org/ https://github.com/bbidulock/icewm"
+LICENSE="GPL-2"
+SRC_URI="https://github.com/bbidulock/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="bidi debug doc minimal nls truetype uclibc xinerama"
+
+# Tests broken in all versions, patches welcome, bug #323907, #389533
+RESTRICT="test"
+
+#fix for icewm preversion package names
+S="${WORKDIR}/${P/_}"
+
+RDEPEND="
+	media-libs/fontconfig
+	x11-libs/gdk-pixbuf:2[X]
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXpm
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	bidi? ( dev-libs/fribidi )
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="
+	${RDEPEND}
+	>=sys-apps/sed-4
+	x11-proto/xextproto
+	x11-proto/xproto
+	doc? ( app-text/linuxdoc-tools )
+	nls? ( >=sys-devel/gettext-0.19.6 )
+	truetype? ( >=media-libs/freetype-2.0.9 )
+	xinerama? ( x11-proto/xineramaproto )
+"
+
+pkg_setup() {
+	if use truetype && use minimal ; then
+		ewarn "You have both 'truetype' and 'minimal' use flags enabled."
+		ewarn "If you really want a minimal install, you will have to turn off"
+		ewarn "the truetype flag for this package."
+	fi
+}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.10-menu.patch
+)
+
+src_prepare() {
+	# Fix bug #486710
+	use uclibc && PATCHES+=( "${FILESDIR}/${PN}-1.3.8-uclibc.patch" )
+
+	default
+
+	if ! use doc ; then
+		sed '/^SUBDIRS =/s@ doc@@' -i Makefile.am || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=()
+	if use truetype ; then
+		myconf=(
+			--enable-gradients
+			--enable-shape
+			--enable-shaped-decorations
+		)
+	else
+		myconf=(
+			--disable-xfreetype
+			--enable-corefonts
+			$(use_enable minimal lite)
+		)
+	fi
+
+	myconf+=(
+		--disable-menus-gnome2
+		--with-libdir=/usr/share/icewm
+		--with-cfgdir=/etc/icewm
+		--with-docdir=/usr/share/doc/${PF}/html
+		$(use_enable bidi fribidi)
+		$(use_enable debug)
+		$(use_enable nls i18n)
+		$(use_enable nls)
+		$(use_enable xinerama)
+	)
+
+	CXXFLAGS="${CXXFLAGS}" econf "${myconf[@]}"
+
+	sed -i "s:/icewm-\$(VERSION)::" src/Makefile || die
+	sed -i "s:ungif:gif:" src/Makefile || die "libungif fix failed"
+}
+
+src_install(){
+	local DOCS=( AUTHORS BUGS CHANGES PLATFORMS README.md TODO VERSION )
+
+	default
+
+	if ! use doc ; then
+		docinto html
+		dodoc doc/*.sgml
+		cp doc/${PN}.man "${T}"/${PN}.1 || die
+		doman "${T}"/${PN}.1
+	fi
+
+	exeinto /etc/X11/Sessions
+	doexe "${FILESDIR}/icewm"
+}
diff --git a/x11-wm/icewm/icewm-1.3.8.ebuild b/x11-wm/icewm/icewm-1.3.8.ebuild
new file mode 100644
index 000000000000..4d76d35485f6
--- /dev/null
+++ b/x11-wm/icewm/icewm-1.3.8.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils python-single-r1
+
+DESCRIPTION="Ice Window Manager with Themes"
+HOMEPAGE="http://www.icewm.org/"
+LICENSE="GPL-2"
+SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
+IUSE="bidi debug gnome minimal nls truetype uclibc xinerama"
+REQUIRED_USE="gnome? ( ${PYTHON_REQUIRED_USE} )"
+
+# Tests broken in all versions, patches welcome, bug #323907, #389533
+RESTRICT="test"
+
+#fix for icewm preversion package names
+S=${WORKDIR}/${P/_}
+
+RDEPEND="
+	x11-libs/gdk-pixbuf:2[X]
+	x11-libs/libX11
+	x11-libs/libXrandr
+	x11-libs/libXext
+	x11-libs/libXpm
+	x11-libs/libXrender
+	x11-libs/libXft
+	x11-libs/libSM
+	x11-libs/libICE
+	xinerama? ( x11-libs/libXinerama )
+	bidi? ( dev-libs/fribidi )
+	gnome? (
+		${PYTHON_DEPS}
+		dev-python/pyxdg
+		gnome-base/gnome-desktop:2
+		gnome-base/gnome-menus
+		gnome-base/libgnomeui )
+	nls? ( sys-devel/gettext )
+	truetype? ( >=media-libs/freetype-2.0.9 )
+	media-libs/giflib
+"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	x11-proto/xextproto
+	xinerama? ( x11-proto/xineramaproto )
+	>=sys-apps/sed-4
+"
+
+pkg_setup() {
+	if use truetype && use minimal; then
+		ewarn "You have both 'truetype' and 'minimal' use flags enabled."
+		ewarn "If you really want a minimal install, you will have to turn off"
+		ewarn "the truetype flag for this package."
+	fi
+}
+
+src_prepare() {
+	# Fedora patches
+	epatch "${FILESDIR}"/${PN}-1.3.8-menu.patch
+	epatch "${FILESDIR}"/${PN}-toolbar.patch
+	epatch "${FILESDIR}"/${PN}-keys.patch
+	epatch "${FILESDIR}"/${PN}-fribidi.patch
+	epatch "${FILESDIR}"/${PN}-1.3.7-dso.patch
+	epatch "${FILESDIR}"/${PN}-defaults.patch
+	epatch "${FILESDIR}"/${PN}-1.3.7-menuiconsize.patch
+	epatch "${FILESDIR}"/${PN}-1.3.8-deprecated.patch
+
+	epatch "${FILESDIR}"/${PN}-1.3.7-gcc44.patch
+
+	# Get thermal info from proper locations, bug #452730
+	epatch "${FILESDIR}"/${PN}-1.3.7-thermal.patch
+
+	# Debian patch fixing multiple build issues, like bug #470148
+	epatch "${FILESDIR}"/${PN}-1.3.8-build-fixes.patch
+
+	# Fix bug #486710
+	use uclibc && epatch "${FILESDIR}/${P}-uclibc.patch"
+
+	eautoreconf
+}
+
+src_configure() {
+	if use truetype
+	then
+		myconf="${myconf} --enable-gradients --enable-shape --enable-shaped-decorations"
+	else
+		myconf="${myconf} --disable-xfreetype --enable-corefonts
+			$(use_enable minimal lite)"
+	fi
+
+	myconf="${myconf}
+		--with-libdir=/usr/share/icewm
+		--with-cfgdir=/etc/icewm
+		--with-docdir=/usr/share/doc/${PF}/html
+		$(use_enable bidi fribidi)
+		$(use_enable debug)
+		$(use_enable gnome menus-gnome2)
+		$(use_enable nls i18n)
+		$(use_enable nls)
+		$(use_enable x86 x86-asm)
+		$(use_enable xinerama)
+		--without-esd-config"
+
+	CXXFLAGS="${CXXFLAGS}" econf ${myconf}
+
+	sed -i "s:/icewm-\$(VERSION)::" src/Makefile || die "patch failed"
+	sed -i "s:ungif:gif:" src/Makefile || die "libungif fix failed"
+}
+
+src_install(){
+	default
+
+	if use gnome; then
+		dobin "${FILESDIR}"/icewm-xdg-menu
+		exeinto /usr/share/icewm/
+		newexe "${FILESDIR}"/icewm-startup startup
+	fi
+
+	dodoc AUTHORS BUGS CHANGES PLATFORMS README* TODO VERSION
+	dohtml -a html,sgml doc/*
+
+	exeinto /etc/X11/Sessions
+	doexe "${FILESDIR}/icewm"
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}/IceWM.desktop"
+}
diff --git a/x11-wm/icewm/icewm-1.4.0.ebuild b/x11-wm/icewm/icewm-1.4.0.ebuild
new file mode 100644
index 000000000000..6ccb181652d1
--- /dev/null
+++ b/x11-wm/icewm/icewm-1.4.0.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils
+
+DESCRIPTION="Ice Window Manager with Themes"
+HOMEPAGE="http://www.icewm.org/ https://github.com/bbidulock/icewm"
+LICENSE="GPL-2"
+SRC_URI="https://github.com/bbidulock/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="bidi debug doc minimal nls truetype uclibc xinerama"
+
+# Tests broken in all versions, patches welcome, bug #323907, #389533
+RESTRICT="test"
+
+#fix for icewm preversion package names
+S="${WORKDIR}/${P/_}"
+
+RDEPEND="
+	media-libs/fontconfig
+	x11-libs/gdk-pixbuf:2[X]
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXpm
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	bidi? ( dev-libs/fribidi )
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="
+	${RDEPEND}
+	>=sys-apps/sed-4
+	x11-proto/xextproto
+	x11-proto/xproto
+	doc? ( app-text/linuxdoc-tools )
+	nls? ( >=sys-devel/gettext-0.19.6 )
+	truetype? ( >=media-libs/freetype-2.0.9 )
+	xinerama? ( x11-proto/xineramaproto )
+"
+
+pkg_setup() {
+	if use truetype && use minimal ; then
+		ewarn "You have both 'truetype' and 'minimal' use flags enabled."
+		ewarn "If you really want a minimal install, you will have to turn off"
+		ewarn "the truetype flag for this package."
+	fi
+}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.10-menu.patch
+)
+
+src_prepare() {
+	# Fix bug #486710
+	use uclibc && PATCHES+=( "${FILESDIR}/${PN}-1.3.8-uclibc.patch" )
+
+	default
+
+	if ! use doc ; then
+		sed '/^SUBDIRS =/s@ doc@@' -i Makefile.am || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--disable-menus-gnome2
+		--with-libdir=/usr/share/icewm
+		--with-cfgdir=/etc/icewm
+		--with-docdir=/usr/share/doc/${PF}/html
+		$(use_enable bidi fribidi)
+		$(use_enable debug)
+		$(use_enable nls i18n)
+		$(use_enable nls)
+		$(use_enable xinerama)
+	)
+	if use truetype ; then
+		myconf+=(
+			--enable-gradients
+			--enable-shape
+			--enable-shaped-decorations
+		)
+	else
+		myconf+=(
+			--disable-xfreetype
+			--enable-corefonts
+			$(use_enable minimal lite)
+		)
+	fi
+
+	CXXFLAGS="${CXXFLAGS}" econf "${myconf[@]}"
+
+	sed -i "s:/icewm-\$(VERSION)::" src/Makefile || die
+	sed -i "s:ungif:gif:" src/Makefile || die "libungif fix failed"
+}
+
+src_install(){
+	local DOCS=( AUTHORS BUGS CHANGES PLATFORMS README.md TODO VERSION )
+
+	default
+
+	if ! use doc ; then
+		cp doc/${PN}.man "${T}"/${PN}.1 || die
+		doman "${T}"/${PN}.1
+	fi
+
+	exeinto /etc/X11/Sessions
+	doexe "${FILESDIR}/icewm"
+}
diff --git a/x11-wm/icewm/icewm-1.4.2.ebuild b/x11-wm/icewm/icewm-1.4.2.ebuild
new file mode 100644
index 000000000000..6ccb181652d1
--- /dev/null
+++ b/x11-wm/icewm/icewm-1.4.2.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils
+
+DESCRIPTION="Ice Window Manager with Themes"
+HOMEPAGE="http://www.icewm.org/ https://github.com/bbidulock/icewm"
+LICENSE="GPL-2"
+SRC_URI="https://github.com/bbidulock/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="bidi debug doc minimal nls truetype uclibc xinerama"
+
+# Tests broken in all versions, patches welcome, bug #323907, #389533
+RESTRICT="test"
+
+#fix for icewm preversion package names
+S="${WORKDIR}/${P/_}"
+
+RDEPEND="
+	media-libs/fontconfig
+	x11-libs/gdk-pixbuf:2[X]
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXpm
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	bidi? ( dev-libs/fribidi )
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="
+	${RDEPEND}
+	>=sys-apps/sed-4
+	x11-proto/xextproto
+	x11-proto/xproto
+	doc? ( app-text/linuxdoc-tools )
+	nls? ( >=sys-devel/gettext-0.19.6 )
+	truetype? ( >=media-libs/freetype-2.0.9 )
+	xinerama? ( x11-proto/xineramaproto )
+"
+
+pkg_setup() {
+	if use truetype && use minimal ; then
+		ewarn "You have both 'truetype' and 'minimal' use flags enabled."
+		ewarn "If you really want a minimal install, you will have to turn off"
+		ewarn "the truetype flag for this package."
+	fi
+}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.10-menu.patch
+)
+
+src_prepare() {
+	# Fix bug #486710
+	use uclibc && PATCHES+=( "${FILESDIR}/${PN}-1.3.8-uclibc.patch" )
+
+	default
+
+	if ! use doc ; then
+		sed '/^SUBDIRS =/s@ doc@@' -i Makefile.am || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--disable-menus-gnome2
+		--with-libdir=/usr/share/icewm
+		--with-cfgdir=/etc/icewm
+		--with-docdir=/usr/share/doc/${PF}/html
+		$(use_enable bidi fribidi)
+		$(use_enable debug)
+		$(use_enable nls i18n)
+		$(use_enable nls)
+		$(use_enable xinerama)
+	)
+	if use truetype ; then
+		myconf+=(
+			--enable-gradients
+			--enable-shape
+			--enable-shaped-decorations
+		)
+	else
+		myconf+=(
+			--disable-xfreetype
+			--enable-corefonts
+			$(use_enable minimal lite)
+		)
+	fi
+
+	CXXFLAGS="${CXXFLAGS}" econf "${myconf[@]}"
+
+	sed -i "s:/icewm-\$(VERSION)::" src/Makefile || die
+	sed -i "s:ungif:gif:" src/Makefile || die "libungif fix failed"
+}
+
+src_install(){
+	local DOCS=( AUTHORS BUGS CHANGES PLATFORMS README.md TODO VERSION )
+
+	default
+
+	if ! use doc ; then
+		cp doc/${PN}.man "${T}"/${PN}.1 || die
+		doman "${T}"/${PN}.1
+	fi
+
+	exeinto /etc/X11/Sessions
+	doexe "${FILESDIR}/icewm"
+}
diff --git a/x11-wm/icewm/metadata.xml b/x11-wm/icewm/metadata.xml
new file mode 100644
index 000000000000..10822b4d146d
--- /dev/null
+++ b/x11-wm/icewm/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
+	<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
+		to have a customizable look using pixmaps.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">bbidulock/icewm</remote-id>
+		<remote-id type="sourceforge">icewm</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-wm/jwm/Manifest b/x11-wm/jwm/Manifest
new file mode 100644
index 000000000000..00abb1dac4d1
--- /dev/null
+++ b/x11-wm/jwm/Manifest
@@ -0,0 +1,12 @@
+AUX jwm.desktop 166 SHA256 72ff2b876eb1f8bcbfdd284e555b89bd242ccfcc8e626346c146746a859f5f8c SHA512 42135a9b282467edec1a61de0180a97b7a0f5bbbb8fe4a5d88dd418dcb5edf32c1c15efee3d8cf96eadf7468dd4d44c679690ec2ff2a89381bb0e0dc9664a43b WHIRLPOOL 1e7beb92d37bcd41060bb29a2e1e6047f246e5dbe926bff16abf0e25a564240b59d50071f47a98bfc3c948c03595cb093f41d769621b2de903f3120bc6707060
+DIST jwm-2.3.2.tar.xz 325648 SHA256 92a3e66ceb847aac9fa09a24b16c93194f6c52e398f5a88f228b4986ea972c53 SHA512 34b9d482815e8b269203e1f5bf02d3e13f3186153755c9e74094e4a8af376f35b8bef4553056e83c20ba0c532e6d2606633d71272e186fe45dfed9e4ea836a27 WHIRLPOOL 93d140919edf16fb44bf93b88880d017174036de363a514862c5553ea84796311ba74fa2f6736fa2f78fe639e95ad6087b38fa962d77c83c4c4d863e35c06703
+DIST jwm-2.3.4.tar.xz 332140 SHA256 249867d2e21fab27f69d4f64b5c8acba5ddc540030e31e450c20ed4b647a06ee SHA512 db9f46ced4b1f8128673b551cd865b6c9b6c8d43f839cfe898168251e8326d402a510ce77144273488c1e65a96d66e16124e4b4749a5a96a9057c1eb20c2bee1 WHIRLPOOL 21328d615fba64fdda943ff0f90991f6f9b19106c0d05d04f2399d01fe63be66f07c9fa6ced34074adbc3d1b7720a602dfe687c41d6701f1f40b414f89c35075
+DIST jwm-2.3.5.tar.xz 339792 SHA256 b0a7908ba3299f82542125f67e329a8a727c2761b4abaa6d0d489bdb8629acf0 SHA512 cb45a5fb349e6c130b89996ba11a99059e95ccedc4ea82ad527676130833fd93297b64fad905a1f22908a4ae69cca544a6353c37160ed8df3e1089f40f9a0565 WHIRLPOOL da46d3ddfefd60d22bd8fd623bebeeda82544f8408b22414a88aa5da4bc138087bc39c7363674982ffb6f73f3729665328bb42dbbff6da608c1ab516f5037137
+DIST jwm-2.3.6.tar.xz 343644 SHA256 a0fedbdf790d2ad2016730db593c436def277507bcdf96d6e85d7f4dc435273d SHA512 ed3556bf2e28bfcf36b2b145e6c08e75c24e47b723b16ce072100d2773338d819c5465e7af2dc6b842e2e35f375ec3a0b85d9987e0a8acecdbe628dc09eabd11 WHIRLPOOL 5b3d35cebef6c0a359179062ce54b3b48dbfbe67abda05a5111b52c55c6b0fd0391e9b127bc14a454e219853dc11020312bf4c0f182ba9fdd7cb94d941ba4e0d
+EBUILD jwm-2.3.2.ebuild 1480 SHA256 2d0533082c09d2963c13a15d8c372801ac9fa5d3e93a297407998a58b296af49 SHA512 5d77f8d9365f335cac1cbf64328e4f02658604944ee82b1403c32476dc2d757c156aeffd68a15e7d4bd758519f0c0af1618605420fef8bb3feb9786983bb985d WHIRLPOOL 3a6aae3d4b1d02c3da6335ef57514ab0786364efb14cc1c7e929502791a90e8072e2900a76369fef03bb72f285b5f8834cde593752dedcf7e02a2c44cd944c19
+EBUILD jwm-2.3.4-r1.ebuild 1550 SHA256 203a5bfd2294c0dde11c3f342b1c34c99cefb77ba0cff926f229e1016179baa0 SHA512 c85ff474a7afe9d2a734fcfd330b2ed2ef3b269d4f695fcc64cc3089ccad6b1387764541b7ff388978f0de99fa7cd6d0c2bb0218a275ea4e0acbaf0d503cfe34 WHIRLPOOL 19461dd3565877378ec1d4de9f63ad02968cc59c0c32c538c614c83a6c51b4153af976df113e474e6b9192806937332e63747b112427a65cf104ca9263f4d161
+EBUILD jwm-2.3.5.ebuild 1830 SHA256 fd07e76931b0893ebe9980259d4c351b13b33c2cbc75e9a23b92488625b87b62 SHA512 ffe5f1e92de51b3bc2c545c454910706f662d1f546dde2f05d2ecf539715bd0c5ad1af6f9fff89b26c4a5e0562170d253d489c0281e2fa042704246930433d47 WHIRLPOOL bb88d7e30788393e0b0b2b538cee825825950de0cb9fa75730df5a47b03bfa329fbdbc0f7f143a870133f1cdaadcfcb3bded1a66492b8715863e8b2095155676
+EBUILD jwm-2.3.6.ebuild 1889 SHA256 b3953a7dae01585151a9a8270fbda3891c915a01b927748b0f1336dae08afcf3 SHA512 13f2e66a2c02145fa326df6242f49acfdde3436a1c8211d9fa3e1f835dbe0a23e5745a40e837207fc039b412a45945c153d1a3adaf7a7f86959df23c056fe616 WHIRLPOOL 8a381be1a80c5c0644d44c9d16fb74259d60f965dd912d730131a1e0a27b7608de3d5bbd41f1ddcfef0580853657ccdc4b2dacdb6122dd947a71d698a8977c78
+MISC ChangeLog 5880 SHA256 511fabb4d9c1dd7ecaf4047373d7112c2fb4e438fcd2667c7d6330b5602ee84e SHA512 afc36f6ae349a737fb48c0838256cc8c6bac3d32b22297fbf54c3c104cb99cc1321494ccaf10c3e5414c684663dd3f507089f23779921d4b6b6658f6f2437ddd WHIRLPOOL bc65eab13db0bb07d25715324486e2e3efa69584f048855e9dc5d61e917ac50d7a13a7b0ab8c17b9299ccc9f220408253d1773f9b26258071ccd3863aca80b59
+MISC ChangeLog-2015 3705 SHA256 fce5ea9e9859194adc4984848a6b302a5f3fb8c7e73c03f8a3cd34533f057c2d SHA512 fe7199606cde6c29f01e34ff6950f50827f605fe9cac97d0f2feb0fa54b7b98a6f170bc1e68a105b6db060f9808c3b1f504613e0fa84766db44e81edfc977639 WHIRLPOOL 625fd954e7a4cb8b29c69f711947ed23cf616b2dce47018dc4bd7afdd0e0441217c672cae939d5c206c49d0884e3a79569a1a1554b256b0c9724bb11142cb8a7
+MISC metadata.xml 973 SHA256 3fc1410c7c5e308d1b66ec0ef9b45f85cdc1d7f2d29203bba82383ad71f69039 SHA512 11ce10dace193af664e4939f506adc8311db83c7caa00959ebc7b57ed3084cd1e6ca8dcd8ff141e9ddbb823c485d45696ca3653d2ba9e252401704077dd932f0 WHIRLPOOL 56383d06ee852de21ffe9d89230741a145047e011c47db12d694cc929cb44ce2a70ff1af3fe4b339cf6a44ef7551071202d93af8de1dd6dc29da721a2274238d
diff --git a/x11-wm/jwm/files/jwm.desktop b/x11-wm/jwm/files/jwm.desktop
new file mode 100644
index 000000000000..0fd122b3b969
--- /dev/null
+++ b/x11-wm/jwm/files/jwm.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=jwm
+Comment=Very fast and lightweight still powerful window manager for X
+TryExec=jwm
+Exec=/etc/X11/Sessions/jwm
+Type=Application
diff --git a/x11-wm/jwm/jwm-2.3.2.ebuild b/x11-wm/jwm/jwm-2.3.2.ebuild
new file mode 100644
index 000000000000..006a0ebc1aab
--- /dev/null
+++ b/x11-wm/jwm/jwm-2.3.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="Very fast and lightweight still powerful window manager for X"
+HOMEPAGE="http://joewing.net/projects/jwm/"
+SRC_URI="http://joewing.net/programs/jwm/releases/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 hppa ppc x86 ~x86-fbsd"
+IUSE="bidi debug jpeg png truetype xinerama xpm"
+
+RDEPEND="xpm? ( x11-libs/libXpm )
+	xinerama? ( x11-libs/libXinerama )
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	truetype? ( x11-libs/libXft )
+	png? ( media-libs/libpng:0= )
+	jpeg? ( virtual/jpeg:0= )
+	bidi? ( dev-libs/fribidi )
+	dev-libs/expat"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	x11-proto/xextproto
+	xinerama? ( x11-proto/xineramaproto )"
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable jpeg) \
+		$(use_enable png) \
+		$(use_enable truetype xft) \
+		$(use_enable xinerama) \
+		$(use_enable xpm) \
+		$(use_enable bidi fribidi) \
+		--enable-shape \
+		--enable-xrender
+}
+
+src_install() {
+	dodir /etc
+	dodir /usr/bin
+	dodir /usr/share/man
+
+	default
+
+	make_wrapper "${PN}" "/usr/bin/${PN}" "" "" "/etc/X11/Sessions"
+
+	dodoc README.md example.jwmrc ChangeLog
+}
+
+pkg_postinst() {
+	einfo "JWM can be configured system-wide with ${EROOT}/etc/system.jwmrc"
+	einfo "or per-user by creating a configuration file in ~/.jwmrc"
+	einfo
+	einfo "An example file can be found in ${EROOT}/usr/share/doc/${PF}/"
+}
diff --git a/x11-wm/jwm/jwm-2.3.4-r1.ebuild b/x11-wm/jwm/jwm-2.3.4-r1.ebuild
new file mode 100644
index 000000000000..f1d7d763d72a
--- /dev/null
+++ b/x11-wm/jwm/jwm-2.3.4-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="Very fast and lightweight still powerful window manager for X"
+HOMEPAGE="http://joewing.net/projects/jwm/"
+SRC_URI="http://joewing.net/programs/jwm/releases/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~x86-fbsd"
+IUSE="bidi debug jpeg png truetype xinerama xpm"
+
+RDEPEND="xpm? ( x11-libs/libXpm )
+	xinerama? ( x11-libs/libXinerama )
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	truetype? ( x11-libs/libXft )
+	png? ( media-libs/libpng:0= )
+	jpeg? ( virtual/jpeg:0= )
+	bidi? ( dev-libs/fribidi )
+	dev-libs/expat"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	x11-proto/xextproto
+	xinerama? ( x11-proto/xineramaproto )"
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable jpeg) \
+		$(use_enable png) \
+		$(use_enable truetype xft) \
+		$(use_enable xinerama) \
+		$(use_enable xpm) \
+		$(use_enable bidi fribidi) \
+		--enable-shape \
+		--enable-xrender
+}
+
+src_install() {
+	dodir /etc
+	dodir /usr/bin
+	dodir /usr/share/man
+
+	default
+
+	make_wrapper "${PN}" "/usr/bin/${PN}" "" "" "/etc/X11/Sessions"
+
+	insinto "/usr/share/xsessions"
+	doins "${FILESDIR}"/jwm.desktop
+
+	dodoc README.md example.jwmrc ChangeLog
+}
+
+pkg_postinst() {
+	einfo "JWM can be configured system-wide with ${EROOT}/etc/system.jwmrc"
+	einfo "or per-user by creating a configuration file in ~/.jwmrc"
+	einfo
+	einfo "An example file can be found in ${EROOT}/usr/share/doc/${PF}/"
+}
diff --git a/x11-wm/jwm/jwm-2.3.5.ebuild b/x11-wm/jwm/jwm-2.3.5.ebuild
new file mode 100644
index 000000000000..105297f295f1
--- /dev/null
+++ b/x11-wm/jwm/jwm-2.3.5.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils
+
+DESCRIPTION="Very fast and lightweight still powerful window manager for X"
+HOMEPAGE="http://joewing.net/projects/jwm/"
+SRC_URI="http://joewing.net/projects/${PN}/releases/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~x86-fbsd"
+IUSE="bidi cairo debug iconv jpeg nls png truetype xinerama xpm"
+
+RDEPEND="dev-libs/expat
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXrender
+	bidi? ( dev-libs/fribidi )
+	cairo? (
+		x11-libs/cairo
+		gnome-base/librsvg
+	)
+	iconv? ( virtual/libiconv )
+	jpeg? ( virtual/jpeg:0= )
+	nls? ( sys-devel/gettext
+		virtual/libintl )
+	png? ( media-libs/libpng:0= )
+	truetype? ( x11-libs/libXft )
+	xinerama? ( x11-libs/libXinerama )
+	xpm? ( x11-libs/libXpm )"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	x11-proto/xextproto
+	xinerama? ( x11-proto/xineramaproto )"
+
+src_configure() {
+	econf \
+		$(use_enable bidi fribidi) \
+		$(use_enable cairo) \
+		$(use_enable debug) \
+		$(use_enable iconv) \
+		$(use_enable jpeg) \
+		$(use_enable nls) \
+		$(use_enable png) \
+		$(use_enable cairo rsvg) \
+		$(use_enable truetype xft) \
+		$(use_enable xinerama) \
+		$(use_enable xpm) \
+		--enable-shape \
+		--enable-xrender \
+		--disable-rpath
+}
+
+src_install() {
+	dodir /etc
+	dodir /usr/bin
+	dodir /usr/share/man
+
+	default
+
+	make_wrapper "${PN}" "/usr/bin/${PN}" "" "" "/etc/X11/Sessions"
+
+	insinto "/usr/share/xsessions"
+	doins "${FILESDIR}"/jwm.desktop
+
+	dodoc README.md example.jwmrc ChangeLog
+}
+
+pkg_postinst() {
+	einfo "JWM can be configured system-wide with ${EROOT}/etc/system.jwmrc"
+	einfo "or per-user by creating a configuration file in ~/.jwmrc"
+	einfo
+	einfo "An example file can be found in ${EROOT}/usr/share/doc/${PF}/"
+}
diff --git a/x11-wm/jwm/jwm-2.3.6.ebuild b/x11-wm/jwm/jwm-2.3.6.ebuild
new file mode 100644
index 000000000000..3f5fcc05da2e
--- /dev/null
+++ b/x11-wm/jwm/jwm-2.3.6.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils
+
+DESCRIPTION="Very fast and lightweight still powerful window manager for X"
+HOMEPAGE="http://joewing.net/projects/jwm/"
+SRC_URI="http://joewing.net/projects/${PN}/releases/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~x86-fbsd"
+IUSE="bidi cairo debug iconv jpeg nls png truetype xinerama xpm"
+
+RDEPEND="dev-libs/expat
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXrender
+	bidi? ( dev-libs/fribidi )
+	cairo? (
+		x11-libs/cairo
+		gnome-base/librsvg
+	)
+	iconv? ( virtual/libiconv )
+	jpeg? ( virtual/jpeg:0= )
+	nls? ( sys-devel/gettext
+		virtual/libintl )
+	png? ( media-libs/libpng:0= )
+	truetype? ( x11-libs/libXft )
+	xinerama? ( x11-libs/libXinerama )
+	xpm? ( x11-libs/libXpm )"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	x11-proto/xextproto
+	xinerama? ( x11-proto/xineramaproto )"
+
+src_configure() {
+	econf \
+		$(use_enable bidi fribidi) \
+		$(use_enable cairo) \
+		$(use_enable debug) \
+		$(use_enable jpeg) \
+		$(use_enable nls) \
+		$(use_enable png) \
+		$(use_enable cairo rsvg) \
+		$(use_enable truetype xft) \
+		$(use_enable xinerama) \
+		$(use_enable xpm) \
+		$(use_with iconv libiconv-prefix /usr) \
+		$(use_with nls libintl-prefix /usr) \
+		--enable-shape \
+		--enable-xrender \
+		--disable-rpath
+}
+
+src_install() {
+	dodir /etc
+	dodir /usr/bin
+	dodir /usr/share/man
+
+	default
+
+	make_wrapper "${PN}" "/usr/bin/${PN}" "" "" "/etc/X11/Sessions"
+
+	insinto "/usr/share/xsessions"
+	doins "${FILESDIR}"/jwm.desktop
+
+	dodoc README.md example.jwmrc ChangeLog
+}
+
+pkg_postinst() {
+	einfo "JWM can be configured system-wide with ${EROOT}/etc/system.jwmrc"
+	einfo "or per-user by creating a configuration file in ~/.jwmrc"
+	einfo
+	einfo "An example file can be found in ${EROOT}/usr/share/doc/${PF}/"
+}
diff --git a/x11-wm/jwm/metadata.xml b/x11-wm/jwm/metadata.xml
new file mode 100644
index 000000000000..1f5b8e82302b
--- /dev/null
+++ b/x11-wm/jwm/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>wraeth@gentoo.org</email>
+		<name>Sam Jorna</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">joewing/jwm</remote-id>
+		<changelog>http://joewing.net/projects/jwm/snapshots/ChangeLog</changelog>
+		<bugs-to>https://github.com/joewing/jwm/issues</bugs-to>
+	</upstream>
+	<longdescription>
+	JWM is a light-weight window manager for the X11 Window System. JWM is
+	written in C and uses only Xlib at a minimum. Because of its small
+	footprint, JWM makes a good window manager for older computers and less
+	powerful systems, such as the Raspberry Pi, though it is perfectly capable
+	of running on modern systems. JWM is included in small Linux distributions
+	such as Puppy Linux and Damn Small Linux, and it is available as a separate
+	package in many other distributions.
+	</longdescription>
+</pkgmetadata>
diff --git a/x11-wm/larswm/Manifest b/x11-wm/larswm/Manifest
new file mode 100644
index 000000000000..dc65e8bd98ce
--- /dev/null
+++ b/x11-wm/larswm/Manifest
@@ -0,0 +1,6 @@
+AUX larswm.desktop 125 SHA256 22e417c10eebe58e0392c6dee9c175b7734b801947a3a7838bb08db88b61faaf SHA512 033ca80e83d928eca524c0a5473f2776f363ff301442a7a7c3f34bb99bc61af8a524f6bf39ee1d6282ce5f732bd1fd7b0b242ad4909063496c4c6965becd7b43 WHIRLPOOL b9485a7d3de4225c69e8ed535f7d9d8598e469efd332d52dec0bc89a3861bf47120123b9e913dc4f9ded5058d5477d21f1fdba4f81ee87f7d3b4906e29c7382c
+DIST larswm-7.5.3.tar.gz 84505 SHA256 7b444b10a93589cbdb4ff45a785d5a65121d80f27a73f0b2ec74421b5eeab4f6 SHA512 7c99aadcc419f695b55bf0ea2f9833757c06f6ba0f00ae58e1db6e38df70bf944bac44834418bb52188d844722a7ac3c49388280c649ede073a74c21572cf3d4 WHIRLPOOL 29e4373ce6924bcd386d45dcadeca801c757d62ba78e043ce03fd612308f300a633df5f04412f24dd45400967d8ebf3bf6ca4abed5c80028876169ab8becfd07
+EBUILD larswm-7.5.3-r1.ebuild 1096 SHA256 5c2d02580a0d6da79fab24d337bc88e7323df35c33edff2fb569d51871ee0274 SHA512 5e8d2e489d9255cb277e30efb4e11f80b47d9a8663d9f91d820f72005a740dd3056f27001468b22e58abc41da106ad8b872c19d6a85b6587e9f131c3eff9470d WHIRLPOOL 1027911c427ee52542acb17b594d1b5a7a81184b83949509c72d63a0e5b3efd1f1f283ea0365beda01afd794569d3b7d10e0c283a61f5e4f4d5c0adb9c18ecae
+MISC ChangeLog 2546 SHA256 f97fc5cf56bd44544d4324ade409012d951776486deb21be9749255b952c7582 SHA512 7bc206e19486303206a74239214c05b2b68671dbeb10a4461c3a6228835ab3b0b5e087fbd288a8dd9b0867cf757bffe0e37bcd21b49dbd4b49863c49df4871d3 WHIRLPOOL ca7797354cbcf66d4ecac8f1d5fc1d40274da0bcd9ad49d7b391c1c9f97dc4c235b2536b51b3b268e59d561b3eec1b76ff8d90a7e30877910bf416642ac5855f
+MISC ChangeLog-2015 3598 SHA256 a9f6dd4dc7c421c038da6e98becd00a7b798e496266a699eedfad9ac4ef62180 SHA512 2d73c4723fba502728aba24f84dbe44bbd311f233d6a318dd0bbdece6929738fe215172dd04adec3adcc1030300ea23b941bb6f17b552ae56c81e8eede31b9bd WHIRLPOOL be27d7ad7c51c29335614190b6b587f5a5558c7a3894e2bbc3d28a388c7f166789ea5f8b6a253edcdb3c072c8a031802eb6e9b5ee4c552b358e34a646e80b363
+MISC metadata.xml 605 SHA256 bac02a6845e7899ff623d9f2e93f9b19098624d4688e254018fcf9a556202f0d SHA512 5c777d2c54e8cbe89c8644cd68697e1da2049c75a450cd6be085fba62bab7d56a8b4a28850330599684dfe9c9725977d14f8de1e52e624911d5c5c7088acb29d WHIRLPOOL f8f4f2894115c0c683b387e3af6e70ce87eee671ab8975e7815228f246b4bc22bcc8799ae5c0c4037c1fd21d05605294ee38a073d391e7cb3c4a3a8127dbbe6f
diff --git a/x11-wm/larswm/files/larswm.desktop b/x11-wm/larswm/files/larswm.desktop
new file mode 100644
index 000000000000..6be965d27308
--- /dev/null
+++ b/x11-wm/larswm/files/larswm.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Version=1.0
+Name=larswm
+Comment=This session logs you into larswm
+Exec=larswm-session
+Icon=
+Type=Application
diff --git a/x11-wm/larswm/larswm-7.5.3-r1.ebuild b/x11-wm/larswm/larswm-7.5.3-r1.ebuild
new file mode 100644
index 000000000000..98f7f805a725
--- /dev/null
+++ b/x11-wm/larswm/larswm-7.5.3-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Tiling window manager for X11, based on 9wm by David Hogan"
+HOMEPAGE="http://larswm.fnurt.net/"
+SRC_URI="http://larswm.fnurt.net/${P}.tar.gz"
+LICENSE="9wm"
+
+SLOT="0"
+KEYWORDS="alpha ~amd64 ppc ppc64 x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	x11-proto/xextproto
+	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}" \
+		|| die
+}
+
+src_install() {
+	dobin larsclock larsmenu larsremote larswm
+	newbin sample.xsession larswm-session
+	for x in *.man ; do
+		newman $x ${x/man/1}
+	done
+	dodoc ChangeLog README* sample.*
+
+	insinto /etc/X11
+	newins sample.larswmrc larswmrc || die
+	exeinto /etc/X11/Sessions
+	newexe sample.xsession larswm
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/larswm.desktop || die
+}
diff --git a/x11-wm/larswm/metadata.xml b/x11-wm/larswm/metadata.xml
new file mode 100644
index 000000000000..1f3bd87d7879
--- /dev/null
+++ b/x11-wm/larswm/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+<longdescription>
+	larswm is a modified version of the 9wm window manager that adds virtual 
+	desktops, automatic window tiling, and many other features designed to 
+	make it a highly efficient user environment. One of the design goals is 
+	that you should never have to manually shuffle windows around on the 
+	screen. Another is that it should use as little CPU time, RAM, and screen 
+	space for itself as possible.
+	</longdescription>	
+</pkgmetadata>
diff --git a/x11-wm/lumina/Manifest b/x11-wm/lumina/Manifest
new file mode 100644
index 000000000000..cf257a89517d
--- /dev/null
+++ b/x11-wm/lumina/Manifest
@@ -0,0 +1,9 @@
+AUX 1.2.0-desktop-files.patch 1001 SHA256 80404a930c681ffbfdbac11235b0be24c6b4285f8ac8f2612cb928442e31a25b SHA512 419fdd6c26f05daa4dacee5d0f21a51ffc465d443ba47e374c431c722dab98b8686453c692b0d8e579c5a5f43b18d92c0f7345845901e1d86ad36c70e1546b4d WHIRLPOOL 523ad45f61d415d023de2604376e101adc2b247a1233e31a8abc768241e047889a50f06c28e55804a500a2d8071aea1d97d8d550be53940b03ac5bcde834de08
+AUX 1.3.0-OS-detect.patch 408 SHA256 e34b9270ac8fb6ed27fcf75b9450fafd7720a540903dc2ef342ecbc86ce91070 SHA512 ecfe35648ee83635dfe1a18cd27071ef5b707a5246e0978f31e2cd5ac71e1a55ac7598988a435f8f26cbc39f5b47c20335bb956b2cc2993239ea5e76f09a039b WHIRLPOOL 505c1ba31aed2180b516600053278f27c6c1d3e2ca567d2e7cb50896b7e30642cf84ff2dba84cd40490fe291a24ad514879bfe67b7689cea488a70a77edf7796
+DIST lumina-1.2.0_p1.tar.gz 56032695 SHA256 f8366212fe3f29039c5febef5b4de97a92eb72483e2d97f5c086edf8fc65bd49 SHA512 8490e2b0f2fa08b2d63ec688f9993771ea935129a2947ef7bfa1874424cbede6d8877083ce90658c283858e67397383b5bab536388e9222b440015ebdf8b2919 WHIRLPOOL 6a7fc95022c4f9cc372c4fafc87cbda70a5f3ebcb52dc1f96516460df928e6e2f02ea380104bd7df9f7df33b1d098b24d8e73ec7ffe77e82a633c920634f9c70
+DIST lumina-1.3.0_p1.tar.gz 86451718 SHA256 76f2b6d45d37d154426cb100d46e3ca4e5e7eca51a7f9f9e442261bfe61b1c31 SHA512 93fb195f26984a2ba6e62dbe1ea619e4ab8e936d1cf1d335db8a7e51058c9be8d3e389146259f8229fb5dc6477610dcc2e1278c4e2a348f27904a318ba095707 WHIRLPOOL 6f3af86b66adc66a1b76732e23189946ad35e4897e4bd00912742e3d972bcf0d816b60055098c8ac1104e7e20ce938e7e4727c7501b5e7c92dcb49794c1bb38e
+EBUILD lumina-1.2.0_p1.ebuild 1597 SHA256 e585aa7a6baac5442e94023d135bec5f78eff6e9ea14c3d91e7dd6fd3b5b5bb6 SHA512 80e936102bcb783232e323b15051f17fc487f56bce3f91c5a5e7c21f4c559f5bcee02b80031d981377897d58213bfb4b576812627e7242c3e64c1407b2f6a549 WHIRLPOOL a446b51f5a11005fc4e8a5462a2c09949df4150f7a4b7ca4406fd977cc5e82edce621b50fc0d094168e48b2390592b4ca8b9bc0d80d20d0d7f9a82da6ac2197d
+EBUILD lumina-1.3.0_p1.ebuild 1464 SHA256 6e711c284a13f5c7b9599e1a2ec03a0ed60116f5cd8e9f9e9131832f91cd5274 SHA512 41eab50e8dfcb3d0fe9b8a599f4ff108f572ea93c06e2aa92fa80bfc38e1551f3d519467fb58bcdfd4eb7d8aa7318cca72d7a39140d9f4ee86eb6007200c03c8 WHIRLPOOL 252efa9cd9140240370dd0fa2322246fab1ced0f00e1880511cc46345353e7554c6d86375cf09ae0b0af923b8f7f463e0c9a51f59fe99dda9e70c55c71c4c47a
+EBUILD lumina-9999.ebuild 1388 SHA256 27fef91f532f765d9093b4f6d9058403b753f8c175897e7f0c2a198b632629b7 SHA512 3676f6aa70c001e6a9e04f44261dd669a5b5eb5bf2c8fd8625a1226804079339ecbf75d66ed61f0315fbf3951df39d036c76556c2221994653408dcbb2f369c3 WHIRLPOOL 34a651e9bf71cbb46aecdcd871dbf7891d88ebea31495b51485530f07445d266cc5a63f4f78fd5c9e4e46457c1aa18f6ba64dbcb28f09e354cabf1d6266a9847
+MISC ChangeLog 903 SHA256 b1b26b42764af12c8710a72f38f65da5021ad128b1127b34a5201198ec0d6dcb SHA512 f9ebd062b553ae8c644b723b05ff8db8936d8cf936ccd481954729f1a49c2cf45fc2742742f9091c15b553194e851b6a6b20be3b8867bf0c2c6be6f31420b253 WHIRLPOOL 3038057f792b98aeff7664198928e9ed3126feb82fd566c3e672abbef5a41557bd9ff5b28909b034db1befc6852f40cd21d569e2ce8305ff11526e2a4df5b2cb
+MISC metadata.xml 1905 SHA256 fb3cdf65447b03919cb1cb0b660788f5aa0a119f05adb028f6c499372d1d24fd SHA512 f266380a3f9d6c9efae5439041dd1f49fea1705a35f9423a185dfd0b9c224a8ea010fca5a138c1351f211c668f02895b62439db040c56b982e4343791fe16e5f WHIRLPOOL 2f85a84c22bf4843c7f6caf2945b773de31efeef718a7a2bd06ddc75b29d96965a7ee3bd133a2a175e12185ec6bff279605d6935c053b0f6314a71332a6ba6ed
diff --git a/x11-wm/lumina/files/1.2.0-desktop-files.patch b/x11-wm/lumina/files/1.2.0-desktop-files.patch
new file mode 100644
index 000000000000..f86c1c49c38f
--- /dev/null
+++ b/x11-wm/lumina/files/1.2.0-desktop-files.patch
@@ -0,0 +1,33 @@
+--- ./src-qt5/core/lumina-info/lumina-support.desktop
++++ ./src-qt5/core/lumina-info/lumina-support.desktop
+@@ -2,8 +2,7 @@
+ Type=Link
+ URL=https://webchat.freenode.net/?channels=%23lumina-desktop
+ Icon=Lumina-DE
+-Categories=System;
+-OnlyShowIn=Lumina;
++OnlyShowIn=X-Lumina;
+ Name=Community Support
+ GenericName=Get Desktop Help
+ Comment=Ask for desktop support on the community IRC channel
+
+--- ./src-qt5/core-utils/lumina-config/lumina-config.desktop
++++ ./src-qt5/core-utils/lumina-config/lumina-config.desktop
+@@ -7,4 +7,4 @@
+ Categories=Settings;
+ Name=Desktop Configuration
+ Comment=Modify the desktop
+-OnlyShowIn=Lumina;
++OnlyShowIn=X-Lumina;
+
+--- ./src-qt5/core/lumina-info/lumina-info.desktop
++++ ./src-qt5/core/lumina-info/lumina-info.desktop
+@@ -5,7 +5,7 @@
+ Type=Application
+ StartupNotify=true
+ Categories=System;
+-OnlyShowIn=Lumina;
++OnlyShowIn=X-Lumina;
+ Name=Desktop Information
+ GenericName=Version and Legal Information
+ Comment=View information about the Lumina Desktop Environment
diff --git a/x11-wm/lumina/files/1.3.0-OS-detect.patch b/x11-wm/lumina/files/1.3.0-OS-detect.patch
new file mode 100644
index 000000000000..48a2076f3aaf
--- /dev/null
+++ b/x11-wm/lumina/files/1.3.0-OS-detect.patch
@@ -0,0 +1,14 @@
+--- ./src-qt5/OS-detect.pri
++++ ./src-qt5/OS-detect.pri
+@@ -76,6 +76,11 @@
+     equals(LINUX_DISTRO,"Fedora"){
+       isEmpty(L_ETCDIR){ L_ETCDIR=/etc }
+     }
++    equals(LINUX_DISTRO,"Gentoo"){
++      isEmpty(L_BINDIR){ L_BINDIR = $${PREFIX}/bin }
++      isEmpty(L_ETCDIR){ L_ETCDIR = $${PREFIX}/../etc }
++      isEmpty(L_MANDIR){ L_MANDIR = $${PREFIX}/share/man }
++    }
+   }else{
+     OS="Unknown";
+   }
diff --git a/x11-wm/lumina/lumina-1.2.0_p1.ebuild b/x11-wm/lumina/lumina-1.2.0_p1.ebuild
new file mode 100644
index 000000000000..6ea490a4cf1d
--- /dev/null
+++ b/x11-wm/lumina/lumina-1.2.0_p1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils
+DESCRIPTION="Lumina desktop environment"
+HOMEPAGE="https://lumina-desktop.org/"
+SRC_URI="https://github.com/trueos/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="desktop-utils"
+
+COMMON_DEPEND="dev-qt/qtcore:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtmultimedia:5[widgets]
+	dev-qt/qtsvg:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtgui:5
+	dev-qt/qtdeclarative:5
+	x11-libs/libxcb:0
+	x11-libs/xcb-util
+	x11-libs/xcb-util-image
+	x11-libs/xcb-util-wm"
+
+DEPEND="$COMMON_DEPEND
+	dev-qt/linguist-tools:5"
+
+RDEPEND="$COMMON_DEPEND
+	|| ( virtual/freedesktop-icon-theme
+	x11-themes/hicolor-icon-theme )
+	sys-fs/inotify-tools
+	x11-misc/numlockx
+	x11-wm/fluxbox
+	|| ( x11-apps/xbacklight
+	sys-power/acpilight )
+	media-sound/alsa-utils
+	sys-power/acpi
+	app-admin/sysstat"
+
+S="${WORKDIR}/${P/_/-}"
+
+PATCHES=(
+	"${FILESDIR}/1.2.0-desktop-files.patch"
+)
+
+src_prepare(){
+	default
+
+	if use !desktop-utils ; then
+		rm -rf src-qt5/desktop-utils || die
+		sed -e "/desktop-utils/d" -i src-qt5/src-qt5.pro || die
+	fi
+}
+
+src_configure(){
+	eqmake5 PREFIX="${EPREFIX}/usr" L_BINDIR="${EPREFIX}/usr/bin" \
+		L_ETCDIR="${EPREFIX}/etc" L_LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		LIBPREFIX="${EPREFIX}/usr/$(get_libdir)" DESTDIR="${D}" CONFIG+=WITH_I18N QMAKE_CFLAGS_ISYSTEM=
+}
+
+src_install(){
+	default
+	mv "${ED%/}"/etc/luminaDesktop.conf{.dist,} || die
+	rm "${ED%/}"/${PN}-* "${ED%/}"/start-${PN}-desktop || die
+}
diff --git a/x11-wm/lumina/lumina-1.3.0_p1.ebuild b/x11-wm/lumina/lumina-1.3.0_p1.ebuild
new file mode 100644
index 000000000000..794daf6eea80
--- /dev/null
+++ b/x11-wm/lumina/lumina-1.3.0_p1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils
+DESCRIPTION="Lumina desktop environment"
+HOMEPAGE="https://lumina-desktop.org/"
+SRC_URI="https://github.com/trueos/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="desktop-utils"
+
+COMMON_DEPEND="dev-qt/qtcore:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtmultimedia:5[widgets]
+	dev-qt/qtsvg:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtgui:5
+	dev-qt/qtdeclarative:5
+	x11-libs/libxcb:0
+	x11-libs/xcb-util
+	x11-libs/xcb-util-image
+	x11-libs/xcb-util-wm"
+
+DEPEND="$COMMON_DEPEND
+	dev-qt/linguist-tools:5"
+
+RDEPEND="$COMMON_DEPEND
+	sys-fs/inotify-tools
+	x11-misc/numlockx
+	x11-wm/fluxbox
+	|| ( x11-apps/xbacklight
+	sys-power/acpilight )
+	media-sound/alsa-utils
+	sys-power/acpi
+	app-admin/sysstat"
+
+S="${WORKDIR}/${P/_/-}"
+
+PATCHES=(
+	"${FILESDIR}/1.2.0-desktop-files.patch"
+	"${FILESDIR}/1.3.0-OS-detect.patch"
+)
+
+src_prepare(){
+	default
+
+	if use !desktop-utils ; then
+		rm -rf src-qt5/desktop-utils || die
+		sed -e "/desktop-utils/d" -i src-qt5/src-qt5.pro || die
+	fi
+}
+
+src_configure(){
+	eqmake5 PREFIX="${EPREFIX}/usr" LIBPREFIX="${EPREFIX}/usr/$(get_libdir)" \
+		DESTDIR="${D}" CONFIG+=WITH_I18N QMAKE_CFLAGS_ISYSTEM=
+}
+
+src_install(){
+	default
+	mv "${ED%/}"/etc/luminaDesktop.conf{.dist,} || die
+	rm "${ED%/}"/${PN}-* "${ED%/}"/start-${PN}-desktop || die
+}
diff --git a/x11-wm/lumina/lumina-9999.ebuild b/x11-wm/lumina/lumina-9999.ebuild
new file mode 100644
index 000000000000..11c8d155760b
--- /dev/null
+++ b/x11-wm/lumina/lumina-9999.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit git-r3 qmake-utils
+DESCRIPTION="Lumina desktop environment"
+HOMEPAGE="https://lumina-desktop.org/"
+EGIT_REPO_URI="https://github.com/pcbsd/lumina"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+IUSE="desktop-utils"
+
+COMMON_DEPEND="dev-qt/qtcore:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtmultimedia:5[widgets]
+	dev-qt/qtsvg:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtgui:5
+	dev-qt/qtdeclarative:5
+	x11-libs/libxcb:0
+	x11-libs/xcb-util
+	x11-libs/xcb-util-image
+	x11-libs/xcb-util-wm"
+
+DEPEND="$COMMON_DEPEND
+	dev-qt/linguist-tools:5"
+
+RDEPEND="$COMMON_DEPEND
+	sys-fs/inotify-tools
+	x11-misc/numlockx
+	x11-wm/fluxbox
+	|| ( x11-apps/xbacklight
+	sys-power/acpilight )
+	media-sound/alsa-utils
+	sys-power/acpi
+	app-admin/sysstat"
+
+S="${WORKDIR}/${P/_/-}"
+
+PATCHES=(
+	"${FILESDIR}/1.2.0-desktop-files.patch"
+)
+
+src_prepare(){
+	default
+
+	if use !desktop-utils ; then
+		rm -rf src-qt5/desktop-utils || die
+		sed -e "/desktop-utils/d" -i src-qt5/src-qt5.pro || die
+	fi
+}
+
+src_configure(){
+	eqmake5 PREFIX="${EPREFIX}/usr" LIBPREFIX="${EPREFIX}/usr/$(get_libdir)" \
+		DESTDIR="${D}" CONFIG+=WITH_I18N QMAKE_CFLAGS_ISYSTEM=
+}
+
+src_install(){
+	default
+	mv "${ED%/}"/etc/luminaDesktop.conf{.dist,} || die
+	rm "${ED%/}"/${PN}-* "${ED%/}"/start-${PN}-desktop || die
+}
diff --git a/x11-wm/lumina/metadata.xml b/x11-wm/lumina/metadata.xml
new file mode 100644
index 000000000000..01658337651c
--- /dev/null
+++ b/x11-wm/lumina/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<pkgmetadata>
+<!-- maintainer-needed -->	
+	<use>
+		<flag name="desktop-utils">Build and install lumina's desktop-utils</flag>
+	</use>
+	<upstream>
+		<maintainer status="active">
+			<email>ken@pcbsd.org</email>
+			<name>Ken Moore</name>
+		</maintainer>
+		<remote-id type="github">pcbsd/lumina</remote-id>
+		<bugs-to>https://github.com/pcbsd/lumina/issues</bugs-to>
+		<doc lang="en">http://lumina-desktop.org/handbook/</doc>
+	</upstream>
+<longdescription lang="en">The Lumina Desktop Environment is a lightweight system interface that is designed for use on any Unix-like operating system. It takes a plugin-based approach, allowing the entire interface to be assembled/arranged by each individual user as desired, with a system-wide default layout which was setup by the  system administrator. This allows every system (or user session) to be designed to maximize the individual user's productivity.
+
+The Lumina desktop developers understand that the point of a computer system is to run applications, so Lumina was designed to require as few system dependencies/requirements as possible. This allows it to be used to revitalize older systems or to allow the user to run applications that may need a higher percentage of the system resources than were previously available with other desktop environments.
+
+Lumina is created/distributed under the 3-clause BSD license, allowing it to be used by anyone, anywhere (including in proprietary distributions). It has been written from scratch in C++/Qt5 and is not based on any existing desktop's code-base. It also does not use any of the Linux-based desktop frameworks (ConsoleKit, PolicyKit, D-Bus, systemd, etc), instead using a simple built-in interface layer for communicating directly with the operating system.
+</longdescription>
+</pkgmetadata>
diff --git a/x11-wm/lwm/Manifest b/x11-wm/lwm/Manifest
new file mode 100644
index 000000000000..bd80fa5c09ed
--- /dev/null
+++ b/x11-wm/lwm/Manifest
@@ -0,0 +1,9 @@
+DIST lwm-1.2.2.tar.gz 47715 SHA256 3567b53f5de8c0bb23a83efa94a256547fc44f677bc15b9449599aeac7aaad7d SHA512 18d0e9923b8c24164b2a8ecbaf48e0120ae3e9be69a5a43716b45e605e740f19c96586dad64506076affcfba7b4e1eeef547a1cb8239ea108c40f80ef2f90419 WHIRLPOOL 98e0c3f5e2d27825df60a82343fb09b453ccbca1bbdf2e8bdb0207baa2ff2ef2665254dbefcc97ef9bd4ce85fa118e5bef73517ad57b9c40f792f82903f96499
+DIST lwm-1.2.3.tar.gz 47253 SHA256 f27587d8f8b77378050917735a69dd9160d9903a4cfb3e23a62991023fc5e558 SHA512 2c699050b3d8ade258a5ff21c0f7a427470bee9a5c8a92f031c4e74f3dcd78f00e181c04ea00bbd4d0dafd60eee5e603b247b75c21faf1017d9f61fb49702d03 WHIRLPOOL 86e8708ae1900ab49382a86729902d15b603eb435d12baceab97892a0757fdbe261cb22d965bd34bae578fc78e3fe84224ca59ffe4ab814fb2c3d7a9e52fcb8e
+DIST lwm-1.2.4.tar.gz 47519 SHA256 7ec05d5572c90340335a586e7a227b561512f21b7710ea5d30f401374ec88dad SHA512 bb4e394c43020b48dedf8c98702b68be7a580f9851d298ba2c6f0aacbd21719d8c772712e56cbbcc400e81a45ad7f4f29cb6e5f17d6dad76aef65029daf812c5 WHIRLPOOL 80316d492ff9d03a36f03b39edb39c771112c90992dd5d05e7475aaca32f28b6ea22cfedf41e2d62923cef4e55ad3b3bfe19e224ff7f06fd8feddee542457172
+EBUILD lwm-1.2.2.ebuild 833 SHA256 b7dee598ea02290a11900c300b4144c93e37a2660edb171a4bc57563decceb34 SHA512 0b6d762db5b32cbe130278d75149a728fbbd9da4f270c9ffe0e433c88f046d651159131915ec4951113fcf712f321f393cb02e60f8803e99f1f0a155e8f018ff WHIRLPOOL 2131bcee98a2e51199d416d009d99fc4afcc8d67aa0defb56c871f3ae31455c6fffc6dd01633110dd42cbbddd327877eede2387a3d1d99bdec73df789f1fa178
+EBUILD lwm-1.2.3.ebuild 839 SHA256 fc37d92f8b489df922ddba405ffc7715ebcf284ff1295c65cbd193e4b1b49fee SHA512 8a886447290cac165f7dec8bbb46f25bc4ba4a2590c74370e83bbac728ee4540f7ffac542c76ce6fee5783c13b523b91ac1a0fb646f2c49ab0b6b07e178bd7c8 WHIRLPOOL 04642d43c126cffae0cff3883478ed7c9ab2c031f90b04d66ce5d14d48d2db2802f2d42100b5d03b35d207528f47acdb5ebc84eb2fedf4ddc65823b180d067cf
+EBUILD lwm-1.2.4.ebuild 867 SHA256 d974ff4fb60080b8c933f57f61959f23953e4284aa5def03e2b2b97982cb62bc SHA512 a2d266e2b2159555bbdcadc4c6ed5ca61f7dca01a03ec5b49e5721df86607067dea58189902d2715f4a4b61b4cd7733ffbfe92b8d9ee1fcba5ba1d7c8f5b091f WHIRLPOOL fce6e753fd594f361adc753c717b45c50883118d9b39734f4a4f56fe8240cc75fb9bbc62a56d9215b25109345aca2e916fa45c4bafca3cb7bed392d4cf6dd441
+MISC ChangeLog 2596 SHA256 69ebf5641f3b39bef203584e2e775d99ddd8553f3ecb716ac690a49a5d22f631 SHA512 a9ba98c607912d0f7617feb1237d29a468be413a103266edbf78870acb1802876653661671238cb9e61b65acae62ddffc96fa24737fb957a4de46ae1f68c45ae WHIRLPOOL 75738daf4c657effe0ee9da09c86db5a5836d04911b0ab47850622dde47e2a9ca633b28bdba330f569def3eb6bf43f3fde80ddf9b8a03a6635bd2ffa963afbb7
+MISC ChangeLog-2015 3281 SHA256 d51a67bd059e89c0668a049075b05e676e13caecec46f17ddc023a87b1f0a047 SHA512 62908fbadc0af734b63b25ac59573e0cd90b45024f796d077025b8bd7ce9b7ab14142b5a64de66291e2fc268f2a32e9354358413f99272bdfe17bd88d8213ef3 WHIRLPOOL 4cab69172de06d8e00b64aad9d67d673817d04225ed6df87cab772cffa37905be80fd258cea526ac9ea7526ddc9a3574a55cf7add75933331b824217e6d14ae0
+MISC metadata.xml 355 SHA256 a79de32de1c62a50159fd7f34972b250ab412b13315d83f78955634bdd6ab7e8 SHA512 9bb07654a69afd045464b0ff8190523a21716d53ad309cc87165c82b699ef7db8cb10caf27a6ccf549cb408f7d1af3f263c5a1e57520856dbcf1f3138807f94f WHIRLPOOL 7db268eb7695fd25550b031eb56ae98357ae6cd4f4e441a0353c3cb6574ad9e1dace80cbd991f9fad1b87842c7959e3eb9289a55a62fadea6f4b31f65115df83
diff --git a/x11-wm/lwm/lwm-1.2.2.ebuild b/x11-wm/lwm/lwm-1.2.2.ebuild
new file mode 100644
index 000000000000..d226e9f1f844
--- /dev/null
+++ b/x11-wm/lwm/lwm-1.2.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit toolchain-funcs
+
+DESCRIPTION="The ultimate lightweight window manager"
+SRC_URI="http://www.jfc.org.uk/files/lwm/${P}.tar.gz"
+HOMEPAGE="http://www.jfc.org.uk/software/lwm.html"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc ~sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libX11
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	x11-proto/xextproto
+	x11-misc/imake"
+
+src_prepare() {
+	sed -i -e "s/(SMLIB)/& -lICE/g" Imakefile || die #370127
+	xmkmf || die
+}
+
+src_compile() {
+	emake \
+		EXTRA_LDOPTIONS="${CFLAGS} ${LDFLAGS}" \
+		CFLAGS="${CFLAGS}" \
+		CC="$(tc-getCC)" \
+		lwm || die
+}
+
+src_install() {
+	dobin lwm
+
+	newman lwm.man lwm.1
+	dodoc AUTHORS BUGS ChangeLog
+}
diff --git a/x11-wm/lwm/lwm-1.2.3.ebuild b/x11-wm/lwm/lwm-1.2.3.ebuild
new file mode 100644
index 000000000000..ba61cf658314
--- /dev/null
+++ b/x11-wm/lwm/lwm-1.2.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="The ultimate lightweight window manager"
+SRC_URI="http://www.jfc.org.uk/files/lwm/${P}.tar.gz"
+HOMEPAGE="http://www.jfc.org.uk/software/lwm.html"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+"
+DEPEND="
+	${RDEPEND}
+	x11-misc/imake
+	x11-proto/xextproto
+	x11-proto/xproto
+"
+
+src_prepare() {
+	sed -i -e "s/(SMLIB)/& -lICE/g" Imakefile || die #370127
+	xmkmf || die
+}
+
+src_compile() {
+	emake \
+		EXTRA_LDOPTIONS="${CFLAGS} ${LDFLAGS}" \
+		CFLAGS="${CFLAGS}" \
+		CC="$(tc-getCC)" \
+		lwm || die
+}
+
+src_install() {
+	dobin lwm
+
+	newman lwm.man lwm.1
+	dodoc AUTHORS BUGS ChangeLog
+}
diff --git a/x11-wm/lwm/lwm-1.2.4.ebuild b/x11-wm/lwm/lwm-1.2.4.ebuild
new file mode 100644
index 000000000000..e9c2c04cd628
--- /dev/null
+++ b/x11-wm/lwm/lwm-1.2.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="The ultimate lightweight window manager"
+SRC_URI="http://www.jfc.org.uk/files/lwm/${P}.tar.gz"
+HOMEPAGE="http://www.jfc.org.uk/software/lwm.html"
+
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+"
+
+DEPEND="
+	${RDEPEND}
+	x11-misc/imake
+	x11-proto/xextproto
+	x11-proto/xproto
+"
+
+DOCS=( AUTHORS BUGS ChangeLog )
+
+src_prepare() {
+	default
+	sed -i -e "s#(SMLIB)#& -lICE#g" Imakefile || die #370127
+	xmkmf || die
+}
+
+src_compile() {
+	emake \
+		EXTRA_LDOPTIONS="${CFLAGS} ${LDFLAGS}" \
+		CFLAGS="${CFLAGS}" \
+		CC="$(tc-getCC)" \
+		"${PN}"
+}
+
+src_install() {
+	dobin "${PN}"
+	newman "${PN}.man" "${PN}.1"
+	einstalldocs
+}
diff --git a/x11-wm/lwm/metadata.xml b/x11-wm/lwm/metadata.xml
new file mode 100644
index 000000000000..931ff07adf2d
--- /dev/null
+++ b/x11-wm/lwm/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+<longdescription>
+	lwm is a window manager for X that tries to keep out of your face. 
+	There are no icons, no button bars, no icon docks, no root menus, 
+	no nothing.
+	</longdescription>	
+</pkgmetadata>
diff --git a/x11-wm/marco/Manifest b/x11-wm/marco/Manifest
new file mode 100644
index 000000000000..d4a97c0eb12a
--- /dev/null
+++ b/x11-wm/marco/Manifest
@@ -0,0 +1,12 @@
+DIST marco-1.12.1.tar.xz 1163996 SHA256 7f799115952a209e5063e5bd88d61d0baf430e630ca7783626af4dce46add084 SHA512 d271c4627fc50643d8e1a2faec33b5327999ad16a3975d62ea3ded956bccf3d5e015ed8085d43a200a34f1ea78f17d7e4ea4afaa9111e5f2e3a2230b51752945 WHIRLPOOL 960074cb63e4bc3381c128f016b0f1c30b1ba2d04ccd3e9a059ac43fb14d81a562dd7b3d5004ddae3a77146737d078eddeed52da3cf66f5106fb22f2500a9e42
+DIST marco-1.14.2.tar.xz 1244076 SHA256 31ab76950bd6f8e829c1c40be8cb53c0d77a17791137752d196e73f3d9e55be4 SHA512 6ca782f5dbbc01f5df4be901a1a6bf5b23398716e5802118482a0bf98e35f4dc544a6070358a931ca11f2d8b71cbbfb7e8768e0535c6605433a202be348ddf84 WHIRLPOOL 61ca2466f9965452e9481f42fc5803041303e5a4696cc11433b0803c23938eb2bc74bfb3f8d7d3b12d6ced37479ea9765f683d06087d5819ab9b23099c9cf617
+DIST marco-1.16.0.tar.xz 1245540 SHA256 33c0fbced78a4d0f22b16858517f9b3574f5de2e34dadf168ba7df5e9de0d0e3 SHA512 f353514dc69543e97fe08f9c67275c195ddc1c52b8b98dfb956351580b541a20b9f3a63d0b41939aca59e2416e58bb384206bbe2b8f56a26435b9760d23665b4 WHIRLPOOL db8636dd91358af76695074a6cfc1340e61a56418bae3b090ace87a7df73d8db715bdd6da1871c8abd757ff4d158c0202ddbbd157bc90d6c43818e317380f802
+DIST marco-1.18.1.tar.xz 1251108 SHA256 65a276104745817208582e5da1894eeb86391ea2e288775aa1d098e679ba8b53 SHA512 d6851c8c1c5bc25993dc72de7e5090736d236942ad37124ef52d0c23cc66faa1e4288273160bb9c1d1c303c99e3e096dcf031b2ea70bde93858627f31034708c WHIRLPOOL 94114a29315e5efe3a0204111f9299e23a7861993c37228d96a68c21fbceb3e0ea4de671056b9a3a21130aaa1ab0b23c4ef326a8e8ab65beaf58550fd0a10d58
+EBUILD marco-1.12.1-r1.ebuild 1565 SHA256 063b3da4b254930ada7e6852ba6d0302bb4a5449c36a0f3f2dfd54fe4270cdd5 SHA512 f67061e9d5a4db1b1fab69e9895057148316ec31e085bb33cbc78501e6e77df5306d5fe16478f080680294767aa531eb9db7466c4ba839efc44e5cd438c026eb WHIRLPOOL 6908609ec9524ef09061bc23508f1a26301367edeed27373940e46c1cf080c8c213bc843af9f5fc92938f3b67b53aa319ba9ca732dfd8e3277f42477e6c74a81
+EBUILD marco-1.12.1.ebuild 1523 SHA256 ca1ab373a90c4a86cc3f7e83c64705e0b24810f51093af3615fff27a4e71c0d9 SHA512 a032aa7dd3eaaef4b6a5dd38330ddebabd61b1f6dd6ebc9569e036368cc5b23e66dbde8f89886fa0a27115c4ba128767b479828bf52a9216d3d06095a9dcbe4d WHIRLPOOL 7179db86d5280420abde9827ab2c582698a56a9775540835eb72e15d5083c024ece1c35e80df80bf2bf79f4c0484dbff5faf9d3146d9292a9aad43f09b1a5203
+EBUILD marco-1.14.2-r1.ebuild 1606 SHA256 b6ee6f3959051714e8da7c75d86861ede21ea3b3b5221457b7f0098a6e300e72 SHA512 4f67f7f03ff5efeb95c262ec9b22b2d202b8a884f1a183773600941171ec185142676458bbba96930c82d96bdd8963814eb77bf9c877501320091d63d53c0231 WHIRLPOOL 9beec3b11e4b01127ae18eab9967520172336328d15c0a11a78b722c6a1860c9f47bfbdc3ea88d798bfc35bb8bb68088b786b33a24fb856c5fc19b90b32e61f5
+EBUILD marco-1.16.0-r1.ebuild 1606 SHA256 b6ee6f3959051714e8da7c75d86861ede21ea3b3b5221457b7f0098a6e300e72 SHA512 4f67f7f03ff5efeb95c262ec9b22b2d202b8a884f1a183773600941171ec185142676458bbba96930c82d96bdd8963814eb77bf9c877501320091d63d53c0231 WHIRLPOOL 9beec3b11e4b01127ae18eab9967520172336328d15c0a11a78b722c6a1860c9f47bfbdc3ea88d798bfc35bb8bb68088b786b33a24fb856c5fc19b90b32e61f5
+EBUILD marco-1.18.1.ebuild 1473 SHA256 cac57d03959de01eed4150ee86b94a9a82565dbb663b6a261f7e9c6264f3bccb SHA512 82e6fe23b37f377d2153f1e9c4c2c6b07b1a970a92e0460224b51a33adcd492340d8b08b7ecc6da15187f27014b350a6fefbd8d0c0267ad517adce8b4f03736b WHIRLPOOL 551c32f862f89a7660d9422d2f4e6f00dafe764509d5184ac2767f6fe6578b55e610193962a0bca5a89e060b4658e0f035d404eb203768468223467661574d91
+MISC ChangeLog 4585 SHA256 8bfd67d04b3f510c1ce3aa5a3135da64a1bd3fceac61405bf408b384bebfed3a SHA512 afe3dcca9a30d6898ba4b5ff9c269b2aac8dfc563ccb4b34f4cf9cc0b9d6c6954fcf2ae71a2dc81b253d119815a319e85ca1a98cf067c2bd3be0e306ad5d04d7 WHIRLPOOL 547ec76ad1538b9942a23af2ebf081f996ed7f21501d08371e6d94aa749767b1be6c2e9f378f36ea2ccc02298b4034ea7cd1fe50ecee00b328afc43fb0c40d44
+MISC ChangeLog-2015 1108 SHA256 fde34d911ad2926cd766e44d64b3524f65921813276acb00d29abf85cbce869e SHA512 6830566b6351ee990e605fdd4ffa3b29713c5b997cf4932fd0e125a72c12e01e27c4058d1f67a619d14aaf2a5de4abbf978e3bd6d7195b003a5d3264fb3eb7a3 WHIRLPOOL e9cdebb860d31b5639c7f522c9b66375eb9147c5d895921de3c3c54e8318f496234757ea78431f476232ba99eb49299866561b076363a64ddd80458c58b591eb
+MISC metadata.xml 410 SHA256 49da4b555f78004ee6de6eefa46e5f069b43077763920da1b1cf3d94bdd45702 SHA512 3736e03b4952f45354445560aa2aa6118a3257fe8b00d8d39df7946f65cfee017ef04f48447807387a9a4b6f37641bc55074efa7cadd944e1243feb183ab1d84 WHIRLPOOL 410a27c26a58bf6341a108743f7e16c0421ef7abcf90947022fd30a43d7060eb2524dc44f6fe93130443de9bddbc29cd9b84615b3fbb59ba71e0bee294ff2de9
diff --git a/x11-wm/marco/marco-1.12.1-r1.ebuild b/x11-wm/marco/marco-1.12.1-r1.ebuild
new file mode 100644
index 000000000000..beb7936f32b6
--- /dev/null
+++ b/x11-wm/marco/marco-1.12.1-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2017 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-proto/xextproto:0
+	x11-proto/xproto:0
+	test? ( app-text/docbook-xml-dtd:4.5 )
+	xinerama? ( x11-proto/xineramaproto:0 )"
+
+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
new file mode 100644
index 000000000000..5de2688902df
--- /dev/null
+++ b/x11-wm/marco/marco-1.12.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2016 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-proto/xextproto:0
+	x11-proto/xproto:0
+	test? ( app-text/docbook-xml-dtd:4.5 )
+	xinerama? ( x11-proto/xineramaproto:0 )"
+
+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
new file mode 100644
index 000000000000..5cdf56cdaaf6
--- /dev/null
+++ b/x11-wm/marco/marco-1.14.2-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 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-proto/xextproto:0
+	x11-proto/xproto:0
+	test? ( app-text/docbook-xml-dtd:4.5 )
+	xinerama? ( x11-proto/xineramaproto:0 )"
+
+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.0-r1.ebuild b/x11-wm/marco/marco-1.16.0-r1.ebuild
new file mode 100644
index 000000000000..5cdf56cdaaf6
--- /dev/null
+++ b/x11-wm/marco/marco-1.16.0-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 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-proto/xextproto:0
+	x11-proto/xproto:0
+	test? ( app-text/docbook-xml-dtd:4.5 )
+	xinerama? ( x11-proto/xineramaproto:0 )"
+
+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.18.1.ebuild b/x11-wm/marco/marco-1.18.1.ebuild
new file mode 100644
index 000000000000..c662c1eca330
--- /dev/null
+++ b/x11-wm/marco/marco-1.18.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2017 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="startup-notification test xinerama"
+
+COMMON_DEPEND="
+	dev-libs/atk:0
+	>=dev-libs/glib-2.32.10:2
+	>=gnome-base/libgtop-2:2=
+	media-libs/libcanberra:0[gtk3]
+	x11-libs/cairo:0
+	>=x11-libs/pango-1.2:0[X]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.0:3
+	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
+	xinerama? ( x11-libs/libXinerama:0 )
+	!!x11-wm/mate-window-manager"
+
+RDEPEND="${COMMON_DEPEND}
+	gnome-extra/zenity:0
+	>=mate-base/mate-desktop-1.17.0"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools:0
+	>=dev-util/intltool-0.34.90:*
+	sys-devel/gettext:*
+	virtual/pkgconfig:*
+	x11-proto/xextproto:0
+	x11-proto/xproto:0
+	test? ( app-text/docbook-xml-dtd:4.5 )
+	xinerama? ( x11-proto/xineramaproto:0 )"
+
+src_configure() {
+	mate_src_configure \
+		--enable-compositor \
+		--enable-render \
+		--enable-shape \
+		--enable-sm \
+		--enable-xsync \
+		$(use_enable startup-notification) \
+		$(use_enable xinerama)
+}
+
+src_install() {
+	mate_src_install
+	dodoc {,doc/}*.txt
+}
diff --git a/x11-wm/marco/metadata.xml b/x11-wm/marco/metadata.xml
new file mode 100644
index 000000000000..e5009557a916
--- /dev/null
+++ b/x11-wm/marco/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<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>
+</pkgmetadata>
diff --git a/x11-wm/matwm2/Manifest b/x11-wm/matwm2/Manifest
new file mode 100644
index 000000000000..fec55e264db7
--- /dev/null
+++ b/x11-wm/matwm2/Manifest
@@ -0,0 +1,7 @@
+AUX matwm2-0.1.2_pre3-destdir-fix.patch 1104 SHA256 56097e258d21d8d471a671036197fd85b8830a682b0ba9b720f6a876947f7258 SHA512 339986e58e4ca608d0d481f1c820662a24a012021733c242aceaec3e82490deccf395bf3766124469983f55cb2cb3552f5a3d07e3f56a34dd93a1251d3dd29a6 WHIRLPOOL f78b89d76136e48a38eee780145263a0eee9b0cc60399b99b593709081643bbae768bdf5b27bdb030880dfade4dfb1c5331f2504dc8b0b5981bac504bcd82569
+AUX matwm2.desktop 69 SHA256 ff87cbe6562a02dd8a13bc5c5582c3cc0c914c1f5c49b49860de65d0b28c5938 SHA512 1308539065599bf807580868510ea772bc09b5e06c6cc184ece5faf100fb14cd424f47e030bc77d62525b7751c874e7313b73444b85ab07076f31bacdcf24e3e WHIRLPOOL c3910679e856650488e95c5532137811fa7b58ef6ed77c9553ce4e0a5a06e0e06c96e81849485b6827bdfe85fcd439b6d6d2f1e7d66e4cb95bf6f2eca6856cc4
+DIST matwm2-0.1.2_pre3.tar.gz 860231 SHA256 c6fc2b4cbe278e5b85035a9019d27e3ad964cab3b5862c442652679ab85523d0 SHA512 30c55c6090015432bf99853f136baebb5b4c1301d5f922dc933e0141caf18d6891a982bd89e22e065c146c0c5c570d0e8aebb7e4c708dddde9b0570b7ed5f9ba WHIRLPOOL 05b651783232ca46f03c5cd018379770749b2ff93d87cd24f297f3ce55677917c1f6980e2e5be8d8e53ff1e6020f07d4bacafdbc7189a9de9133b8147048f78c
+EBUILD matwm2-0.1.2_pre3.ebuild 1481 SHA256 ad8a3f5e3b580c078080f2c9441cf6b58f2ad96510a158f1261682d65f3b710b SHA512 7cfad1edb7e45f24aaa73530dd5dc80fac511b4bf3117bb6c1bcceac8eb9695e0d4e67df84949bfa049b9ec806075cae737f5540170a54ee66a9be7efa067707 WHIRLPOOL d6f88323cdf0a19909f5c4677098a27939022d45d5f4be31db41d1656fcc49638dfbf078c88613c2a4cbf9d24940e90e75607f6abe3417de003cedc98aacede6
+MISC ChangeLog 2579 SHA256 66bd2e3ec0a78e72cb6f172a56cb0ac8e959b8c10733cd27d168aced20f22cab SHA512 f962586d439598ad7bbdfef312f3dddfbe31290b189a44407d86bae9f32d8dc9d6e1006b4adf2a48d3f1480bcdb3c52e2695c159df1b4af0495e3026c4a4b3d5 WHIRLPOOL dc8427f9f14649867f9bc355b3b81f7d2b2a3f496c8fa6e6a9004674cd29de986b06c97c82cafb6b73bbc43799b1b60ab25560e999e4ab1d2153922d69844646
+MISC ChangeLog-2015 966 SHA256 0e7ad47750b42fa58efaef844d914393235eecaeb46f005d810c3f371fe1b80b SHA512 8227694f1383b76606a57a980c886ac6499b0ce211bf2c479884ecef3febbba17bdfa9cc5468a4030c3956c03e3ee308f67854ee7fb35aaf90221c04013dbbef WHIRLPOOL f825b05ee5caf2a31d4157986dd076411ae038a9a2496455c9bf5f5361d66654a3d2d9d59481abd679edcd29d488b10b02c4bf5ebd38fbf307579fbdbe77006c
+MISC metadata.xml 244 SHA256 0e54936fc5521de9f75d4d74b6a85e7a1deb7c32c22910c2a186783495b12a74 SHA512 ab9836137510572de701a29e6c8f81e7ec496e1e6b29119b5bcf183e4f7e99b1c8790c123054abf8cecfb4e93d427a42e61b862590c9badee70ec4736ee82eef WHIRLPOOL df05420730c8d912c0adff3bc46ce739f574efdabe66b94ec999cb0f929770012b5d8a1f3240b9c659222b79803f7d66d751f73ca66b4bd9ffe3448deb9745d7
diff --git a/x11-wm/matwm2/files/matwm2-0.1.2_pre3-destdir-fix.patch b/x11-wm/matwm2/files/matwm2-0.1.2_pre3-destdir-fix.patch
new file mode 100644
index 000000000000..8bd966301f88
--- /dev/null
+++ b/x11-wm/matwm2/files/matwm2-0.1.2_pre3-destdir-fix.patch
@@ -0,0 +1,34 @@
+From a752f42ebdc0b3cb7c7246c96fdb1601a4d1eae4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?G=C3=B6kt=C3=BCrk=20Y=C3=BCksek?= <gokturk@gentoo.org>
+Date: Wed, 8 Feb 2017 02:00:08 -0500
+Subject: [PATCH] Makefile.in: use DESTDIR for install and deinstall targets
+
+Distinguish between PREFIX and DESTDIR.
+---
+ Makefile.in | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index fd3e299..5ec1471 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -23,12 +23,12 @@ clean:
+ 	$(RM) matwm2 *.o
+ 
+ install: matwm2
+-	mkdir -p $(PREFIX)/bin $(MANDIR)/man1
+-	install -s matwm2 $(PREFIX)/bin
+-	install matwm2.1 $(MANDIR)/man1
++	mkdir -p $(DESTDIR)$(PREFIX)/bin $(DESTDIR)$(MANDIR)/man1
++	install -s matwm2 $(DESTDIR)$(PREFIX)/bin
++	install matwm2.1 $(DESTDIR)$(MANDIR)/man1
+ 
+ deinstall:
+-	$(RM) $(PREFIX)/bin/matwm2 $(MANDIR)/man1/matwm2.1* $(MANDIR)/cat1/matwm2.1*
++	$(RM) $(DESTDIR)$(PREFIX)/bin/matwm2 $(DESTDIR)$(MANDIR)/man1/matwm2.1* $(DESTDIR)$(MANDIR)/cat1/matwm2.1*
+ 
+ # converts default_matwmrc into C code that can be compiled into the binary
+ defcfg:
+-- 
+2.10.2
+
diff --git a/x11-wm/matwm2/files/matwm2.desktop b/x11-wm/matwm2/files/matwm2.desktop
new file mode 100644
index 000000000000..e15f8e95d0a0
--- /dev/null
+++ b/x11-wm/matwm2/files/matwm2.desktop
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Version=1.0
+Name=matwm2
+Exec=matwm2
+Type=Application
diff --git a/x11-wm/matwm2/matwm2-0.1.2_pre3.ebuild b/x11-wm/matwm2/matwm2-0.1.2_pre3.ebuild
new file mode 100644
index 000000000000..0f564a80660e
--- /dev/null
+++ b/x11-wm/matwm2/matwm2-0.1.2_pre3.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+MY_PV="${PV//_/}"
+
+DESCRIPTION="Simple EWMH compatible window manager with titlebars and frames"
+HOMEPAGE="https://github.com/segin/matwm2"
+SRC_URI="https://github.com/segin/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug xft xinerama"
+S="${WORKDIR}/${PN}-${MY_PV}/${PN}"
+
+RDEPEND="
+	x11-libs/libXext
+	x11-libs/libX11
+	debug? ( x11-proto/xproto )
+	xft? ( x11-libs/libXft )
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-proto/xextproto
+	xinerama? ( x11-proto/xineramaproto )
+"
+
+PATCHES=( "${FILESDIR}/${P}-destdir-fix.patch" )
+
+src_prepare() {
+	default
+
+	# Let the package manager handle stripping
+	sed -e 's/install -s/install/g' -i Makefile.in || die
+}
+
+src_configure() {
+	# configure is not autotools based
+	local myconfigureargs=(
+		--prefix="${EPREFIX}/usr"
+		--mandir="${EPREFIX}/usr/share/man"
+		--cc="$(tc-getCC)"
+		$(usex debug "--enable-debug" "")
+		$(usex xft "" "--disable-xft")
+		$(usex xinerama "" "--disable-xinerama")
+	)
+
+	./configure "${myconfigureargs[@]}" || die
+}
+
+src_install() {
+	default
+
+	docompress -x "${EPREFIX}/usr/share/doc/${PF}"/default_matwmrc
+	dodoc default_matwmrc
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/${PN}.desktop
+
+	echo ${PN} > "${T}"/${PN} || die
+	exeinto /etc/X11/Sessions
+	doexe "${T}"/${PN}
+}
diff --git a/x11-wm/matwm2/metadata.xml b/x11-wm/matwm2/metadata.xml
new file mode 100644
index 000000000000..ff23f35a28b1
--- /dev/null
+++ b/x11-wm/matwm2/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">segin/matwm2</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-wm/metadata.xml b/x11-wm/metadata.xml
new file mode 100644
index 000000000000..4e0a0d83bfbf
--- /dev/null
+++ b/x11-wm/metadata.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The x11-wm category contains X11 window managers.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie x11-wm enthält verschiedene Window Manager für X11.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría x11-wm contiene manejadores de ventanas para X11.
+	</longdescription>
+	<longdescription lang="ja">
+		x11-wmカテゴリーにはX11のウィンドゥ・マネージャーが含まれています。
+	</longdescription>
+	<longdescription lang="nl">
+		De x11-wm categorie bevat verschillende window managers voor X11.
+	</longdescription>
+	<longdescription lang="sk">
+		Kategória x11-wm obsahuje správcov okien (window managers) pre X11.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm x11-wm chứa các trình quản lý cửa sổ X11.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria x11-wm contiene dei gestori di finestre per X11.
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria x11-wm contém gerenciadores de janelas para X11.
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria x11-wm zawiera menedżery okien dla środowisk X11.
+	</longdescription>
+</catmetadata>
+
diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
new file mode 100644
index 000000000000..cba7ea02a778
--- /dev/null
+++ b/x11-wm/muffin/Manifest
@@ -0,0 +1,14 @@
+DIST muffin-2.8.5.tar.gz 2715965 SHA256 0ae19de74111f222b44f7bf8d159437a83c6ae2e7ce70b327c0296365d69aba4 SHA512 a285e076f27e3a52ba4c6d813578e780f7f900e0ed3fa009951d908ffef3b0ded3678f6d298dd08f80b1cd61f20c90b0acd8607d53ad2accc27e16bf1bc14221 WHIRLPOOL 6493050ea667b354324511818a692cf0fca33ef83701dfee38f3bf4cec738276f885cfbdf65efa769e5bd0c0870b6359acb3fd6de583e9ab66ef09daaeeba8ff
+DIST muffin-3.0.5.tar.gz 2717820 SHA256 11c27abedad6952aaa446d37ad23e910c3c51dc0dd8d29298cfae2c3ad917e64 SHA512 2d4d37099e33ee5b0817970f5f7e264d679752ef5a256916e54a7072419e8c75a67d8609c541238bd76c462a85c9841167e051b3ced968a557aa4a90f41b2d5c WHIRLPOOL e57f4ab9970cabae7039bdedeb3f02abfb1b4311824af39eb8022cff694f3c34d19183b133f81cc0663e195ea66b32602462e145f1ecb77c63d17d4ce2b065e7
+DIST muffin-3.2.0.tar.gz 2718913 SHA256 061966c2c8520804e1338de0dd499672a7f054aa7ae32b2fd98e49e656ad9a21 SHA512 f1c17fdaf4d8f32ae9e62a60811a24c120413ad2a1e824ee412527a2c3336c2523596cb06fcad01a2f1fbf1a09a78cc30a5769b1cb860ce26d96690a8c3c4043 WHIRLPOOL 14ca0f448f22cabde6aebde70438bba783c26f5b488b7691bf54c26cabd97eabdaf083cb5988f76f0a8bb13dd190d6ffd32214bc425e0234ec34eae40723e47e
+DIST muffin-3.4.0.tar.gz 2719701 SHA256 bbfd8997ad0f03d029f804c4927f464e89276ce384aef5aa6787dddc04e6ef85 SHA512 27c800dbd433f5eac19aa7db51994311acad347630f1f8b86f71846723f1b7d89929a1c900e6f8766b86ab078ed6b766554fe65dc12d81a61925e0396095e51d WHIRLPOOL 18c0e77aa3766528ea93c2eb88812f4bdb9d4360015799edff12c8a1b6951f61ff31767e61ab7dabcd3b20ec3f8097cfb84726f70bd77600a96beae0c8af7992
+DIST muffin-3.4.1.tar.gz 2720297 SHA256 f051c9bb1291381c9e32bf06ef829cb2ee894e8d6293a4d2738c8655d3643c26 SHA512 896dcb9c51d4aee28dcf16fbf721c1b3f581bc2a0f5344eb360655339e78f34ee89120c7a9b4ee3ffe55243c7c300f20140b76bfff52a7a9a9f292de33b9488c WHIRLPOOL 9e9e4e646d64d416f88baf5bd245c22768ce71267fb2e8fe7709d8377a495beb6ab3fcf59f9a282800c6251211bbde9844474ddb6e847e1b71df7e7205f736bc
+EBUILD muffin-2.8.5.ebuild 2113 SHA256 fa4891f13586653b0f62fc74b9de1cd26769c8304c5fffd1d38c92cb0e34453c SHA512 572c9c02850d30fe088ff832a1a92df2ad422d250a6739e94d0240668e1669ad8f677ac55409b4d136bca6f8d6f5591b232096dab2bf09378e56c3ccd5c30f2c WHIRLPOOL 64ee1fd192cab60461ded28c35e6ec644e3031644dd484b8e2ce731f52556ef0edae63549e6621b5926661a88b15e43eac97aaa307c02f6851f937a5da5bf667
+EBUILD muffin-3.0.5.ebuild 2070 SHA256 2ed0ecb3c0704c9bd9f8b0657aed84376279d655b5b558a2c7c7078dd8fdefea SHA512 f3596e96d56b7b7577bc5c368c792322260221951fd5fb2eac71689d1d4cc54dc8ddc0b2990a41d5d7a5aafd6ff293c01fcc36f026853a2d2161fb4ee172ccd7 WHIRLPOOL cdca57889bb88119af7b5fa8a25e7a5c556d8c47525c83793aaa7ff2dfa8f7fc433d8b46561eae00dbc726e1b490889baf738d0b15f7d0ff32073f5d152c69a4
+EBUILD muffin-3.2.0-r1.ebuild 2074 SHA256 f3e6fd7b7001d641e785a044833c297d244bd5c5ccd3249530add41e6f40a46d SHA512 4093e47d2a93ce7c0e70748b26145b1daf990f39e8558b8d3a8672c66f5cf2f04e19b0a8681495021d05857dd688e2842cb5288d3a68bc6d34af5109a5065bd9 WHIRLPOOL 41315852928c958de598b22b26e501c244304c46725370d60be4a1dc4f2097f58acf242a149b5ece260b62ea198c59a875665b99cd2e6c82cf1073c2cd685bcb
+EBUILD muffin-3.2.0.ebuild 2072 SHA256 71d5fb8f51ea4240819c34c05cb4934d59d54ee1c8b6317c22b2fbb608a3cdd7 SHA512 85a1a978cef004b7874c9febecb7ed7723a4c68241fcc2b573b7e0527fd8f78092da3ae21c1f7f91c976a0ea90c1f75fb71e73475bbf29bfde4e2909e65494ac WHIRLPOOL 7054579af2e0b4bbb9b31b181136620d8392e92857967e33cc32422c254bdabd00220af5bb13f07e736cc2affe709f5f8a3c437f9852380079c1a49bc27c4a31
+EBUILD muffin-3.4.0.ebuild 2074 SHA256 f3e6fd7b7001d641e785a044833c297d244bd5c5ccd3249530add41e6f40a46d SHA512 4093e47d2a93ce7c0e70748b26145b1daf990f39e8558b8d3a8672c66f5cf2f04e19b0a8681495021d05857dd688e2842cb5288d3a68bc6d34af5109a5065bd9 WHIRLPOOL 41315852928c958de598b22b26e501c244304c46725370d60be4a1dc4f2097f58acf242a149b5ece260b62ea198c59a875665b99cd2e6c82cf1073c2cd685bcb
+EBUILD muffin-3.4.1.ebuild 2074 SHA256 f3e6fd7b7001d641e785a044833c297d244bd5c5ccd3249530add41e6f40a46d SHA512 4093e47d2a93ce7c0e70748b26145b1daf990f39e8558b8d3a8672c66f5cf2f04e19b0a8681495021d05857dd688e2842cb5288d3a68bc6d34af5109a5065bd9 WHIRLPOOL 41315852928c958de598b22b26e501c244304c46725370d60be4a1dc4f2097f58acf242a149b5ece260b62ea198c59a875665b99cd2e6c82cf1073c2cd685bcb
+MISC ChangeLog 5587 SHA256 68704bc26ff5786c149f897a7763394986ce1d02944bbc7f95258bb95a79ab03 SHA512 3411a80f0d89b035ffe1a0f0b9418843cda2dfcad1bf6955c7886927863cf7ea03bdd5af7950da357836510e8bb00574ad0bad838c73bf3d63a09913db7b033e WHIRLPOOL 4fdbb94bd677420be480e4fb943855363dccb5e011fa3ed65e159b7067c3c11966946e3919b973c2b7324d37e458c455e6e50a1f69e20debbd5bd77446938b23
+MISC ChangeLog-2015 5221 SHA256 4978100bf2489fc741e2a6041d4bf239d5867e75bdd00be5d7c3d695f42b836b SHA512 6dbc5067036c63360201e7ae191c6c7be75e7dac4779a58db0e1afa8c902b636bc6ebab9e65e1942d8a53d6336e45ac3ad59c2a90b32d74c9166d787f5da4ab2 WHIRLPOOL 2d08b4fe576c7fcc87adbe1e3d865ccdf9166c4570f082c31a6e35233a917ed1bfd635ae4e16ce5e62d36834a6535dc71c9548ef3d2bb0d43450da8bd6a8fe8a
+MISC metadata.xml 345 SHA256 915782cea700bbce9d28e58ec050a4b43ffbbcba5757d57cc0440af5a53142e0 SHA512 e58170ad4dfd2f521bb2a10519dcc46772b00e14b6bd3fa107532d1b825565d82fad2e814ae9ffa2150ed9435965095428ccc4131c946a7d63e10575940ac470 WHIRLPOOL b134974e63102c2df2e76bc13ba25c8c4858e764f7f4a92fecae1d105e94e2c3cba400b57224ffecab8d1430fd95a908dfe812bbaf11e4c0c29e419baca8fcdc
diff --git a/x11-wm/muffin/metadata.xml b/x11-wm/muffin/metadata.xml
new file mode 100644
index 000000000000..658465f83128
--- /dev/null
+++ b/x11-wm/muffin/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+        <email>cinnamon@gentoo.org</email>
+        <name>Cinnamon Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">linuxmint/muffin</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-wm/muffin/muffin-2.8.5.ebuild b/x11-wm/muffin/muffin-2.8.5.ebuild
new file mode 100644
index 000000000000..ec923203378d
--- /dev/null
+++ b/x11-wm/muffin/muffin-2.8.5.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils gnome2 python-any-r1
+
+DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+introspection test xinerama"
+KEYWORDS="amd64 x86"
+
+COMMON_DEPEND="
+	>=x11-libs/pango-1.2[X,introspection?]
+	>=x11-libs/cairo-1.14:=[X]
+	x11-libs/gdk-pixbuf:2[introspection?]
+	>=x11-libs/gtk+-3.9.12:3[X,introspection?]
+	>=dev-libs/glib-2.37.3:2[dbus]
+	>=gnome-extra/cinnamon-desktop-2.4:0=[introspection?]
+	>=gnome-base/gsettings-desktop-schemas-3.3.0[introspection?]
+	>=media-libs/clutter-1.14.3:1.0=[introspection?]
+	>=media-libs/cogl-1.13.3:1.0=[introspection?]
+	>=media-libs/libcanberra-0.26[gtk3]
+	>=x11-libs/libXcomposite-0.3
+	>=x11-libs/startup-notification-0.7:=
+
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	virtual/opengl
+
+	gnome-extra/zenity
+
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+	xinerama? ( x11-libs/libXinerama )
+"
+# needs gtk-doc, not just -am, for gtk-doc.make
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	>=app-text/gnome-doc-utils-0.8
+	sys-devel/gettext
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+	test? ( app-text/docbook-xml-dtd:4.5 )
+	xinerama? ( x11-proto/xineramaproto )
+	x11-proto/xextproto
+	x11-proto/xproto
+"
+RDEPEND="${COMMON_DEPEND}
+	!x11-misc/expocity
+"
+
+src_prepare() {
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* *.txt doc/*.txt"
+	gnome2_src_configure \
+		--disable-static \
+		--enable-shape \
+		--enable-sm \
+		--enable-startup-notification \
+		--enable-xsync \
+		--enable-verbose-mode \
+		--with-libcanberra \
+		$(use_enable introspection) \
+		$(use_enable xinerama)
+}
diff --git a/x11-wm/muffin/muffin-3.0.5.ebuild b/x11-wm/muffin/muffin-3.0.5.ebuild
new file mode 100644
index 000000000000..67813feeeb3b
--- /dev/null
+++ b/x11-wm/muffin/muffin-3.0.5.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils gnome2
+
+DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+introspection test xinerama"
+KEYWORDS="amd64 x86"
+
+COMMON_DEPEND="
+	>=x11-libs/pango-1.2[X,introspection?]
+	>=x11-libs/cairo-1.14:=[X]
+	x11-libs/gdk-pixbuf:2[introspection?]
+	>=x11-libs/gtk+-3.9.12:3[X,introspection?]
+	>=dev-libs/glib-2.37.3:2[dbus]
+	>=gnome-extra/cinnamon-desktop-2.4:0=[introspection?]
+	>=gnome-base/gsettings-desktop-schemas-3.3.0[introspection?]
+	>=media-libs/clutter-1.14.3:1.0=[introspection?]
+	>=media-libs/cogl-1.13.3:1.0=[introspection?]
+	>=media-libs/libcanberra-0.26[gtk3]
+	>=x11-libs/libXcomposite-0.3
+	>=x11-libs/startup-notification-0.7:=
+
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	virtual/opengl
+
+	gnome-extra/zenity
+
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+	xinerama? ( x11-libs/libXinerama )
+"
+# needs gtk-doc, not just -am, for gtk-doc.make
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	>=app-text/gnome-doc-utils-0.8
+	sys-devel/gettext
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+	test? ( app-text/docbook-xml-dtd:4.5 )
+	xinerama? ( x11-proto/xineramaproto )
+	x11-proto/xextproto
+	x11-proto/xproto
+"
+RDEPEND="${COMMON_DEPEND}
+	!x11-misc/expocity
+"
+
+src_prepare() {
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* *.txt doc/*.txt"
+	gnome2_src_configure \
+		--disable-static \
+		--enable-shape \
+		--enable-sm \
+		--enable-startup-notification \
+		--enable-xsync \
+		--enable-verbose-mode \
+		--with-libcanberra \
+		$(use_enable introspection) \
+		$(use_enable xinerama)
+}
diff --git a/x11-wm/muffin/muffin-3.2.0-r1.ebuild b/x11-wm/muffin/muffin-3.2.0-r1.ebuild
new file mode 100644
index 000000000000..54cfd8ecf95d
--- /dev/null
+++ b/x11-wm/muffin/muffin-3.2.0-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils gnome2
+
+DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+introspection test xinerama"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	>=x11-libs/pango-1.2[X,introspection?]
+	>=x11-libs/cairo-1.14:=[X]
+	x11-libs/gdk-pixbuf:2[introspection?]
+	>=x11-libs/gtk+-3.9.12:3[X,introspection?]
+	>=dev-libs/glib-2.37.3:2[dbus]
+	>=gnome-extra/cinnamon-desktop-2.4:0=[introspection?]
+	>=gnome-base/gsettings-desktop-schemas-3.3.0[introspection?]
+	>=media-libs/clutter-1.14.3:1.0=[X,introspection?]
+	>=media-libs/cogl-1.13.3:1.0=[introspection?]
+	>=media-libs/libcanberra-0.26[gtk3]
+	>=x11-libs/libXcomposite-0.3
+	>=x11-libs/startup-notification-0.7:=
+
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	virtual/opengl
+
+	gnome-extra/zenity
+
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+	xinerama? ( x11-libs/libXinerama )
+"
+# needs gtk-doc, not just -am, for gtk-doc.make
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	>=app-text/gnome-doc-utils-0.8
+	sys-devel/gettext
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+	test? ( app-text/docbook-xml-dtd:4.5 )
+	xinerama? ( x11-proto/xineramaproto )
+	x11-proto/xextproto
+	x11-proto/xproto
+"
+RDEPEND="${COMMON_DEPEND}
+	!x11-misc/expocity
+"
+
+src_prepare() {
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* *.txt doc/*.txt"
+	gnome2_src_configure \
+		--disable-static \
+		--enable-shape \
+		--enable-sm \
+		--enable-startup-notification \
+		--enable-xsync \
+		--enable-verbose-mode \
+		--with-libcanberra \
+		$(use_enable introspection) \
+		$(use_enable xinerama)
+}
diff --git a/x11-wm/muffin/muffin-3.2.0.ebuild b/x11-wm/muffin/muffin-3.2.0.ebuild
new file mode 100644
index 000000000000..afdf5b916e46
--- /dev/null
+++ b/x11-wm/muffin/muffin-3.2.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils gnome2
+
+DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+introspection test xinerama"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	>=x11-libs/pango-1.2[X,introspection?]
+	>=x11-libs/cairo-1.14:=[X]
+	x11-libs/gdk-pixbuf:2[introspection?]
+	>=x11-libs/gtk+-3.9.12:3[X,introspection?]
+	>=dev-libs/glib-2.37.3:2[dbus]
+	>=gnome-extra/cinnamon-desktop-2.4:0=[introspection?]
+	>=gnome-base/gsettings-desktop-schemas-3.3.0[introspection?]
+	>=media-libs/clutter-1.14.3:1.0=[introspection?]
+	>=media-libs/cogl-1.13.3:1.0=[introspection?]
+	>=media-libs/libcanberra-0.26[gtk3]
+	>=x11-libs/libXcomposite-0.3
+	>=x11-libs/startup-notification-0.7:=
+
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	virtual/opengl
+
+	gnome-extra/zenity
+
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+	xinerama? ( x11-libs/libXinerama )
+"
+# needs gtk-doc, not just -am, for gtk-doc.make
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	>=app-text/gnome-doc-utils-0.8
+	sys-devel/gettext
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+	test? ( app-text/docbook-xml-dtd:4.5 )
+	xinerama? ( x11-proto/xineramaproto )
+	x11-proto/xextproto
+	x11-proto/xproto
+"
+RDEPEND="${COMMON_DEPEND}
+	!x11-misc/expocity
+"
+
+src_prepare() {
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* *.txt doc/*.txt"
+	gnome2_src_configure \
+		--disable-static \
+		--enable-shape \
+		--enable-sm \
+		--enable-startup-notification \
+		--enable-xsync \
+		--enable-verbose-mode \
+		--with-libcanberra \
+		$(use_enable introspection) \
+		$(use_enable xinerama)
+}
diff --git a/x11-wm/muffin/muffin-3.4.0.ebuild b/x11-wm/muffin/muffin-3.4.0.ebuild
new file mode 100644
index 000000000000..54cfd8ecf95d
--- /dev/null
+++ b/x11-wm/muffin/muffin-3.4.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils gnome2
+
+DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+introspection test xinerama"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	>=x11-libs/pango-1.2[X,introspection?]
+	>=x11-libs/cairo-1.14:=[X]
+	x11-libs/gdk-pixbuf:2[introspection?]
+	>=x11-libs/gtk+-3.9.12:3[X,introspection?]
+	>=dev-libs/glib-2.37.3:2[dbus]
+	>=gnome-extra/cinnamon-desktop-2.4:0=[introspection?]
+	>=gnome-base/gsettings-desktop-schemas-3.3.0[introspection?]
+	>=media-libs/clutter-1.14.3:1.0=[X,introspection?]
+	>=media-libs/cogl-1.13.3:1.0=[introspection?]
+	>=media-libs/libcanberra-0.26[gtk3]
+	>=x11-libs/libXcomposite-0.3
+	>=x11-libs/startup-notification-0.7:=
+
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	virtual/opengl
+
+	gnome-extra/zenity
+
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+	xinerama? ( x11-libs/libXinerama )
+"
+# needs gtk-doc, not just -am, for gtk-doc.make
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	>=app-text/gnome-doc-utils-0.8
+	sys-devel/gettext
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+	test? ( app-text/docbook-xml-dtd:4.5 )
+	xinerama? ( x11-proto/xineramaproto )
+	x11-proto/xextproto
+	x11-proto/xproto
+"
+RDEPEND="${COMMON_DEPEND}
+	!x11-misc/expocity
+"
+
+src_prepare() {
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* *.txt doc/*.txt"
+	gnome2_src_configure \
+		--disable-static \
+		--enable-shape \
+		--enable-sm \
+		--enable-startup-notification \
+		--enable-xsync \
+		--enable-verbose-mode \
+		--with-libcanberra \
+		$(use_enable introspection) \
+		$(use_enable xinerama)
+}
diff --git a/x11-wm/muffin/muffin-3.4.1.ebuild b/x11-wm/muffin/muffin-3.4.1.ebuild
new file mode 100644
index 000000000000..54cfd8ecf95d
--- /dev/null
+++ b/x11-wm/muffin/muffin-3.4.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils gnome2
+
+DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+introspection test xinerama"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	>=x11-libs/pango-1.2[X,introspection?]
+	>=x11-libs/cairo-1.14:=[X]
+	x11-libs/gdk-pixbuf:2[introspection?]
+	>=x11-libs/gtk+-3.9.12:3[X,introspection?]
+	>=dev-libs/glib-2.37.3:2[dbus]
+	>=gnome-extra/cinnamon-desktop-2.4:0=[introspection?]
+	>=gnome-base/gsettings-desktop-schemas-3.3.0[introspection?]
+	>=media-libs/clutter-1.14.3:1.0=[X,introspection?]
+	>=media-libs/cogl-1.13.3:1.0=[introspection?]
+	>=media-libs/libcanberra-0.26[gtk3]
+	>=x11-libs/libXcomposite-0.3
+	>=x11-libs/startup-notification-0.7:=
+
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	virtual/opengl
+
+	gnome-extra/zenity
+
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+	xinerama? ( x11-libs/libXinerama )
+"
+# needs gtk-doc, not just -am, for gtk-doc.make
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	>=app-text/gnome-doc-utils-0.8
+	sys-devel/gettext
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+	test? ( app-text/docbook-xml-dtd:4.5 )
+	xinerama? ( x11-proto/xineramaproto )
+	x11-proto/xextproto
+	x11-proto/xproto
+"
+RDEPEND="${COMMON_DEPEND}
+	!x11-misc/expocity
+"
+
+src_prepare() {
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* *.txt doc/*.txt"
+	gnome2_src_configure \
+		--disable-static \
+		--enable-shape \
+		--enable-sm \
+		--enable-startup-notification \
+		--enable-xsync \
+		--enable-verbose-mode \
+		--with-libcanberra \
+		$(use_enable introspection) \
+		$(use_enable xinerama)
+}
diff --git a/x11-wm/musca/Manifest b/x11-wm/musca/Manifest
new file mode 100644
index 000000000000..2b44c7ec263a
--- /dev/null
+++ b/x11-wm/musca/Manifest
@@ -0,0 +1,12 @@
+AUX musca-0.9.24-make.patch 711 SHA256 114b44eb6cc3584fb079faadc85d3ebf170d6c1f790a6f55c78ce7f95583cadb SHA512 e31f4eb6b79e4137e366943c804aeaf7d571f005cf81332611126b94a82a3dd93651631670f7d0b6620e8f41047250c0c2c1955e86d9d48193ba3acd99e1c54c WHIRLPOOL 5f66c25a6a0309bf002223bf79097de6bc2b545b853cbee0a66f3a62d394a43e8a8002179245b56d3d51e22dbd283dc702ba64e3fe4e05ef14569bec61f200d9
+AUX musca-0.9.24_p20100226-dmenu-4.4.patch 1421 SHA256 d88c845edaa58a73bc4d2c331bfbd15cbbb0db50df6ab74e351eb35d92e77e6d SHA512 9aee1756cd0ff7094a26aa3ab0e2440728b973a72234c3532f733afc57763678cfcfb6a07ec2ae386f2b70d2313d62437cf889d561bbf321f96fe979181541b3 WHIRLPOOL 00682b04df0db076ac022dc2f18fb1d7dd9f7af6abfc195642815c3b298459de4c386e7442d56b9c056b0dc8359a0e208cb4aa359bccc1402245d71bddf4da42
+AUX musca-0.9.24_p20100226-fix-cycle.patch 408 SHA256 4683118c5149c1a299de55778a9e6c9891c9b68834bc02575f0366bde0322319 SHA512 873f3907bcc31aa29e8af92ec5a20996e6efa5e879eb2d1b6f5bccc562d3816b83475f650f07b7834e9392b32f15644b298056a03a570c6f768224d3bd5f4449 WHIRLPOOL 8ac8525633ac221159490cb6f838359f6f80b831fcbd70ed6e318ebbe6180d2569c99e1b87307d7be753d83a037b837d3bb8d6508ec20e9894d6ab5718f79cf3
+AUX musca-0.9.24_p20100226-fix-pad.patch 818 SHA256 79389a349c3ef4ea9d1041f2988f0955d994ce45f373b8e0f3e0ab28c3b64425 SHA512 9552c301a2f228fc4147bfc27ab28bd0d17c7cd308f20ff432c37a041b91fd62a166eca2085c36693249ac6d19225717c898c13e7ed176adb9000c37cd8bd0e5 WHIRLPOOL 7717f29deab12f83293fe77262a6e262d6005def7b5968c6ce1c6853ff077abcd4a154140f9282c7579a02f943470e6c88ada047b787bc9ce856b10ded9175f8
+AUX musca-0.9.24_p20100226-null.patch 4271 SHA256 426d5646ac1ac294c24426cb070957285e1f96d1d2b1479a43a6e0d4b4e0e9d0 SHA512 76bf5d67eee6a5045d1781b818333ef36bac87276bb6050b794502abc4aa77a930092f62ec07622ee18f6bb270924ec40813ee70d25ea8e5d3cf1458a39569a5 WHIRLPOOL cfa0efd4f44c8233306453ca803c79953e2f8fcad56f19c87d15666789fd798c5fd4153f07681adcc95a45cc835417949de7847b35487a64da253a72e0d79f90
+AUX musca.xsession 16 SHA256 b9497cce444e83c33c62c124cb73fa3a7ee5b2ab24a9679b3c6d89a5957a9c47 SHA512 f276046ab82ceeaebf5307ea9050d55767a55cbd1913854ef0f73bdf162d2d751537ad604fc2a99d8d9c9b89426b609f127451c7a3f6b36868c74842d28a8622 WHIRLPOOL a646ec627cd03b627ba7ed6814b72ade83f28f3c3835841a9e041304efc07d3fd8d5c8661bc0640809ba72d07cdfa69c504a96df99c5912a9b19153d029a3b18
+DIST musca-0.9.24_p20100226.tgz 81490 SHA256 63167c76fa5ea9381685d209e12b795001d8d0d183b22a6578f255b56ca87676 SHA512 9030931dbc332fce144edc6bea907d86aab1eef6b1384958a7889b533af5065a2f20b7233ea063648fff0eb468c2083a310e38586c2c4d83848c773fb1984f45 WHIRLPOOL 79b45f6c48fc1e263baddc4fa14dce737824b02ed4a0ccd2199d4ac968aae4044e0487f9350278c8e5674d14f7241bd676c4ab96cdec7f0a6f0c2b7b6f246829
+EBUILD musca-0.9.24_p20100226-r3.ebuild 1180 SHA256 67b81bdff7f27943561f1d9ec2854953e219720214d1803983011a0c7a9211d8 SHA512 bca766ac4931ad5d81ca212b44c69f85a318a175a303340b8e3116790bda7cae9600aa1108081b3c128c34b8d99aa6d7f0ad6a7120ee80c86dfcc990853bc2e1 WHIRLPOOL d4bd1eaa0bac7248b905af23e30a29d53c5e4badafaf271b4bed23c6ecf3bf93371586bbe0eab4c83cf1b96eedc1e3f18e21a788e30d4ce7fdaeae56cac2e393
+EBUILD musca-0.9.24_p20100226-r4.ebuild 1291 SHA256 1b5de98feb00073f305db2f13797cbb0b3d6356ca3232d2f0bce123f7cb55b96 SHA512 8ce1a6797954ed85d34408f002d78a257915b3c6eae4a5c2465135cda8f0ddbf17c6043ae65fb77f2840872e16be051d9c33b5176a2c49fc01299fafbb9bf45a WHIRLPOOL 4747342c0b93df88f734703d71b17c55626ab2eb001f829b88074352b4efdda0a1e3a766653e606688d17e073aa1bbd8f5ee3026e080d953b9deb3ee1e79343d
+MISC ChangeLog 2520 SHA256 df6d2d9e76fdffad93ca6bb6c6f06228106983557c0e8d37818edafce32e24e5 SHA512 eb1467eb47c5daf9f8bd5c206284edd68283c0756b0de55f2123a9d5dc6f4cce714244f3078a21cd11cf082cb7a21c6dc5cac3cd69997bc8fbab559fdbe5287c WHIRLPOOL 2b67f26e1eb8d9a1fba155ceae61979eceb13e773924bcd28da5388af655a13fbdce882985e8717914cda94add393c486a36d5e86d524ba87f15654a3bb95260
+MISC ChangeLog-2015 3990 SHA256 e65b0be323d410dc7180e3621cf6b0765198c72f53589e5fcf856b77a9e21f0a SHA512 dda1a444b67ce5377ea9255cde01a62f8df712f49c76faa03e014ff36ec3100d867a084444e23775c9c8737a979383dff1654e61c83bdc73e490163970e9396e WHIRLPOOL 5385627721ed374c066420c9b3b29704dd807169d3d3a07cd0108a5de33134c73eec4223e4f0888a7165c395c0da78602c970d705d2293e7262ac617b912a7e0
+MISC metadata.xml 486 SHA256 7e45534994d115d0181c18215c5aad73878d08c642b68e7242fa49d8af082d65 SHA512 098a06d7dff066cf54e909923066078fc8347f7402846a66c26bae0e5df4752cd5a44dec6457e977b2060be5f3068e16ad5147e151ea1b4cac23b4e9e20c136a WHIRLPOOL 4e188f1223c9d324a47f23f30ec93256c9d8bbc4ebe83e0c4b74256642cae22afcc699a98355982e058c9853ab016c32b2a72e5c3a4a21a81338ed3c455fab0d
diff --git a/x11-wm/musca/files/musca-0.9.24-make.patch b/x11-wm/musca/files/musca-0.9.24-make.patch
new file mode 100644
index 000000000000..0f28c5653c7b
--- /dev/null
+++ b/x11-wm/musca/files/musca-0.9.24-make.patch
@@ -0,0 +1,23 @@
+--- a/Makefile	2009-11-03 03:20:21.000000000 +0100
++++ b/Makefile	2009-12-27 19:12:02.461539607 +0100
+@@ -1,9 +1,12 @@
+-CFLAGS?=-Wall -g
++CFLAGS ?= -Wall -g
++INCLUDES = $(shell pkg-config --cflags x11)
++LIBS = $(shell pkg-config --libs x11) -lm
++BIN_DIST = musca apis xlisten
+ 
+-all:
+-	$(CC) $(CFLAGS) -I/usr/X11R6/include -L/usr/X11R6/lib -lc -lm -lX11 -o musca musca.c
+-	$(CC) $(CFLAGS) -I/usr/X11R6/include -L/usr/X11R6/lib -lc -lm -lX11 -o apis apis.c
+-	$(CC) $(CFLAGS) -I/usr/X11R6/include -L/usr/X11R6/lib -lc -lm -lX11 -o xlisten xlisten.c
++all: $(BIN_DIST)
++
++$(BIN_DIST):
++	$(CC) $(CFLAGS) $(INCLUDES) $@.c -o $@ $(LDFLAGS) $(LIBS)
+ 
+ clean:
+-	rm -f musca apis
++	rm -f $(BIN_DIST)
++
++.PHONY: all clean
diff --git a/x11-wm/musca/files/musca-0.9.24_p20100226-dmenu-4.4.patch b/x11-wm/musca/files/musca-0.9.24_p20100226-dmenu-4.4.patch
new file mode 100644
index 000000000000..ce6bc45de73e
--- /dev/null
+++ b/x11-wm/musca/files/musca-0.9.24_p20100226-dmenu-4.4.patch
@@ -0,0 +1,44 @@
+https://bugs.archlinux.org/task/25232
+https://bugs.launchpad.net/musca/+bug/816890
+
+--- a/musca.c
++++ b/musca.c
+@@ -2162,8 +2162,16 @@ void launch(char *cmd)
+ }
+ void menu(char *cmd, char *after)
+ {
++	// we keep original behaviour by sorting
+ 	char *tmp = allocate(strlen(cmd)+strlen(after)+BLOCK);
+-	sprintf(tmp, "%s | %s | %s", cmd, settings[ms_dmenu].s, after);
++	sprintf(tmp, "%s | sort | dmenu %s | %s", cmd, settings[ms_dmenu].s, after);
++	printf("%s\n", tmp);
++	launch(tmp); free(tmp);
++}
++void menufix(char *cmd, char*after)
++{
++	char *tmp = allocate(strlen(cmd)+strlen(after)+BLOCK);
++	sprintf(tmp, "%s %s | %s",cmd, settings[ms_dmenu].s, after);
+ 	printf("%s\n", tmp);
+ 	launch(tmp); free(tmp);
+ }
+@@ -2631,7 +2639,7 @@ char* com_command(char *cmd, regmatch_t *subs)
+ }
+ char* com_shell(char *cmd, regmatch_t *subs)
+ {
+-	menu("dmenu_path", settings[ms_run_shell_command].s);
++	menufix("dmenu_run", settings[ms_run_shell_command].s);
+ 	return NULL;
+ }
+ char* com_alias(char *cmd, regmatch_t *subs)
+diff --git a/musca_proto.h b/musca_proto.h
+index dc14d75..e25c1ea 100644
+--- a/musca_proto.h
++++ b/musca_proto.h
+@@ -145,6 +145,7 @@ void head_focus(head *h);
+ void head_next();
+ void launch(char *cmd);
+ void menu(char *cmd, char *after);
++void menufix(char *cmd, char *after);
+ void menu_wrapper(char *cmd, char *after);
+ void shutdown();
+ dcell parse_size(char *cmd, regmatch_t *subs, ucell index, ucell limit);
diff --git a/x11-wm/musca/files/musca-0.9.24_p20100226-fix-cycle.patch b/x11-wm/musca/files/musca-0.9.24_p20100226-fix-cycle.patch
new file mode 100644
index 000000000000..6765ebcdcf7d
--- /dev/null
+++ b/x11-wm/musca/files/musca-0.9.24_p20100226-fix-cycle.patch
@@ -0,0 +1,11 @@
+--- a/musca.c
++++ b/musca.c
+@@ -3202,7 +3202,7 @@ void mapnotify(XEvent *ev)
+ 		handle_map(ws);
+ 		head *h = head_by_root(ws->attr.root);
+ 		if (is_netwmstate(ws->state, NetWMStateFullscreen))
+-			stack_push(h->fullscreen, (void*)ws);
++			stack_push(h->fullscreen, (void*)ws->w);
+ 		else
+ 		if (ws->attr.override_redirect || is_netwmstate(ws->state, NetWMStateAbove))
+ 			stack_push(h->above, (void*)ws->w);
diff --git a/x11-wm/musca/files/musca-0.9.24_p20100226-fix-pad.patch b/x11-wm/musca/files/musca-0.9.24_p20100226-fix-pad.patch
new file mode 100644
index 000000000000..23bd9283467a
--- /dev/null
+++ b/x11-wm/musca/files/musca-0.9.24_p20100226-fix-pad.patch
@@ -0,0 +1,21 @@
+--- a/musca.c
++++ b/musca.c
+@@ -1985,7 +1985,8 @@ void group_other()
+ // resize frames to match changes in the screen border padding
+ void group_resize(group *ta, int l, int r, int t, int b)
+ {
+-	frame *f = ta->frames; int i;
++	frame *f = ta->frames; int i, j;
++	client *c = ta->clients;
+ 	int sw = ta->head->screen->width;
+ 	int sh = ta->head->screen->height;
+ 	     if (l < ta->l) { frames_fill_gap(ta, l, ta->t, ta->l - l, sh - ta->b, FRAMES_ALL); ta->l = l; }
+@@ -1998,6 +1999,8 @@ void group_resize(group *ta, int l, int r, int t, int b)
+ 	else if (b > ta->b) { frames_make_gap(ta, ta->l, sh - b, sw - ta->l - ta->r, b - ta->b); ta->b = b; }
+ 	FOR_RING (NEXT, f, ta->frames, i)
+ 		frame_update(f);
++	FOR_RING (NEXT, c, ta->clients, j)
++		client_configure(c,NULL);
+ }
+ group* group_by_name(head *h, char *name)
+ {
diff --git a/x11-wm/musca/files/musca-0.9.24_p20100226-null.patch b/x11-wm/musca/files/musca-0.9.24_p20100226-null.patch
new file mode 100644
index 000000000000..6efb77ff0b35
--- /dev/null
+++ b/x11-wm/musca/files/musca-0.9.24_p20100226-null.patch
@@ -0,0 +1,151 @@
+https://bugs.launchpad.net/musca/+bug/1236500
+
+
+--- a/musca.c
++++ b/musca.c
+@@ -421,7 +421,7 @@
+ 	if (s->depth)
+ 	{
+ 		int *indexes = allocate(sizeof(int) * s->depth);
+-		int count = 0, i; Window *w;
++		int count = 0, i; Window *w = NULL;
+ 		FOR_STACK (w, s, Window*, i)
+ 		{
+ 			note("%d", i);
+@@ -1673,7 +1673,6 @@
+ 	frame *f = t->frames;
+ 	frame **group = NULL;
+ 	int i = 0, x, y, w, h;
+-	ubyte changes = 0;
+ 	if (direction == HORIZONTAL)
+ 	{
+ 		if (f->x + f->w >= t->head->screen->width - t->r)
+@@ -1684,7 +1683,6 @@
+ 				group = frame_siblings(f, LEFT);
+ 				if (frame_siblings_growable(group, LEFT, size))
+ 				{
+-					changes = 1;
+ 					x = f->x - size; w = size; y = f->y; h = 0;
+ 					for (i = 0; group[i]; i++)
+ 						y = MIN(y, group[i]->y), h += group[i]->h;
+@@ -1702,7 +1700,6 @@
+ 			group = frame_siblings(f, RIGHT);
+ 			if (frame_siblings_growable(group, RIGHT, size))
+ 			{
+-				changes = 1;
+ 				x = f->x + f->w; w = size; y = f->y; h = 0;
+ 				for (i = 0; group[i]; i++)
+ 					y = MIN(y, group[i]->y), h += group[i]->h;
+@@ -1725,7 +1722,6 @@
+ 				group = frame_siblings(f, TOP);
+ 				if (frame_siblings_growable(group, TOP, size))
+ 				{
+-					changes = 1;
+ 					y = f->y - size; h = size; x = f->x; w = 0;
+ 					for (i = 0; group[i]; i++)
+ 						x = MIN(x, group[i]->x), w += group[i]->w;
+@@ -1743,7 +1739,6 @@
+ 			group = frame_siblings(f, BOTTOM);
+ 			if (frame_siblings_growable(group, BOTTOM, size))
+ 			{
+-				changes = 1;
+ 				y = f->y + f->h; h = size; x = f->x; w = 0;
+ 				for (i = 0; group[i]; i++)
+ 					x = MIN(x, group[i]->x), w += group[i]->w;
+@@ -2205,11 +2200,9 @@
+ char* com_frame_split(char *cmd, regmatch_t *subs)
+ {
+ 	group *g = heads->groups; frame *f = g->frames;
+-	int sw = heads->screen->width  - g->l - g->r,
+-	    sh = heads->screen->height - g->t - g->b;
+ 	char *mode = regsubstr(cmd, subs, 1);
+-	ucell fs = f->h, ss = sh; ubyte dir = VERTICAL;
+-	if (*mode == 'h') { fs = f->w; ss = sw; dir = HORIZONTAL; }
++	ucell fs = f->h; ubyte dir = VERTICAL;
++	if (*mode == 'h') { fs = f->w; dir = HORIZONTAL; }
+ 	dcell size = parse_size(cmd, subs, 2, fs);
+ 	frame_split(dir, size / fs);
+ 	free(mode);
+@@ -2630,7 +2623,7 @@
+ }
+ char* com_command(char *cmd, regmatch_t *subs)
+ {
+-	int i; alias *a; autostr s; str_create(&s);
++	int i; alias *a = NULL; autostr s; str_create(&s);
+ 	str_print(&s, strlen(command_hints)+NOTE, "%s \n", command_hints);
+ 	FOR_STACK (a, aliases, alias*, i) str_print(&s, NOTE, "%s \n", a->name);
+ 	menu_wrapper(s.pad, settings[ms_run_musca_command].s);
+@@ -2747,7 +2740,7 @@
+ char* show_aliases()
+ {
+ 	autostr s; str_create(&s);
+-	alias *a; int i;
++	alias *a = NULL; int i;
+ 	FOR_STACK (a, aliases, alias*, i)
+ 		str_print(&s, strlen(a->name)+strlen(a->command)+10, "alias %s %s\n",
+ 			a->name, a->command);
+@@ -2849,7 +2842,7 @@
+ }
+ char* com_place(char *cmd, regmatch_t *subs)
+ {
+-	placement *p; int i;
++	placement *p = NULL; int i;
+ 	char *class = regsubstr(cmd, subs, 1);
+ 	ubyte flag = parse_flag(cmd, subs, 2, 0);
+ 	char *group = regsubstr(cmd, subs, 3);
+@@ -3441,7 +3434,7 @@
+ 		autostr s; str_create(&s);
+ 		for (;;)
+ 		{
+-			char c = getchar();
++			int c = getchar();
+ 			if (c == EOF) break;
+ 			str_push(&s, c);
+ 		}
+@@ -3530,7 +3523,7 @@
+ }
+ void grab_stuff()
+ {
+-	int i, j, k; head *h; binding *b; ucell *m;
++	int i, j, k; head *h; binding *b; ucell *m = NULL;
+ 	refresh_bindings();
+ 	ungrab_stuff();
+ 	ucell modifiers[] = { 0, LockMask, NumlockMask, LockMask|NumlockMask };
+@@ -3550,7 +3543,7 @@
+ {
+ 	int i;
+ 	command_hash = hash_create();
+-	command *c; autostr str; str_create(&str);
++	command *c = NULL; autostr str; str_create(&str);
+ 	FOR_ARRAY (c, commands, command, i)
+ 	{
+ 		char *keys = c->keys;
+@@ -3566,7 +3559,7 @@
+ 	strtrim(command_hints);
+ 	// compile setting regex
+ 	setting_hash = hash_create();
+-	setting *s;
++	setting *s = NULL;
+ 	FOR_ARRAY (s, settings, setting, i)
+ 		hash_set(setting_hash, s->name, s);
+ 	// compile modmask regex
+@@ -3597,7 +3590,7 @@
+ }
+ void setup_bindings()
+ {
+-	int i; keymap *k;
++	int i; keymap *k = NULL;
+ 	// prepare key bindings
+ 	bindings = stack_create();
+ 	FOR_ARRAY (k, keymaps, keymap, i)
+--- a/tools.c
++++ b/tools.c
+@@ -227,7 +227,7 @@
+ 	ucell ptr = 0;
+ 	for (;;)
+ 	{
+-		byte c = fgetc(src);
++		int c = fgetc(src);
+ 		if (c == EOF)
+ 			break;
+ 
diff --git a/x11-wm/musca/files/musca.xsession b/x11-wm/musca/files/musca.xsession
new file mode 100644
index 000000000000..41e90a7ceb3e
--- /dev/null
+++ b/x11-wm/musca/files/musca.xsession
@@ -0,0 +1,2 @@
+#!/bin/sh
+musca
diff --git a/x11-wm/musca/metadata.xml b/x11-wm/musca/metadata.xml
new file mode 100644
index 000000000000..4b518dbe6410
--- /dev/null
+++ b/x11-wm/musca/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>jer@gentoo.org</email>
+		<name>Jeroen Roovers</name>
+	</maintainer>
+	<use>
+		<flag name="apis">Optionally install the experimental `apis' window manager</flag>
+		<flag name="xlisten">Optionally install the xlisten utility</flag>
+	</use>
+	<upstream>
+		<remote-id type="launchpad">musca</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-wm/musca/musca-0.9.24_p20100226-r3.ebuild b/x11-wm/musca/musca-0.9.24_p20100226-r3.ebuild
new file mode 100644
index 000000000000..df917b3ed563
--- /dev/null
+++ b/x11-wm/musca/musca-0.9.24_p20100226-r3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit eutils savedconfig toolchain-funcs
+
+DESCRIPTION="A simple dynamic window manager, with features nicked from ratpoison and dwm"
+HOMEPAGE="https://launchpad.net/musca"
+SRC_URI="mirror://gentoo/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="apis xlisten"
+
+COMMON="x11-libs/libX11"
+DEPEND="${COMMON}
+	sys-apps/sed"
+RDEPEND="
+	${COMMON}
+	>=x11-misc/dmenu-4.4
+	apis? ( x11-misc/xbindkeys )
+"
+
+src_prepare() {
+	restore_config config.h
+
+	sed -i config.h \
+		-e 's:"sort | dmenu -i -b":"-i -b":g' \
+		-e 's:sed.*exec.*-i::g' \
+		|| die
+
+	epatch \
+		"${FILESDIR}"/${PN}-0.9.24-make.patch \
+		"${FILESDIR}"/${PN}-0.9.24_p20100226-dmenu-4.4.patch \
+		"${FILESDIR}"/${PN}-0.9.24_p20100226-null.patch
+
+	local i
+	for i in apis xlisten; do
+		if ! use ${i}; then
+			sed -e "s|${i}||g" -i Makefile || die
+		fi
+	done
+
+	tc-export CC
+}
+
+src_install() {
+	dobin musca
+
+	local i
+	for i in xlisten apis; do
+		if use ${i}; then
+			dobin ${i}
+		fi
+	done
+	doman musca.1
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/${PN}.xsession musca
+
+	save_config config.h
+}
diff --git a/x11-wm/musca/musca-0.9.24_p20100226-r4.ebuild b/x11-wm/musca/musca-0.9.24_p20100226-r4.ebuild
new file mode 100644
index 000000000000..129899ded8d0
--- /dev/null
+++ b/x11-wm/musca/musca-0.9.24_p20100226-r4.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils savedconfig toolchain-funcs
+
+DESCRIPTION="A simple dynamic window manager, with features nicked from ratpoison and dwm"
+HOMEPAGE="https://launchpad.net/musca"
+SRC_URI="mirror://gentoo/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="apis xlisten"
+
+COMMON="x11-libs/libX11"
+DEPEND="${COMMON}
+	sys-apps/sed"
+RDEPEND="
+	${COMMON}
+	>=x11-misc/dmenu-4.4
+	apis? ( x11-misc/xbindkeys )
+"
+
+src_prepare() {
+	restore_config config.h
+
+	sed -i config.h \
+		-e 's:"sort | dmenu -i -b":"-i -b":g' \
+		-e 's:sed.*exec.*-i::g' \
+		|| die
+
+	epatch \
+		"${FILESDIR}"/${PN}-0.9.24-make.patch \
+		"${FILESDIR}"/${PN}-0.9.24_p20100226-dmenu-4.4.patch \
+		"${FILESDIR}"/${PN}-0.9.24_p20100226-null.patch \
+		"${FILESDIR}"/${PN}-0.9.24_p20100226-fix-cycle.patch \
+		"${FILESDIR}"/${PN}-0.9.24_p20100226-fix-pad.patch
+
+	local i
+	for i in apis xlisten; do
+		if ! use ${i}; then
+			sed -e "s|${i}||g" -i Makefile || die
+		fi
+	done
+
+	tc-export CC
+}
+
+src_install() {
+	dobin musca
+
+	local i
+	for i in xlisten apis; do
+		if use ${i}; then
+			dobin ${i}
+		fi
+	done
+	doman musca.1
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/${PN}.xsession musca
+
+	save_config config.h
+}
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
new file mode 100644
index 000000000000..1683033f8a42
--- /dev/null
+++ b/x11-wm/mutter/Manifest
@@ -0,0 +1,13 @@
+AUX 3.22.4-clutter-missing-null-terminator.patch 1071 SHA256 0936643c48849fc23f048258c2701029d2935c2080f7ac26e41a7601f95f8780 SHA512 743bf69779f4b7fe7eedd483682e7fc353bac42bffe2cdfa4ac079c29eef81e0be7fdd993752523d8ff3ac71f86dea78ad2041afeb68815cf4d564c68bbfe631 WHIRLPOOL a560b66f7ef706a9261d70ea0fbb9aac761e4eab9b9ed81dfe05a2ca995c23e886af899f62b9ab4e61c1f37e0a95eb257e341c2c39153324895c352ff3633ce5
+AUX 3.22.4-wayland-clipboard-fix.patch 1283 SHA256 78be68b36b916dccc6110ea42d3e55c01e44211a26e66e83659896b280cb2302 SHA512 71436a5ea1cb325795ceedc536211dd3c28ef5bb0e8c9904b171354031c0d26e896ec0ab3ed85c3e4fabdba01f70ca9433a9111f7fd0b7bb04bf6ac365e9dce3 WHIRLPOOL 23cde5bb2f14bbae5d4643cd71aaea1dcaa31ca4e6d9d85328524938359ec8907614e1568332dae5ca52dadef3113a23cf0ced269c9c1cce0dc1e0bd9b69a27a
+AUX 3.22.4-wayland-crash-fix.patch 1149 SHA256 39f5d2ef9a361f85bf558def5c6485829402927866a15138fd9682c9deb0663a SHA512 68b629b25be5e019581aba2883f2409b65279758d814ce8f854b9052357adf44e3f2a649ef4aa8ef398afa8e4a58117fe1a8ccc6040c3578acfefbcb721cdf4a WHIRLPOOL b3ac3ed48f477ccf3f54cb9eb08c0ff74e236bb2baaa5087061071f1f590461503bc3fb784a65cb51a83d52b8f819619f8dd24737326f4d19d3d2b8e31a9e341
+AUX 3.22.4-wayland-ensure-pending-geometry.patch 1744 SHA256 5d00ea04d27c250f001c74e23d9c677f83c86ecdb5c0ccc1dcd77844be04b26e SHA512 e84319db9c0541b71dec03bd466b64f6e71637034bc91263d25fcf6546469435a4d77acaa32b24532e540fe62b079521f4d60c5cc2e1f0571b2f3cbc4917c964 WHIRLPOOL 394cde119e4294ed68f01154a7df2e780bdef68df81d67ad74df40bf0d55a3f4e0cd4da5c21dc77ba7ecacfa0efbdc3e9c73b4e582c47db613a933d1217c95da
+AUX 3.22.4-wayland-size-hints.patch 2281 SHA256 8908f9be047d39530c7c530d048b246f750799100986047e6d8e0f4757ee6ed7 SHA512 cf2afdb822f67a729713df571db446e955b111ac5d56342ba318646a6b3302a8cac394d63166c4043b94678360d19e3d35ddf60102794c038fdfc9039729318a WHIRLPOOL 362078706b55332d6413a3ffef32b41d97dcfdfc6c76efa99cfd74dc1a25932d44f253a150e6becf1621b0e40c087536f281ad010d4358753f16e42b967cc0a6
+AUX 3.24.4-gudev-232.patch 1034 SHA256 309b1b8c0c8aa710f03de5239bde72b92ed3baef5293326956525f82d676c445 SHA512 a73aabd388c73a6a4ab91f69cdd647e5e2b1295f67c1576725f7cbaa8dc24afeb77a7f4e3880f6b2e8fc604aeefb4b44f30cc80f3f2f88b0d0c03b49dd6bbfe2 WHIRLPOOL 4eb402669f253fad8efe592e340528bc1cb47e2b2d3b729aa4d7c52beeeef520f1a5cc5930c2b472635f1d7a88d1f98a17d6930fc6e304e1b2da1eccac497468
+DIST mutter-3.22.4.tar.xz 3536792 SHA256 37ea9f398758b48b7a2db17145143bc32bd0f6df7c69c631b52b719a9067b219 SHA512 849e98186cecb4ffcab3da055febf72ef76fa87ecbdc506c696c2c7debd5183361c4b3b31d00d3c85e45d7f47aa5abf748d999571b147c831eb999116919023c WHIRLPOOL f6c7cda3ee6fdce7ef376e384591f7e3e07060db4f3d006842d15973296dc341bf4f9e56f9c3603a5bdb064f22a9835693c110a401bbaa893b6952591904f357
+DIST mutter-3.24.4.tar.xz 3583916 SHA256 7300b3fbf1bd0f7fe25e4869dd37134f2127bb6d9b8aa3aadd0eaf3c8bbf9aea SHA512 7ae579ab3e9df09cae37fbc1b277e382c9f610058b914b69a7bdb89f3bec510403210c0cded16a6487111507151f4d7075d161e051c0b88585d6ab6b4575b8d3 WHIRLPOOL 141151e402c80711f091ff62fdb468da4bf1d8b9fe556e9b13e2b3bce7833776ca50c15709303a0d7ce8a435c06ab2b2f5b761f6193248ec29f3d41e4551988b
+EBUILD mutter-3.22.4-r1.ebuild 4117 SHA256 95872d91be7e083c6f366f307ac0b1c5e816cc097a588e11010c494eb8f372dd SHA512 36e28f4334d87b8d2319c19ec384593b2d8bba8e206b21d13e043ba3381cb8215ee5836d8427e0b4bb025efa23ea0f89175e6c04c278cb340f40d6961152d8a7 WHIRLPOOL 13176d0fdbfa73a711cebe4e32f3e9f7ef55fb6f0eb792656bcb7f2b07dea36db7d59e5b609a0e72f41da5e553ec3e381cdff3433a2b2dbb79b229fd161a7e0c
+EBUILD mutter-3.24.4.ebuild 3636 SHA256 23ee9d2e31c9f08d531a06cc071b217b87f7ce00f896ff79757d3d51caf3dc4a SHA512 9457b7d6a6b3f15f2d88b1b6c3ee1715b198cf749cf13ee66fd7133c64ab6c449ecb91b78a90675ae30206c3034ed2716f1953296d42ad5d2ef2cc1b8b9ed473 WHIRLPOOL c0646237d47358b079085290fef57fe06b9111a68772afbe431a4a6378274c83b8bf62e19d43aa8d169228c5fa8ee9d538da044712c7aa5f44f835359db8c1da
+MISC ChangeLog 9902 SHA256 345940ef8fe59a3bc0ae3dd30d345885d8f9b70b87cedcdda295c1c16b7432db SHA512 13212784664467cbcb6b4f028665d8f2528360399aff4b73fb49b9e52a8d186f63eeede38a36b0bb681a0a93ba2907baaf8f11e253742a8964763382c614e107 WHIRLPOOL 620573991576968c56aa8ec5b1271bfd3d3c8e22848c361da6022e088d9695c89996b0f80d81c581facd654d1363feec345df8051cb4f6022e1af44a2440dc56
+MISC ChangeLog-2015 9695 SHA256 74b10c6eaf2c1278b40e8fd0fb56d679d0584dfaeda0a386b18bfe0e45e4309c SHA512 1d6beab276a0283c0cbe0f4dfe69bd8ed442f972f4d8b84f2d9ba7d823230faa59e6c6460a34e012116bd5ff6800dc5113aa23abc13655b3253214331630dda7 WHIRLPOOL 9c143d95ba6852f4a99bc2a150427129a1ff775c3a59a088a016d24703b5db71c57c7f39c05d94438b9076c6c73c8bc53596ebbdbf7f95d724081ee677f4e1f1
+MISC metadata.xml 325 SHA256 d5bffb3858c18700cf75a1e6c9ef2324652c05e618abbcd60686d28a73bc6487 SHA512 2732e366e7870b21a854e6bccf57d479c754fe5a9cf17673c3a78e231a1b476b684fd97497f8ab51c57137d066f9bfa6590458f56e5f42c5c38e1cd00962fe80 WHIRLPOOL e8fcc1027b2efe93e5044c2d9cb39844b98b7a985de837c386a1653c8c7ed124b801393d0fc9920c87de75004c7d5e7248f70c09a18921ea2b3093b7b85ed160
diff --git a/x11-wm/mutter/files/3.22.4-clutter-missing-null-terminator.patch b/x11-wm/mutter/files/3.22.4-clutter-missing-null-terminator.patch
new file mode 100644
index 000000000000..ed16b8c6f4b8
--- /dev/null
+++ b/x11-wm/mutter/files/3.22.4-clutter-missing-null-terminator.patch
@@ -0,0 +1,28 @@
+From f6888519ff3e20ec8f5e6064bff5707acbe13fbd Mon Sep 17 00:00:00 2001
+From: Nigel Taylor <nigel@openbsd.org>
+Date: Fri, 5 May 2017 08:42:47 -0400
+Subject: [PATCH 2/5] clutter: conform/actor-graph: Add missing
+ null-termination
+
+https://bugzilla.gnome.org/show_bug.cgi?id=759085
+---
+ clutter/tests/conform/actor-graph.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/clutter/tests/conform/actor-graph.c b/clutter/tests/conform/actor-graph.c
+index 0dad49b..8fbf4bc 100644
+--- a/clutter/tests/conform/actor-graph.c
++++ b/clutter/tests/conform/actor-graph.c
+@@ -350,7 +350,8 @@ actor_replace_child (void)
+   g_assert_cmpstr (clutter_actor_get_name (iter), ==, "qux");
+ 
+   clutter_actor_add_child (actor, g_object_new (CLUTTER_TYPE_ACTOR,
+-                                                "name", "foo"));
++                                                "name", "foo",
++                                                NULL));
+ 
+   clutter_actor_replace_child (actor, iter,
+                                g_object_new (CLUTTER_TYPE_ACTOR,
+-- 
+2.10.1
+
diff --git a/x11-wm/mutter/files/3.22.4-wayland-clipboard-fix.patch b/x11-wm/mutter/files/3.22.4-wayland-clipboard-fix.patch
new file mode 100644
index 000000000000..24e6fd36a309
--- /dev/null
+++ b/x11-wm/mutter/files/3.22.4-wayland-clipboard-fix.patch
@@ -0,0 +1,32 @@
+From 19f08fbdbba113883c6011e4b8ccf3ea3a6eb57e Mon Sep 17 00:00:00 2001
+From: Carlos Garnacho <carlosg@gnome.org>
+Date: Wed, 10 May 2017 20:28:42 +0200
+Subject: [PATCH 5/5] xwayland: Use the right atom type for further selection
+ requests to X11
+
+If we translate between text/plain;charset-utf-8 from the wayland side to
+UTF8_STRING on the X11 side, we want to continue all further X11 selection
+requests using the same translated UTF8_STRING atom than we use in the
+first XConvertSelection call.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=782472
+---
+ src/wayland/meta-xwayland-selection.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/wayland/meta-xwayland-selection.c b/src/wayland/meta-xwayland-selection.c
+index a78e846..24b8cd2 100644
+--- a/src/wayland/meta-xwayland-selection.c
++++ b/src/wayland/meta-xwayland-selection.c
+@@ -829,7 +829,7 @@ meta_x11_source_send (MetaWaylandDataSource *source,
+   /* Takes ownership of fd */
+   selection->x11_selection =
+     x11_selection_data_new (compositor->xwayland_manager.selection_data,
+-                            fd, mime_type);
++                            fd, gdk_x11_get_xatom_name (type_atom));
+ 
+   XConvertSelection (xdisplay,
+                      selection->selection_atom, type_atom,
+-- 
+2.10.1
+
diff --git a/x11-wm/mutter/files/3.22.4-wayland-crash-fix.patch b/x11-wm/mutter/files/3.22.4-wayland-crash-fix.patch
new file mode 100644
index 000000000000..a6eddb1f72e0
--- /dev/null
+++ b/x11-wm/mutter/files/3.22.4-wayland-crash-fix.patch
@@ -0,0 +1,31 @@
+From ba317dcd74baebfd8f8c8dd417ded71f6cc8c771 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
+Date: Mon, 17 Apr 2017 13:27:35 +0800
+Subject: [PATCH 1/5] wayland/subsurface: Handle clients committing on
+ destroyed subsurface
+
+A client can still commit state to a destroyed subsurface. It wont
+update anything on the screen, since the subsurface will not be
+visible, but mutter should still handle it and not crash.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=781391
+---
+ src/wayland/meta-wayland-surface.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/wayland/meta-wayland-surface.c b/src/wayland/meta-wayland-surface.c
+index 99e3dfd..a6079ee 100644
+--- a/src/wayland/meta-wayland-surface.c
++++ b/src/wayland/meta-wayland-surface.c
+@@ -605,7 +605,7 @@ subsurface_role_get_toplevel (MetaWaylandSurfaceRole *surface_role)
+     meta_wayland_surface_role_get_surface (surface_role);
+   MetaWaylandSurface *parent = surface->sub.parent;
+ 
+-  if (parent->role)
++  if (parent && parent->role)
+     return meta_wayland_surface_role_get_toplevel (parent->role);
+   else
+     return NULL;
+-- 
+2.10.1
+
diff --git a/x11-wm/mutter/files/3.22.4-wayland-ensure-pending-geometry.patch b/x11-wm/mutter/files/3.22.4-wayland-ensure-pending-geometry.patch
new file mode 100644
index 000000000000..543d6edb8e76
--- /dev/null
+++ b/x11-wm/mutter/files/3.22.4-wayland-ensure-pending-geometry.patch
@@ -0,0 +1,47 @@
+From ca31a94e54819b5bfeccbeef4e7c041bbef15eac Mon Sep 17 00:00:00 2001
+From: Olivier Fourdan <ofourdan@redhat.com>
+Date: Fri, 5 May 2017 13:55:51 +0200
+Subject: [PATCH 3/5] wayland: Make sure we have a pending geometry
+
+If the client doesn't set a geometry using xdg_shell, we'll compute its
+geometry based on its surface and subsurfaces.
+
+Yet, we translate that as a window (re)size only when there is a pending
+geometry, that we don't have when we computed the geometry by ourself.
+
+Make sure we set the pending new geometry flag when computing the
+geometry when it actually changed.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=782213
+---
+ src/wayland/meta-wayland-xdg-shell.c | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/src/wayland/meta-wayland-xdg-shell.c b/src/wayland/meta-wayland-xdg-shell.c
+index aa355da..87a8382 100644
+--- a/src/wayland/meta-wayland-xdg-shell.c
++++ b/src/wayland/meta-wayland-xdg-shell.c
+@@ -1263,11 +1263,19 @@ xdg_surface_role_commit (MetaWaylandSurfaceRole  *surface_role,
+     }
+   else if (!priv->has_set_geometry)
+     {
++      MetaRectangle new_geometry = { 0 };
++
+       /* If the surface has never set any geometry, calculate
+        * a default one unioning the surface and all subsurfaces together. */
++
+       meta_wayland_surface_calculate_window_geometry (surface,
+-                                                      &priv->geometry,
++                                                      &new_geometry,
+                                                       0, 0);
++      if (!meta_rectangle_equal (&new_geometry, &priv->geometry))
++        {
++          pending->has_new_geometry = TRUE;
++          priv->geometry = new_geometry;
++        }
+     }
+ }
+ 
+-- 
+2.10.1
+
diff --git a/x11-wm/mutter/files/3.22.4-wayland-size-hints.patch b/x11-wm/mutter/files/3.22.4-wayland-size-hints.patch
new file mode 100644
index 000000000000..03b2b22fe655
--- /dev/null
+++ b/x11-wm/mutter/files/3.22.4-wayland-size-hints.patch
@@ -0,0 +1,56 @@
+From 40a3d67698dc992d084886e01b07a78d438bbf8e Mon Sep 17 00:00:00 2001
+From: Olivier Fourdan <ofourdan@redhat.com>
+Date: Wed, 10 May 2017 08:59:53 +0200
+Subject: [PATCH 4/5] wayland: Apply size hints regardless of geometry
+
+Previously we would bail out early in xdg_toplevel_role_commit() if no
+geometry change was set, ignoring the possible min/max size hints
+changes.
+
+But setting a min/max size hint without changing the geometry is
+perfectly valid, so we ought to apply the min/max changes regardless of
+a geometry change.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=782213
+---
+ src/wayland/meta-wayland-xdg-shell.c | 22 ++++++++++------------
+ 1 file changed, 10 insertions(+), 12 deletions(-)
+
+diff --git a/src/wayland/meta-wayland-xdg-shell.c b/src/wayland/meta-wayland-xdg-shell.c
+index 87a8382..bd576f6 100644
+--- a/src/wayland/meta-wayland-xdg-shell.c
++++ b/src/wayland/meta-wayland-xdg-shell.c
+@@ -615,20 +615,18 @@ xdg_toplevel_role_commit (MetaWaylandSurfaceRole  *surface_role,
+   if (!window)
+     return;
+ 
+-  if (!pending->has_new_geometry)
++  if (pending->has_new_geometry)
+     {
+-      if (pending->dx != 0 || pending->dx != 0)
+-        {
+-          g_warning ("XXX: Attach-initiated move without a new geometry. This is unimplemented right now.");
+-        }
+-      return;
++      window_geometry = meta_wayland_xdg_surface_get_window_geometry (xdg_surface);
++      meta_window_wayland_move_resize (window,
++                                       &xdg_surface_priv->acked_configure_serial,
++                                       window_geometry,
++                                       pending->dx, pending->dy);
++    }
++  else if (pending->dx != 0 || pending->dx != 0)
++    {
++      g_warning ("XXX: Attach-initiated move without a new geometry. This is unimplemented right now.");
+     }
+-
+-  window_geometry = meta_wayland_xdg_surface_get_window_geometry (xdg_surface);
+-  meta_window_wayland_move_resize (window,
+-                                   &xdg_surface_priv->acked_configure_serial,
+-                                   window_geometry,
+-                                   pending->dx, pending->dy);
+ 
+   /* When we get to this point, we ought to have valid size hints */
+   if (pending->has_new_min_size || pending->has_new_max_size)
+-- 
+2.10.1
+
diff --git a/x11-wm/mutter/files/3.24.4-gudev-232.patch b/x11-wm/mutter/files/3.24.4-gudev-232.patch
new file mode 100644
index 000000000000..5808e977c73c
--- /dev/null
+++ b/x11-wm/mutter/files/3.24.4-gudev-232.patch
@@ -0,0 +1,33 @@
+From 361bf847af82c7dca097302fe64c575079280c9c Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Fri, 1 Sep 2017 02:06:38 +0200
+Subject: build: Require libgudev >= 232
+
+And remove the g_autoptr implementations in mutter itself.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=760670
+
+Gentoo: stripped configure.ac part to avoid autoreconf
+---
+ configure.ac                        | 4 ++--
+ src/backends/native/meta-launcher.c | 4 ----
+ 2 files changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/src/backends/native/meta-launcher.c b/src/backends/native/meta-launcher.c
+index 90b4b98..eb35f88 100644
+--- a/src/backends/native/meta-launcher.c
++++ b/src/backends/native/meta-launcher.c
+@@ -49,10 +49,6 @@
+ 
+ #define DRM_CARD_UDEV_DEVICE_TYPE "drm_minor"
+ 
+-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GUdevDevice, g_object_unref)
+-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GUdevClient, g_object_unref)
+-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GUdevEnumerator, g_object_unref)
+-
+ struct _MetaLauncher
+ {
+   Login1Session *session_proxy;
+-- 
+cgit v0.12
+
diff --git a/x11-wm/mutter/metadata.xml b/x11-wm/mutter/metadata.xml
new file mode 100644
index 000000000000..73abedd9cf02
--- /dev/null
+++ b/x11-wm/mutter/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<use>
+		<flag name="gles2">Enable OpenGL ES 2.0 support</flag>
+	</use>
+</pkgmetadata>
diff --git a/x11-wm/mutter/mutter-3.22.4-r1.ebuild b/x11-wm/mutter/mutter-3.22.4-r1.ebuild
new file mode 100644
index 000000000000..997051bb842b
--- /dev/null
+++ b/x11-wm/mutter/mutter-3.22.4-r1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2 virtualx
+
+DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
+HOMEPAGE="https://git.gnome.org/browse/mutter/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+IUSE="debug gles2 input_devices_wacom +introspection test udev wayland"
+
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+
+# libXi-1.7.4 or newer needed per:
+# https://bugzilla.gnome.org/show_bug.cgi?id=738944
+COMMON_DEPEND="
+	>=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.49.0:2[dbus]
+	>=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=
+	>sys-power/upower-0.99:=
+
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	>=x11-libs/libXcomposite-0.4
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	>=x11-libs/libXfixes-3
+	>=x11-libs/libXi-1.7.4
+	x11-libs/libXinerama
+	>=x11-libs/libXrandr-1.5
+	x11-libs/libXrender
+	x11-libs/libxcb
+	x11-libs/libxkbfile
+	>=x11-libs/libxkbcommon-0.4.3[X]
+	x11-misc/xkeyboard-config
+
+	gnome-extra/zenity
+	media-libs/mesa[egl]
+
+	gles2? ( media-libs/mesa[gles2] )
+	input_devices_wacom? ( >=dev-libs/libwacom-0.13 )
+	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
+	udev? ( virtual/libgudev:= )
+	wayland? (
+		>=dev-libs/libinput-1.4
+		>=dev-libs/wayland-1.6.90
+		>=dev-libs/wayland-protocols-1.7
+		>=media-libs/mesa-10.3[egl,gbm,wayland]
+		sys-apps/systemd
+		virtual/libgudev:=
+		>=virtual/libudev-136:=
+		x11-base/xorg-server[wayland]
+		x11-libs/libdrm:=
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-devel/gettext-0.19.6
+	virtual/pkgconfig
+	x11-proto/xextproto
+	x11-proto/xineramaproto
+	x11-proto/xproto
+	test? ( app-text/docbook-xml-dtd:4.5 )
+	wayland? ( >=sys-kernel/linux-headers-4.4 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!x11-misc/expocity
+"
+
+PATCHES=(
+	# Important fixes from gnome-3-22 branch, mostly for wayland session
+	"${FILESDIR}"/${PV}-wayland-crash-fix.patch # firefox wrongly using subsurfaces for popups occasional crash fix
+	"${FILESDIR}"/${PV}-clutter-missing-null-terminator.patch # fixes potential crashes on armhf
+	"${FILESDIR}"/${PV}-wayland-ensure-pending-geometry.patch # initial positioning fix for wayland for certain apps
+	"${FILESDIR}"/${PV}-wayland-size-hints.patch # apply min/max size hints in more cases properly
+	"${FILESDIR}"/${PV}-wayland-clipboard-fix.patch # Fixes utf8 clipboard with gtk+-3.22.13+
+)
+
+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() {
+	# Prefer gl driver by default
+	# GLX is forced by mutter but optional in clutter
+	# xlib-egl-platform required by mutter x11 backend
+	# native backend without wayland is useless
+	gnome2_src_configure \
+		--disable-static \
+		--enable-compile-warnings=minimum \
+		--enable-gl \
+		--enable-glx \
+		--enable-sm \
+		--enable-startup-notification \
+		--enable-verbose-mode \
+		--enable-xlib-egl-platform \
+		--with-default-driver=gl \
+		--with-libcanberra \
+		$(usex debug --enable-debug=yes "") \
+		$(use_enable gles2)        \
+		$(use_enable gles2 cogl-gles2) \
+		$(use_enable introspection) \
+		$(use_enable wayland) \
+		$(use_enable wayland kms-egl-platform) \
+		$(use_enable wayland native-backend) \
+		$(use_enable wayland wayland-egl-server) \
+		$(use_with input_devices_wacom libwacom) \
+		$(use_with udev gudev)
+}
+
+src_test() {
+	virtx emake check
+}
diff --git a/x11-wm/mutter/mutter-3.24.4.ebuild b/x11-wm/mutter/mutter-3.24.4.ebuild
new file mode 100644
index 000000000000..c05bdb7e50c5
--- /dev/null
+++ b/x11-wm/mutter/mutter-3.24.4.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2 virtualx
+
+DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
+HOMEPAGE="https://git.gnome.org/browse/mutter/"
+
+LICENSE="GPL-2+"
+SLOT="0/0"
+
+IUSE="debug gles2 input_devices_wacom +introspection test udev wayland"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# libXi-1.7.4 or newer needed per:
+# https://bugzilla.gnome.org/show_bug.cgi?id=738944
+COMMON_DEPEND="
+	>=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.49.0:2[dbus]
+	>=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=
+	>sys-power/upower-0.99:=
+
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	>=x11-libs/libXcomposite-0.4
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	>=x11-libs/libXfixes-3
+	>=x11-libs/libXi-1.7.4
+	x11-libs/libXinerama
+	>=x11-libs/libXrandr-1.5
+	x11-libs/libXrender
+	x11-libs/libxcb
+	x11-libs/libxkbfile
+	>=x11-libs/libxkbcommon-0.4.3[X]
+	x11-misc/xkeyboard-config
+
+	gnome-extra/zenity
+	media-libs/mesa[egl]
+
+	gles2? ( media-libs/mesa[gles2] )
+	input_devices_wacom? ( >=dev-libs/libwacom-0.13 )
+	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
+	udev? ( >=virtual/libgudev-232:= )
+	wayland? (
+		>=dev-libs/libinput-1.4
+		>=dev-libs/wayland-1.6.90
+		>=dev-libs/wayland-protocols-1.7
+		>=media-libs/mesa-10.3[egl,gbm,wayland]
+		sys-apps/systemd
+		>=virtual/libgudev-232:=
+		>=virtual/libudev-136:=
+		x11-base/xorg-server[wayland]
+		x11-libs/libdrm:=
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-devel/gettext-0.19.6
+	virtual/pkgconfig
+	x11-proto/xextproto
+	x11-proto/xineramaproto
+	x11-proto/xproto
+	test? ( app-text/docbook-xml-dtd:4.5 )
+	wayland? ( >=sys-kernel/linux-headers-4.4 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!x11-misc/expocity
+"
+
+PATCHES=(
+	# Fix build with >=gudev-232, bug #630312
+	"${FILESDIR}"/3.24.4-gudev-232.patch
+)
+
+src_prepare() {
+	# Disable building of noinst_PROGRAM for tests
+	if ! use test; then
+		sed -e '/^noinst_PROGRAMS/d' \
+			-i cogl/tests/conform/Makefile.{am,in} || die
+		sed -e '/noinst_PROGRAMS += testboxes/d' \
+			-i src/Makefile-tests.am || die
+		sed -e '/noinst_PROGRAMS/ s/testboxes$(EXEEXT)//' \
+			-i src/Makefile.in || die
+	fi
+
+	gnome2_src_prepare
+
+	# Leave the damn CFLAGS alone
+	sed -e 's/$CFLAGS -g/$CFLAGS /' \
+		-i clutter/configure || die
+	sed -e 's/$CFLAGS -g -O0/$CFLAGS /' \
+		-i cogl/configure || die
+	sed -e 's/$CFLAGS -g -O/$CFLAGS /' \
+		-i configure || die
+}
+
+src_configure() {
+	# Prefer gl driver by default
+	# GLX is forced by mutter but optional in clutter
+	# xlib-egl-platform required by mutter x11 backend
+	# native backend without wayland is useless
+	gnome2_src_configure \
+		--disable-static \
+		--enable-compile-warnings=minimum \
+		--enable-gl \
+		--enable-glx \
+		--enable-sm \
+		--enable-startup-notification \
+		--enable-verbose-mode \
+		--enable-xlib-egl-platform \
+		--with-default-driver=gl \
+		--with-libcanberra \
+		$(usex debug --enable-debug=yes "") \
+		$(use_enable gles2)        \
+		$(use_enable gles2 cogl-gles2) \
+		$(use_enable introspection) \
+		$(use_enable wayland) \
+		$(use_enable wayland kms-egl-platform) \
+		$(use_enable wayland native-backend) \
+		$(use_enable wayland wayland-egl-server) \
+		$(use_with input_devices_wacom libwacom) \
+		$(use_with udev gudev)
+}
+
+src_test() {
+	virtx emake check
+}
diff --git a/x11-wm/notion/Manifest b/x11-wm/notion/Manifest
new file mode 100644
index 000000000000..50907b7cfc30
--- /dev/null
+++ b/x11-wm/notion/Manifest
@@ -0,0 +1,11 @@
+AUX notion 26 SHA256 70ff05ede1d85ff4bf8d5100aa7ace3bb89ac09596543c6829fb1f65fddb546c SHA512 4d5aa2efb7ff7c9927ec6c2d8b0e5fd9ad1fcd10c7c40b20312342cb5a01ea9a835bbdfa88a054fb639f4a1a94dd4e05cb5f77a47d46ff43326086aba0cd69d8 WHIRLPOOL 14d17193642b810671ee231b4e8a1f1664e21456203abe0a1f7f226497767f9505dbcfc09095ebc2d24c13a48b754bb225a16fd9092e06b5c51a22a8dae727e6
+AUX notion-3_p2015061300-pkg-config.patch 2533 SHA256 1b42a53541e1300672ee7ac4a79d7f2b5a8983fed300ce568444bbf4cd619d64 SHA512 7fb084b35dc274e8d943a4801f2a38d43bead5eb94d33282903416120e5116d37811b6388b61f4f402d1efeed01cf36606537cb7c0aaf8a3362e99d05c9c3fda WHIRLPOOL 4ded8793626c6ab1b2d362e66f35e6c7e3fca719fbc994400621985c0d2a5ede27fb767a29998511eae1b09d7e08953e888b232b2902c38e5153272b1b6d737e
+AUX notion.desktop 208 SHA256 c79e3d5d1f35f55ad2a11639339986363a4c23a839b6a58c7f9d5a307e1e05bc SHA512 3c0a0c5787d77afc94b0f0f9187be5c32374c2dbc51d2d9de3729b2c4e18572d6d8d79a554b017ba33c7276bc2aca8182f93b2d7268f92101385ab6a06f8191f WHIRLPOOL 820785e196965f4e589c2f4d5356d00e3c6b9685c49a06c6c1fba17fe41920ab0b6bf5a0e182ab0a970d380af41b806379ed050a742f88af8a9f7aadc7154848
+DIST notion-3-2013030200-src.tar.bz2 625211 SHA256 565d85757cf5aac0193498339d245d3fd34dff09a1f2816735cae584a5b863e7 SHA512 266df9ca2f3613c7138a3bfe7bab1fadd27c1ad40078d134be827167b9407b900bc240780cb5375e6996777978bb8a3bc12fbfa45bb4d8d619ee93335c6039b2 WHIRLPOOL 23831d187dc23bffb83965015c0d052cb4a7378c6599dfac0d0fb845e624e7dd934be7a2a1e6bb8598330d9fbf621cc346986baeff3d96b16018774a116f7dd0
+DIST notion-3_p2015061300.tar.gz 797057 SHA256 3c9d9f35a9fb0d17c263b76fe28f7a1a4a05b7d6140545524cc1effd98c5c305 SHA512 254be12a8ece555d9f6253d99891bb51214379d0c04b6bf9595b7e5bf9493cb5d2fada37438f89621e7157f9e3647e446b5e173847498ee3608081f006b86679 WHIRLPOOL 15263dd3298e90f0f16119198b01e1466acba7cf431d2d6a56e71f53b35a2461be7155462b31d9da6c0a652e8fd33b7b9fbf6960a64f956e9853ad3030e8bcb8
+EBUILD notion-3_p2013030200.ebuild 2005 SHA256 98c7adfdd76ae90eb241626e22d8e59ae04001eabe252f7eddb05c62be0909ca SHA512 f19a33cee33e2eec1ffed9edc384ca311b3a4bfa94e972c9a5849e24ebe57d47d8602df6dc219d47dbce56678a41cecab50d1aa04fad0074a4a94c9961b1d001 WHIRLPOOL 8ce45b9b486605323eb4d3af4016cb0e89ca7a28c67768b5c23f7d77e9dd1dc8327331704f0835a5baad694c5c89f2eb221e10eb5d1970a2c88b2ed28b99b77a
+EBUILD notion-3_p2015061300-r1.ebuild 2245 SHA256 e64e84efb524009bdc83c92a222b55b64dccab0cd6e1baa265d9e8bd88126260 SHA512 6d5a344f95b91d562075ba29ebb79b59988f84e651190560d6e749372e2d06120c8358fe983dbce25f8cecd4cda2445ef17f997e6985069a97b320c35e68d6d1 WHIRLPOOL 3765ccd57502ea7fca456523a9cd1723d7478bd9e87e56fbfded885b00145411fd9fb2b9588f814b93e50139853b15d7da0305d4a2d9663ffdb00a6b39c2c3fb
+EBUILD notion-9999.ebuild 2201 SHA256 dedd242f5d314d8a794fb0b23cbd16814ffe6f14d92654220f57b28927713846 SHA512 90c4f1155880bd861b3bd2fd0fa3322bd2076717714776abb036710e8c0ebb9442fcb35492bcb22e4d2b2cdb66a0d5557ca2210409fc8f07757f424414aa56f4 WHIRLPOOL 032b3219f851cb4dce7bf67286f6432d82d36d86946bbc954928c6906d46ccd670914f3510982b1e0a00654d355cc35533d554b35a0c80349b07076e54d99481
+MISC ChangeLog 3324 SHA256 14cf353717e0b1f2985b63f1c39a4698e5c77d2423815729abdb70e818bf6997 SHA512 66b5ad2348083178f66293d3c06f12267a26d8fe125cbd9683c0f2630d24aada043d5435dd6e89c2585bca27699b261a32d8e8d5cbbced3c6a68edd6d3dd22e0 WHIRLPOOL ff780b9cbfa9a6610ae0ff30ee324333323668685f25aa185b838751799ab8d7b4b6c63d88ddd502116e7fc969c1d6c0f0809f52640675d93861ef1856eecff2
+MISC ChangeLog-2015 2515 SHA256 9612741d849c032ddcc2223f586ae3cf06d223ff6a62d5d08cfac5072b4d9ade SHA512 0523597e39f47130f3143c171b72c8c18bde5ebb4b47be4f4710130ac1861d4204bd297a2eccab286cd3dc439cb5439091d7bdb79ab801e07ecaa3389daaa054 WHIRLPOOL 7eb54ce283fb92ff461ea3f4bf237c6dc4837b29e88aefede32d8b9a4c870ece7096698ebd688459c3b6a3d11f1b755212a12fd5f270dea9d3f16cb4ca85672f
+MISC metadata.xml 557 SHA256 6e7e1e69a16380780c3088d0352b35abfe8c6bbb4d7fbcf486171aa24930cd87 SHA512 a26324e741b6b0f680889ac5d25c94d915ed20504175ecfe0e6de03a9037dbc7224e379ab15493e2a35b17429254da9dc8349dc155770256ba669101cadf6425 WHIRLPOOL 7a54ea6966e9cc592d6518d1207b68141a238617d7e0e709476e6a2570e98851b75e93e4c86849a410a92d85365bc132a4f3a107b6d8ecc4e7026f579802927f
diff --git a/x11-wm/notion/files/notion b/x11-wm/notion/files/notion
new file mode 100644
index 000000000000..65bf5648ad0b
--- /dev/null
+++ b/x11-wm/notion/files/notion
@@ -0,0 +1,2 @@
+#!/bin/sh
+/usr/bin/notion
diff --git a/x11-wm/notion/files/notion-3_p2015061300-pkg-config.patch b/x11-wm/notion/files/notion-3_p2015061300-pkg-config.patch
new file mode 100644
index 000000000000..fb718caa3158
--- /dev/null
+++ b/x11-wm/notion/files/notion-3_p2015061300-pkg-config.patch
@@ -0,0 +1,76 @@
+--- notion-3-2015061300/system-autodetect.mk
++++ notion-3-2015061300/system-autodetect.mk
+@@ -84,8 +84,8 @@
+ # SunOS/Solaris
+ #X11_PREFIX ?= /usr/openwin
+ 
+-X11_LIBS=-L$(X11_PREFIX)/lib -lX11 -lXext
+-X11_INCLUDES=-I$(X11_PREFIX)/include
++X11_LIBS=$(shell $(PKG_CONFIG) --libs x11 xext)
++X11_INCLUDES=$(shell $(PKG_CONFIG) --cflags-only-I x11 xext)
+ 
+ # XFree86 libraries up to 4.3.0 have a bug that can cause a segfault.
+ # The following setting  should  work around that situation.
+--- notion-3-2015061300/mod_xinerama/Makefile
++++ notion-3-2015061300/mod_xinerama/Makefile
+@@ -9,14 +9,14 @@
+ 
+ ######################################
+ 
+-INCLUDES += $(LIBTU_INCLUDES) $(LIBEXTL_INCLUDES) $(X11_INCLUDES) -I$(TOPDIR)
+-CFLAGS += $(XOPEN_SOURCE) $(C99_SOURCE)
++INCLUDES += $(LIBTU_INCLUDES) $(LIBEXTL_INCLUDES) $(X11_INCLUDES) -I$(TOPDIR) $(shell $(PKG_CONFIG) --cflags-only-I xinerama)
++CFLAGS += $(XOPEN_SOURCE) $(C99_SOURCE) $(shell $(PKG_CONFIG) --cflags-only-other xinerama)
+ DOCS=LICENSE README
+ 
+ SOURCES=mod_xinerama.c
+ 
+ MAKE_EXPORTS=mod_xinerama
+-LIBS = -L/usr/lib/x86_64-linux-gnu $(X11_LIBS) -lXinerama
++LIBS = $(X11_LIBS) $(shell $(PKG_CONFIG) --libs xinerama)
+ MODULE=mod_xinerama
+ MODULE_STUB=mod_xinerama.lua
+ 
+@@ -44,7 +44,7 @@
+ 
+ .PHONY: test
+ test: $(SOURCES)
+-	lua test_xinerama.lua
++	$(LUA) test_xinerama.lua
+ 
+ ######################################
+ 
+@@ -57,4 +57,4 @@
+ ################ ls_xinerama utility ###############
+ 
+ ls_xinerama: ls_xinerama.c
+-	$(CC) ls_xinerama.c -o ls_xinerama -Wl,--as-needed -lX11 -lXinerama
++	$(CC) $(CFLAGS) ls_xinerama.c -o ls_xinerama $(LDFLAGS) $(LIBS)
+--- notion-3-2015061300/mod_xrandr/Makefile
++++ notion-3-2015061300/mod_xrandr/Makefile
+@@ -9,13 +9,13 @@
+ 
+ ######################################
+ 
+-INCLUDES += $(LIBTU_INCLUDES) $(LIBEXTL_INCLUDES) $(X11_INCLUDES) -I$(TOPDIR)
+-CFLAGS += $(XOPEN_SOURCE) $(C99_SOURCE)
++INCLUDES += $(LIBTU_INCLUDES) $(LIBEXTL_INCLUDES) $(X11_INCLUDES) -I$(TOPDIR) $(shell pkg-config --cflags-only-I xrandr)
++CFLAGS += $(XOPEN_SOURCE) $(C99_SOURCE) $(shell $(PKG_CONFIG) --cflags-only-other xrandr)
+ 
+ SOURCES=mod_xrandr.c
+ 
+ MAKE_EXPORTS=mod_xrandr
+-LIBS = $(X11_LIBS) -lXrandr
++LIBS = $(X11_LIBS) $(shell $(PKG_CONFIG) --libs xrandr)
+ MODULE=mod_xrandr
+ MODULE_STUB=mod_xrandr.lua
+ ETC=cfg_xrandr.lua
+@@ -45,7 +45,7 @@
+ 
+ .PHONY: test
+ test: $(SOURCES)
+-	for i in test_xrandr*.lua ; do echo 'Testing' $$i ; lua $$i ; done
++	for i in test_xrandr*.lua ; do echo 'Testing' $$i ; $(LUA) $$i ; done
+ 
+ ######################################
+ 
diff --git a/x11-wm/notion/files/notion.desktop b/x11-wm/notion/files/notion.desktop
new file mode 100644
index 000000000000..7c9de9a95fd3
--- /dev/null
+++ b/x11-wm/notion/files/notion.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Notion
+Comment=A tiling tabbed window manager designed with keyboard users in mind.
+Exec=notion
+TryExec=notion
+# no icon yet, only the top three are currently used
+Icon=
+Type=Application
diff --git a/x11-wm/notion/metadata.xml b/x11-wm/notion/metadata.xml
new file mode 100644
index 000000000000..0705b1a8566a
--- /dev/null
+++ b/x11-wm/notion/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>moaxcp@gmail.com</email>
+		<name>John Mercier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="xrandr">Add support for xrandr</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">notion</remote-id>
+		<remote-id type="github">raboof/notion</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-wm/notion/notion-3_p2013030200.ebuild b/x11-wm/notion/notion-3_p2013030200.ebuild
new file mode 100644
index 000000000000..adebdbe6ff62
--- /dev/null
+++ b/x11-wm/notion/notion-3_p2013030200.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Notion is a tiling, tabbed window manager for the X window system"
+HOMEPAGE="http://notion.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/files/${P/_p/-}-src.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls xinerama +xrandr"
+
+RDEPEND=">=dev-lang/lua-5.1:0=
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	nls? ( sys-devel/gettext )
+	xinerama? ( x11-libs/libXinerama )
+	xrandr? ( x11-libs/libXrandr )"
+
+DEPEND="${RDEPEND}
+		virtual/pkgconfig"
+
+# needs luaposix,slingshot,... not in tree
+RESTRICT=test
+
+S=${WORKDIR}/${P/_p/-}
+
+src_prepare() {
+	sed -e "/^CFLAGS=/s:=:+=:" \
+		-e "/^CFLAGS/{s:-Os:: ; s:-g::}" \
+		-e "/^LDFLAGS=/{s:=:+=: ; s:-Wl,--as-needed::}" \
+		-e "/^CC=/s:=:?=:" \
+		-e "s:^\(PREFIX=\).*$:\1${ROOT}usr:" \
+		-e "s:^\(ETCDIR=\).*$:\1${ROOT}etc/notion:" \
+		-e "s:^\(LIBDIR=\).*:\1\$(PREFIX)/$(get_libdir):" \
+		-e "s:^\(DOCDIR=\).*:\1\$(PREFIX)/share/doc/${PF}:" \
+		-e "s:^\(LUA_DIR=\).*$:\1\$(PREFIX)/usr:" \
+		-e "s:^\(VARDIR=\).*$:\1${ROOT}var/cache/${PN}:" \
+		-e "s:^\(X11_PREFIX=\).*:\1\$(PREFIX)/usr:" \
+		-i system-autodetect.mk || die
+	sed -e 's/gcc/$(CC)/g' \
+		-i ioncore/Makefile || die
+	export STRIPPROG=true
+
+	tc-export CC
+}
+
+src_configure() {
+	use nls || export DEFINES=" -DCF_NO_LOCALE -DCF_NO_GETTEXT"
+
+	if ! use xinerama ; then
+		sed -e 's/mod_xinerama//g' -i modulelist.mk || die
+	fi
+
+	if ! use xrandr ; then
+		sed -e 's/mod_xrandr//g' -i modulelist.mk || die
+	fi
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)"
+}
+
+src_install() {
+	default
+
+	exeinto /etc/X11/Sessions
+	doexe "${FILESDIR}"/notion
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/notion.desktop
+}
+
+pkg_postinst() {
+	elog "If you want notion to have an ability to view a file based on its"
+	elog "guessed MIME type you should emerge app-misc/run-mailcap."
+}
diff --git a/x11-wm/notion/notion-3_p2015061300-r1.ebuild b/x11-wm/notion/notion-3_p2015061300-r1.ebuild
new file mode 100644
index 000000000000..b4ea2bbe831a
--- /dev/null
+++ b/x11-wm/notion/notion-3_p2015061300-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs readme.gentoo
+
+DESCRIPTION="Notion is a tiling, tabbed window manager for the X window system"
+HOMEPAGE="http://notion.sourceforge.net"
+SRC_URI="https://github.com/raboof/${PN}/archive/${PV/_p/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls xinerama +xrandr"
+
+RDEPEND=">=dev-lang/lua-5.1:0=
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	nls? ( sys-devel/gettext )
+	xinerama? ( x11-libs/libXinerama )
+	xrandr? ( x11-libs/libXrandr )"
+DEPEND="${RDEPEND}
+		virtual/pkgconfig"
+
+# mod_xrandr references mod_xinerama
+REQUIRED_USE="xrandr? ( xinerama )"
+
+# needs luaposix,slingshot,... not in tree
+RESTRICT=test
+
+S=${WORKDIR}/${P/_p/-}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-pkg-config.patch"
+
+	sed -e "/^CFLAGS/{s: =: +=: ; s:-Os:: ; s:-g::}" \
+		-e "/^LDFLAGS/{s: =: +=: ; s:-Wl,--as-needed::}" \
+		-i system-autodetect.mk || die
+	echo > build/lua-detect.mk
+}
+
+src_configure() {
+	{	echo "CFLAGS += -D_DEFAULT_SOURCE"
+		echo "PREFIX=${ROOT}usr"
+		echo "DOCDIR=\$(PREFIX)/share/doc/${PF}"
+		echo "ETCDIR=${ROOT}etc/${PN}"
+		echo "LIBDIR=\$(PREFIX)/$(get_libdir)"
+		echo "VARDIR=${ROOT}var/cache/${PN}"
+		echo "X11_PREFIX=${ROOT}usr"
+		echo "STRIPPROG=true"
+		echo "CC=$(tc-getCC)"
+		echo "AR=$(tc-getAR)"
+		echo "RANLIB=$(tc-getRANLIB)"
+		echo "LUA_MANUAL=1"
+		echo "LUA=\$(BINDIR)/lua"
+		echo "LUAC=\$(BINDIR)/luac"
+		echo "LUA_LIBS=\$(shell pkg-config --libs lua)"
+		echo "LUA_INCLUDES=\$(shell pkg-config --cflags)"
+		use nls || echo "DEFINES+=-DCF_NO_LOCALE -DCF_NO_GETTEXT"
+	} > system-local.mk
+
+	if ! use xinerama ; then
+		sed -e 's/mod_xinerama//g' -i modulelist.mk || die
+	fi
+
+	if ! use xrandr ; then
+		sed -e 's/mod_xrandr//g' -i modulelist.mk || die
+		sed -e '/mod_xrandr/d' \
+			-i etc/cfg_defaults.lua || die
+	fi
+}
+
+src_install() {
+	default
+
+	exeinto /etc/X11/Sessions
+	doexe "${FILESDIR}"/notion
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/notion.desktop
+
+	readme.gentoo_src_install
+}
+
+DOC_CONTENTS="If you want notion to have an ability to view a file based on its
+guessed MIME type you should emerge app-misc/run-mailcap."
diff --git a/x11-wm/notion/notion-9999.ebuild b/x11-wm/notion/notion-9999.ebuild
new file mode 100644
index 000000000000..7e3e396b1255
--- /dev/null
+++ b/x11-wm/notion/notion-9999.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils git-r3 multilib toolchain-funcs readme.gentoo
+
+DESCRIPTION="Notion is a tiling, tabbed window manager for the X window system"
+HOMEPAGE="http://notion.sourceforge.net"
+EGIT_REPO_URI="https://github.com/raboof/${PN}.git"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS=""
+IUSE="nls xinerama +xrandr"
+
+RDEPEND=">=dev-lang/lua-5.1:0=
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	nls? ( sys-devel/gettext )
+	xinerama? ( x11-libs/libXinerama )
+	xrandr? ( x11-libs/libXrandr )"
+DEPEND="${RDEPEND}
+		virtual/pkgconfig"
+
+# mod_xrandr references mod_xinerama
+REQUIRED_USE="xrandr? ( xinerama )"
+
+# needs luaposix,slingshot,... not in tree
+RESTRICT=test
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-3_p2015061300-pkg-config.patch"
+
+	sed -e "/^CFLAGS/{s: =: +=: ; s:-Os:: ; s:-g::}" \
+		-e "/^LDFLAGS/{s: =: +=: ; s:-Wl,--as-needed::}" \
+		-i system-autodetect.mk || die
+	echo > build/lua-detect.mk
+}
+
+src_configure() {
+	{	echo "CFLAGS += -D_DEFAULT_SOURCE"
+		echo "PREFIX=${ROOT}usr"
+		echo "DOCDIR=\$(PREFIX)/share/doc/${PF}"
+		echo "ETCDIR=${ROOT}etc/${PN}"
+		echo "LIBDIR=\$(PREFIX)/$(get_libdir)"
+		echo "VARDIR=${ROOT}var/cache/${PN}"
+		echo "X11_PREFIX=${ROOT}usr"
+		echo "STRIPPROG=true"
+		echo "CC=$(tc-getCC)"
+		echo "AR=$(tc-getAR)"
+		echo "RANLIB=$(tc-getRANLIB)"
+		echo "LUA_MANUAL=1"
+		echo "LUA=\$(BINDIR)/lua"
+		echo "LUAC=\$(BINDIR)/luac"
+		echo "LUA_LIBS=\$(shell pkg-config --libs lua)"
+		echo "LUA_INCLUDES=\$(shell pkg-config --cflags)"
+		use nls || echo "DEFINES+=-DCF_NO_LOCALE -DCF_NO_GETTEXT"
+	} > system-local.mk
+
+	if ! use xinerama ; then
+		sed -e 's/mod_xinerama//g' -i modulelist.mk || die
+	fi
+
+	if ! use xrandr ; then
+		sed -e 's/mod_xrandr//g' -i modulelist.mk || die
+		sed -e '/mod_xrandr/d' \
+			-i etc/cfg_defaults.lua || die
+	fi
+}
+
+src_install() {
+	default
+
+	exeinto /etc/X11/Sessions
+	doexe "${FILESDIR}"/notion
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/notion.desktop
+
+	readme.gentoo_src_install
+}
+
+DOC_CONTENTS="If you want notion to have an ability to view a file based on its
+guessed MIME type you should emerge app-misc/run-mailcap."
diff --git a/x11-wm/openbox/Manifest b/x11-wm/openbox/Manifest
new file mode 100644
index 000000000000..52029f2dd2bb
--- /dev/null
+++ b/x11-wm/openbox/Manifest
@@ -0,0 +1,12 @@
+AUX openbox-3.5.2-gnome-session.patch 574 SHA256 45e1c57d9134d7e370f9dfe1c057f998e516900255dcb71b709a6d035fb8a4d4 SHA512 35d36dd2ddef05e21491df75a1d14c3d26dd17a8da79577d06fb3b7ddf6a179c7e23bb777e4cbdaa4bb4ab745db023981645f3dbe4dcf75c7b4d5f46e18b96c8 WHIRLPOOL 25288c03e121bc619f20f1deb1462d7555a6880944c9ea82bd8129de06a4b6f3483c4d7fd5158931e5915e4f7fa0367fb337542c90d8a024e1805d551f31295a
+DIST openbox-3.5.2.tar.gz 972751 SHA256 128fb4ef11f83f6edb1685cfc04f44a16a5322082fc519f9d7cac84fc658af33 SHA512 89c58364bc482f2b098341e28b2bbab69a791430ff8924dc0dd6fe56aabadde916d42a4e7dfb47cab21afebd747698e106a19e852444d2ede05e72ef423df09d WHIRLPOOL 808109bc07c5c2a1f2444501c91f4d3f111290d034811d46f63f21001343f0a368a648d964e69a7264d4a5f447ce780ceba9d075e4d65d5b928075776a8274f2
+DIST openbox-3.6.1.tar.gz 962665 SHA256 8b4ac0760018c77c0044fab06a4f0c510ba87eae934d9983b10878483bde7ef7 SHA512 5e6f4a214005bea8b26bc8959fe5bb67356a387ddd317e014f43cb5b5bf263ec617a5973e2982eb76a08dc7d3ca5ec9e72e64c9b5efd751001a8999b420b1ad0 WHIRLPOOL 9fbfac65bc811f23f8e68af2f61d0271697ef0ebf3555de169d35afe91d0152a8379b717dc4f897c9c47c0332a4f2eb2d032f9459ab0d544cc3049c3917f3bd6
+DIST openbox-3.6.tar.gz 963207 SHA256 866c0ab8cb1cd15c7ae8022179cb6132a4c0f0476673bd3b834a1ef67a593ba8 SHA512 7f158a5236dcba5ec3c0e4fb5d1a5cabbd956d4125f19dfdb0594f5ded52545078d85ab645589ec3400a5306f63b43db5ee1ae26e3683141ee47f1b406d9788b WHIRLPOOL e6b4b0e73befe9a76ab4c4e388f7cea8b60874266c8ce8f2ce40b277a5b3744c99c10bde0bf3adc3650e10be46936352d9d758019288d9bbc24799f70de81ac8
+DIST surreal-gentoo.tar.gz 13410 SHA256 f478c58b2b6cd7a2a2ebe53fa261adb2d1fddf188f059d238b1b69ecc8701626 SHA512 dd43cb78e5e33345767edad22d0470765ac9eeae02bbad0acd8098bc096c15a166bf651493d12a5953bc043c9be92e9b160607eafb4723a6bcfc5d1d6fae235e WHIRLPOOL c9b406f4d822c8ce250bf8f30c9ad6bab75a0c1889a5b60061b83e44c06fd386f60c69ace176672d1a9658f4aa82fc82daaef205630c15c4711019cb48cca7ad
+EBUILD openbox-3.5.2-r1.ebuild 2716 SHA256 7550915e10d8b7c126e17a0b8b20880b918b8d8dd6dd4f7056eae802efb5c476 SHA512 b14911124572668c88dd4dc52728fcb186e68dfab27198025d65f5f0ac60bb95668526526e5a46548193b45eb30965133c48a004bec6c03e6bc36068431234f2 WHIRLPOOL 4c37b412e1261f40df323d3b6462a0d60d63d0bc222812f8654e1fa0036dd2c9c7dac55ffd332bea06ff67a15e02a0cb5077e4e51e6694f1c7e3d3992d8e56b0
+EBUILD openbox-3.6.1.ebuild 2750 SHA256 6875f6df2158ea42eda8fb603e62f9400d4a45518e03beebd5c2460059f6f76e SHA512 e0a5e23ab9323d4575ec93ee5fbf1491e6331676528c665859f97f170b69084d9f96b02febb58a240a436027462c8cc3e3f5e5681fc272a37466b589002aaa28 WHIRLPOOL 00e42148df165ca5a30f17ecd170c161bedfc55d771174657cac27729dca7c37dacf0508dc2a01e2c1dd9a596257b4927436ebf387f3640749231dce19e064b9
+EBUILD openbox-3.6.ebuild 2724 SHA256 d703ae8f9d9a3607569e668b08d044b3eeeb6160f937a3f74038f39861bac6c5 SHA512 7bb1da8b01675655a6d35585b8c4ab5b3c9e27923dc5a4ed58c1f5a47564318f4e97a3718b4332e1e7e8de1a8f43123030b134ce00c038f3093245aa518496e0 WHIRLPOOL b0e7bb347c4a636cd56536be3967f23ed4e44554e181748818bf0509252c4ebdce4b942ad5da33be8b2e394bb08ee4fbb417d07d66148fd80e5647ed3b42d633
+EBUILD openbox-9999.ebuild 2677 SHA256 b10fe7bbcbab14b9e60fc13dfad2925211ebc2fbb04129b4214092dc6eb018eb SHA512 8c5df980c5514f99497334841de5c3b382715990c34151ac6e48558f196603ebcfd3c78d46c20eeb1bb2e4c31783e9f3638e7096717a4170ea660bc21162dc4c WHIRLPOOL 77cd2786b0850961b950cd98c86572edbfda631c4111da80ef9f4d5d80734b1f612bee82846192ae002d13cd37690b401d5966d0477aa2fabb06dec0e85c97eb
+MISC ChangeLog 4322 SHA256 0c91bf578235694f1a1e1b5f6eefe545b1a4e90f11374613f6d53c7757b82cd8 SHA512 66db17c76061cd6c8246d5b18097306ceec4250abfda41bf0945c26c4bc5a18d80683114c4fe82449077a52ac4e36b767578c485a725af67baf48418c617a83a WHIRLPOOL 2be91ad53689c0342afb911b86e86d769cff666ea2fd68bc19e3c9453fc0198da80fadb17bf130981665f1aa9ba6b50cdb43cbd141ad200858ef31b316cc18ed
+MISC ChangeLog-2015 45110 SHA256 95aff620daa1c0ae608655358df3cfb47a6ab157903d924d039b068709f44682 SHA512 095f266632b53b5a7c4eec817031efa73e6286b26ff8d8238bc5d396df967a220ea8c7ffbd1ff095589693af8d8e0d4eb799a9af3b6a0ff2b5cbc213d19b55aa WHIRLPOOL f0572623da65792c42c9d6f17ab467cc410ee7af5d24ae0152f5fa476a53408030d88719423df2eaeb4ffe51042bb2901b84b6580d5e4baf26feea541674fe7f
+MISC metadata.xml 859 SHA256 886e9a281ad32428c3e42a5d2e2c14e7814560e5aa53b7ac81a38ce5b47bb470 SHA512 aef0f2f81315e0d07c4157d9503b9418aa8e1090913a63367e4230b681fb203caedf18bedcac9fa1cefda2bae9f05699ff5b251448fa75ce9c7f7f96510ed39e WHIRLPOOL 0f7aaa177d023ff46a74a5d3afcc129bbd2fcdf2b10b021ae65051eaa6e108d8ad7e475474fdb013e2e4a0ec583ffe49e93949d71a3ba9d75b6a8e9f9e16a847
diff --git a/x11-wm/openbox/files/openbox-3.5.2-gnome-session.patch b/x11-wm/openbox/files/openbox-3.5.2-gnome-session.patch
new file mode 100644
index 000000000000..10406af33c96
--- /dev/null
+++ b/x11-wm/openbox/files/openbox-3.5.2-gnome-session.patch
@@ -0,0 +1,14 @@
+Index: openbox-3.5.2/data/xsession/openbox-gnome-session.in
+===================================================================
+--- openbox-3.5.2.orig/data/xsession/openbox-gnome-session.in
++++ openbox-3.5.2/data/xsession/openbox-gnome-session.in
+@@ -18,6 +18,9 @@ VER=$(gnome-session --version 2>/dev/nul
+ MAJOR=$(echo $VER | cut -d . -f 1)
+ MINOR=$(echo $VER | cut -d . -f 2)
+ 
++# use gnome menus (gentoo bug #291965)
++export XDG_MENU_PREFIX=gnome-
++
+ # run GNOME with Openbox as its window manager
+ 
+ if test $MAJOR -lt 2 || (test $MAJOR = 2 && test $MINOR -le 22); then
diff --git a/x11-wm/openbox/metadata.xml b/x11-wm/openbox/metadata.xml
new file mode 100644
index 000000000000..03e0a0449e0d
--- /dev/null
+++ b/x11-wm/openbox/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+  	<email>hwoarang@gentoo.org</email>
+	<name>Markos Chandras</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>lxde@gentoo.org</email>
+    <name>Gentoo LXDE Project</name>
+  </maintainer>
+  <use>
+ 	 <flag name="session">Enables support for session managers</flag>
+	 <flag name="xdg">Install the python xdg files for xdg autostart</flag>
+  </use>
+  <upstream>
+    <maintainer status="active">
+      <email>danakj@orodu.net</email>
+      <name>Dana Jansens</name>
+    </maintainer>
+    <changelog>http://openbox.org/wiki/Openbox:News</changelog>
+    <doc>http://openbox.org/wiki/Help:Contents</doc>
+    <bugs-to>http://openbox.org/wiki/Openbox:Contribute</bugs-to>
+  </upstream>
+</pkgmetadata>
diff --git a/x11-wm/openbox/openbox-3.5.2-r1.ebuild b/x11-wm/openbox/openbox-3.5.2-r1.ebuild
new file mode 100644
index 000000000000..3f45b41ad72c
--- /dev/null
+++ b/x11-wm/openbox/openbox-3.5.2-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+inherit multilib autotools python-r1 eutils
+
+DESCRIPTION="A standards compliant, fast, light-weight, extensible window manager"
+HOMEPAGE="http://openbox.org/"
+if [[ ${PV} == *9999* ]]; then
+	inherit git-2
+	EGIT_REPO_URI="git://git.openbox.org/dana/openbox"
+	SRC_URI="branding? (
+	https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
+	KEYWORDS=""
+
+else
+	SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz
+	branding? ( https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd ~arm-linux ~x86-linux"
+fi
+
+LICENSE="GPL-2"
+SLOT="3"
+IUSE="branding debug imlib nls session startup-notification static-libs svg xdg"
+REQUIRED_USE="xdg? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="dev-libs/glib:2
+	>=dev-libs/libxml2-2.0
+	>=media-libs/fontconfig-2
+	x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXt
+	>=x11-libs/pango-1.8[X]
+	imlib? ( media-libs/imlib2 )
+	startup-notification? ( >=x11-libs/startup-notification-0.8 )
+	svg? ( gnome-base/librsvg:2 )
+	xdg? (
+		${PYTHON_DEPS}
+		dev-python/pyxdg[${PYTHON_USEDEP}]
+	)
+	"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xextproto
+	x11-proto/xf86vidmodeproto
+	x11-proto/xineramaproto"
+
+src_unpack() {
+	if [[ ${PV} == *9999* ]]; then
+		git-2_src_unpack
+	else
+		unpack ${A}
+	fi
+}
+
+src_prepare() {
+	use xdg && python_export_best
+	epatch "${FILESDIR}"/${PN}-3.5.2-gnome-session.patch
+	sed -i \
+		-e "s:-O0 -ggdb ::" \
+		-e 's/-fno-strict-aliasing//' \
+		"${S}"/m4/openbox.m4 || die
+	epatch_user
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		$(use_enable debug) \
+		$(use_enable static-libs static) \
+		$(use_enable nls) \
+		$(use_enable imlib imlib2) \
+		$(use_enable svg librsvg) \
+		$(use_enable startup-notification) \
+		$(use_enable session session-management) \
+		--with-x
+}
+
+src_install() {
+	dodir /etc/X11/Sessions
+	echo "/usr/bin/openbox-session" > "${ED}/etc/X11/Sessions/${PN}"
+	fperms a+x /etc/X11/Sessions/${PN}
+	emake DESTDIR="${D}" install
+	if use branding; then
+		insinto /usr/share/themes
+		doins -r "${WORKDIR}"/Surreal_Gentoo
+		# make it the default theme
+		sed -i \
+			-e "/<theme>/{n; s@<name>.*</name>@<name>Surreal_Gentoo</name>@}" \
+			"${D}"/etc/xdg/openbox/rc.xml \
+			|| die "failed to set Surreal Gentoo as the default theme"
+	fi
+	use static-libs || prune_libtool_files --all
+	if use xdg ; then
+		python_replicate_script "${ED}"/usr/libexec/openbox-xdg-autostart
+	else
+		rm "${ED}"/usr/libexec/openbox-xdg-autostart || die
+	fi
+}
diff --git a/x11-wm/openbox/openbox-3.6.1.ebuild b/x11-wm/openbox/openbox-3.6.1.ebuild
new file mode 100644
index 000000000000..555caa92ec33
--- /dev/null
+++ b/x11-wm/openbox/openbox-3.6.1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+inherit multilib autotools python-r1 eutils
+
+DESCRIPTION="A standards compliant, fast, light-weight, extensible window manager"
+HOMEPAGE="http://openbox.org/"
+if [[ ${PV} == *9999* ]]; then
+	inherit git-2
+	EGIT_REPO_URI="git://git.openbox.org/dana/openbox"
+	SRC_URI="branding? (
+	https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
+	KEYWORDS="alpha arm hppa ppc ppc64 sparc x86"
+
+else
+	SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz
+	branding? ( https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd ~arm-linux ~x86-linux"
+fi
+
+LICENSE="GPL-2"
+SLOT="3"
+IUSE="branding debug imlib nls session startup-notification static-libs svg xdg"
+REQUIRED_USE="xdg? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="dev-libs/glib:2
+	>=dev-libs/libxml2-2.0
+	>=media-libs/fontconfig-2
+	x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXt
+	>=x11-libs/pango-1.8[X]
+	imlib? ( media-libs/imlib2 )
+	startup-notification? ( >=x11-libs/startup-notification-0.8 )
+	svg? ( gnome-base/librsvg:2 )
+	xdg? (
+		${PYTHON_DEPS}
+		dev-python/pyxdg[${PYTHON_USEDEP}]
+	)
+	"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xextproto
+	x11-proto/xf86vidmodeproto
+	x11-proto/xineramaproto"
+
+src_unpack() {
+	if [[ ${PV} == *9999* ]]; then
+		git-2_src_unpack
+	else
+		unpack ${A}
+	fi
+}
+
+src_prepare() {
+	use xdg && python_export_best
+	epatch "${FILESDIR}"/${PN}-3.5.2-gnome-session.patch
+	sed -i \
+		-e "s:-O0 -ggdb ::" \
+		-e 's/-fno-strict-aliasing//' \
+		"${S}"/m4/openbox.m4 || die
+	epatch_user
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		$(use_enable debug) \
+		$(use_enable static-libs static) \
+		$(use_enable nls) \
+		$(use_enable imlib imlib2) \
+		$(use_enable svg librsvg) \
+		$(use_enable startup-notification) \
+		$(use_enable session session-management) \
+		--with-x
+}
+
+src_install() {
+	dodir /etc/X11/Sessions
+	echo "/usr/bin/openbox-session" > "${ED}/etc/X11/Sessions/${PN}"
+	fperms a+x /etc/X11/Sessions/${PN}
+	emake DESTDIR="${D}" install
+	if use branding; then
+		insinto /usr/share/themes
+		doins -r "${WORKDIR}"/Surreal_Gentoo
+		# make it the default theme
+		sed -i \
+			-e "/<theme>/{n; s@<name>.*</name>@<name>Surreal_Gentoo</name>@}" \
+			"${D}"/etc/xdg/openbox/rc.xml \
+			|| die "failed to set Surreal Gentoo as the default theme"
+	fi
+	use static-libs || prune_libtool_files --all
+	if use xdg ; then
+		python_replicate_script "${ED}"/usr/libexec/openbox-xdg-autostart
+	else
+		rm "${ED}"/usr/libexec/openbox-xdg-autostart || die
+	fi
+}
diff --git a/x11-wm/openbox/openbox-3.6.ebuild b/x11-wm/openbox/openbox-3.6.ebuild
new file mode 100644
index 000000000000..1311371aa881
--- /dev/null
+++ b/x11-wm/openbox/openbox-3.6.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+inherit multilib autotools python-r1 eutils
+
+DESCRIPTION="A standards compliant, fast, light-weight, extensible window manager"
+HOMEPAGE="http://openbox.org/"
+if [[ ${PV} == *9999* ]]; then
+	inherit git-2
+	EGIT_REPO_URI="git://git.openbox.org/dana/openbox"
+	SRC_URI="branding? (
+	https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
+	KEYWORDS=""
+
+else
+	SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz
+	branding? ( https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux"
+fi
+
+LICENSE="GPL-2"
+SLOT="3"
+IUSE="branding debug imlib nls session startup-notification static-libs svg xdg"
+REQUIRED_USE="xdg? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="dev-libs/glib:2
+	>=dev-libs/libxml2-2.0
+	>=media-libs/fontconfig-2
+	x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXt
+	>=x11-libs/pango-1.8[X]
+	imlib? ( media-libs/imlib2 )
+	startup-notification? ( >=x11-libs/startup-notification-0.8 )
+	svg? ( gnome-base/librsvg:2 )
+	xdg? (
+		${PYTHON_DEPS}
+		dev-python/pyxdg[${PYTHON_USEDEP}]
+	)
+	"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xextproto
+	x11-proto/xf86vidmodeproto
+	x11-proto/xineramaproto"
+
+src_unpack() {
+	if [[ ${PV} == *9999* ]]; then
+		git-2_src_unpack
+	else
+		unpack ${A}
+	fi
+}
+
+src_prepare() {
+	use xdg && python_export_best
+	epatch "${FILESDIR}"/${PN}-3.5.2-gnome-session.patch
+	sed -i \
+		-e "s:-O0 -ggdb ::" \
+		-e 's/-fno-strict-aliasing//' \
+		"${S}"/m4/openbox.m4 || die
+	epatch_user
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		$(use_enable debug) \
+		$(use_enable static-libs static) \
+		$(use_enable nls) \
+		$(use_enable imlib imlib2) \
+		$(use_enable svg librsvg) \
+		$(use_enable startup-notification) \
+		$(use_enable session session-management) \
+		--with-x
+}
+
+src_install() {
+	dodir /etc/X11/Sessions
+	echo "/usr/bin/openbox-session" > "${ED}/etc/X11/Sessions/${PN}"
+	fperms a+x /etc/X11/Sessions/${PN}
+	emake DESTDIR="${D}" install
+	if use branding; then
+		insinto /usr/share/themes
+		doins -r "${WORKDIR}"/Surreal_Gentoo
+		# make it the default theme
+		sed -i \
+			-e "/<theme>/{n; s@<name>.*</name>@<name>Surreal_Gentoo</name>@}" \
+			"${D}"/etc/xdg/openbox/rc.xml \
+			|| die "failed to set Surreal Gentoo as the default theme"
+	fi
+	use static-libs || prune_libtool_files --all
+	if use xdg ; then
+		python_replicate_script "${ED}"/usr/libexec/openbox-xdg-autostart
+	else
+		rm "${ED}"/usr/libexec/openbox-xdg-autostart || die
+	fi
+}
diff --git a/x11-wm/openbox/openbox-9999.ebuild b/x11-wm/openbox/openbox-9999.ebuild
new file mode 100644
index 000000000000..150b3ce0a56d
--- /dev/null
+++ b/x11-wm/openbox/openbox-9999.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+inherit multilib autotools python-r1 eutils
+
+DESCRIPTION="A standards compliant, fast, light-weight, extensible window manager"
+HOMEPAGE="http://openbox.org/"
+if [[ ${PV} == *9999* ]]; then
+	inherit git-2
+	EGIT_REPO_URI="git://git.openbox.org/dana/openbox"
+	SRC_URI="branding? (
+	https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
+	KEYWORDS=""
+
+else
+	SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz
+	branding? ( https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux"
+fi
+
+LICENSE="GPL-2"
+SLOT="3"
+IUSE="branding debug imlib nls session startup-notification static-libs svg xdg"
+REQUIRED_USE="xdg? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="dev-libs/glib:2
+	>=dev-libs/libxml2-2.0
+	>=media-libs/fontconfig-2
+	x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXt
+	>=x11-libs/pango-1.8[X]
+	imlib? ( media-libs/imlib2 )
+	startup-notification? ( >=x11-libs/startup-notification-0.8 )
+	svg? ( gnome-base/librsvg:2 )
+	xdg? (
+		${PYTHON_DEPS}
+		dev-python/pyxdg[${PYTHON_USEDEP}]
+	)
+	"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xextproto
+	x11-proto/xf86vidmodeproto
+	x11-proto/xineramaproto"
+
+src_unpack() {
+	if [[ ${PV} == *9999* ]]; then
+		git-2_src_unpack
+	else
+		unpack ${A}
+	fi
+}
+
+src_prepare() {
+	use xdg && python_export_best
+	epatch "${FILESDIR}"/${PN}-3.5.2-gnome-session.patch
+	sed -i \
+		-e "s:-O0 -ggdb ::" \
+		"${S}"/m4/openbox.m4 || die
+	epatch_user
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		$(use_enable debug) \
+		$(use_enable static-libs static) \
+		$(use_enable nls) \
+		$(use_enable imlib imlib2) \
+		$(use_enable svg librsvg) \
+		$(use_enable startup-notification) \
+		$(use_enable session session-management) \
+		--with-x
+}
+
+src_install() {
+	dodir /etc/X11/Sessions
+	echo "/usr/bin/openbox-session" > "${ED}/etc/X11/Sessions/${PN}"
+	fperms a+x /etc/X11/Sessions/${PN}
+	emake DESTDIR="${D}" install
+	if use branding; then
+		insinto /usr/share/themes
+		doins -r "${WORKDIR}"/Surreal_Gentoo
+		# make it the default theme
+		sed -i \
+			-e "/<theme>/{n; s@<name>.*</name>@<name>Surreal_Gentoo</name>@}" \
+			"${D}"/etc/xdg/openbox/rc.xml \
+			|| die "failed to set Surreal Gentoo as the default theme"
+	fi
+	use static-libs || prune_libtool_files --all
+	if use xdg ; then
+		python_replicate_script "${ED}"/usr/libexec/openbox-xdg-autostart
+	else
+		rm "${ED}"/usr/libexec/openbox-xdg-autostart || die
+	fi
+}
diff --git a/x11-wm/oroborus/Manifest b/x11-wm/oroborus/Manifest
new file mode 100644
index 000000000000..d12c6a01301b
--- /dev/null
+++ b/x11-wm/oroborus/Manifest
@@ -0,0 +1,7 @@
+AUX oroborus.desktop 137 SHA256 94af55746976452f2cb01a4d7c7bb4c1226b1eff3f02796f74b6cec7ae0eff6b SHA512 6fffb36df68027eb763c947d575e8de7cadcfc5fba42caa6d74a54bab884011f81961004563d3327f692905f64d57edca8829724d6fefb3961d23117d6b6ef80 WHIRLPOOL 8fb17ec01c7654c0b49ec670199020c2c0010ea8df4bacbb3b231b649183a8f60c8e5dc04bebae0c3201f91c0fdfe42450cd10a328c1e6b53bce376242a18afb
+DIST oroborus_2.0.20.tar.gz 335099 SHA256 5220a540bcf6812c6773fbe583d9ea3f54f452cbac55bedcaadeba8c3a9a7b89 SHA512 0ffa9e3ce25c3d2cb6f24c827755b4f7af14f6e34127fec66ef367cb8dc53ceb89d0fec3619f80f055f9d2241dfa0e4edf53e4e22dad1558d7b448f0b878c573 WHIRLPOOL 1e1f92c91c17c885324e65da92b56aa56672e2e0713fe6332613e1386590cec595596d5291e2b878d812ac1712f200a99e4a174dffba76e88b96f5193691d55f
+EBUILD oroborus-2.0.20-r1.ebuild 532 SHA256 41115fe891f4df70bc1d1f4899726553e01a81e1d66756f5a3649e3493f10858 SHA512 40a3a5464b8451a5a4a239404aae4821cbc03dca6ff06ec5130876ec4da17e5fe7cfcbfb2d2f38ad70b1585f485b6de4928494e074936a680968ac4736765c57 WHIRLPOOL 792fe2b3e3c77c126e937e5dc18d7808da66796204fde88972803f734a7f7f8a383cc4c78a0dde6e79462dd89d43f13242c08e5bb4243ab03f3cbcb0b820a5c4
+EBUILD oroborus-2.0.20.ebuild 740 SHA256 06e333b4e8538203c118d2ee44d93c2e27447967d5ffe5acba7da6dd9cb973ab SHA512 a14be62eb5b1655ec67817c264bc8001f0b23618efc43ec50064f2802c804470523e20e10b15565e349c7520d87df01b3667c9c0bbcb30e5ba0dc1c43ff50852 WHIRLPOOL fd9e6f280b73f2b3c9eb3eb71f79a2fcd28ed27b654277adc5dc6c2f520bf7bdd855b4f5a9abaf46ee121c3aba80a079878852777163285f9381724c25678038
+MISC ChangeLog 2550 SHA256 5545cd68a6dc58bcadb77001a74687e53373121c1452494c480eaebd92800174 SHA512 46b59a53b1c843d6d3be81efe17c34c31632f04b2d6f19b9199773e0dbcb30d5fb7f76588ec6d58ac85c4e0946785ae7e47d550224767b1dd9acadee90b6c76f WHIRLPOOL a892d1980d67bde9baf92e3313598cd7e928c658bab431642d9b2fc776b84ce53fd7c401520a3e2acc7313a70d3beb205112cb1bbcb66623929594c6c9d3fb47
+MISC ChangeLog-2015 5210 SHA256 e947ec740134aaa752bfd6b70371230804632d6c63af04c27545efef8d3eeb15 SHA512 d57514612c764389d6382a8f5e83461e8a2f60a8e433acea9153a5cf049aab04dae9639c47993a40baa57d2f9e21bfb94fd833a443c750b66259085813199a50 WHIRLPOOL 0873a757c81da14881275d2f5e2c4cbb754c11a2d801373332cec8c9035ab88481f984187f2595fd6cdf92e02799e4c3b704c101be98f935d2252a8107b7414a
+MISC metadata.xml 493 SHA256 f3d6667a4bb403239f7271a874cfb210e4584d9907331ee63629b2d6464e3e5a SHA512 f5e29aa56730150e348a610458c2faf18a203712e06ec78cfe0861dc61d0bc1f3c502f53abf02648b81566cee831ddf590894923b220f9b071badc5572d6cadf WHIRLPOOL 61b92f9ba3a149158f8fd385b913def4d03c40ac7728ccdc9e0e45278e7c51088e59e4c876c5c5a1b9ac7e2c702b54c599461b57d2b35fe57c2f59ef5be60935
diff --git a/x11-wm/oroborus/files/oroborus.desktop b/x11-wm/oroborus/files/oroborus.desktop
new file mode 100644
index 000000000000..725ce52170e3
--- /dev/null
+++ b/x11-wm/oroborus/files/oroborus.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Name=Oroborus
+Exec=oroborus
+TryExec=oroborus
+Icon=
+Type=Application
+
+[X-Window Manager]
+SessionManaged=false
diff --git a/x11-wm/oroborus/metadata.xml b/x11-wm/oroborus/metadata.xml
new file mode 100644
index 000000000000..5ec5a71660ce
--- /dev/null
+++ b/x11-wm/oroborus/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+<longdescription>
+		Oroborus is a small and simple but configurable and themeable window 
+		manager. There is no fancy dock, clip, wharf, or root menu - these 
+		utilities can be provided by other programs. It has support for GNOME 
+		and session management, or can be run as a stand-alone window manager.
+	</longdescription>	
+</pkgmetadata>
diff --git a/x11-wm/oroborus/oroborus-2.0.20-r1.ebuild b/x11-wm/oroborus/oroborus-2.0.20-r1.ebuild
new file mode 100644
index 000000000000..d3cebd0ecfc3
--- /dev/null
+++ b/x11-wm/oroborus/oroborus-2.0.20-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Small and fast window manager"
+HOMEPAGE="http://www.oroborus.org"
+SRC_URI="mirror://debian/pool/main/o/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-proto/xextproto
+	x11-proto/xproto"
+
+DOCS=( AUTHORS ChangeLog example.${PN}rc README TODO )
diff --git a/x11-wm/oroborus/oroborus-2.0.20.ebuild b/x11-wm/oroborus/oroborus-2.0.20.ebuild
new file mode 100644
index 000000000000..a5e7374cb092
--- /dev/null
+++ b/x11-wm/oroborus/oroborus-2.0.20.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="Small and fast window manager"
+HOMEPAGE="http://www.oroborus.org"
+SRC_URI="mirror://debian/pool/main/o/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="gnome"
+
+RDEPEND="x11-libs/libXpm
+	x11-libs/libXext
+	x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	x11-proto/xextproto"
+
+src_configure() {
+	econf --disable-dependency-tracking
+}
+
+src_install () {
+	emake DESTDIR="${D}" install
+
+	if use gnome; then
+		insinto /usr/share/gnome/wm-properties
+		doins "${FILESDIR}"/${PN}.desktop
+	fi
+
+	dodoc AUTHORS ChangeLog example.${PN}rc README TODO
+}
diff --git a/x11-wm/page/Manifest b/x11-wm/page/Manifest
new file mode 100644
index 000000000000..e57aab9f04da
--- /dev/null
+++ b/x11-wm/page/Manifest
@@ -0,0 +1,7 @@
+DIST page-1.9.8.tar.gz 993882 SHA256 c4cb93e64ea0ce1a2ea5c8f68b5aa5f9ea60e7b9cf778c6e03d7b06c5e9c39a7 SHA512 624493282bb3258bbbaf731d4b6e0fe50741a6dfe80a559feb40112042aeb799b46e820c23d8a1679c4374ceb5be0b63890e2f660f1240b4dd249bb3b8aa61a8 WHIRLPOOL 9db09cb6f36ca8bc3a60d4d7f8ce3d995bbd0a888c90bfd065f33d83ec9d4d6a298d7e4131b60b6fe0fd99d42aca298555df374cbce96adba6b47d9592afd5c4
+DIST page-1.9.9.tar.gz 1007419 SHA256 d88109c03c185c90a61ca638ac08a0b412cb42208f986dd341c7977ea6f8a85b SHA512 4dfd7b04823e13c2a592e3037803022d6e30019ac9390b6da9196e0a250de8e213d2a6a7546cd97c3d77deac4fa70410def2ed2367bb3a21c6f1ddb3df61d5f8 WHIRLPOOL f606fe21766851bc99ab95fba22df579e6f8eefee2b1d9ec4b719cf8c88cadce9e004b1737cf36f04b3f1b8bd1fd2f64b84ec295181d1043aced4ce4f7ea810e
+EBUILD page-1.9.8-r1.ebuild 1279 SHA256 c1b7bc138d89bf7f150426c1ac3ba8756830b769c5cbffdad1934768cf498e31 SHA512 edbf0d1a93e8d7c0502608118db8e1369fc1e86b4daea0de970f251cb85a13d75f896ae74d749439583bb06d5b896106b9048258701130c48b74d98daabef510 WHIRLPOOL 1b5e27f3a8eb4b682f71fb6529033c46b03f97cf519a15e1f9096975987271bb04699e5774ec80205a9c7d2e18206fe83485c575654089da774b064bdee85ea3
+EBUILD page-1.9.8.ebuild 1278 SHA256 4dced44bceda6e67c407b02fc691fe60c60942e085fd1e99578ea6b35c0052d3 SHA512 18f901d6d0a07e68da1c36421e7fe9e7c31dcaedf5a36a2f7f70533244c8712c0dc1eb0ccd3a987383afb52bdc1664a40659116f7e33d8ce111bf52683381702 WHIRLPOOL 9ba307971ddf74bae7c053f45c04f3c854a74b6526a2c8108eeaecbed3bc55903df096c6480e3c4e1b44b150964a926a5bc50cdc598d8ae6f83c0b9e6396dbac
+EBUILD page-1.9.9.ebuild 1463 SHA256 4a94eba460a0c42c1909f7d28ac92ce9cac9db93842d8c93111b45e4026649df SHA512 b55d92be0c9cd3cb910b0e61b6f453a1fe50f846086bbd357400bc37a16f486ff652a90d2202308ee133c86c183e1479344d76f78fdd9a488df90440a4e508a7 WHIRLPOOL 1bfb446a1ec29983d8a47e23c2ebdc8355e169f10773eaa2828196953e72e829b745c791910ed18a0ab98b58836be2652d2c92bc68c632395bb3b6b6fa8227f5
+MISC ChangeLog 3076 SHA256 f22ef7a87bc18c9599e41f4bca30c2cf446823cad42a34fc82f5496421e03948 SHA512 7118a7e017b50d7c296f11b320eaf50511c6e82266a05938dfdf010e5889653379f1476b4fa273c3a809a8e69ee4f083927fdce517af9c7f09a6a6bfbc330427 WHIRLPOOL d60a201d76056e2c786f23e03ac3ad0de4560d5e889fcbbbbbd5ca1aec49b57a14c3afc495d445157e75214669841da3fa6cc2a2658753a37c45a8cddceb225b
+MISC metadata.xml 498 SHA256 80cf0bad51102ae38d6ccc51f70910befa684ad51ee95f74844570a91b9b2c35 SHA512 145a1353db0d958c3a2198f57c2d3e7e163b723ca794c96ca76a76e385e22233683a55bc62528193ca87444889423f38d4ab4fda833ecc8a51c1c87bc6400fca WHIRLPOOL 84397d14ec5c96a416f8e1f45148eb54d456d18a8c448a2b6ba52329eedf22ba5e2c40e635e34eac446606c3978c1d6090b3d6b498ec7bde878856dfb46799f3
diff --git a/x11-wm/page/metadata.xml b/x11-wm/page/metadata.xml
new file mode 100644
index 000000000000..e445535184ef
--- /dev/null
+++ b/x11-wm/page/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>gschwind@gnu-log.net</email>
+    <name>Benoit Gschwind</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>monsieurp@gentoo.org</email>
+    <name>Patrice Clement</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/x11-wm/page/page-1.9.8-r1.ebuild b/x11-wm/page/page-1.9.8-r1.ebuild
new file mode 100644
index 000000000000..05d2c406a4df
--- /dev/null
+++ b/x11-wm/page/page-1.9.8-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+EAPI=5
+
+DESCRIPTION="A mouse friendly tiling window manager"
+HOMEPAGE="http://www.hzog.net/index.php/Main_Page"
+SRC_URI="http://www.hzog.net/pub/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	x11-proto/xcb-proto
+	x11-libs/libxcb
+	x11-libs/xcb-util
+	x11-libs/libXfixes
+	x11-libs/libXdamage
+	x11-proto/damageproto
+	x11-proto/randrproto
+	x11-libs/libXrandr
+	x11-proto/xproto
+	x11-proto/fixesproto
+	x11-proto/compositeproto
+	x11-libs/libXcomposite
+	x11-proto/renderproto
+	x11-libs/libXrender
+	x11-libs/libXext
+	x11-proto/xextproto
+	x11-libs/cairo[X,xcb]
+	x11-libs/pango
+	dev-libs/glib:2"
+
+DEPEND="${RDEPEND}"
+
+src_install() {
+	default
+
+	# Solves file collision with dev-tcltk/tcllib, bug #574074
+	ebegin "Changing references from 'page' to 'pagewm'"
+	mv "${D}"usr/bin/page "${D}"usr/bin/pagewm || die "Could not rename binary!"
+	sed -i -e "s:/usr/bin/page:/usr/bin/pagewm:" "${D}"usr/share/applications/page.desktop || die "Could not change .desktop file!"
+	eend
+}
+
+pkg_postinst() {
+	elog "page can now be launched using \"pagewm\". To find out more about this functionality,"
+	elog "see the following bug report: https://bugs.gentoo.org/574074."
+}
diff --git a/x11-wm/page/page-1.9.8.ebuild b/x11-wm/page/page-1.9.8.ebuild
new file mode 100644
index 000000000000..c03cb2442c54
--- /dev/null
+++ b/x11-wm/page/page-1.9.8.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="A mouse friendly tiling window manager"
+HOMEPAGE="http://www.hzog.net/index.php/Main_Page"
+SRC_URI="http://www.hzog.net/pub/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	x11-proto/xcb-proto
+	x11-libs/libxcb
+	x11-libs/xcb-util
+	x11-libs/libXfixes
+	x11-libs/libXdamage
+	x11-proto/damageproto
+	x11-proto/randrproto
+	x11-libs/libXrandr
+	x11-proto/xproto
+	x11-proto/fixesproto
+	x11-proto/compositeproto
+	x11-libs/libXcomposite
+	x11-proto/renderproto
+	x11-libs/libXrender
+	x11-libs/libXext
+	x11-proto/xextproto
+	x11-libs/cairo[xcb]
+	x11-libs/pango
+	dev-libs/glib:2"
+
+DEPEND="${RDEPEND}"
+
+src_install() {
+	default
+
+	# Solves file collision with dev-tcltk/tcllib, bug #574074
+	ebegin "Changing references from 'page' to 'pagewm'"
+	mv "${D}"usr/bin/page "${D}"usr/bin/pagewm || die "Could not rename binary!"
+	sed -i -e "s:/usr/bin/page:/usr/bin/pagewm:" "${D}"usr/share/applications/page.desktop || die "Could not change .desktop file!"
+	eend
+}
+
+pkg_postinst() {
+	elog "page can now be launched using \"pagewm\". To find out more about this functionality,"
+	elog "see the following bug report: https://bugs.gentoo.org/574074."
+}
diff --git a/x11-wm/page/page-1.9.9.ebuild b/x11-wm/page/page-1.9.9.ebuild
new file mode 100644
index 000000000000..4bd58b7eb176
--- /dev/null
+++ b/x11-wm/page/page-1.9.9.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A mouse friendly tiling window manager"
+HOMEPAGE="http://www.hzog.net/index.php/Main_Page"
+SRC_URI="http://www.hzog.net/pub/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=x11-proto/xcb-proto-1.12-r2
+	>=x11-libs/libxcb-1.11[xkb]
+	>=x11-libs/xcb-util-0.4.0
+	>=x11-libs/libXfixes-5.0.3
+	>=x11-libs/libXdamage-1.1.4-r1
+	>=x11-proto/damageproto-1.2.1-r1
+	>=x11-proto/randrproto-1.5.0
+	>=x11-libs/libXrandr-1.5.1
+	>=x11-proto/xproto-7.0.31
+	>=x11-proto/fixesproto-5.0-r1
+	>=x11-proto/compositeproto-0.4.2-r1
+	>=x11-libs/libXcomposite-0.4.4-r1
+	>=x11-proto/renderproto-0.11.1-r1
+	>=x11-libs/libXrender-0.9.10
+	>=x11-libs/libXext-1.3.3
+	>=x11-proto/xextproto-7.3.0
+	>=x11-libs/cairo-1.14.6[X,xcb]
+	>=x11-libs/pango-1.40.5
+	>=dev-libs/glib-2.50.3-r1:2"
+
+DEPEND="${RDEPEND}"
+
+src_install() {
+	default
+
+	# Solves file collision with dev-tcltk/tcllib, bug #574074
+	ebegin "Changing references from 'page' to 'pagewm'"
+	mv "${D}"usr/bin/page "${D}"usr/bin/pagewm || die "Could not rename binary!"
+	sed -i -e "s:/usr/bin/page:/usr/bin/pagewm:" "${D}"usr/share/applications/page.desktop || die "Could not change .desktop file!"
+	eend
+}
+
+pkg_postinst() {
+	elog "page can now be launched using \"pagewm\". To find out more about this functionality,"
+	elog "see the following bug report: https://bugs.gentoo.org/574074."
+}
diff --git a/x11-wm/pekwm/Manifest b/x11-wm/pekwm/Manifest
new file mode 100644
index 000000000000..304da64306b0
--- /dev/null
+++ b/x11-wm/pekwm/Manifest
@@ -0,0 +1,6 @@
+DIST pekwm-0.1.17.tar.bz2 405742 SHA256 8a1fd3bf9f38e8c7bb2b2864c090f986b60cec2281ecf1bba462d120fb327d00 SHA512 fa4c95ddc7e17f737b4e90f32258a79bf2a0abe96a2ab1a4166b1aa6832ff7a978116d224c98c31a4b33444b3c59e9ecd6095ca062d8a65f0f6174803f5b0811 WHIRLPOOL e7371577e9cef2aade3679dbe50bc2124a55fdd443fada46cf3068e7cb9fc70c9f81f747c93a04a2b347c4b772c55b7520030fa0cbac50d4572a8e6599479327
+DIST pekwm-themes.tar.bz2 138599 SHA256 5a14f0c98381e0d5b36dcc2e56b30b0dd279e14b6dd61b199fedf807eccb4a13 SHA512 c95bc980b5aeeb4f4832cb2dbbf82adf72e4a784fcd46432fd6e6a6577ef02823ec1c4b861d07747c066050fc5040aca975e2cdc78342abab99a3d486888a25d WHIRLPOOL 1d55f89b2ca75fa169590e60d72c14c6049eceb100c1fb54ed736657a48a236eb2be6378852366254d2faf0da446eb570eecee3a3388064e7c45e54996dc6a0d
+EBUILD pekwm-0.1.17-r1.ebuild 1705 SHA256 bbef84d14f27495fa4ee95319ab19b6559eb717068d99385acd7e96590cae6da SHA512 a9a859e4ebf9b38e1eb1a4185462e956c4d9c08865d9b2c38a5ee6a7deee6ff21054af03c249dae6e2fdd706d85678c5269878078ea02d18ee07f8c6d84ebc0d WHIRLPOOL 60a9707ba21711dfbc528d348d30cd36f42aece89cf9495be6bcacdaff5e2a21131e869e10f48612d33316873177fdacc4e6cc99589e7356fd7c89eab63891da
+MISC ChangeLog 3049 SHA256 2433fd7ac17eee81f22d7e922daaa49157f94181b23460f3b5fd93cde41e0ce7 SHA512 e3cfa200308774b8dbb6e29fdf27a2748cdfffc1469fe1623e91861ab2e99e9e004291dd28c2206cfcbe3f8d40fcf3b25fa21ae66e76594208e74cb1854fe448 WHIRLPOOL d802a6c321fefa1c378a539636b47d682f6546c06197e91d5b248ad27c6cad3edff7ae0e2694480a02835743b75c4243595967f672c53642bcfcbffb50051dfb
+MISC ChangeLog-2015 10134 SHA256 e921e9d762ecccc7d5138ba1d79df86c3e4f99663cee0e5af76c68413bcb391c SHA512 d8e10423cd3ad29e2efb208ff4250e877c881d19bb36f0b0748e446320c0a852f72302ca1219b7cb667f28d865c083390b4ba64f7dd29ccafd9a070103bd1844 WHIRLPOOL 1355fc228451da0426a406e3f1029cf9debd3cdf49cf5dece7dfee5bd5ae5646db3d23ded9beddb28ff2fe9634733a411d998036722fefc90c90ca6b75a851a2
+MISC metadata.xml 1043 SHA256 e7888ce2fe27f9ca5d7447d405f59911762e89069271c6900c12c5e2ff96143c SHA512 b49fe56ed6f19963222c1268e8ef524525767594b969e6359f3efb6aef3b3dd25ebf9e7cb31bc8150c5b3d4e282d3a814d61b657a5e79eeddeb40730fd2f9b50 WHIRLPOOL e441f914863b6e2273114b6c582103d261f5010a89213fcce6c819b38db27a28a7efef539bab7bc8d12f37d6a2deb76077b1117b64b408fe977798443f320976
diff --git a/x11-wm/pekwm/metadata.xml b/x11-wm/pekwm/metadata.xml
new file mode 100644
index 000000000000..5d97b5bb7def
--- /dev/null
+++ b/x11-wm/pekwm/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>jer@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>linbug+gbz@posteo.org</email>
+		<name>Andreas Schlick</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		Pekwm is a window manager based on aewm++, but it no longer resembles 
+		it. It is highly configurable, rather fast, and aimed towards being 
+		usable while remaining pretty enough to look at. Features include 
+		client window grouping into one window frame, automatic window size, 
+		location, grouping and title rewriting properties, keychains, Xinerama
+		support, pixmap theming, and dynamic menus.
+	</longdescription>	
+	<use>
+		<flag name="contrib">Install optional extras in the documentation directory</flag>
+		<flag name="themes">Install additional themes</flag>
+	</use>
+</pkgmetadata>
diff --git a/x11-wm/pekwm/pekwm-0.1.17-r1.ebuild b/x11-wm/pekwm/pekwm-0.1.17-r1.ebuild
new file mode 100644
index 000000000000..0eb0537b1d5d
--- /dev/null
+++ b/x11-wm/pekwm/pekwm-0.1.17-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="A lightweight window manager initially based on aewm++"
+HOMEPAGE="http://pekwm.org/"
+SRC_URI="
+	http://pekwm.org/projects/pekwm/files/${P}.tar.bz2
+	themes? ( mirror://gentoo/${PN}-themes.tar.bz2 )
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=" amd64 ~mips ppc x86 ~x86-fbsd"
+IUSE="contrib debug themes truetype xinerama"
+
+RDEPEND="
+	media-libs/libpng:0=
+	virtual/jpeg:0
+	x11-libs/libXpm
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	truetype? ( x11-libs/libXft )
+	xinerama? ( x11-libs/libXinerama )
+"
+
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	if use themes; then
+		rm "${WORKDIR}"/themes/Ace/.theme.swp || die
+	fi
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable truetype xft) \
+		$(use_enable xinerama) \
+		--enable-image-jpeg \
+		--enable-image-png \
+		--enable-image-xpm \
+		--enable-shape \
+		--enable-xrandr
+}
+
+src_install() {
+	default
+
+	# Install contributor scripts into doc folder
+	if use contrib ; then
+		docinto /usr/share/doc/${PF}/contrib
+		dodoc contrib/lobo/{check.png,pekwm_autoprop.pl,pekwm_menu_config.pl} \
+			contrib/lobo/{pekwm_menu_config.pl.vars,README,uncheck.png}
+	fi
+
+	if use themes; then
+		insinto /usr/share/${PN}/themes
+		doins -r "${WORKDIR}"/themes/*
+	fi
+
+	# Insert an Xsession
+	echo -e "#!/bin/sh\n\n/usr/bin/${PN}" > "${T}"/${PN} || die
+	exeinto /etc/X11/Sessions
+	doexe "${T}"/${PN}
+
+	# Insert a GDM/KDM xsession file
+	make_session_desktop ${PN} ${PN}
+}
+
+pkg_postinst() {
+	if use contrib ; then
+		elog " User contributed scripts have been installed into:"
+		elog " /usr/share/doc/${PF}/contrib"
+	fi
+}
diff --git a/x11-wm/plwm/Manifest b/x11-wm/plwm/Manifest
new file mode 100644
index 000000000000..c33267047724
--- /dev/null
+++ b/x11-wm/plwm/Manifest
@@ -0,0 +1,6 @@
+AUX plwm-2.7_rc1-pep0263.patch 653 SHA256 a603a854f811d12d6cf4ebd731b411484cef10d61ebe63b6b25f591ae83132f3 SHA512 82b596bf7d82cbbfbd8aee08f8e80a958f1d2c73526f60ad959082ca294dd58f663bbfde00a6d0fdbbe09059a811994b9edb268725b1aa0bd9e64e29b4dde1fe WHIRLPOOL 064151d7d79d4576fd2e367c6b88aef46fc47c4eadcad936a6f697b95d4de56e3a4bbf5e7f00e8fc112ec347fe1c83c3ec07540cdb179860d4a7e7437a658226
+DIST PLWM-2.7rc1.tar.gz 343570 SHA256 789fbd6229ad63ee9b2d939e27d049282dca45315d8e22debad56636a3b0a305 SHA512 4716677c86cf6b31ba8ea6c4e8fad729d9cf7d9c09b7d56ba6686173793c5b248865f0af281561a2df161433ea0fb2f2ca050dfb3b6c9fedbe41ff0ad0c07f7e WHIRLPOOL c1e678b4f15701c644e3f609c9b53100fe376a09f96454094fddba83c7a1f5c167c4746962e4996586568d110dfb3c4232e0bcaf33d09492946454b2e400d5eb
+EBUILD plwm-2.7_rc1-r1.ebuild 899 SHA256 e44e44a76ff4e38795c2417bf6f2e484dc0eca2663b9a8f50e9306e412a25060 SHA512 1f48aa82a02bb61e0f83995ff03b20060d29784c2f3bd5aa37a7ab7485e35a52a441d8705d2c9cbd6eac3d6bf6d8e9bbf5fb3367dcb62b2e786c16256b1cc2f4 WHIRLPOOL 4c4c957734846fa854fe6c4b01e48d5f409e36b2b15d1906704a4c8955a8a17e66c1816ee5378d8052eb9b536699bc704b7c780cac34175136ebaa77553afbc1
+MISC ChangeLog 3241 SHA256 8fb6348d38ea2fbe161dcada71bd3e7a2f6974f26d4da5dbe7692373bb099cad SHA512 d7c14f09f9fd45f22f9d1d4c39e45e2164b9fa52cb638eb9dfe0b2748b1f16f7db4415e3bc993249f569acd4e85728916592ac157f9f021c7019ef8ddac884ed WHIRLPOOL b956c731049f7f4cc9952b7dee1946fa42b1abb458cbf6f45e1ba5132dce13880bafd441ba6a239f77630082beaab88a9470f6e43f01776132e11916517f10a9
+MISC ChangeLog-2015 2947 SHA256 0a52458c3baee086c428b0b6260985b2f346e916f877785e2dd2a4d51adc1242 SHA512 3cfd33b5b03591e3fd710022231ee51b3fb2d29a3c8dff4e8d597cf20618b85dd30d0b6b14aee6664155baf3c4a5ef202c35094b5909af35f7f1f6bbdfb3a699 WHIRLPOOL 3c2ccd69518a3136825b5ae5ca35f1560d220484ab309c2db93220069f94366870b73f3b95cb939336bfb26a619fc70f87dbb7d03fff54f0c22600ced0e18f8b
+MISC metadata.xml 482 SHA256 3b8132da996d2772120c6d72e5dcf6078471f056bab9ae4d6d760dfdac4944b9 SHA512 e109bff59bd5750fabe5d62325bc8d88d2d9d365375232730c2a86126ac276f0b2df238d9705f1f0dfd94cbd43850ed92c92fdbcdce5ee42664fa162d85cd558 WHIRLPOOL 2435502d06ec4f670331f20fa0200b347c01ae198728d96526c3831bf74ee3ec5a68e7f112f54579996d6ff897577aeba2f91a29d7d624e14b6eab2a33d8c502
diff --git a/x11-wm/plwm/files/plwm-2.7_rc1-pep0263.patch b/x11-wm/plwm/files/plwm-2.7_rc1-pep0263.patch
new file mode 100644
index 000000000000..aadc8f86f458
--- /dev/null
+++ b/x11-wm/plwm/files/plwm-2.7_rc1-pep0263.patch
@@ -0,0 +1,17 @@
+diff -ur PLWM-2.7rc1.orig/examples/hrwwm.py PLWM-2.7rc1/examples/hrwwm.py
+--- PLWM-2.7rc1.orig/examples/hrwwm.py	2007-08-27 15:06:29.000000000 +0200
++++ PLWM-2.7rc1/examples/hrwwm.py	2007-08-27 15:07:33.000000000 +0200
+@@ -1,4 +1,5 @@
+ #!/usr/bin/env python
++# -*- coding: utf-8 -*-
+ #
+ # hrwwm.py -- Example PLWM window manager "configuration"
+ #
+diff -ur PLWM-2.7rc1.orig/plwm/mw_apm.py PLWM-2.7rc1/plwm/mw_apm.py
+--- PLWM-2.7rc1.orig/plwm/mw_apm.py	2007-08-27 15:06:29.000000000 +0200
++++ PLWM-2.7rc1/plwm/mw_apm.py	2007-08-27 15:07:00.000000000 +0200
+@@ -1,3 +1,4 @@
++# -*- coding: utf-8 -*-
+ #
+ # mw_apm.py -- display APM status in a modewindow
+ #
diff --git a/x11-wm/plwm/metadata.xml b/x11-wm/plwm/metadata.xml
new file mode 100644
index 000000000000..956d8e2ed88f
--- /dev/null
+++ b/x11-wm/plwm/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>axs@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		 PLWM is a Python package, containing classes suitable for 
+		 implementing a window manager. PLWM is also a window manager, 
+		 using the PLWM package.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">plwm</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-wm/plwm/plwm-2.7_rc1-r1.ebuild b/x11-wm/plwm/plwm-2.7_rc1-r1.ebuild
new file mode 100644
index 000000000000..bead79daae86
--- /dev/null
+++ b/x11-wm/plwm/plwm-2.7_rc1-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils
+
+MY_P=PLWM-${PV/_}
+
+DESCRIPTION="Python classes for, and an implementation of, a window manager"
+HOMEPAGE="http://plwm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/plwm/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/python-xlib-0.14[${PYTHON_USEDEP}]"
+DEPEND="sys-apps/texinfo"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-pep0263.patch
+)
+
+python_compile_all() {
+	emake -C "${S}"/doc
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	python_newscript examples/examplewm.py plwm
+	python_doscript utils/*.py
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doinfo doc/*.info
+
+	dodoc ONEWS
+	dodoc -r examples
+	docinto utils
+	dodoc utils/ChangeLog
+}
diff --git a/x11-wm/qtile/Manifest b/x11-wm/qtile/Manifest
new file mode 100644
index 000000000000..dedb4817f4ee
--- /dev/null
+++ b/x11-wm/qtile/Manifest
@@ -0,0 +1,9 @@
+AUX qtile-session 1854 SHA256 848ebde7357aa27e94c7b2e6d4f0eb670ce9ddf0528b58e8019944cada4f7131 SHA512 4d7418316f6baeaa28b254f341c74641004bd58444c425f626c92e44bff046ec108d128a9e91c10daae75b222c5758e8f0e8a5e3b778b2af36409f4d4b778cbe WHIRLPOOL fc591eb8c5ef8f3457f847e7577f915c8dbee381607760a556204114c6ea88ab0071624070d7dafd849b3888d7a930a77ff55bac1fcb267e9bab74d0fe5961bf
+DIST qtile-0.10.5.tar.gz 325311 SHA256 1dd9512900d7c9eeb40c2d6bac400485e80eb5093083eea095f77b22fb126850 SHA512 00fbeaa17921eb2d4014c979bcd1f81f22e155606b13340f4653c262d7fde3b1f471a7f20e9a80b58435bdc1e5479c983a72e4be180b49df2ef4a5fe568b8631 WHIRLPOOL 63f7ba175683a3e3f2e1b18e1a33e7bffd1927ed4f6148cf044e9fb9ba603f001fc23950ce0d5e76474c64c5f7baf3430d96758bbe7e95bd953c55c7214040bb
+DIST qtile-0.10.6.tar.gz 328892 SHA256 2b0f18d3bbe1da25cebc5172134c6c5f8fbe0d2b60d81ac2c2dfdf8a1e8b903a SHA512 39eef26358e1220ca766b030733396206df68677e3f23d6847d375f479952a4e2d47e0c3e59fab2e5046e899bad91d107a913bb25458fb66859dec3fa8c0e956 WHIRLPOOL 6bece67dfe39f0538a24791a862faf0ab0c902fb011c4a022a0e5699e332b92f458aae6a54ae438ec0fae0c57cb9d1916bdbff987485d984ecfc71840c815965
+EBUILD qtile-0.10.5.ebuild 1331 SHA256 036bfc6da3d23f7194a8c491b137bc556e026415c8ff703d3aa2bfb9a65acb4c SHA512 a515550e2b03034a774df7dee0863cdaa357c204871fc17e0ff2f154099f44855ca80c815b9f3289ef244c5a091905833eafb8874b71964585b46ac6976a2a69 WHIRLPOOL cf8880d955143ce5fa56cb860b97e76e2fb87a7c883d46c6f6ea9858908196cef830d2bf4517ccc0c0fc3726809d6f63511193c09175b6af10ab25f15b1ed048
+EBUILD qtile-0.10.6.ebuild 1354 SHA256 3348afb72d5f5fd619242a5d542d8ea24f09d6c0d169d8134d44f83fec3ac8c7 SHA512 5949738009c1fc7f7baa658d314c2cf17b43d1e4338df0772ae2c8d6d8b687a7f7b434029222eb2c675f8b32d35693521115d585d4bf146484d6f5cec7880e53 WHIRLPOOL 23304aa2098245d47e869bfe70d6dfae78727aba2ec8478d95c5916f23fb0d279b289aca2a49ea7e738cdf248b8ef47f4e29854d84741c229779ed932f9f9024
+EBUILD qtile-9999.ebuild 1354 SHA256 3348afb72d5f5fd619242a5d542d8ea24f09d6c0d169d8134d44f83fec3ac8c7 SHA512 5949738009c1fc7f7baa658d314c2cf17b43d1e4338df0772ae2c8d6d8b687a7f7b434029222eb2c675f8b32d35693521115d585d4bf146484d6f5cec7880e53 WHIRLPOOL 23304aa2098245d47e869bfe70d6dfae78727aba2ec8478d95c5916f23fb0d279b289aca2a49ea7e738cdf248b8ef47f4e29854d84741c229779ed932f9f9024
+MISC ChangeLog 3395 SHA256 af4ab126f66e5c2c83ab1f59bdf1c66156c0c934361605c0d260923242d536da SHA512 3bfd55359e5ca34bc5403d9c1ab5e0412069a6376fd75a44b82f6466429e698c3298973e57bb35df8146359231cb416e9933eaf16bc82ddeaa16807f4c51195a WHIRLPOOL 45b23bd7a592afe8fe90621d1575415e7c4608f695fbefa02764153dbbef3858e45da469d52971c7d04d4121f2b8564be10e114c99d8486377f22c0d904cc2e1
+MISC ChangeLog-2015 2866 SHA256 6f959805af5f80d73bf799ef558428993718fa3ab6d63c76d37c8cfa6d96595c SHA512 af108143fa29cc525f467fa957865c6d91a49a72b86cb7e0d65cdf8ec2c3f7fc0eb3a3b9532aadd684dbeb5785c74db293ac27c56ecd5d894ad1fb2fb3b308a2 WHIRLPOOL ca4dd5cb3d677f22bb6ef8bc2aaabfbc528c12102cc57b1a2235b78ef5b18c9b896c74aa734bd082570a9d77e94be6de3d7125fd8b86acfae69bdef1cbcb4991
+MISC metadata.xml 322 SHA256 167a9c02d0507ce690e00820a196215ad332a4268b004e00d65fb56d8316fb35 SHA512 2722b020cfc1260e907fccc5055ea5556435bd603fe362fbe0ceb0b3074ee20baf6ecc04d2afd6bd9c7b949d0ce0cc06f5c9234f77963374916924d6d7249564 WHIRLPOOL 2820e8fba8b8483457df70efef1711cfccd619c1a1b9eef0b953c69591dd21498d554479f927b78eb19c6ab0c48b51acc8b04fc06a36d3a50626274275ec7473
diff --git a/x11-wm/qtile/files/qtile-session b/x11-wm/qtile/files/qtile-session
new file mode 100644
index 000000000000..56a96ddd79ea
--- /dev/null
+++ b/x11-wm/qtile/files/qtile-session
@@ -0,0 +1,89 @@
+#!/bin/sh
+# qtile Xsession starter, based on Xsession from x11-apps/xinit
+
+# redirect errors to a file in user's home directory if we can
+for errfile in "$HOME/.qtile-errors" "${TMPDIR-/tmp}/qtile-$USER" "/tmp/qtile-$USER"
+do
+	if ( cp /dev/null "$errfile" 2> /dev/null )
+	then
+		chmod 600 "$errfile"
+		exec > "$errfile" 2>&1
+		break
+	fi
+done
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+userxkbmap=$HOME/.Xkbmap
+
+sysresources=/etc/X11/Xresources
+sysmodmap=/etc/X11/Xmodmap
+sysxkbmap=/etc/X11/Xkbmap
+
+rh6sysresources=/etc/X11/xinit/Xresources
+rh6sysmodmap=/etc/X11/xinit/Xmodmap
+
+# merge in defaults
+if [ -f "$rh6sysresources" ]; then
+	xrdb -merge "$rh6sysresources"
+fi
+
+if [ -f "$sysresources" ]; then
+	xrdb -merge "$sysresources"
+fi
+
+if [ -f "$userresources" ]; then
+	xrdb -merge "$userresources"
+fi
+
+# merge in keymaps
+if [ -f "$sysxkbmap" ]; then
+	setxkbmap `cat "$sysxkbmap"`
+	XKB_IN_USE=yes
+fi
+
+if [ -f "$userxkbmap" ]; then
+	setxkbmap `cat "$userxkbmap"`
+	XKB_IN_USE=yes
+fi
+
+#
+# Eeek, this seems like too much magic here
+#
+if [ -z "$XKB_IN_USE" -a ! -L /etc/X11/X ]; then
+	if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then
+		xkbsymbols=`sed -n -e 's/^[	   ]*XkbSymbols[   ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config /etc/X11/xorg.conf`
+		if [ -n "$xkbsymbols" ]; then
+			setxkbmap -symbols "$xkbsymbols"
+			XKB_IN_USE=yes
+		fi
+	fi
+fi
+
+# xkb and xmodmap don't play nice together
+if [ -z "$XKB_IN_USE" ]; then
+	if [ -f "$rh6sysmodmap" ]; then
+		xmodmap "$rh6sysmodmap"
+	fi
+
+	if [ -f "$sysmodmap" ]; then
+		xmodmap "$sysmodmap"
+	fi
+
+	if [ -f "$usermodmap" ]; then
+		xmodmap "$usermodmap"
+	fi
+fi
+
+unset XKB_IN_USE
+
+# run all system xinitrc shell scripts.
+if [ -d /etc/X11/xinit/xinitrc.d ]; then
+	for i in /etc/X11/xinit/xinitrc.d/* ; do
+		if [ -x "$i" ]; then
+		. "$i"
+		fi
+	done
+fi
+
+exec /usr/bin/qtile
diff --git a/x11-wm/qtile/metadata.xml b/x11-wm/qtile/metadata.xml
new file mode 100644
index 000000000000..7055ada3bf93
--- /dev/null
+++ b/x11-wm/qtile/metadata.xml
@@ -0,0 +1,11 @@
+<?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>
+	<upstream>
+		<remote-id type="github">qtile/qtile</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-wm/qtile/qtile-0.10.5.ebuild b/x11-wm/qtile/qtile-0.10.5.ebuild
new file mode 100644
index 000000000000..b0eaff58e983
--- /dev/null
+++ b/x11-wm/qtile/qtile-0.10.5.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1 virtualx
+
+if [[ ${PV} == 9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/qtile/qtile.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/qtile/qtile/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A full-featured, hackable tiling window manager written in Python"
+HOMEPAGE="http://qtile.org/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+# docs require sphinxcontrib-blockdiag and sphinxcontrib-seqdiag
+
+RDEPEND="x11-libs/pango
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/cairocffi-0.7[${PYTHON_USEDEP}]
+	>=dev-python/cffi-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+	>=dev-python/xcffib-0.3.2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/trollius[${PYTHON_USEDEP}]' 'python2*')
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		x11-base/xorg-server[kdrive]
+	)
+"
+
+RESTRICT="test"
+
+python_test() {
+	VIRTUALX_COMMAND="nosetests" virtualmake
+}
+
+python_install_all() {
+	local DOCS=( CHANGELOG README.rst )
+	distutils-r1_python_install_all
+
+	insinto /usr/share/xsessions
+	doins resources/qtile.desktop
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/${PN}-session ${PN}
+}
diff --git a/x11-wm/qtile/qtile-0.10.6.ebuild b/x11-wm/qtile/qtile-0.10.6.ebuild
new file mode 100644
index 000000000000..4133132c10db
--- /dev/null
+++ b/x11-wm/qtile/qtile-0.10.6.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1 virtualx
+
+if [[ ${PV} == 9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/qtile/qtile.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/qtile/qtile/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A full-featured, hackable tiling window manager written in Python"
+HOMEPAGE="http://qtile.org/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+# docs require sphinxcontrib-blockdiag and sphinxcontrib-seqdiag
+
+RDEPEND="
+	x11-libs/cairo[xcb]
+	x11-libs/pango
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/cairocffi-0.7[${PYTHON_USEDEP}]
+	>=dev-python/cffi-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+	>=dev-python/xcffib-0.3.2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/trollius[${PYTHON_USEDEP}]' 'python2*')
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		x11-base/xorg-server[kdrive]
+	)
+"
+
+RESTRICT="test"
+
+python_test() {
+	VIRTUALX_COMMAND="nosetests" virtualmake
+}
+
+python_install_all() {
+	local DOCS=( CHANGELOG README.rst )
+	distutils-r1_python_install_all
+
+	insinto /usr/share/xsessions
+	doins resources/qtile.desktop
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/${PN}-session ${PN}
+}
diff --git a/x11-wm/qtile/qtile-9999.ebuild b/x11-wm/qtile/qtile-9999.ebuild
new file mode 100644
index 000000000000..4133132c10db
--- /dev/null
+++ b/x11-wm/qtile/qtile-9999.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1 virtualx
+
+if [[ ${PV} == 9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/qtile/qtile.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/qtile/qtile/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A full-featured, hackable tiling window manager written in Python"
+HOMEPAGE="http://qtile.org/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+# docs require sphinxcontrib-blockdiag and sphinxcontrib-seqdiag
+
+RDEPEND="
+	x11-libs/cairo[xcb]
+	x11-libs/pango
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/cairocffi-0.7[${PYTHON_USEDEP}]
+	>=dev-python/cffi-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+	>=dev-python/xcffib-0.3.2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/trollius[${PYTHON_USEDEP}]' 'python2*')
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		x11-base/xorg-server[kdrive]
+	)
+"
+
+RESTRICT="test"
+
+python_test() {
+	VIRTUALX_COMMAND="nosetests" virtualmake
+}
+
+python_install_all() {
+	local DOCS=( CHANGELOG README.rst )
+	distutils-r1_python_install_all
+
+	insinto /usr/share/xsessions
+	doins resources/qtile.desktop
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/${PN}-session ${PN}
+}
diff --git a/x11-wm/ratpoison/Manifest b/x11-wm/ratpoison/Manifest
new file mode 100644
index 000000000000..6af73aea6613
--- /dev/null
+++ b/x11-wm/ratpoison/Manifest
@@ -0,0 +1,12 @@
+AUX 50ratpoison-gentoo.el 524 SHA256 ac355a0e2eed6612552d2cfd861c2deb142ba6cab852de04a29b8ff820c2da59 SHA512 ba91fcad3332dc3353de3f60c553795b60295d260c5f0fd526f3952cb69459e12bdc96c36bec4ddebaf0504d62bea1b16912f95b799e2e93b004bd0e62fb2c64 WHIRLPOOL e911ccd66f5ccb81cf5ee09ad5179c2c6596d209f4e01c16724a24c5cd9e475709b543b4009d3dd65be190bf41db5ee50c49ae530a1309c3b96eed69fe9d132c
+AUX ratpoison.desktop 122 SHA256 a3946195eaba2ba852000e4f3ca4c70cf73010a84ae559a1c0c6c23c187103e6 SHA512 f94b9557636a130939ab29b440c07c64ebb6d9ab169ae32af87314d147a31c48f5a74721e85a7b7260b6ce1ad5172234958c8af075a2b0b1f308961f4f3fe12f WHIRLPOOL 7b346eb7096df804882fce7335dac491d1ac457353014a842abb25a3232d7190624d6f426cea0fb71b8d483174ad446e91a1685c760cf7330a1d643f193956f6
+AUX ratpoison.el-gentoo.patch 220 SHA256 0caf37c15fd3ef6780e76fa4fdd49deca80385e41740b8e63d1f3b73d85ca47a SHA512 c9e0e322b0c632b6bd7cee0c34269accfd0cf2d12751b9f2a65955f5ae5aa72804f819ca0147da5e0ff571357b34460337668adc07ad77afdf7a50b512f6b36f WHIRLPOOL bb4695158bf547b1a8f2804dd8f8629ba41292616f8a3e61ed2c2b4a0a9b5fae434963c0d5685f6196d0eb720c0e7f75f49b239efe83fe1e398c4f0a3186c272
+AUX ratpoison.xsession 19 SHA256 6b8677e8eae6043ebe4e5785b0cdf14e78d070cdcc7c9652640f88fbd58d8424 SHA512 684dbc8aa49355bac63254beaef79ec0d499f5f4d20976fae9daa686102c5120e564fc3a60eb9a770c0c648c998e49b63414fb92b8e5b5af0f5fc23695cd6b8e WHIRLPOOL 8d48f9814bbbb5461d2461a5c335f801e31b2e0bc579c47e483f44767e4699cc4cbfdc45f01ebcade079ab7a616c511d87e4a43b71f084d17a2844ee439cd0ce
+DIST ratpoison-1.4.8.tar.xz 364700 SHA256 da4695636d1fce8883ef2144d79ce46ebb0431a5da02440bd1ffec5dca17a0f0 SHA512 10b44489e60d3186ca407a5bd87e23dbd737cdafee22ea7284ac4db8bb4463081af483460d1899161fbae2973f4d25fbd1bfd354e3ffb59735baf69bbd6f94f6 WHIRLPOOL 53e087a28e685f7667ecbf2302db3df88382ac5840c898b3b8e7954f5c6de3b6f6928e8d021df30e5562991dab5c1c1b810556abc8fdef8979ffc062dd144426
+DIST ratpoison-1.4.9.tar.xz 315584 SHA256 d98fa4be025ecca453c407ff311ab3949f29f20d6d8abedf8f0716b85fc8d1f1 SHA512 97f705efd2092b8e12528496890c59f613e6fcec010aca94a5a59bd641e22dfc50dd500a4b94af7a07553a8a6359f6bec4eee0db1a7ded29d7f051904b09beef WHIRLPOOL 719aa36dce28b1cd0614e0e994f4109c3ade0d32fef7a295530f0c760c8bd3864b67ee3d2b5d9d45c89e059000721d0f564f40b33086c458f0a6df5876140e40
+EBUILD ratpoison-1.4.8-r1.ebuild 1805 SHA256 c90edaafb631e470f02b4fe47ce6c4694565d39e6334b02d04041ef968b38b75 SHA512 59963dff1a5ffa529180cd8386bce013d0c34acf8141eacefaf798fd219ae4bc18842f5a07453167fb0dcf2823a8e12dfb1313a5fb7c8f55f65ecb93dfd6bbb7 WHIRLPOOL a97eebc8ba41832812b5d0a30701e1ada818d27decfed2d75af7196a474216ffcd7d06cace7cbde5b1fbac9328f25626b370b2a1587b8c026c1adfeba27d8cbf
+EBUILD ratpoison-1.4.9.ebuild 1869 SHA256 d3f943fcbf357a4769cd8872006c4599dc2f40adf5707133be3bff4b6432500b SHA512 74e4596179f76e7aa0d5a23387770d4a96be8b936d231faefda9c1b503bcd9b3fa4b7b0ecb047a87224213b93ee0a1aa8d5f7729111c8d70864c042dd83f84c6 WHIRLPOOL ec142f169d4bc595eb7308a8afbd7602041a3e82f79424f73b3d03df60bcaaaf0afa16d4ec15db0a8ad7c0f7a69abe67ab26982ded518ef9a1bdaa7bfc4b4b15
+EBUILD ratpoison-9999.ebuild 1847 SHA256 61828fcdff8aea4298921ea586ea2d5528dc2b6b9671009e2822308710ee4971 SHA512 b502680abb58e39f9a4898c63193d0c8fc3e9d228bd954326fb3e393cd5a517b8132d79aacdda973208dc2460b28bdabfe9b63dada14ac91d92febd8582224cf WHIRLPOOL 69157fd34b935abb5c8e5235b509175e700a909028bb9b6ab1e6be3be986ee3966e7aa6bb2403717276b59f2914a361cc7c1a8f4f064ea0c9a89a775c7b14af7
+MISC ChangeLog 3093 SHA256 ea5d419f6c74e74e05cab9048eb346cf0fc24ecef383198f4a1d34116d5fdf21 SHA512 efdada7c43ea4792249aa2ce577c12620d00a7aa295821cbf079453d8fa6b3904897483a546ac12903bff72193dc8b02c4a8e4a3092519f4abbc1f4e43522f10 WHIRLPOOL 9f5fb0240c5b20675bea4748909ee31524cf745e9166b21e4dc5f9b71464c0ad5312b1486983ad5759006b5c64583a9a8aa6650f2bd44fb3bceb28bf9a80899d
+MISC ChangeLog-2015 14561 SHA256 df7b96a60c369334d3096cd5b7439ac8f401e222f3ddeefb97befb2559c87ffa SHA512 b935183d0714922afc30e659ae0661047764f71a8b10005d44dc4e7a38f825fbaf280c089241c7ca593cd563b539efb8a1dcacff04dad5e3875c2f6b4f47d23f WHIRLPOOL a493134eb6b42d1b4a51c772063f549eff2f1f80f417d13f12013388ced388102003cdc3a8892336530fe1d44f47a4debb92a4c25aeded98cc0eb44db2475042
+MISC metadata.xml 1036 SHA256 bf8a200c7e5e830b90b572a93c31bd10bbd9297493436b94d9f001018bca1546 SHA512 d40c0383ad7243df552727fda5979063a1138224b3eb4ed85cd730ad61af76fa688a74d023c46562856655f1d0c15af748d933f4cc8b61faa7cbc7eed6f4c149 WHIRLPOOL 74132d13525b57b5f45cb2ba8673dab157700c7aa4bdf490dc747f6e3b3b6a70b012c48b998aea521e4a2ae13c3976fa82c1849465c2461bf612db9d5e543874
diff --git a/x11-wm/ratpoison/files/50ratpoison-gentoo.el b/x11-wm/ratpoison/files/50ratpoison-gentoo.el
new file mode 100644
index 000000000000..b8885bd7adc4
--- /dev/null
+++ b/x11-wm/ratpoison/files/50ratpoison-gentoo.el
@@ -0,0 +1,10 @@
+
+;;; site-lisp configuration for ratpoison
+
+(add-to-list 'load-path "@SITELISP@")
+
+(autoload 'ratpoisonrc-mode "ratpoison" "Mode for ratpoison configuration files." t)
+(autoload 'ratpoison-command "ratpoison" "Run a ratpoison command." t)
+(autoload 'ratpoison-command-on-region "ratpoison" "Run a ratpoison command contained in the region." t)
+(autoload 'ratpoison-info "ratpoison" "Call up the ratpoison info page." t)
+(autoload 'ratpoison-command-info "ratpoison" "Call up the info page listing the ratpoison commands." t)
+\ No newline at end of file
diff --git a/x11-wm/ratpoison/files/ratpoison.desktop b/x11-wm/ratpoison/files/ratpoison.desktop
new file mode 100644
index 000000000000..3f9e2dd5a4d6
--- /dev/null
+++ b/x11-wm/ratpoison/files/ratpoison.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=ratpoison
+Comment=Say good-bye to the rodent
+Exec=ratpoison
+TryExec=ratpoison
+Icon=
+Type=Application
diff --git a/x11-wm/ratpoison/files/ratpoison.el-gentoo.patch b/x11-wm/ratpoison/files/ratpoison.el-gentoo.patch
new file mode 100644
index 000000000000..64f8f4ee0bc3
--- /dev/null
+++ b/x11-wm/ratpoison/files/ratpoison.el-gentoo.patch
@@ -0,0 +1,11 @@
+--- a/contrib/ratpoison.el
++++ b/contrib/ratpoison.el
+@@ -44,6 +44,8 @@
+ ;; - auto-completion of commands
+ ;; - probably a bunch of other things
+ 
++(require 'generic)
++
+ (defvar ratpoison-commands-0
+   (list
+    "abort"
diff --git a/x11-wm/ratpoison/files/ratpoison.xsession b/x11-wm/ratpoison/files/ratpoison.xsession
new file mode 100644
index 000000000000..664edf72a543
--- /dev/null
+++ b/x11-wm/ratpoison/files/ratpoison.xsession
@@ -0,0 +1 @@
+/usr/bin/ratpoison
diff --git a/x11-wm/ratpoison/metadata.xml b/x11-wm/ratpoison/metadata.xml
new file mode 100644
index 000000000000..00627b349571
--- /dev/null
+++ b/x11-wm/ratpoison/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person"><email>jer@gentoo.org</email></maintainer>
+	<longdescription>
+		Ratpoison is a simple Window Manager with no fat library dependencies,
+		no fancy graphics, no window decorations, and no rodent dependence. It
+		is largely modelled after GNU Screen which has done wonders in the
+		virtual terminal market.
+
+		All windows are maximized and kept maximized to take full advantage of
+		your precious screen real estate.
+
+		All interaction with the window manager is done through keystrokes.
+		ratpoison has a prefix map to minimize the key clobbering that cripples
+		Emacs and other quality pieces of software.
+	</longdescription>
+<use>
+	<flag name="history">Use <pkg>sys-libs/readline</pkg> for history handling</flag>
+	<flag name="sloppy">Install sloppy, a focus-follows-mouse implementation for ratpoison</flag>
+	<flag name="xrandr">Enable support for XRandR</flag>
+</use>
+</pkgmetadata>
diff --git a/x11-wm/ratpoison/ratpoison-1.4.8-r1.ebuild b/x11-wm/ratpoison/ratpoison-1.4.8-r1.ebuild
new file mode 100644
index 000000000000..a53471373a97
--- /dev/null
+++ b/x11-wm/ratpoison/ratpoison-1.4.8-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit elisp-common eutils toolchain-funcs
+
+DESCRIPTION="window manager without mouse dependency"
+HOMEPAGE="http://www.nongnu.org/ratpoison/"
+SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 hppa ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug emacs +history sloppy +xft"
+
+RDEPEND="
+	emacs? ( virtual/emacs )
+	history? ( sys-libs/readline:= )
+	xft? ( x11-libs/libXft )
+	virtual/perl-Pod-Parser
+	x11-libs/libXinerama
+	x11-libs/libXtst
+"
+DEPEND="
+	${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+"
+
+SITEFILE=50ratpoison-gentoo.el
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+src_prepare() {
+	epatch "${FILESDIR}"/ratpoison.el-gentoo.patch
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable history) \
+		$(use_with xft)
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}"
+	if use emacs; then
+		elisp-compile contrib/ratpoison.el || die "elisp-compile failed"
+	fi
+
+	if use sloppy; then
+		pushd contrib
+		$(tc-getCC) \
+			${CFLAGS} \
+			${LDFLAGS} \
+			-o sloppy{,.c} \
+			$( $(tc-getPKG_CONFIG) --libs x11) \
+			|| die
+	fi
+}
+
+src_install() {
+	default
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/ratpoison.xsession ratpoison
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/${PN}.desktop
+
+	use sloppy && dobin contrib/sloppy
+
+	docinto example
+	dodoc contrib/{genrpbindings,split.sh} \
+		doc/{ipaq.ratpoisonrc,sample.ratpoisonrc}
+
+	rm -rf "${ED}/usr/share/"{doc/ratpoison,ratpoison}
+
+	if use emacs; then
+		elisp-install ${PN} contrib/ratpoison.*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/x11-wm/ratpoison/ratpoison-1.4.9.ebuild b/x11-wm/ratpoison/ratpoison-1.4.9.ebuild
new file mode 100644
index 000000000000..f0c2e4dc948d
--- /dev/null
+++ b/x11-wm/ratpoison/ratpoison-1.4.9.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit elisp-common eutils toolchain-funcs
+
+DESCRIPTION="window manager without mouse dependency"
+HOMEPAGE="http://www.nongnu.org/ratpoison/"
+SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug emacs +history sloppy +xft +xrandr"
+
+RDEPEND="
+	emacs? ( virtual/emacs )
+	history? ( sys-libs/readline:= )
+	xft? ( x11-libs/libXft )
+	xrandr? ( x11-libs/libXrandr )
+	virtual/perl-Pod-Parser
+	x11-libs/libXtst
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-proto/randrproto
+	x11-proto/xproto
+"
+
+SITEFILE=50ratpoison-gentoo.el
+DOCS=(
+	AUTHORS
+	ChangeLog
+	NEWS
+	README
+	TODO
+)
+
+PATCHES=(
+	"${FILESDIR}"/ratpoison.el-gentoo.patch
+)
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable history) \
+		$(use_with xft) \
+		$(use_with xrandr) \
+		--without-electric-fence
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}"
+	if use emacs; then
+		elisp-compile contrib/ratpoison.el || die
+	fi
+
+	if use sloppy; then
+		pushd contrib
+		$(tc-getCC) \
+			${CFLAGS} \
+			${LDFLAGS} \
+			-o sloppy{,.c} \
+			$( $(tc-getPKG_CONFIG) --libs x11) \
+			|| die
+	fi
+}
+
+src_install() {
+	default
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/ratpoison.xsession ratpoison
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/${PN}.desktop
+
+	use sloppy && dobin contrib/sloppy
+
+	docinto example
+	dodoc contrib/{genrpbindings,split.sh} \
+		doc/{ipaq.ratpoisonrc,sample.ratpoisonrc}
+
+	rm -rf "${ED}/usr/share/"{doc/ratpoison,ratpoison}
+
+	if use emacs; then
+		elisp-install ${PN} contrib/ratpoison.*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/x11-wm/ratpoison/ratpoison-9999.ebuild b/x11-wm/ratpoison/ratpoison-9999.ebuild
new file mode 100644
index 000000000000..568ee3d06f21
--- /dev/null
+++ b/x11-wm/ratpoison/ratpoison-9999.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools elisp-common eutils git-r3 toolchain-funcs
+
+DESCRIPTION="window manager without mouse dependency"
+HOMEPAGE="http://www.nongnu.org/ratpoison/"
+EGIT_REPO_URI="git://git.savannah.nongnu.org/ratpoison.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="debug emacs +history sloppy +xft +xrandr"
+
+RDEPEND="
+	emacs? ( virtual/emacs )
+	history? ( sys-libs/readline:= )
+	xft? ( x11-libs/libXft )
+	xrandr? ( x11-libs/libXrandr )
+	virtual/perl-Pod-Parser
+	x11-libs/libXtst
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-proto/randrproto
+	x11-proto/xproto
+"
+
+SITEFILE=50ratpoison-gentoo.el
+DOCS=(
+	AUTHORS
+	ChangeLog
+	NEWS
+	README
+	TODO
+)
+
+src_prepare() {
+	eapply "${FILESDIR}"/ratpoison.el-gentoo.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable history) \
+		$(use_with xft) \
+		$(use_with xrandr) \
+		--without-electric-fence
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}"
+	if use emacs; then
+		elisp-compile contrib/ratpoison.el || die
+	fi
+
+	if use sloppy; then
+		pushd contrib
+		$(tc-getCC) \
+			${CFLAGS} \
+			${LDFLAGS} \
+			-o sloppy{,.c} \
+			$( $(tc-getPKG_CONFIG) --libs x11) \
+			|| die
+	fi
+}
+
+src_install() {
+	default
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/ratpoison.xsession ratpoison
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/${PN}.desktop
+
+	use sloppy && dobin contrib/sloppy
+
+	docinto example
+	dodoc contrib/{genrpbindings,split.sh} \
+		doc/{ipaq.ratpoisonrc,sample.ratpoisonrc}
+
+	rm -rf "${ED}/usr/share/"{doc/ratpoison,ratpoison}
+
+	if use emacs; then
+		elisp-install ${PN} contrib/ratpoison.*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/x11-wm/sawfish/Manifest b/x11-wm/sawfish/Manifest
new file mode 100644
index 000000000000..2700fb4c6278
--- /dev/null
+++ b/x11-wm/sawfish/Manifest
@@ -0,0 +1,9 @@
+AUX 50sawfish-gentoo.el 366 SHA256 8e103a2e8a83fe9e299496bfa6c619a58a4f6ca8a335f37933b4aef8140d62f7 SHA512 a05fe8328ed42c11fcf7ce43eac8278e53d69610a53118283d1292c89c690aa85b43090cbcfd0995a9e2e92cb61277848404a27b1797e33c80ad09db752d8ba5 WHIRLPOOL a761c12c5ee396717d5cb459795fe40f0a9393a553d1e116493e65825245e85820fdcf0fb7e105adfc3b74908a7b364a184cbcd026d56d2ac91ae784ed344f7f
+AUX sawfish-1.9.1-firefox.patch 920 SHA256 68df77ecb3d2acc5a9a09808f047cbdfaa7d8b88413a1f240b87d9656421ba41 SHA512 194b27a5674113b0820d5e03892973fb15b377cac9c43913b0f5698eb63cf6da556ff0edcee2b426fc218ea97f44bbbf5b21a4d6aa73af4a907cfc7944c53966 WHIRLPOOL 9e501414981c2db917ef1f229f7809e6c606c6e920bd74041b40a50d032d52a6b98e1c6478881d16532929472db579272e7ecd10d93a7aa101b5848779b98a52
+DIST sawfish-1.9.1.tar.xz 2616612 SHA256 c1751abf46a52dead8a50fa4b91c09ff0540cb9cc988c76ebfea0bee9edd0618 SHA512 243a818e2cc2546c040f33fbc076bbcc4033b88f0b4be573f9daa80b2dcfd8d9dc97384d236b9b71d6efe08ad39bfd3f3f31b5c055b9b268418efb7668e27a42 WHIRLPOOL 9293221e4a1c7cfddbf5dd619ac9fcd6e8da02723b651e4b62f9baa9e7d7c66d6f0967a960b097c6d9c9f7b7b79de94070733b0e80a1954d9ce477a6187d89fc
+DIST sawfish_1.11.90.tar.xz 2751684 SHA256 734ac2b2781889793e2d846d81f52b8a90707e136bce7b5691c4d12e90ce7cfa SHA512 24735438167c1146e57f82a58876b68b1126d45f237751828ae9603a8eea966058fb6d8fbfddc28e1a96ab774a044b4b9b70b1e299f958b77eb32c987684925e WHIRLPOOL 95ee12896cda57992b2f5cc86ed536a584e265ef793af0840d4738728610f48e235f82b6bc3043d5f2c92d55d2461720725bbc4f292baec8b93fcffe294ecfef
+EBUILD sawfish-1.11.90.ebuild 2332 SHA256 c6b9771dee9807d5396a7551c3af5cf7bf813176eb826d4fc7aefa4fb6d52327 SHA512 745912863185eaccb070fd83a7157f1e386c742a3d279735fece5b7bbd367397e47b25662e17b347ae65a40f3b15d082b3a9f198b3029d0cc81bc371be7f05a6 WHIRLPOOL a7eb066c4b98d06ec47302aa15e06afecc0c6d49b19e0cab9b2fc487916efd46f10fd0db13376e00308033eb46da97bfea3f0e0fa5bb3b4cc60ea709229c8102
+EBUILD sawfish-1.9.1-r2.ebuild 1832 SHA256 ed56bef9be8c53f428dece0e4f20df9da52b3d5906ee41554e46ff7bb1b11f2b SHA512 970a02beb9306c21f68b789fc1924bfa389d01e8e2ad0c67bcb201b5a79c7623112eae9843e71c322ae5e9a861e423da1a996c5ab8808f5f070c2bd2469ce72d WHIRLPOOL 00b86826965db6bba0f5cdf9ae2691bdda1df54e925798e8544caaf706e4736a817e7500e88cff1d7a7456093366026aa09d16f4752f8e24098ea04af79cd53b
+MISC ChangeLog 3154 SHA256 55dc01741ea016c7ad2c05078b0b662291812c5bb48c438c429ff7cc949fd8e5 SHA512 2489cef7ddc661fb5ad07140c2131c0ec6fe539b87f155e23e277ce2d60c8b026c552e6834df0b5b6f34b84079b0977b3df4efa2c6a3d59bc26e8d92e627fe3b WHIRLPOOL b12fedb82cd92bdf95f9186f2ce9b1502192369556ae35f9c7018490f44ec11cb2dd52cc803a01c33ba2f2a74c4866f4f91d192232bc83ce657b148fccfd4bab
+MISC ChangeLog-2015 20488 SHA256 bd7321e65b4b060ecc9a739d590a697cdef3af7573ca17bad920360a6b2834d5 SHA512 005d01100c7e354d4a72910d007bf762666733d896e4d67c4be791409bc79725b44b39096c82483561b6ffcf55b5336b683c7ce1ce4c141597d28711c1c8d02a WHIRLPOOL a0190cc1c3d0a50b56b856d1c265e4bd8ea55ce83bf7bff073ba675a92197474f402cb8ac8f2109bd06bc615dd84327ec57f744b8cd738ccfc883c846af0884a
+MISC metadata.xml 357 SHA256 d828991389eb118ad067a94dafd20d5800b4507c2d93ecf9d9836f8ce9a45152 SHA512 ab28ed64d52513cf76bea32b2f289dedab2420e91592ba31d2917efc2d7868a4bf949067562594254a601e62885cf530d7ec00404cf62dd4705b7ac1a892ba9b WHIRLPOOL 44411aa6b552a165bed3fbc4cdccd8077c6c2087c0abd729ed94a0df4241bfbd85a72ccd16725b1e09bf6c5967c68f3cb4fc7f29d9aea8b37aaad751a2be83c8
diff --git a/x11-wm/sawfish/files/50sawfish-gentoo.el b/x11-wm/sawfish/files/50sawfish-gentoo.el
new file mode 100644
index 000000000000..d1b6006e6307
--- /dev/null
+++ b/x11-wm/sawfish/files/50sawfish-gentoo.el
@@ -0,0 +1,7 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'sawfish-mode "sawfish" nil t)
+(autoload 'sawfish-interaction "sawfish" nil t)
+(autoload 'sawfish-console "sawfish" nil t)
+(add-to-list 'auto-mode-alist '("\\.sawfishrc\\'" . sawfish-mode))
+(add-to-list 'auto-mode-alist '("\\.jl\\'" . sawfish-mode))
+(add-to-list 'auto-mode-alist '("\\.sawfish/rc\\'" . sawfish-mode))
diff --git a/x11-wm/sawfish/files/sawfish-1.9.1-firefox.patch b/x11-wm/sawfish/files/sawfish-1.9.1-firefox.patch
new file mode 100644
index 000000000000..6fb27bb820cc
--- /dev/null
+++ b/x11-wm/sawfish/files/sawfish-1.9.1-firefox.patch
@@ -0,0 +1,20 @@
+X-Git-Url: http://git.tuxfamily.org/sawfish/main.git?p=sawfish%2Fmain.git;p=sawfish%2Fmain.git;a=blobdiff_plain;f=src%2Fwindows.c;h=053b95a9933b04a99301b300a5477e2ce3329cbd;hp=c6117e778ad157f9868c431efa934964b88897fd;hb=798c6992cc41f5ca7ec1bd4bd74d721a59820897;hpb=ec807ed20eecb401c3e11b3b04d375fc848ca4c1
+
+diff --git a/src/windows.c b/src/windows.c
+index c6117e7..053b95a 100644
+--- a/src/windows.c
++++ b/src/windows.c
+@@ -1297,6 +1297,13 @@ associated with WINDOW. Possible keys in the alist are `min-height',
+     hints = &VWIN(win)->hints;
+     flags = hints->flags;
+ 
++    /* workaround stuff like Firefox 17 that
++     * has enormous max-width/maxh-height */
++    if (hints->max_width >= 32767)
++	    hints->max_width = 32767;
++    if (hints->max_height >= 32767)
++	    hints->max_height = 32767;
++
+     /* Some sanity checking */
+     if ((flags & PMinSize) 
+ 	&& (hints->min_width < 0 || hints->min_height < 0))
diff --git a/x11-wm/sawfish/metadata.xml b/x11-wm/sawfish/metadata.xml
new file mode 100644
index 000000000000..d305b1f6a31c
--- /dev/null
+++ b/x11-wm/sawfish/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+<maintainer type="project">
+  <email>gnu-emacs@gentoo.org</email>
+  <description>
+    Components installed with USE=emacs.
+    Do not assign for anything else.
+  </description>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-wm/sawfish/sawfish-1.11.90.ebuild b/x11-wm/sawfish/sawfish-1.11.90.ebuild
new file mode 100644
index 000000000000..a7d4141d7884
--- /dev/null
+++ b/x11-wm/sawfish/sawfish-1.11.90.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils elisp-common
+
+MY_P="${P/-/_}"
+DESCRIPTION="Extensible window manager using a Lisp-based scripting language"
+HOMEPAGE="http://sawfish.wikia.com/"
+SRC_URI="http://download.tuxfamily.org/sawfish/${MY_P}.tar.xz"
+
+LICENSE="GPL-2 Artistic-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="emacs nls xinerama"
+
+RDEPEND="emacs? ( virtual/emacs !app-emacs/sawfish )
+	>=dev-libs/librep-0.92.1
+	>=x11-libs/rep-gtk-0.90.7
+	x11-libs/pangox-compat
+	>=x11-libs/gtk+-2.24.0:2
+	x11-libs/libXtst
+	nls? ( sys-devel/gettext )
+	xinerama? ( x11-libs/libXinerama )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( AUTHORS ChangeLog CONTRIBUTING doc/AUTOSTART doc/KEYBINDINGS
+	   doc/OPTIONS doc/XSettings MAINTAINERS NEWS README README.IMPORTANT
+	   TODO )
+
+src_configure() {
+	# The configure script tries to use kde4-config (bug #573664) or
+	# kf5-config (from kdelibs4support) to detect where it should put
+	# its session files. This could probably be enabled for kde5 going
+	# forward (behind USE=kde), but there's currently a bug in the
+	# configure script preventing that from working nicely:
+	#
+	#   https://github.com/SawfishWM/sawfish/issues/22
+	#
+	# For now, we just disable the kde[45] session support entirely.
+	set -- \
+		$(use_with xinerama) \
+		--with-gdk-pixbuf \
+		--without-kde4session \
+		--without-kde5session \
+		--disable-static
+
+	if ! use nls; then
+		# Use a space because configure script reads --enable-linguas=""
+		# as "install everything". Don't use --disable-linguas, because
+		# that means --enable-linguas="no", which means "install
+		# Norwegian translations".
+		set -- "$@" --enable-linguas=" "
+	elif [[ "${LINGUAS+set}" == "set" ]]; then
+		strip-linguas -i po
+		set -- "$@" --enable-linguas=" ${LINGUAS} "
+	else
+		set -- "$@" --enable-linguas=""
+	fi
+
+	econf "$@"
+}
+
+src_compile() {
+	default
+	use emacs && elisp-compile sawfish.el
+}
+
+src_install() {
+	default
+	prune_libtool_files --modules
+
+	if use emacs; then
+		elisp-install ${PN} sawfish.{el,elc}
+		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/x11-wm/sawfish/sawfish-1.9.1-r2.ebuild b/x11-wm/sawfish/sawfish-1.9.1-r2.ebuild
new file mode 100644
index 000000000000..dffdcaa78119
--- /dev/null
+++ b/x11-wm/sawfish/sawfish-1.9.1-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils elisp-common
+
+DESCRIPTION="Extensible window manager using a Lisp-based scripting language"
+HOMEPAGE="http://sawfish.wikia.com/"
+SRC_URI="http://download.tuxfamily.org/sawfish/${P}.tar.xz"
+
+LICENSE="GPL-2 Artistic-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ppc ~ppc64 ~sh sparc x86 ~x86-fbsd"
+IUSE="emacs nls xinerama"
+
+RDEPEND="emacs? ( virtual/emacs !app-emacs/sawfish )
+	>=dev-libs/librep-0.92.1
+	>=x11-libs/rep-gtk-0.90.7
+	x11-libs/pangox-compat
+	>=x11-libs/gtk+-2.24.0:2
+	x11-libs/libXtst
+	nls? ( sys-devel/gettext )
+	xinerama? ( x11-libs/libXinerama )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig"
+
+src_prepare() {
+	# Fix firefox resizing problems, bug #462016
+	epatch "${FILESDIR}/${P}-firefox.patch"
+}
+
+src_configure() {
+	set -- \
+		$(use_with xinerama) \
+		--with-gdk-pixbuf \
+		--disable-static
+
+	if ! use nls; then
+		# Use a space because configure script reads --enable-linguas="" as
+		# "install everything"
+		# Don't use --disable-linguas, because that means --enable-linguas="no",
+		# which means "install Norwegian translations"
+		set -- "$@" --enable-linguas=" "
+	elif [[ "${LINGUAS+set}" == "set" ]]; then
+		strip-linguas -i po
+		set -- "$@" --enable-linguas=" ${LINGUAS} "
+	else
+		set -- "$@" --enable-linguas=""
+	fi
+
+	econf "$@"
+}
+
+src_compile() {
+	emake
+	use emacs && elisp-compile sawfish.el
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	prune_libtool_files --modules
+	dodoc AUTHORS ChangeLog DOC FAQ NEWS OPTIONS README README.IMPORTANT TODO
+
+	if use emacs; then
+		elisp-install ${PN} sawfish.{el,elc}
+		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/x11-wm/selectwm/Manifest b/x11-wm/selectwm/Manifest
new file mode 100644
index 000000000000..2af7fdd60322
--- /dev/null
+++ b/x11-wm/selectwm/Manifest
@@ -0,0 +1,8 @@
+AUX selectwm-0.4.1-enable-deprecated-gtk.patch 299 SHA256 aef7b2dcf51b9fba19bf70b18537889fa08b600e23602764cf5542ffcaa3c5e0 SHA512 154be35f4310e46708824312c53a4d6b942d80dd570ae2bafcdb6ffdc27eebfbdf518e2afb775d1c0014c6c521e4ae7b2177f2540a41e10a88412993746f04c1 WHIRLPOOL 17ec27f1982549d2a77b53f64ac95abcfb6ee67985524558847282f3904f1fc2db307dd1f0db8ef43086bc86b94da275cda38aec280a5743a080ebbff738cbc2
+AUX selectwm-0.4.1-glibc-2.10.patch 677 SHA256 104aed065fe00c6ebfd1fb025f13da2366beabc053ab1e0780c276db9ac9d10f SHA512 dd477395578142bfa89a36d3f9f8c669f2a40d4867ef8ba366333bb1c107da4d2286d7ed1e357c3b78653213de5938955f52aa6e275ebb9cf5db0acd3bdcfcf9 WHIRLPOOL 42ffbf36be1aa48c1dbe3b70a2434a2b2d9a8714c57dc331daa1ae7a6babf364a44ec1e1f0f1630e9367f35ad36ab9a1ff17faf9d575e74baa36a8eae3df3d08
+AUX selectwm-0.4.1-nostrip.patch 393 SHA256 2963fd7ad6dec5a9fd05e210e28ce6008888674e307b9603e64ee7db94b4d325 SHA512 202949731242143aca8ea7aa9b18e9cb48fa110e620fcad5b4eb8fb0e6bec33e47fd7989780dbbe9b5395d17b2ecd9ccdf32346a045983c85b6c390459a39bb0 WHIRLPOOL 1124d16fe27d46363e1e73fa7db154738f9272582222595c93d75c09e925a6d6f61b4a412cd93f651330bae6c9e35600330471b88ecd7fe70b680d0a960e7faa
+DIST selectwm-0.4.1.tar.bz2 151454 SHA256 5ba49d5303f6613b829c88098b29b78e3d555d3a69a5c88a73aa4deaf82729a4 SHA512 3ddc4c1560d317ecb6e8e041d63415d16d31b67b4651d9e33fbe3e76a63754b78a86d332077ec091317e985dbedd903c9fdca46eb7cb650ad693039b8f4ab1ea WHIRLPOOL 1b953f9d2ce3a0b83d1178929b7a5087beef72d4eca71aa15445eae7bdfc771939b066c5899f939045ef917f9481e033c9117d051db3f990fb8340ed2331b7b2
+EBUILD selectwm-0.4.1.ebuild 759 SHA256 48c95bea8afa173ba9a5e35b551983dff3becac265ff310d72d32a23522af486 SHA512 d7c094a8cf69a29bde7fe7ce1ed406ab340eef3bedb9c126b5075f26ed189c7ed38ac3dd9bd4f4c639be82876de1f3d4ebda5b6f9998e378351e03d8bbf27b3a WHIRLPOOL b3fb4bfc4f2cf5cdfd9d7d674288b5d8fed31b1320f0fcfd0785718b9502baa96ec03fe39c15c13595dd071cec22cf706ae5f5ecdb49921e9ff438363b164945
+MISC ChangeLog 2655 SHA256 6dd3a2cd46e38f9eeb97c8f769d2d3eaa8eba92374ff40b3d665e8d13345b44f SHA512 25ed4ca8baf19aeda602ea408bafb19672cf23a4365d2b8ba007661e920d487f394a4be27e5451c861bc55b6e117be4db1a3ec03427144fc9f5e83d41d2be9b0 WHIRLPOOL c0e2ae994efd54d24c3a8f76b7ecc51fef07b97c69cf296cbe586aeef8b905b9ab10209b6cdcc43a275ad6a40d3dcd0a042b537c773dbfcb95716f3b2a037c21
+MISC ChangeLog-2015 2993 SHA256 a9c7d354a356c1884a2375b6b2538a150109ce8a661ee985e0972cd542606c99 SHA512 133f5a14aca710bc88040c75af83e4a3ab7505f3cecf0494ad2edca5a9630cc26c54d46ed32e44b1e4890d209de7d3905d22409d690e3a206afea62e6877ee61 WHIRLPOOL ef2cdad2b5e5294379cd7c688f372e079dd24b125da26a41374ab46d40fe8c69a2b42c1d2bdb2a1f1fb5571774522707f733bd4c2b29e9a210e4387e193ce2f7
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/x11-wm/selectwm/files/selectwm-0.4.1-enable-deprecated-gtk.patch b/x11-wm/selectwm/files/selectwm-0.4.1-enable-deprecated-gtk.patch
new file mode 100644
index 000000000000..df7f9e437b45
--- /dev/null
+++ b/x11-wm/selectwm/files/selectwm-0.4.1-enable-deprecated-gtk.patch
@@ -0,0 +1,11 @@
+--- selectwm-0.4.1.orig/src/define.h	2007-09-30 21:48:25.000000000 +0200
++++ selectwm-0.4.1/src/define.h	2007-09-30 22:01:53.000000000 +0200
+@@ -1,8 +1,5 @@
+ #include "config.h"
+ 
+-#define GTK_DISABLE_DEPRECATED
+-#define G_DISABLE_DEPRECATED
+-
+ #ifdef ENABLE_NLS
+ #  include <libintl.h>
+ #  undef _
diff --git a/x11-wm/selectwm/files/selectwm-0.4.1-glibc-2.10.patch b/x11-wm/selectwm/files/selectwm-0.4.1-glibc-2.10.patch
new file mode 100644
index 000000000000..4353d5e36662
--- /dev/null
+++ b/x11-wm/selectwm/files/selectwm-0.4.1-glibc-2.10.patch
@@ -0,0 +1,21 @@
+diff -Naurp selectwm-0.4.1-orig/src/options.c selectwm-0.4.1/src/options.c
+--- selectwm-0.4.1-orig/src/options.c	2009-07-26 14:46:44.092880624 -0600
++++ selectwm-0.4.1/src/options.c	2009-07-26 14:46:11.484940363 -0600
+@@ -32,7 +32,7 @@
+ #include "miscui.h"
+ #include "modify.h"
+ 
+-static GString *getline (FILE *fichier) {
++static GString *selectwm_getline (FILE *fichier) {
+ 	GString *temp;
+ 	gchar buf[128];
+ 	
+@@ -64,7 +64,7 @@ static gint read_config_file (config *se
+ 	}
+ 	buf = g_string_new ("");
+ 	while (!feof (config)) {
+-		buf = getline (config);
++		buf = selectwm_getline (config);
+ 
+ 		if (buf->len > 0 && buf->str[0] != '#') {
+ 			if (g_strrstr (buf->str, ":")) {
diff --git a/x11-wm/selectwm/files/selectwm-0.4.1-nostrip.patch b/x11-wm/selectwm/files/selectwm-0.4.1-nostrip.patch
new file mode 100644
index 000000000000..d5300c9f94a7
--- /dev/null
+++ b/x11-wm/selectwm/files/selectwm-0.4.1-nostrip.patch
@@ -0,0 +1,15 @@
+Respect CFLAGS, don't strip binaries
+
+http://bugs.gentoo.org/show_bug.cgi?id=252124
+
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -10,5 +10,6 @@
+ 	modify.c modify.h \
+ 	misc.h define.h
+ 
+-LIBS = @GTK_LIBS@
+-AM_CFLAGS = -s -O2 -Wall @GTK_CFLAGS@ -DLOCALEDIR=\"$(datadir)/locale\"
++selectwm_LDADD = @GTK_LIBS@
++selectwm_CFLAGS = @GTK_CFLAGS@
++selectwm_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\"
diff --git a/x11-wm/selectwm/metadata.xml b/x11-wm/selectwm/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/x11-wm/selectwm/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/x11-wm/selectwm/selectwm-0.4.1.ebuild b/x11-wm/selectwm/selectwm-0.4.1.ebuild
new file mode 100644
index 000000000000..ac8889b0e7ff
--- /dev/null
+++ b/x11-wm/selectwm/selectwm-0.4.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="window manager selector tool"
+HOMEPAGE="http://ordiluc.net/selectwm"
+SRC_URI="http://ordiluc.net/selectwm/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="amd64 ppc sparc x86 ~x86-fbsd"
+IUSE="nls"
+
+RDEPEND="x11-libs/gtk+:2
+	dev-libs/glib:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-enable-deprecated-gtk.patch \
+		"${FILESDIR}"/${P}-glibc-2.10.patch \
+		"${FILESDIR}"/${P}-nostrip.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--program-suffix=2 \
+		$(use_enable nls)
+}
+
+src_install () {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS README sample.xinitrc
+}
diff --git a/x11-wm/sithwm/Manifest b/x11-wm/sithwm/Manifest
new file mode 100644
index 000000000000..75672fbcf299
--- /dev/null
+++ b/x11-wm/sithwm/Manifest
@@ -0,0 +1,6 @@
+AUX sithwm-1.2.3-warnings.patch 880 SHA256 d59a9ddc629453cdac3a25bb83d7988f02cde693c1b8acc571729268bf72f377 SHA512 1cd1ee4c6b6e71aacafdd10ada0c3f07c89cdf51a3b565408a440ad2fa1b40f5a266b73873a059be19fa232dec35817bc0aca2e58b6271ccce5753e7cdcddb89 WHIRLPOOL 35b310cab1b2f8d2f054850d790178434175e026ccd53f78269d003baa8b4158503a54a9f5eb47547586a093b98939b67b7dce7fdf1dd994468cefc78c736ef1
+DIST sithwm-1.2.3.tgz 29976 SHA256 6369e0429d0cc52eae6a9a11e2339f300306ed8754b5ac5f8be9e8fc41950f1f SHA512 12b57d28da2a5b365b1c165ba6904d901990e69950986cc7be285060a58ccdc32edc4bd60a63d2eba3f6f7f695d461e424bce23542c18a13afd5aab2e91067dd WHIRLPOOL ffefa96071e2fb0cf45f923ae5a8e9521ca6bd1b8d04d6cd0537393441fb2fa0daa9a24448e150e65d8243d5cf58856ed90cca473294a09ea49ea7693a7d3ced
+EBUILD sithwm-1.2.3.ebuild 561 SHA256 175ff65edc4d3de6da2cd2bb9539e0c0b964f4fae5a9ef8846dc42292c7f5536 SHA512 a77a0dd1c1355b4f141d6c1fa927e275b5e06f65cbacbbcef36652c268b34765a3afa17da63968b654f21f49d90e2426358397772e966d04258ed962e0258497 WHIRLPOOL 1e7aa9d68ee4edf46a47140bcf61465e4e5122e9284818145ce9dea1dbb5351930b2c9150f48fe3e358095214d57d8f77cd0407bebe36fb582fd1b91d422391f
+MISC ChangeLog 2704 SHA256 09c2f2d474a18ea7e97c3e04fd64956cd20bec0b666a0e1eba29dae0361ac18f SHA512 249679c1e8cafd2c10a66f487522b1471dfeb858ff17ece179f74d19dcde1a2c012706e146b71f66964872cf3a46129b16b7c521327cd15db720bef9842ab464 WHIRLPOOL 692dff91e053cd7f5d0d1367a56ac0b91e1a389fc17748912e77a5c7852e3529ac43d90a328e721706c20dd1f5cf2034faff3668e5573785975d7d457fcba676
+MISC ChangeLog-2015 742 SHA256 8006a6ef19ec38cc513f3d13c812ff1991aeb209fc8a84418d0a0066195472cb SHA512 ce1f66d8e0b4585704177a819864f5ea077486fcd6252a3b2291bdd92b13111a42f6d2f4b889d3abd542c248dc310f8fd8be8b5108e37e2ab56fe50d9841b22c WHIRLPOOL 1aff742ab6aa23289fbe32bd01a191e6a533f70dcf8addbd5b84020d19a874bb485cee0378a8864d57add9e3c1712062419964c7fe2e9d84dace612e8ff47e83
+MISC metadata.xml 379 SHA256 aed55ece5c62f962058b5eeca30a559f8400d6dec052048c87e92fc14c0e1a8b SHA512 056a09e4940d4c2e199601a5b55a0d4e81368e88faf8fec0d1c97a2e74fc1a80a725f409163b21c3b12189ab7c9268df203969e9031c4b025faab904c05aca42 WHIRLPOOL de49219f6389ee8e8788b79af26f3175cb3dcba5f14d0c1a7ef60f4369111694a18fa9f1805db2029abf7aa9235e455a06a8753ba214c92c354e0c6b21b53838
diff --git a/x11-wm/sithwm/files/sithwm-1.2.3-warnings.patch b/x11-wm/sithwm/files/sithwm-1.2.3-warnings.patch
new file mode 100644
index 000000000000..c2653dcd8db9
--- /dev/null
+++ b/x11-wm/sithwm/files/sithwm-1.2.3-warnings.patch
@@ -0,0 +1,34 @@
+--- sithwm-1.2.3/menu.c
++++ sithwm-1.2.3/menu.c
+@@ -355,7 +355,7 @@
+    int freem = 1;
+    int freestrs = 1;
+    struct area a;
+-   unsigned int mask;
++   unsigned int mask = NoValue;
+    char*p=global_buffer;
+    char ent_type[3] = "\0";
+    for (;;) {
+--- sithwm-1.2.3/misc.c
++++ sithwm-1.2.3/misc.c
+@@ -21,7 +21,7 @@
+             char *dot = strchr(colon, '.');
+             if (!dot)
+                dot = colon + strlen(colon);
+-            snprintf(dot, 5, ".%d", current_screen-screens);
++            snprintf(dot, 5, ".%ld", current_screen-screens);
+             putenv(ebuf);
+          }
+ 	 snprintf(global_buffer, sizeof global_buffer, "%s&", command);
+--- sithwm-1.2.3/screen.c
++++ sithwm-1.2.3/screen.c
+@@ -146,6 +146,9 @@
+    }break;
+    default:
+ 	 iwin.w = 0;
++	 iwin.h = 0;
++	 iwin.pos.x = 0;
++	 iwin.pos.y = 0;
+    }
+ 
+    int stackwidth = opt_popup_stack_width;
diff --git a/x11-wm/sithwm/metadata.xml b/x11-wm/sithwm/metadata.xml
new file mode 100644
index 000000000000..808e5dd95d7a
--- /dev/null
+++ b/x11-wm/sithwm/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>xmw@gentoo.org</email>
+<name>Michael Weber</name>
+</maintainer>
+<upstream>
+	<remote-id type="sourceforge">sithwm</remote-id>
+	<bugs-to>https://sourceforge.net/tracker/?group_id=175787</bugs-to>
+</upstream>
+</pkgmetadata>
diff --git a/x11-wm/sithwm/sithwm-1.2.3.ebuild b/x11-wm/sithwm/sithwm-1.2.3.ebuild
new file mode 100644
index 000000000000..74bd02edc37a
--- /dev/null
+++ b/x11-wm/sithwm/sithwm-1.2.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Minimalist Window Manager for X"
+HOMEPAGE="http://sithwm.darkside.no/"
+SRC_URI="http://sithwm.darkside.no/sn/sithwm-1.2.3.tgz"
+
+LICENSE="GPL-2+ MIT 9wm"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-warnings.patch
+	sed -e 's|install -s|install|g' \
+		-i Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
diff --git a/x11-wm/spectrwm/Manifest b/x11-wm/spectrwm/Manifest
new file mode 100644
index 000000000000..c72bd2b42b92
--- /dev/null
+++ b/x11-wm/spectrwm/Manifest
@@ -0,0 +1,10 @@
+AUX spectrwm-2.6.2-Makefile.patch 661 SHA256 9237ac70d3093386de15ed3db94e3d7b636876880c278b1c924cbfc7ebb5188b SHA512 12246a6bb44cf7f0f02bba4b488e7783acdc32a8dc28a93e979995a640e3731e26d2108f19e0cebe3ea3540903f495ebc4b487a7f642ad3c87077c63df5bfb3a WHIRLPOOL 71ffb6003968b71a1704d65320398c1efe57ab749292853b540165f43d3e2c0abeadcbdd047235be35fee03201bf6e1cacd369be751973b3ed80013fee1b2223
+DIST spectrwm-2.7.2.tgz 132554 SHA256 b56cffa01ee2c58515350c1be1940140286fd18778659c6f5ada4595319f97cb SHA512 cebb0e42566125933bf2c4c9200765d360bb572fd953c510ad39e7abcf9cc507e61420441234fb1bb44d06d28526ba6c594272c173a04181d2c6798e404b7421 WHIRLPOOL 5ab24d2866d6a252c03a72fae3e0dd914f6c2041185088da5beb4c7a4a0ee5ec0c3b55cff32bef5f10f159ae1a5e66a6a217a3d67cba2d17ed324145a05391c7
+DIST spectrwm-3.0.1.tar.gz 147331 SHA256 315fe232e8ac727c289fde8c9b3a3eba19b98739ccb98015c29ce06eacee1853 SHA512 34e5673940217916c4725e036c28bff440085b1f3a7015a334ec9fcd08a2ef97f8c060dba6a508d7c2b9c8415e4e20a2587dea099def2493803472b1b2df7ced WHIRLPOOL bf2af477df6d503d0b6bc838b635b61a14c4b6c977f9528b1b2497e17cdfeee06e93daf1f426b7e598bfd7f3f27fa7194cf2f500c09373fc09e42e0e3278334d
+DIST spectrwm-3.0.2.tar.gz 147355 SHA256 82ce0280039de642c41684f3096abb0388926b60c37987ca1dbc53a0913cab18 SHA512 bbc5620078bd90ad6bf48b3e0218cf5398b819282322ee6d23b5b3aa2334b35f4981736157d0c442f1dde268503ec15e321cdbe08d842abc6c0a0239ac6d99c2 WHIRLPOOL 7091cace363a4ba365ea691903823523e3ac55411e3d108f969f4f51080528c345a070897c2ebc68b25f93bc3c20ee8ed234fc13a69941843b48acdd0985b183
+EBUILD spectrwm-2.7.2-r1.ebuild 1093 SHA256 d62b32221e75a4a4d76ce6fb2909962c96e85679d2ac935029bc2d501873984e SHA512 8781f95f64cfa1443ea9c33b01499257ea3d6e31600ed669990a883b9ace0ff070903e5cf7cd501fa0ad0f117fdbda30fca4ffdcb925f852d76df1cfdfa3e568 WHIRLPOOL b2e40f06dc1b8f48293b1e2a7846a5dfb2237b9032c27da8bf7bb38756ccedcd920d1833411573f5698f5f4cf91093fb542546a8dc7756c930a64b957fe4034f
+EBUILD spectrwm-3.0.1.ebuild 1137 SHA256 ddfeebb2d9b97a962f819bdf9d7a7be45e824e21349444b535de662308e6f97b SHA512 01e19447268dec1d98d17ea9f8fd6188a062b8fa39ae5ea3001c5738642fa04bcef56a7f3ee9d352285049e37499e9200b668b034344381668306406917989be WHIRLPOOL e6776670b3a2416832a61e70d5ab02d12bc9f0cd0b318a84696a0df6570dd3beb7317b166669510baa25dbbedb5343399e42751c3381c7c01e58d31decd02e7c
+EBUILD spectrwm-3.0.2.ebuild 1137 SHA256 ddfeebb2d9b97a962f819bdf9d7a7be45e824e21349444b535de662308e6f97b SHA512 01e19447268dec1d98d17ea9f8fd6188a062b8fa39ae5ea3001c5738642fa04bcef56a7f3ee9d352285049e37499e9200b668b034344381668306406917989be WHIRLPOOL e6776670b3a2416832a61e70d5ab02d12bc9f0cd0b318a84696a0df6570dd3beb7317b166669510baa25dbbedb5343399e42751c3381c7c01e58d31decd02e7c
+MISC ChangeLog 4758 SHA256 16cc3d72811599201585075d7d014be3c637e81b9ce7890b34ea2ee6d5d65e24 SHA512 f225d36b04d32bd16e3c7a136e0ab89b714ceac314203f48f4ab3720be8d39d79921535056ae62cc9719aa69da9f86d1e84b2b058a8ee2d394ff92ca47e3966d WHIRLPOOL aef9f366aa8021b8761ce93a053facff593bb2417c93d29848540c18f7aef2a04853c733d256a8c6ad2440227c8ce7c8418ef540d496d4a1c42f995eb2c3b2ba
+MISC ChangeLog-2015 4642 SHA256 6858fb6de15a8f26d083bd33b7a783926a89cec79440ee64c045c7f05c66f850 SHA512 d329d8c56df6ec417296dcd47d1e7508df1404c003aefdce7b8d729cf19933dc3abcb126578146c6d54c262d06b0d4ce7e863fa23378e6d5082e1f2069ca96ec WHIRLPOOL 7a73153fab0299535b164865fd95ea1e691be6f368de203f8df170737625074a22919649d138f3577e28a42d4df6ba1221f777f8c686b2290c609000c8317dab
+MISC metadata.xml 237 SHA256 ffb571839c57797d282263369646d2bba2662601a45f7bb3251bb97f716554a6 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f WHIRLPOOL 60d6da846c983457e038ea5ba3c0bf48f939c9586610985a14cac9772fd1d45d781a643abc16482f232f3028e44fe99fe1a382deaebf6589602fc244a4460e3f
diff --git a/x11-wm/spectrwm/files/spectrwm-2.6.2-Makefile.patch b/x11-wm/spectrwm/files/spectrwm-2.6.2-Makefile.patch
new file mode 100644
index 000000000000..e380b60fdf13
--- /dev/null
+++ b/x11-wm/spectrwm/files/spectrwm-2.6.2-Makefile.patch
@@ -0,0 +1,11 @@
+--- spectrwm-2.6.2/linux/Makefile
++++ spectrwm-2.6.2/linux/Makefile
+@@ -9,7 +9,7 @@
+ LIBVERSION      = $(shell .  $(CURDIR)/../lib/shlib_version; echo $$major.$$minor)
+ LIBMAJORVERSION = $(shell .  $(CURDIR)/../lib/shlib_version; echo $$major)
+ 
+-MAINT_CFLAGS   = -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow -Wno-uninitialized -g
++MAINT_CFLAGS   = -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow -Wno-uninitialized
+ MAINT_CPPFLAGS = -D_GNU_SOURCE -I. -I/usr/include/freetype2 -DSWM_LIB=\"$(LIBDIR)/libswmhack.so.$(LIBVERSION)\"
+ MAINT_LDLIBS   = -lX11 -lX11-xcb -lxcb -lxcb-icccm -lxcb-randr -lxcb-keysyms -lxcb-util -lxcb-xtest -lXft -lXcursor
+ 
diff --git a/x11-wm/spectrwm/metadata.xml b/x11-wm/spectrwm/metadata.xml
new file mode 100644
index 000000000000..a535b8852829
--- /dev/null
+++ b/x11-wm/spectrwm/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>xmw@gentoo.org</email>
+<name>Michael Weber</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-wm/spectrwm/spectrwm-2.7.2-r1.ebuild b/x11-wm/spectrwm/spectrwm-2.7.2-r1.ebuild
new file mode 100644
index 000000000000..0a0371d5135d
--- /dev/null
+++ b/x11-wm/spectrwm/spectrwm-2.7.2-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Small dynamic tiling window manager for X11"
+HOMEPAGE="https://opensource.conformal.com/wiki/spectrwm"
+SRC_URI="http://opensource.conformal.com/snapshots/${PN}/${P}.tgz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="x11-misc/dmenu"
+DEPEND="${DEPEND}
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	x11-libs/xcb-util
+	!x11-wm/scrotwm"
+
+S=${WORKDIR}/${P}/linux
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.6.2-Makefile.patch
+	tc-export CC
+}
+
+src_compile() {
+	emake PREFIX="${EROOT}usr" LIBDIR="${EROOT}usr/$(get_libdir)"
+}
+
+src_install() {
+	emake PREFIX="${EROOT}usr" LIBDIR="${EROOT}usr/$(get_libdir)" DESTDIR="${D}" install
+
+	cd "${WORKDIR}"/${P} || die
+
+	insinto /etc
+	doins ${PN}.conf
+	dodoc ${PN}_*.conf {initscreen,screenshot}.sh
+
+	make_session_desktop ${PN} ${PN}
+
+	elog "Example keyboard config and helpful scripts can be found"
+	elog "in ${ROOT}usr/share/doc/${PF}"
+}
diff --git a/x11-wm/spectrwm/spectrwm-3.0.1.ebuild b/x11-wm/spectrwm/spectrwm-3.0.1.ebuild
new file mode 100644
index 000000000000..49bfbf2e655e
--- /dev/null
+++ b/x11-wm/spectrwm/spectrwm-3.0.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs vcs-snapshot
+
+DESCRIPTION="Small dynamic tiling window manager for X11"
+HOMEPAGE="https://opensource.conformal.com/wiki/spectrwm"
+SRC_URI="https://codeload.github.com/conformal/${PN}/tar.gz/SPECTRWM_${PV//./_} -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-misc/dmenu"
+DEPEND="${DEPEND}
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	x11-libs/xcb-util
+	!x11-wm/scrotwm"
+
+S=${WORKDIR}/${P}/linux
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.6.2-Makefile.patch
+	tc-export CC
+}
+
+src_compile() {
+	emake PREFIX="${EROOT}usr" LIBDIR="${EROOT}usr/$(get_libdir)"
+}
+
+src_install() {
+	emake PREFIX="${EROOT}usr" LIBDIR="${EROOT}usr/$(get_libdir)" DESTDIR="${D}" install
+
+	cd "${WORKDIR}"/${P} || die
+
+	insinto /etc
+	doins ${PN}.conf
+	dodoc ${PN}_*.conf {initscreen,screenshot}.sh
+
+	make_session_desktop ${PN} ${PN}
+
+	elog "Example keyboard config and helpful scripts can be found"
+	elog "in ${ROOT}usr/share/doc/${PF}"
+}
diff --git a/x11-wm/spectrwm/spectrwm-3.0.2.ebuild b/x11-wm/spectrwm/spectrwm-3.0.2.ebuild
new file mode 100644
index 000000000000..49bfbf2e655e
--- /dev/null
+++ b/x11-wm/spectrwm/spectrwm-3.0.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs vcs-snapshot
+
+DESCRIPTION="Small dynamic tiling window manager for X11"
+HOMEPAGE="https://opensource.conformal.com/wiki/spectrwm"
+SRC_URI="https://codeload.github.com/conformal/${PN}/tar.gz/SPECTRWM_${PV//./_} -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-misc/dmenu"
+DEPEND="${DEPEND}
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	x11-libs/xcb-util
+	!x11-wm/scrotwm"
+
+S=${WORKDIR}/${P}/linux
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.6.2-Makefile.patch
+	tc-export CC
+}
+
+src_compile() {
+	emake PREFIX="${EROOT}usr" LIBDIR="${EROOT}usr/$(get_libdir)"
+}
+
+src_install() {
+	emake PREFIX="${EROOT}usr" LIBDIR="${EROOT}usr/$(get_libdir)" DESTDIR="${D}" install
+
+	cd "${WORKDIR}"/${P} || die
+
+	insinto /etc
+	doins ${PN}.conf
+	dodoc ${PN}_*.conf {initscreen,screenshot}.sh
+
+	make_session_desktop ${PN} ${PN}
+
+	elog "Example keyboard config and helpful scripts can be found"
+	elog "in ${ROOT}usr/share/doc/${PF}"
+}
diff --git a/x11-wm/stumpwm-contrib/Manifest b/x11-wm/stumpwm-contrib/Manifest
new file mode 100644
index 000000000000..6c9371ed49a0
--- /dev/null
+++ b/x11-wm/stumpwm-contrib/Manifest
@@ -0,0 +1,4 @@
+DIST stumpwm-contrib-20170921.tar.bz2 573525 SHA256 57973985fbe7e441ec73c65c333b61db70445874745b4d3499a746300407f673 SHA512 ab5a9b93e85d36ac35ff6b2aa8c77e3084b34a25d4f665edac296dfa24ac35aff6578e0cdf9556ebe6f57755be5d0c9c476bfbbdd2bfcc1e39c57881c57bea33 WHIRLPOOL f6e276fecee3230078e702c6388f9f54434e1f860fe5aa0e382ae2ab131ca27b96af477e66a4b8e34dd5e676cbfaa3e2d31b234dbb4eb7eb5c54aab0ee4ea6e6
+EBUILD stumpwm-contrib-20170921.ebuild 735 SHA256 30cf25b8648fb13a36ec24c9bc1092b4f5858dd276f758a953d2a10bf7b6eca8 SHA512 6e973929e9918b7b050ac3fa72e2fa21579978ee76912ee36d1d91914b5fcd9f04ac267abdd99ef17231ec1eccccd20d5f909fa0562b67fed24d1435604b58a0 WHIRLPOOL e763521ff63683bd871a7c4787aa811c9e3460d5d39d3fd379817c8b18f359429a14665ca88d36d1cf0bb572d418dc3f06056be58a17921937f05223180ceb14
+EBUILD stumpwm-contrib-99999999.ebuild 735 SHA256 30cf25b8648fb13a36ec24c9bc1092b4f5858dd276f758a953d2a10bf7b6eca8 SHA512 6e973929e9918b7b050ac3fa72e2fa21579978ee76912ee36d1d91914b5fcd9f04ac267abdd99ef17231ec1eccccd20d5f909fa0562b67fed24d1435604b58a0 WHIRLPOOL e763521ff63683bd871a7c4787aa811c9e3460d5d39d3fd379817c8b18f359429a14665ca88d36d1cf0bb572d418dc3f06056be58a17921937f05223180ceb14
+MISC metadata.xml 338 SHA256 42f922c2c80b9c16bded32f0805e443b2d252fb5cfa19863ce9fe578930937db SHA512 d662b61f41f064ce5fb100324aec996c0956736c9a56f797a2522bb5a1ac7731eec1792d72aa11e85bdb162d7f3b345f8d06540c7452b34bf3064febc1136f64 WHIRLPOOL cb40783e6d7bc211d20553ada44dd82ca4c743c1194bea22246eaa187b11adc29dde1c94cc49f2dd30f1bb7e5e6d958a78ef0294fd2467d8adcdba16a3e970f1
diff --git a/x11-wm/stumpwm-contrib/metadata.xml b/x11-wm/stumpwm-contrib/metadata.xml
new file mode 100644
index 000000000000..910100127ec6
--- /dev/null
+++ b/x11-wm/stumpwm-contrib/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>nimiux@gentoo.org</email>
+		<name>Chema Alonso Josa</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">stumpwm/stumpwm-contrib</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-wm/stumpwm-contrib/stumpwm-contrib-20170921.ebuild b/x11-wm/stumpwm-contrib/stumpwm-contrib-20170921.ebuild
new file mode 100644
index 000000000000..373f997b8e5a
--- /dev/null
+++ b/x11-wm/stumpwm-contrib/stumpwm-contrib-20170921.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit common-lisp-3
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/stumpwm/${PN}"
+else
+	SRC_URI="https://dev.gentoo.org/~nimiux/${CATEGORY}/${PN}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Extension Modules for StumpWM"
+HOMEPAGE="https://github.com/stumpwm/stumpwm-contrib/"
+
+LICENSE="GPL-2 GPL-3 BSD-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=x11-wm/stumpwm-0.9.9"
+
+CONTRIBCATEGORIES="media modeline minor-mode util"
+
+src_install() {
+	common-lisp-install-sources -t all ${CONTRIBCATEGORIES}
+	dobin util/stumpish/stumpish
+	dobin util/pinentry/stumpwm-pinentry
+	dodoc README.org
+}
diff --git a/x11-wm/stumpwm-contrib/stumpwm-contrib-99999999.ebuild b/x11-wm/stumpwm-contrib/stumpwm-contrib-99999999.ebuild
new file mode 100644
index 000000000000..373f997b8e5a
--- /dev/null
+++ b/x11-wm/stumpwm-contrib/stumpwm-contrib-99999999.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit common-lisp-3
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/stumpwm/${PN}"
+else
+	SRC_URI="https://dev.gentoo.org/~nimiux/${CATEGORY}/${PN}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Extension Modules for StumpWM"
+HOMEPAGE="https://github.com/stumpwm/stumpwm-contrib/"
+
+LICENSE="GPL-2 GPL-3 BSD-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=x11-wm/stumpwm-0.9.9"
+
+CONTRIBCATEGORIES="media modeline minor-mode util"
+
+src_install() {
+	common-lisp-install-sources -t all ${CONTRIBCATEGORIES}
+	dobin util/stumpish/stumpish
+	dobin util/pinentry/stumpwm-pinentry
+	dodoc README.org
+}
diff --git a/x11-wm/stumpwm/Manifest b/x11-wm/stumpwm/Manifest
new file mode 100644
index 000000000000..f076be13c83e
--- /dev/null
+++ b/x11-wm/stumpwm/Manifest
@@ -0,0 +1,7 @@
+AUX 70stumpwm-gentoo.el 84 SHA256 45683a3c00460e54243ac2489cc78ff394f2d5818ec7b2fe72ca5ffc33b2e1a2 SHA512 2e67f51dd6840f850aa1c0e3f2e8c2453203603f174f3ce97feacd2658cf6168bf557eb6ee83499b8c60fb107fdd527caccdda7ab5692646a33f96ad1350bcd1 WHIRLPOOL 8b494c5df00f07f753580bbcb009920de4eabb7d561719b8b3fd4c9cf2d41f9e31c863a241113b361c24e332fe774c38c3bdb65d0d0b8b6f25bd9fe7046e2698
+AUX README.Gentoo 1894 SHA256 a708ee3f7fba6862ae2685daa4707c5a58f500c07862da0dafb92c17bf78b82c SHA512 c187fcc12bbb4c10718e708a4b17a9adc89f1268270f231e8b5feeea881149482d8b70ac0f5eb78b7e0b93700d6cd5133bf7d844f97736bee793405de9a25a09 WHIRLPOOL a4adb14ed13157619a1efcd7a2974c19dac6270f373994311eba2bf2e5b83f38ede7dafa9289d09b2953948670687cdfdd97a7fbd25be67ee88edff14301b49d
+DIST stumpwm-1.0.0.tar.gz 200794 SHA256 31fcb6fb34af20bf4857bb4621ab4b2c9bd6bec92bfd9ddaf88a18f850ba5dd5 SHA512 eb5bf48a5d185d982e8a9ec7639958f14fd912e0f4c89da205f0bcb0c10a61c3953bce5029c2a301fdcd29fe05c505601d4db30fc50b34b7082ce69bd25b43ac WHIRLPOOL 7049299b1c5db42f7379f3f741de8d87e3322deac6787494fb09c553130e0c2c79de93fdcb33beabb80f44f5b29a03f25bc61bfdcb3755043b4937627a3658fc
+EBUILD stumpwm-1.0.0.ebuild 2000 SHA256 5744f862070f0d77be62b94af5c0fe524b65a06790545827e2934d96892a6548 SHA512 5ef81d50b544bb0df49e14dec44d3b88573b8938efddb870d8522329e2929a1d766453d8e0d537fae17b42ee430295afe106672982a44226d90b6ef8d2986f89 WHIRLPOOL b423c9b66bac2cebbf295db279b573217fa2c74f5debca5352ca6168a0614cdd04f1b63f9d86b752d34255904562097ba33e57a231736d345a3ca6a0e64c2267
+MISC ChangeLog 4202 SHA256 4cb6f95ee88f1a3f9a972f4eec281e05dd7e2aa0ad124bebf36f370ca34bc38b SHA512 f9371fd5906d25ae8d036831248d3db72c56b157fb6b54727ec28bd37a2964a45f87734aab1cd38f91fe72620206b1bba38535c7cad7b005d8e4980c296eb9a0 WHIRLPOOL 10c6ab0711f3d6e51839c3061a45da1ade001545b76996da6f5dcee162f108ed53ad57355e7efae233089db777f826a532e830545fd08c308be1a55fbe1a7f7d
+MISC ChangeLog-2015 1987 SHA256 f5eae5e51be2f68ac25698c140f367ef9975023120cca8e7c2a3b003ebf77d1b SHA512 4b1a93c67e72eeabb75a459eec64758e1326a7a2b0f1d3ce124536e11d91f624dbc23bfa0b4cea56e32f15c01d540da6822a76134dce3fbdf8fad32d394de0eb WHIRLPOOL fb5cd0394ae822d7117a1d95a4c37ebb0b50a1895a910399771edac8886f56d94c6550c34ead08ddc4e3cf4263e2ca80bb8bd06896e92b6bdced8ca62918a167
+MISC metadata.xml 2521 SHA256 afe4d1bbea8fa28f84e35c3c1a43d4c8871b1bc5218e86fb3a6e720d4c44aa2a SHA512 98a39ff560bb2317766cdd3b3360a55542c9d1ca4c7f8d814863f133744636c300cea4622886dd8318390d17b75ba2a42151ad5e9273bfb7054e4581f9d33e89 WHIRLPOOL 28f5106b8bf8a44130ce843cc13fda5b998fe0254b35b6547475304eb70f76b0e465b2caa3192e46c86a52746ececdbf6c9cc605c15106ed845d867f9f86657e
diff --git a/x11-wm/stumpwm/files/70stumpwm-gentoo.el b/x11-wm/stumpwm/files/70stumpwm-gentoo.el
new file mode 100644
index 000000000000..c07bdf2de499
--- /dev/null
+++ b/x11-wm/stumpwm/files/70stumpwm-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'stumpwm-mode "stumpwm-mode" nil t)
diff --git a/x11-wm/stumpwm/files/README.Gentoo b/x11-wm/stumpwm/files/README.Gentoo
new file mode 100644
index 000000000000..7277305dcda1
--- /dev/null
+++ b/x11-wm/stumpwm/files/README.Gentoo
@@ -0,0 +1,56 @@
+
+This file is installed in /usr/share/doc/stumpwm-cvs-*/README.Gentoo.gz
+
+Stumpwm notes for Gentoo
+------------------------
+
+As always with CVS ebuilds, DO NOT report problems to upstream.
+Always report problems to the Gentoo Bugzilla at
+http://bugs.gentoo.org/.
+
+This is a live CVS port of Stumpwm therefore every time you emerge
+x11-wm/stumpwm-cvs you will be installing the most recent Stumpwm.
+You may not always get a working Stumpwm.  The ebuild supports setting
+ECVS_BRANCH from outside the ebuild so you can select Stumpwm CVS
+source from the past.
+
+Starting Stumpwm
+----------------
+
+For the moment, actually starting Stumpwm is left as an exercise for
+the user.  Some users may prefer to load SLIME (via SWANK) support
+into the image with Stumpwm and some users may prefer not to.
+Deciding on SLIME TCP port numbers is also a user decision.  Users may
+wish to experiment with Stumpwm in different Common Lisp
+implementations or just use a particular implementation.
+
+Here are some hints to get you started:
+
+    (asdf:oos 'asdf:load-op :stumpwm)
+
+Start a SLIME listener:
+
+    (asdf:oos 'asdf:load-op :swank)
+    (swank:create-swank-server 4005 :spawn)
+
+Then you can connect your Emacs to the Stumpwm image later using the
+following from Emacs:
+
+    M-x slime-connect RET 127.0.0.1 RET 4005 RET
+
+Isn't SLIME wonderful?.  You might consider app-misc/detachtty or
+app-misc/screen for recovering the REPL if not using SLIME.
+
+Start Stumpwm:
+
+    (stumpwm:stumpwm ":0")
+
+You might also consider dev-lisp/cl-launch which is an excellent way
+to wrap up Common Lisp systems into a single, portable shell script.
+For example, the following creates a ~/bin/mystumpwm script which will
+try to load the stumpwm system definition into SBCL.  If that fails,
+it will try CLISP:
+
+    cl-launch --output ~/bin/mystumpwm  --lisp "sbcl clisp" \
+        --system stumpwm --init '(stumpwm:stumpwm ":0")'
+
diff --git a/x11-wm/stumpwm/metadata.xml b/x11-wm/stumpwm/metadata.xml
new file mode 100644
index 000000000000..280080d2f50a
--- /dev/null
+++ b/x11-wm/stumpwm/metadata.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>nimiux@gentoo.org</email>
+    <name>Chema Alonso</name>
+  </maintainer>
+  <longdescription lang="en">
+    Stumpwm is a tiling, keyboard driven X11 Window Manager written entirely in
+    Common Lisp.
+
+    If you're tired of flipping through themes like channel-surfing, and going
+    from one perfect-except-for-just-one-thing window manager to another
+    even-more-broken-in-some-other-way then perhaps Stumpwm can help.
+
+    Stumpwm attempts to be customizable yet visually minimal. There are no
+    window decorations, no icons, and no buttons.
+    It does have various hooks to attach your personal customizations, and
+    variables to tweak.
+
+      * Hack the good hack
+      * debug your good hack
+      * customize your window manager 
+
+    while it's running. That's right. With a 100% Common Lisp window manager
+    there's no stopping the hacks. Just re-eval and GO!
+  </longdescription>
+  <longdescription lang="es">
+    Stumpwm es un gestor de ventanas estilo mosaico gestionado por teclado
+    escrito completamente en Common Lisp.
+
+    Si está cansado de cambiar de temas como navegación por canales y vagar
+    de un gestor de ventanas perfecto excepto por esa pequeña característica
+    a otro incluso más roto de alguna otra forma, entonces quizá Stumpwm
+    pueda ser de ayuda.
+
+    Stumpwm persigue ser personalizable a la vez que mínimo. No hay
+    decoración en las ventanas, ni iconos ni botones.
+    Dispone de varios enganches para realizar nuestras propias configuraciones
+    personales y variables que podemos ajustar a nuestras necesidades para:
+
+      * Cacharrear de forma correcta
+      * Depurar nuestro propio cacharreo
+      * Personalizar nuestro gestor de ventanas
+
+    mientras está corriendo. Eso está bien. Con un gestor de ventanas escrito
+    al 100% en Common Lisp no hay forma de detener el cacharreo. ¡Simplemente
+    reevalúe y CONTINÚE!
+  </longdescription>
+  <use>
+    <flag name="contrib">Install contrib modules</flag>
+    <flag name="doc">Include documentation</flag>
+    <flag name="emacs">Add support for GNU Emacs</flag>
+    <flag name="clisp">Use CLISP for the runtime</flag>
+    <flag name="ecl">Use SCL for the runtime</flag>
+    <flag name="sbcl">Use SBCL for the runtime</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">stumpwm/stumpwm</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/x11-wm/stumpwm/stumpwm-1.0.0.ebuild b/x11-wm/stumpwm/stumpwm-1.0.0.ebuild
new file mode 100644
index 000000000000..ebb4b56c5712
--- /dev/null
+++ b/x11-wm/stumpwm/stumpwm-1.0.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit common-lisp-3 autotools elisp-common xdg-utils
+
+DESCRIPTION="Stumpwm is a Window Manager written entirely in Common Lisp."
+HOMEPAGE="https://stumpwm.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="contrib doc emacs clisp ecl +sbcl"
+
+RESTRICT="strip mirror"
+
+RDEPEND="dev-lisp/cl-ppcre
+		sbcl?  ( >=dev-lisp/sbcl-1.0.32 )
+		sbcl? ( >=dev-lisp/clx-0.7.3 )
+		!sbcl? ( !clisp? ( !ecl? ( >=dev-lisp/sbcl-1.0.32 ) ) )
+		!sbcl? ( !clisp? (  ecl? ( >=dev-lisp/ecls-10.4.1 ) ) )
+		!sbcl? (  clisp? ( >=dev-lisp/clisp-2.44[X,new-clx] ) )
+		emacs? ( virtual/emacs app-emacs/slime )"
+DEPEND="${RDEPEND}
+		sys-apps/texinfo
+		doc? ( virtual/texi2dvi )"
+
+PDEPEND="contrib? ( x11-wm/stumpwm-contrib )"
+
+SITEFILE=70${PN}-gentoo.el
+CLPKGDIR="${CLSOURCEROOT}/${CLPACKAGE}"
+
+get_lisp() {
+	local lisp
+
+	for lisp in "$@" ; do
+		use ${lisp} && echo ${lisp} && return
+	done
+}
+
+install_docs() {
+	local pdffile="${PN}.pdf"
+
+	texi2pdf -o "${pdffile}" "${PN}.texi.in" && dodoc "${pdffile}" || die
+	cp "${FILESDIR}/README.Gentoo" . && sed -i "s:@VERSION@:${PV}:" README.Gentoo || die
+	dodoc AUTHORS NEWS README.md README.Gentoo
+	doinfo "${PN}.info"
+	docinto examples ; dodoc sample-stumpwmrc.lisp
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	xdg_environment_reset
+	econf --with-lisp=$(get_lisp sbcl clisp ecl)
+}
+
+src_compile() {
+	emake -j1
+}
+
+src_install() {
+	common-lisp-export-impl-args $(get_lisp sbcl clisp ecl)
+	dobin stumpwm
+	make_session_desktop StumpWM /usr/bin/stumpwm
+
+	common-lisp-install-sources *.lisp
+	common-lisp-install-asdf
+	# Fix ASDF dir
+	sed -i -e "/(:directory/c\   (:directory \"${CLPKGDIR}\")" \
+		"${D}${CLPKGDIR}/load-stumpwm.lisp" || die
+	use doc && install_docs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/x11-wm/subtle/Manifest b/x11-wm/subtle/Manifest
new file mode 100644
index 000000000000..cb8facf5316e
--- /dev/null
+++ b/x11-wm/subtle/Manifest
@@ -0,0 +1,6 @@
+DIST subtle-0.11.3244.tar.gz 190549 SHA256 63f0a33ca187123f05f4f98b57fa05835d594ae9f018298e7e76e9a0be3f08b8 SHA512 3d6edd5cb1b5dcd058caeddf3ead024c7cce39684baca8bac9709683ce3130a5c8433cbe046d28dc7420637dd855a2b6775638097f78a5e701bb85e505e8167c WHIRLPOOL 1e555dbd211247c1c771dcd70a89fe0413bf4e0ad4255da0187c74dd05b22aeea738a299cf6b9eb0edb7801ab5b15e6e1f98d556fcd8ac654b3ed69a2a56dfbb
+EBUILD subtle-0.11.3244.ebuild 2038 SHA256 086f584ce8466c447364e42dc59efdfc87babc732223178e9bc43df85731b661 SHA512 fb62f9712d4b676255eccad5b49b5f9b6512b610dd8e0f5482274d1cd26d25e0e7f8f82752dc90c2bb66bfb489d9a737a5c30dc76a6b69b1ef539b09105a402e WHIRLPOOL d79c324815fe85b39a7eac53c83e88afd6ea3953ff13766969d07cc136d330522d9ca2eab01ab6de752c2a2e6dc695bb9acffa1675ee9a5642065769460219c4
+EBUILD subtle-9999.ebuild 2038 SHA256 086f584ce8466c447364e42dc59efdfc87babc732223178e9bc43df85731b661 SHA512 fb62f9712d4b676255eccad5b49b5f9b6512b610dd8e0f5482274d1cd26d25e0e7f8f82752dc90c2bb66bfb489d9a737a5c30dc76a6b69b1ef539b09105a402e WHIRLPOOL d79c324815fe85b39a7eac53c83e88afd6ea3953ff13766969d07cc136d330522d9ca2eab01ab6de752c2a2e6dc695bb9acffa1675ee9a5642065769460219c4
+MISC ChangeLog 2667 SHA256 fee733aedfa2096cb16666d07461a07904f6c558aeede4ef28c4b01e3d71f54c SHA512 5283d992790a09b61741900b05f9acedb4291b7a0fedf8796181693e3f4197edc7832ab8d96d25a02db9634582f5f729b85f08ff4ae50c1bccb4e7b4502e20cd WHIRLPOOL eb8d45b5bb72ef8528656c591a4301256abbe5016ce311df09124c218686adadcdc0d29a1eeaa0dc0ccbd75c4e2fde24e8ff25a5deb9987c8c3bb3e822b0b165
+MISC ChangeLog-2015 1352 SHA256 3704e56c103ad1a77ea51d50d079ff24903b49a6d96efa3eaca87d1f7c2fa0a1 SHA512 a05f3f85d0177f4e8ef8d8f679428a44b2c7b0669af60284433d1e6d1c22b17c3620d11a53d5b211b43a835fef17dfe0baae74ff31805d76f6976892bb87e481 WHIRLPOOL 83df48ca6fd47a1a001df5b0a5e77386a26aa93f18da8812cb29baaf8acbd9f04a37844b43bd46fdbfce0287f9fe20fce8238aa4e0c4b2876435730106b6a213
+MISC metadata.xml 1150 SHA256 68ae8ef225bf6bba1c69506bbe8f72e90d6996a3d0b65e550b933480cacee981 SHA512 842ba7afc25372e9bb6a5bef00c0ddc99acda3d8ac0d40b15a2b40f1bb9a32eaf77f2515a32090ed7468e8830ae67e34649e8f30b024278d29d4ac1446678637 WHIRLPOOL 40c4ab350527a99d15098fbc0f276621efac55f3929b8f5a18592e0e773bddeb67180032187a951f1be3fc85424f521c58f08d511b137f62f6709e839bbecd56
diff --git a/x11-wm/subtle/metadata.xml b/x11-wm/subtle/metadata.xml
new file mode 100644
index 000000000000..dbe1a9d351c1
--- /dev/null
+++ b/x11-wm/subtle/metadata.xml
@@ -0,0 +1,26 @@
+<?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>
+	<longdescription lang="en">
+		subtle is a manual tiling window manager with a rather uncommon approach
+		of tiling: Instead of relying on predefined layouts, subtle divides the
+		screen into a grid with customizeable slots (called gravities). For
+		better understanding, the default config uses a 3x3 grid and maps each
+		gravity to one key of the numpad. With those keys, windows can be moved
+		directly to the desired gravity - the same can be done with tagging
+		rules in the config.
+
+		Another unique concept is the strict tagging: Unlike other tiling window
+		managers, subtle doesn't allow weak tagging and always maps windows to
+		virtual desktops (called views) with matching tags, regardless of the
+		current active view.
+	</longdescription>
+	<use>
+		<flag name="xrandr">Enable support for the X RandR extension</flag>
+		<flag name="xtest">Enable support for the XTest extension</flag>
+	</use>
+</pkgmetadata>
diff --git a/x11-wm/subtle/subtle-0.11.3244.ebuild b/x11-wm/subtle/subtle-0.11.3244.ebuild
new file mode 100644
index 000000000000..6417ae23f9b2
--- /dev/null
+++ b/x11-wm/subtle/subtle-0.11.3244.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+USE_RUBY="ruby22 ruby23 ruby24"
+
+inherit ruby-ng toolchain-funcs
+
+if [[ ${PV} == "9999" ]]; then
+	EHG_REPO_URI="http://hg.subforge.org/subtle"
+	EHG_CHECKOUT_DIR=${S}/all
+	inherit mercurial
+else
+	SRC_URI="https://dev.gentoo.org/~radhermit/dist/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A manual tiling window manager"
+HOMEPAGE="http://subforge.org/projects/subtle/wiki"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug doc +xft xinerama xpm +xrandr +xtest"
+
+RDEPEND="x11-libs/libX11
+	xft? ( x11-libs/libXft )
+	xinerama? ( x11-libs/libXinerama )
+	xpm? ( x11-libs/libXpm )
+	xtest? ( x11-libs/libXtst )
+	xrandr? ( x11-libs/libXrandr )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+ruby_add_rdepend "dev-ruby/archive-tar-minitar"
+ruby_add_bdepend "dev-ruby/rake doc? ( dev-ruby/rdoc )"
+
+all_ruby_unpack() {
+	if [[ ${PV} == "9999" ]]; then
+		mercurial_src_unpack
+	else
+		default
+	fi
+}
+
+each_ruby_configure() {
+	local myconf
+	use debug && myconf+=" debug=yes" || myconf+=" debug=no"
+	use xft && myconf+=" xft=yes" || myconf+=" xft=no"
+	use xinerama && myconf+=" xinerama=yes" || myconf+=" xinerama=no"
+	use xpm && myconf+=" xpm=yes" || myconf+=" xpm=no"
+	use xtest && myconf+=" xtest=yes" || myconf+=" xtest=no"
+	use xrandr && myconf+=" xrandr=yes" || myconf+=" xrandr=no"
+
+	${RUBY} -S rake -v CC="$(tc-getCC)" destdir="${D}" ${myconf} config || die
+}
+
+each_ruby_compile() {
+	${RUBY} -S rake -v build || die
+}
+
+all_ruby_compile() {
+	use doc && { rake rdoc || die ; }
+}
+
+each_ruby_install() {
+	${RUBY} -S rake -v install || die
+}
+
+all_ruby_install() {
+	dodir /etc/X11/Sessions
+	cat <<-EOF > "${D}/etc/X11/Sessions/${PN}"
+		#!/bin/sh
+		exec /usr/bin/subtle
+	EOF
+	fperms a+x /etc/X11/Sessions/${PN}
+
+	insinto /usr/share/xsessions
+	doins data/${PN}.desktop
+
+	dodoc AUTHORS NEWS
+
+	use doc && dohtml -r html/*
+}
+
+pkg_postinst() {
+	elog "Note that surserver will currently not work since dev-ruby/datamapper"
+	elog "is not in the tree."
+}
diff --git a/x11-wm/subtle/subtle-9999.ebuild b/x11-wm/subtle/subtle-9999.ebuild
new file mode 100644
index 000000000000..6417ae23f9b2
--- /dev/null
+++ b/x11-wm/subtle/subtle-9999.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+USE_RUBY="ruby22 ruby23 ruby24"
+
+inherit ruby-ng toolchain-funcs
+
+if [[ ${PV} == "9999" ]]; then
+	EHG_REPO_URI="http://hg.subforge.org/subtle"
+	EHG_CHECKOUT_DIR=${S}/all
+	inherit mercurial
+else
+	SRC_URI="https://dev.gentoo.org/~radhermit/dist/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A manual tiling window manager"
+HOMEPAGE="http://subforge.org/projects/subtle/wiki"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug doc +xft xinerama xpm +xrandr +xtest"
+
+RDEPEND="x11-libs/libX11
+	xft? ( x11-libs/libXft )
+	xinerama? ( x11-libs/libXinerama )
+	xpm? ( x11-libs/libXpm )
+	xtest? ( x11-libs/libXtst )
+	xrandr? ( x11-libs/libXrandr )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+ruby_add_rdepend "dev-ruby/archive-tar-minitar"
+ruby_add_bdepend "dev-ruby/rake doc? ( dev-ruby/rdoc )"
+
+all_ruby_unpack() {
+	if [[ ${PV} == "9999" ]]; then
+		mercurial_src_unpack
+	else
+		default
+	fi
+}
+
+each_ruby_configure() {
+	local myconf
+	use debug && myconf+=" debug=yes" || myconf+=" debug=no"
+	use xft && myconf+=" xft=yes" || myconf+=" xft=no"
+	use xinerama && myconf+=" xinerama=yes" || myconf+=" xinerama=no"
+	use xpm && myconf+=" xpm=yes" || myconf+=" xpm=no"
+	use xtest && myconf+=" xtest=yes" || myconf+=" xtest=no"
+	use xrandr && myconf+=" xrandr=yes" || myconf+=" xrandr=no"
+
+	${RUBY} -S rake -v CC="$(tc-getCC)" destdir="${D}" ${myconf} config || die
+}
+
+each_ruby_compile() {
+	${RUBY} -S rake -v build || die
+}
+
+all_ruby_compile() {
+	use doc && { rake rdoc || die ; }
+}
+
+each_ruby_install() {
+	${RUBY} -S rake -v install || die
+}
+
+all_ruby_install() {
+	dodir /etc/X11/Sessions
+	cat <<-EOF > "${D}/etc/X11/Sessions/${PN}"
+		#!/bin/sh
+		exec /usr/bin/subtle
+	EOF
+	fperms a+x /etc/X11/Sessions/${PN}
+
+	insinto /usr/share/xsessions
+	doins data/${PN}.desktop
+
+	dodoc AUTHORS NEWS
+
+	use doc && dohtml -r html/*
+}
+
+pkg_postinst() {
+	elog "Note that surserver will currently not work since dev-ruby/datamapper"
+	elog "is not in the tree."
+}
diff --git a/x11-wm/treewm/Manifest b/x11-wm/treewm/Manifest
new file mode 100644
index 000000000000..fef5c6782365
--- /dev/null
+++ b/x11-wm/treewm/Manifest
@@ -0,0 +1,7 @@
+AUX treewm-0.4.5-gcc43.patch 614 SHA256 6d1a2904ba1b00a8e594dd38ca85bd32e5164c4c0652f1858f215b7ffbd88016 SHA512 2e2e965c8592083e411da78eb3abdf2112e0b37b5759dd98ea62ad8c19859a59b72de1d0b9630962d8651921f220ad8e670e9e963a062dd3435a9e7d9e517e94 WHIRLPOOL d26d7dcf31878c824d11cf628ef19a4a9e6ee6e9e93b3c69cd16d99724588f0b27fb705d2b88391b50a1f5ef7907e50931e122d63c1cc050374b4cfd73169721
+DIST treewm-0.4.5.tar.bz2 87098 SHA256 3daea1c8d5dfe44bfe4e038e112f7ae5044c7978b196acd0258ac6f51e2f8c13 SHA512 96eb8eec11cec992daa4492b5a9243db5cc80b23d3827169d223d81b9ff289b62dbe6c8c3ea9da5da2e32435d98cc4552038c26e975cddec795de3b88f9db9cf WHIRLPOOL 1dbda040392cf785144eb1f1402978e1af4367585cab45c732b804b94652e10bb166c7367f9e2743724b996643bf75a1889891e5037fbbcbe95059fc72213c71
+EBUILD treewm-0.4.5-r1.ebuild 1606 SHA256 46c42e269504c45ed7def54e610562339d7968f6f97d72a4486d865c4dc5c0ab SHA512 dc707da5d6ae6c51cde3fc33d32b98ba972e1fccaabad578e3dd5e2eac692944f86d2c2bc567e9c1540340b4da0a2cf028c983c9e3a802e4eb5b1126c086475b WHIRLPOOL fab36aec995751e412b7cd97dd31a36348a84d4eb36607b793ed3d11fcac4109b60a6c42b55ee98f95f82bc074031adf03eee00d508ac75797f4c3970ab3ce9c
+EBUILD treewm-0.4.5.ebuild 924 SHA256 1fd0cf0b5b67b0857853f5f707f4ab3da1db26ff6d2a37e75b65f6867fd89bea SHA512 27fed366018ba960e694db39d1dd8ae84ebc201c3248a693238e849b7a39aceee2f4a0c1f66fd8b74e2bf40355bcfd7f1a1dfaeb738aa3499a927cba1511250f WHIRLPOOL 960bc92bc5f9a34204c03e599bf91b971acdb22f4f305046ae5773fb865a33a97b6e802d2b3c2140c534919af0f66385bd68836fe0eaddb2ea5c32f4465d873d
+MISC ChangeLog 2262 SHA256 add7786cec2eda80f2c37cca9ca74d5982da7b403a11d2bbd18142e185282d68 SHA512 02c59d00bf7c3b0b2ebe108d4f27b484e779f6718dfeae1ae277f998ac44c00e367bdeaadd9134311921d689294abbccff132f273d5a46d437e8e23518c56561 WHIRLPOOL 4e076136ac2b7c746fd7e702a273f12397bf5642459f9385d0e70d7701c723c6e2f83097fb3a31e5f165f4fd181900c1c8079ecd3eac881fa41870b9d09aae3f
+MISC ChangeLog-2015 3007 SHA256 f944cb53a637ca01071fda24b0e8d3d655cc88745041a17103a1209f20ad2879 SHA512 529fe8dae6debab0810a02afc1a489b098123fbc256ee5d3ab7c4953dfd35a60bc2a393ef16165d0ece6c2a354a9bc90a2ba00994cdbd0f9a29cf4e2f5b87e61 WHIRLPOOL c09bd52081752c86be81d10b9ab857e62d81d563d944c02c4282ed3027ca943aff5e4842b81e366d9d47808024ec0fb5e4c35e09444e6f6a690fec0a6998c916
+MISC metadata.xml 436 SHA256 ed6d98b28e15522cc422ac1a6d681bd31c0137064d366eecd3898c4dd1869a58 SHA512 cde7c7c0dadb71cb58c15a2fa7efb031fda246d1464bebb476c4a02c64baf1f90a03198b82e1188ac83b36eb4778e21595335bce5af14beb1cf20de4b978b7e8 WHIRLPOOL a856311661133868b760725db1090267afa07b281d6e0707d1fd0b31954976ca8e3b7fdf4e041acdded3181df5d4732cad97b5bf387d5759f6ed089ef71650f0
diff --git a/x11-wm/treewm/files/treewm-0.4.5-gcc43.patch b/x11-wm/treewm/files/treewm-0.4.5-gcc43.patch
new file mode 100644
index 000000000000..a8faf4319871
--- /dev/null
+++ b/x11-wm/treewm/files/treewm-0.4.5-gcc43.patch
@@ -0,0 +1,20 @@
+--- 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
+@@ -9,6 +9,7 @@
+ #include "clienttree.h"
+ #include "clientinfo.h"
+ #include <unistd.h>
++#include <string.h>
+ 
+ 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
+@@ -12,6 +12,7 @@
+ #include "global.h"
+ #include "client.h"
+ #include <map>
++#include <string.h>
+ 
+ struct ltstr {
+   bool operator() (const char* s1, const char* s2) const  {
diff --git a/x11-wm/treewm/metadata.xml b/x11-wm/treewm/metadata.xml
new file mode 100644
index 000000000000..37df03dd573f
--- /dev/null
+++ b/x11-wm/treewm/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>lordvan@gentoo.org</email>
+    <name>Thomas Raschbacher</name>
+  </maintainer>
+  <longdescription>WindowManager that arranges the windows in a tree not a list</longdescription>
+  <upstream>
+    <remote-id type="sourceforge">treewm</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/x11-wm/treewm/treewm-0.4.5-r1.ebuild b/x11-wm/treewm/treewm-0.4.5-r1.ebuild
new file mode 100644
index 000000000000..118cd3b8d39c
--- /dev/null
+++ b/x11-wm/treewm/treewm-0.4.5-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="WindowManager that arranges the windows in a tree (not in a list)"
+SRC_URI="mirror://sourceforge/treewm/${P}.tar.bz2"
+HOMEPAGE="http://treewm.sourceforge.net/"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXxf86vm
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-misc/imake
+	x11-proto/xf86vidmodeproto"
+
+src_prepare() {
+	# bug 251845
+	epatch "${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}" \
+		|| die "emake"
+}
+
+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."
+}
diff --git a/x11-wm/treewm/treewm-0.4.5.ebuild b/x11-wm/treewm/treewm-0.4.5.ebuild
new file mode 100644
index 000000000000..1a4feee1d072
--- /dev/null
+++ b/x11-wm/treewm/treewm-0.4.5.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils
+
+DESCRIPTION="WindowManager that arranges the windows in a tree (not in a list)"
+SRC_URI="mirror://sourceforge/treewm/${P}.tar.bz2"
+HOMEPAGE="http://treewm.sourceforge.net/"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 sparc ppc"
+IUSE=""
+
+RDEPEND="x11-libs/libXau
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXxf86vm
+	x11-libs/libXdmcp
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-misc/imake
+	x11-proto/xf86vidmodeproto"
+
+src_unpack() {
+	unpack ${A}
+	# bug 251845
+	epatch "${FILESDIR}/${P}-gcc43.patch"
+	# bug 86453
+	sed -i -e "s:malloc:Malloc:g" "${S}"/xprop/dsimple.c
+}
+
+src_compile() {
+	emake PREFIX="/usr" ROOT="${D}" || die
+}
+
+src_install() {
+	make PREFIX="/usr" ROOT="${D}" install || die
+
+	# hack for Gentoo's doc policy:
+	cd "${D}/usr/share/doc/treewm" && dodoc * && cd .. && rm -rf treewm || die
+}
diff --git a/x11-wm/twm/Manifest b/x11-wm/twm/Manifest
new file mode 100644
index 000000000000..eb6cdbb2d8ae
--- /dev/null
+++ b/x11-wm/twm/Manifest
@@ -0,0 +1,7 @@
+DIST twm-1.0.8.tar.bz2 275201 SHA256 7660352353d632127ff50390991706aa660b28a4ada816c2582ac02720722e44 SHA512 669c6453574d3f12ce27ab365303b1fdf5bbe2d0219bff5decf7058cd08eb942202f4006a35352554b6220c618a1e5405515fbec8e0df1387420e08bc871d663 WHIRLPOOL 3968b2be299bc9e2202cf3560a08fbbee4c2007eea514b779224a0c8748fbaedb34c952d0d785c6739e9459a737fbf40c5c35f6c1fb6839aa3379e34f425f662
+DIST twm-1.0.9.tar.bz2 284160 SHA256 c575167ac33edf3bd1592f1bedfe0559debb128ed5fb4873c1278e3be166310a SHA512 7b967560d19d1d928729688b7fab8cb7ff1221cef8054b8ad8e62ff0abc451466b49f0ff55a06d7ca89304eda4125e3285751d983705d8d27bb34677a0bf0fbf WHIRLPOOL 205c965f6120548e6b0625a24de518a3bcb03ed7129a614317330d109c633838fdca6c9b13091c63d126de960064bff6316731c9806e318264f5aa9c4b3c6d3f
+EBUILD twm-1.0.8.ebuild 459 SHA256 6c7c4e2f9567436749ec282da7ab5612faf0043dd9ba4cdfa84ff7e2331da7a3 SHA512 aab8440b3c7a2f922be96b649cae812e8bd7fbfe7dbd3640ee597f7ea35397361c2ab8e1424e9bfb0fafb4740655bdd589904a301424c6586c2da7b9ec581511 WHIRLPOOL 86d74135438c3d19bfe3f74899e846d59a0988b6c024ba4354a127b7b5917ab5d8361c4df7ee9516e4e90a55a120f306f1a9d3a35b3fdcc1fd1c01c309b8cbf1
+EBUILD twm-1.0.9.ebuild 466 SHA256 e8e22a586f8fab7b95c14faacf2feb12a21681a42f2c75d428f60dcc67e685e3 SHA512 943a66ce65c350acfedf32649ee7e6aaaed586a4d385dc2c914b42df16d408bfefa142ac4b3809041efb051bfae3253176a72b3ae1f6fb57e5b3ae7985259035 WHIRLPOOL 06ba4f0fd4282b2c6f0754d42b1a70df4f90f5d25987f880017184f464415c8f2123920e6269d00b8c4889159d67dc0bc4c302079e03520361635a5301c6c105
+MISC ChangeLog 4085 SHA256 5d781f86fabd261a2ba55f4902bbe7868bc6766ba208b04a4df33378a4933598 SHA512 82b5fae97c882aae54203668e680e590c6a31c93c218e92945fc5604d4944a103503b903d45221afa61f778557b539574e04d829a54f2f7e5e287a53dec94e98 WHIRLPOOL 3c1c7e66f6d2890dc12c1781f4faae04350d2d0f0e869e72cc19d0b28026f9fef43a4c4086d85b8f12f2cf9ab4ae688b9cb43dfa2e9b764382c083e89d37bbe1
+MISC ChangeLog-2015 9038 SHA256 aed8212d8c890c3bf6970395944366c39b270cbb6bf179bcff4952ce4201968c SHA512 9fb1939288449e84c623641b273970cea60ed23964c4a3e26892081777d504df8f4c30a22ded56b6d7db272915b498213759c6607dcb6b58d911046934c24d36 WHIRLPOOL b463c0045f35e6463645c23acb0dfe9f104d63ece9bb199a704133eeee1d57feadedab577c7108b565ada067744fd07d055136c85c302bdc80eb0cd331742e00
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-wm/twm/metadata.xml b/x11-wm/twm/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-wm/twm/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-wm/twm/twm-1.0.8.ebuild b/x11-wm/twm/twm-1.0.8.ebuild
new file mode 100644
index 000000000000..2f783b92b001
--- /dev/null
+++ b/x11-wm/twm/twm-1.0.8.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_STATIC=no
+inherit xorg-2
+
+DESCRIPTION="X.Org twm application"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXt
+	x11-libs/libXmu
+	x11-libs/libICE
+	x11-libs/libSM"
+DEPEND="${RDEPEND}
+	sys-devel/bison"
diff --git a/x11-wm/twm/twm-1.0.9.ebuild b/x11-wm/twm/twm-1.0.9.ebuild
new file mode 100644
index 000000000000..49a0c07af1cb
--- /dev/null
+++ b/x11-wm/twm/twm-1.0.9.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_STATIC=no
+inherit xorg-2
+
+DESCRIPTION="X.Org twm application"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXt
+	x11-libs/libXmu
+	x11-libs/libICE
+	x11-libs/libSM"
+DEPEND="${RDEPEND}
+	sys-devel/bison"
diff --git a/x11-wm/vtwm/Manifest b/x11-wm/vtwm/Manifest
new file mode 100644
index 000000000000..2a8d0479d0b4
--- /dev/null
+++ b/x11-wm/vtwm/Manifest
@@ -0,0 +1,9 @@
+AUX vtwm-5.4.7-NO_SOUND_SUPPORT.patch 835 SHA256 f469d7c3ab389b42aaeb8d7dadfbab9c6bba8383ff9b1370643fb254e40772c9 SHA512 74ed936d5fd2a6276a7be921551f7e55c5e62e8cff9c8aa0176b27497965295a8ffbc09b83a7002465eb0c59645e29168955a002cf215eb0c0cb7936731b0340 WHIRLPOOL d3c320f664886a27db84aab772d734bffa14fd16221b50125125dbd2d3cf278ecdfda937f43b3352d13d6f386a372a55ccbf410617e759b5172d3a2d4c208687
+AUX vtwm-5.4.7-do-not-rm.patch 1039 SHA256 83348d06d90e3e9dc97699bacebf05c1baeba00597df66f7609622b485eebce9 SHA512 f10762468cbcdeffbae4d3d2135c094b054e687caaf991caff90dc85e33d27e69664b978e75deda2ba66b18c537c21670005f02ee8a4558ad83c08f401533d86 WHIRLPOOL 9650cf892ec316cb474861a6d4b88cee86485337fbc6a874c023bbce3a550e9fbc5624b7caf9b12384abb67cfdfebc2c33fbbfc2ea96315e2c492e808bd184b5
+DIST vtwm-5.4.6a.tar.gz 992488 SHA256 e31fca6071f82f082d78a816062c32c87aafb25aa2c2419a2ec8a1bfe2e50f71 SHA512 2500dfe50fae90cbceeee2b3dcf1dd05c330abd978a51abdf2768b3231fabdd71975f3bbdc341ebe25101773009cbf7cb12f263a013165bbda5c048e8b602686 WHIRLPOOL d1cae6b759bcb4e33232534f4e9656df6a6b5a774ffe2c7c13be2e1cb73c255e0da05a329813cbe7aeb514f896d7a1db394a836f5ee813b88a5cfe5b68300216
+DIST vtwm-5.4.7.tar.gz 1021160 SHA256 c62f692c42420666920a23cd489633e91789b379fed13561321b44d9ffa8c9e9 SHA512 abd9a1b1d077232eef7f39521823446f2674d69a071333209a808ff651dfa83a7f6fa00dab06356897d9e7a88fd6616e5920af030e24541bd4703b3351628728 WHIRLPOOL 630d39f41e77ff54611241e621c942672c65f10efec3c7c68d8e1db610ad13c1664f408dca262069451cbad76beccc51054b45a264f75f20c6a213fea9675c03
+EBUILD vtwm-5.4.6a.ebuild 971 SHA256 7ba5360a92f0faba1277532714f2d97ba3428f3efc7d4e321ad3b1599825bcac SHA512 5de2207eda913d41242a6dddb014778fe07d28a1680016eba656a261bec6a73da3854d055103468f93433ee6d6ba3d30b4fbfb986f5ebcab30b7d96dc297e99e WHIRLPOOL ddafb22095f41f8d08863fd792e8e8f1f2efeebc9751945a72e5cac7edac5ef17daf1bbc7b15e2e160e5a3a6bb05ef11feb13319e0c24e13a28c3e18bfe5d21a
+EBUILD vtwm-5.4.7-r1.ebuild 1617 SHA256 7d149a862d9daebbc1870fe3b359796e9e9152f9b6bec7bbe28543a39ef0a9c5 SHA512 dbe58569459d9ebd9f8d3901c71d675f7cc07e1ea13cdfdb142bd500ff1c692c05f86fe4e9ec3304127b4e1275ecd68b926cffcf2d31d75b130bdb155a540bc3 WHIRLPOOL 8a76563b529885ad44ca4b2467da4f57189d2e04c7ead5f3aed879c7988c59416cf7ddeecb918c015114c8aa2c5a494b02a0ba7d6b777ccc1dbd2f92f6f020f5
+MISC ChangeLog 2644 SHA256 5712a55ae41fb7d8cc4f6a428197657b222d09580a8b5d9551ce71c2f73d493e SHA512 273275c6672d58faacf8340665ba79966d34f62215c5645bfa3ec0f4e159f0bf718287873f773627b1eb2613212a7f16d0af9cd7d7e8a0558e4868f37be8f198 WHIRLPOOL 27c06b9c2e0f3980dca2d31a72535a263f6055d29ab0f900ac2453c3261b5d1cc8211cd9d23a1a9bc8b87dec2ac5b83d7bd9d4417db32d4b181431210e418f96
+MISC ChangeLog-2015 2033 SHA256 8b78d8e61724cf257e467ae2dff90f83c278a5e8240c8114ca27de503741b10a SHA512 57b3f531c89c3cf6cab8cb1fa7a0f4bf538892ae6ab20e06d8d22eb1b07cffdac064160b87c55e6c251f80d3deeecf04e5e6a6ffec52d86fec0e4baa5550a83b WHIRLPOOL fd2d7daeeb807bb41d4e68fe65b44aad30c086523004ed3988415375cfcb6924afaa87f2f78981d939dd77a109b3698d890b29edcb827f46bdffcee0701390d8
+MISC metadata.xml 636 SHA256 54d29e99cba701b64026bd018be8deb10d0c76635aa71917a2b5040de2417b41 SHA512 5b71984f85b57680ea4d9432ee9aac7c4ed9d0df7082425fb650099338dad971985a56f8278ebb6c2eebe45d58272753682ffdbb9dfebeb54d6fd5d9539b77a4 WHIRLPOOL 8e973ab73a58796568275b1e2c05779cdf00b07f711c7973ff56bb4e39f9e6a5d63dd3cdaea6eecbfc27ccc3fdb14032debef0948e6c1f11c0a6a78e6e2d39e0
diff --git a/x11-wm/vtwm/files/vtwm-5.4.7-NO_SOUND_SUPPORT.patch b/x11-wm/vtwm/files/vtwm-5.4.7-NO_SOUND_SUPPORT.patch
new file mode 100644
index 000000000000..2006d66519e2
--- /dev/null
+++ b/x11-wm/vtwm/files/vtwm-5.4.7-NO_SOUND_SUPPORT.patch
@@ -0,0 +1,35 @@
+* Remove all traces of sound support, even when Imakefile suggests uncommenting
+* a variable is enough - JeR
+
+--- a/gram.y	2005-05-17 03:19:48.000000000 +0200
++++ b/gram.y	2010-09-17 01:43:51.000000000 +0200
+@@ -339,8 +339,6 @@
+ 		  function
+ 		| ICONS 		{ list = &Scr->IconNames; }
+ 		  icon_list
+-		| SOUNDS
+-		  sound_list
+ 		| COLOR 		{ color = COLOR; }
+ 		  color_list
+                 | SAVECOLOR
+@@ -743,20 +741,6 @@
+ 					}
+ 		;
+ 
+-/* djhjr - 6/22/01 */
+-sound_list	: LB sound_entries RB
+-		;
+-
+-/* djhjr - 6/22/01 */
+-sound_entries	: /* Empty */
+-		| sound_entries sound_entry
+-		;
+-
+-/* djhjr - 8/16/01 */
+-sound_entry	: string string		{ if (Scr->FirstTime) SetSound($1, $2, -1); }
+-		| string string number	{ if (Scr->FirstTime) SetSound($1, $2, $3); }
+-		;
+-
+ /* djhjr - 4/26/99 */
+ applet_list	: LB applet_entries RB
+ 		;
diff --git a/x11-wm/vtwm/files/vtwm-5.4.7-do-not-rm.patch b/x11-wm/vtwm/files/vtwm-5.4.7-do-not-rm.patch
new file mode 100644
index 000000000000..170dd3dd9806
--- /dev/null
+++ b/x11-wm/vtwm/files/vtwm-5.4.7-do-not-rm.patch
@@ -0,0 +1,45 @@
+* Remove all pointless RM calls as this only results in rebuilding in
+* src_install(). -JeR
+
+
+--- a/Imakefile	2005-05-09 14:46:24.000000000 +0200
++++ b/Imakefile	2010-09-17 02:07:22.000000000 +0200
+@@ -128,10 +128,8 @@
+ depend:: lex.c gram.c deftwmrc.c lastmake.c vtwm.man
+ 
+ all::
+-	$(RM) deftwmrc.* lastmake.*
+ 
+ install::
+-	$(RM) deftwmrc.* lastmake.*
+ 	$(MAKE) install.man
+ 
+ clean::
+@@ -144,7 +142,6 @@
+ 	$(MV) y.tab.h gram.h
+ 
+ deftwmrc.c: system.vtwmrc
+-	$(RM) $@
+ 	echo '/* ' >>$@
+ 	echo ' * This file is generated automatically from the default' >>$@
+ 	echo ' * VTWM bindings file system.vtwmrc.'$(SYS_VTWMRC_LOOK)' by the VTWM Makefile.' >>$@
+@@ -155,7 +152,6 @@
+ 	echo '(char *)0 };' >>$@
+ 
+ lastmake.c:
+-	$(RM) $@
+ 	echo '/* ' >>$@
+ 	echo ' * This file is generated automatically by the VTWM Makefile.' >>$@
+ 	echo ' */' >>$@
+@@ -166,11 +162,9 @@
+ 	echo '    "" };' >>$@
+ 
+ system.vtwmrc:
+-	$(RM) $@
+ 	$(CP) $@.$(SYS_VTWMRC_LOOK) $@
+ 
+ vtwm.man:
+-	$(RM) $@
+ 	$(LN) doc/$@ $@
+ 
+ XCOMM Handy for developers to check the man page
diff --git a/x11-wm/vtwm/metadata.xml b/x11-wm/vtwm/metadata.xml
new file mode 100644
index 000000000000..e73c1f81740f
--- /dev/null
+++ b/x11-wm/vtwm/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+<longdescription>VTWM, one of many TWM descendants, implements a Virtual
+  Desktop, meaning that what is currently on screen is just a portion of a
+  larger workspace. What portion of the virtual desktop that is displayed,
+  and whatever windows might be visible within it, are simple
+  point-and-click operations within a scaled representation of the
+  workspace.</longdescription>
+  <use>
+    <flag name="rplay">Enable rplay support, needed for sound.</flag>
+  </use>
+</pkgmetadata>
diff --git a/x11-wm/vtwm/vtwm-5.4.6a.ebuild b/x11-wm/vtwm/vtwm-5.4.6a.ebuild
new file mode 100644
index 000000000000..f79f1888904d
--- /dev/null
+++ b/x11-wm/vtwm/vtwm-5.4.6a.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="one of many TWM descendants and implements a Virtual Desktop"
+HOMEPAGE="http://www.vtwm.org/"
+SRC_URI="ftp://ftp.visi.com/users/hawkeyd/X/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha ppc sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-misc/imake
+	app-text/rman
+	x11-proto/xproto
+	x11-proto/xextproto"
+
+src_compile() {
+	xmkmf || die "xmkmf failed"
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	make BINDIR=/usr/bin \
+		LIBDIR=/etc/X11 \
+		MANPATH=/usr/share/man \
+		DESTDIR="${D}" install || die "make install failed"
+
+	echo "#!/bin/sh" > vtwm
+	echo "xsetroot -cursor_name left_ptr &" >> vtwm
+	echo "/usr/bin/vtwm" >> vtwm
+	exeinto /etc/X11/Sessions
+	doexe vtwm || die
+	dodoc doc/{4.6.*,CHANGELOG,BUGS,DEVELOPERS,HISTORY,SOUND,WISHLIST} || die
+}
diff --git a/x11-wm/vtwm/vtwm-5.4.7-r1.ebuild b/x11-wm/vtwm/vtwm-5.4.7-r1.ebuild
new file mode 100644
index 000000000000..2b781fab571a
--- /dev/null
+++ b/x11-wm/vtwm/vtwm-5.4.7-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="one of many TWM descendants and implements a Virtual Desktop"
+HOMEPAGE="http://www.vtwm.org/"
+SRC_URI="http://www.vtwm.org/downloads/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~ppc ~sparc ~x86"
+IUSE="rplay"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libXext
+	x11-libs/libXpm
+	rplay? ( media-sound/rplay )"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	x11-misc/imake
+	app-text/rman
+	x11-proto/xproto
+	x11-proto/xextproto"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-do-not-rm.patch
+	sed -i Imakefile \
+		-e 's:-L/usr/local/lib::g' \
+		-e 's:-I/usr/local/include::g' \
+		|| die "sed Imakefile"
+	if ! use rplay ; then
+		sed -i Imakefile \
+			-e 's:^XCOMM\ \(.*NO_SOUND\):\1:' \
+			-e 's:^\(SOUNDLIB.*\):XCOMM\ \1:' \
+			-e 's:sound\..::g' \
+			|| die "sed Imakefile"
+		epatch "${FILESDIR}"/${P}-NO_SOUND_SUPPORT.patch
+	fi
+}
+
+src_configure() {
+	xmkmf || die "xmkmf failed"
+	emake depend || die "emake depend"
+}
+
+src_compile() {
+	emake \
+		CC=$(tc-getCC) \
+		CCOPTIONS="${CFLAGS}" \
+		EXTRA_LDOPTIONS="${LDFLAGS}" \
+		|| die "emake failed"
+}
+
+src_install() {
+	emake BINDIR=/usr/bin \
+		LIBDIR=/etc/X11 \
+		MANPATH=/usr/share/man \
+		DESTDIR="${D}" install || die "emake install failed"
+
+	echo "#!/bin/sh" > vtwm
+	echo "xsetroot -cursor_name left_ptr &" >> vtwm
+	echo "/usr/bin/vtwm" >> vtwm
+	exeinto /etc/X11/Sessions
+	doexe vtwm || die
+	dodoc doc/{4.7.*,CHANGELOG,BUGS,DEVELOPERS,HISTORY,SOUND,WISHLIST} || die
+}
diff --git a/x11-wm/windowlab/Manifest b/x11-wm/windowlab/Manifest
new file mode 100644
index 000000000000..7ec35287d425
--- /dev/null
+++ b/x11-wm/windowlab/Manifest
@@ -0,0 +1,9 @@
+AUX windowlab-1.34-fixed-font.patch 385 SHA256 5ab86f594ac6013c5510c1a08fe834248e56abd66647a07d6c938c2ddd60c8b9 SHA512 c0e860c92dce68a921880fbe042163a50ad2f1e31572acb2a93bc557405ba7323a8a5e0e5608365be0585dac1bf648958c74aa9e017b9da6c0a15ac4caaae6e4 WHIRLPOOL 6d95ec4590a9e788fe688c8192b52222cea4c1f06d571c1d782ab574516f1ca4af10676032d76ece9d8db329e056f1c81ee5efac452dd501021a1a10c1b9f102
+AUX windowlab-1.40-gentoo.diff 1621 SHA256 fcd7019d24334bfb5304e30874e4d8f17a5c63d4e8eea986606312fdf4899b6e SHA512 d0d06e2396f1a2f26d7c76b5ed513df2fa4d7496a898664b1fec51b33d6e3f63dd131207cd68243f9c8895d7bfa00e399b3a38ac81101e8321532f454f193ccd WHIRLPOOL e28d3f4d30529af935385606e5d454a6145fd8f1c8e821432da26f08d9c779e21ce278f3c5c8e14f118ed76ec8360335625810c5b0764583eae91f11fefde6c1
+DIST windowlab-1.34.tar 163840 SHA256 a646abd1a7b1c548621ba8fcadc32311555e89f2a45b78a0f105421d618e4d35 SHA512 1d24065fdc2e66d9906d7a1c383d547f677db3c1343176501251637588c7683c08c2803473a505097cafda38486efbdc055bf9597c9ce00456c5ae0d1781e930 WHIRLPOOL 1b540d86ec831ccaf1aaa7a62688f28535da420cc692938f76b2c5870ffcda566ad09192bcbc46ba2c8abdecf2d18f5d0cec791ee66391699c2cdb379e43a98a
+DIST windowlab-1.40.tar 174080 SHA256 1c9cca5d997cfdcec093e98b7f1996da2d806fbbe4472bdcca568863f3e75d93 SHA512 abea16f4f85f846d426fecce548cef2bf867fc6545a720ec2d3a8d93eb5a4abd6942e44534bb7faef6cffe0551181764effa99d835b8f067a1510f7d50af6d3d WHIRLPOOL 8e4a033574f3da7415f4ba0477ef0b3faae0d24523927de669ae932cf6d4a3e99090a00b73ccdffd3fb4dce5bce20bc3019cba2a05e7c7956f618a3fa82b8889
+EBUILD windowlab-1.34.ebuild 1231 SHA256 9a6f6299db955c3f8086b03e6ff9220f63f8c1c3251f984582b9081e0534b111 SHA512 d03b1f8dbe6c0548566348395b31048c48168cbd10dd9c78be1d881fd62815c09011049072451484f7c700740044ac1a681594736a19c12354c0c80d6e5c5acd WHIRLPOOL 1ba53c4b914f96783035e94af9b56a10c99daf837c4d23c7e6de714d299e5b7512110bbf3e959747badf5ffd64a7e1a8be975be0fef692ddfd08cde09a427ce5
+EBUILD windowlab-1.40-r1.ebuild 1094 SHA256 3fc0d94fcccd58dbe1ef79896c226df42b7d77a38cda02b37aa50d93f0b84c26 SHA512 4fcf4cd58cb21ecab8a049b8adf09f7c8339ffd07cebb11c8f84b616bf66cfd99e72ef5bba5c0993fe3d7829ceb38b32261b6fdb0b0a007f918d544caa237e9b WHIRLPOOL 292e1a470e115abfb3016ad06395a0e6ae2852cf9029431cbcec65a8e27ade4c97b2548705b56d6ad8119f16ba89682e6cbb443dc0d0b1f6edb6054ccb5521e6
+MISC ChangeLog 2655 SHA256 8c167dd951c1feb34ad7690d7695a51a88fa106589ab534629f187959f54e7aa SHA512 0a5aabca863451600ee813bf32103716fd6e32bac58dfed2f6187d6a6b06d7b7a7b8bb007259c910b9d8ab83d9ddeaea08aa9f06d3a696c97398be7d1eb25d7f WHIRLPOOL 2fd5fb0922f68b3fd8a08f75ce2b0c77e2aec8ba8e408f383664365454bf0ea87bfc2c2c86d735466739bf37ec47c20381c0ff0865432876ee1bbe32279f3086
+MISC ChangeLog-2015 4906 SHA256 145f185658fe9c31cf5160f7f0e1bf8646b2b08f3f5e8c5862ae748e86e9af49 SHA512 788ba928f719bc7f7e885b09bda79320dc6f74e68166eef4f2302d4c6e8b39845852df48c282802e4914522be5e8dfcfbfa66a172e682083796be1ae3e58b252 WHIRLPOOL 1f6b9b60c4882db1d4da62c532cc15dc150bafeabdc6bfd79c3389680f6e4d7ed866867d030012fc2c1da63b8c5f51d1809e9fa124afb3eeaf18d5737545fda7
+MISC metadata.xml 745 SHA256 8d2f11a35f85edb671216fadba27d05304efe6cef3bdb9f1b4a39340e7070714 SHA512 ce0e891248ce741753ca470dab5e537d46a361836814608a6253bcd81f56c2b7a7627bda7236e006bea279d28ade0aa6980f71678ad8ca1751769e7b61e46729 WHIRLPOOL 17f0669d4b840ae14f94a344f76a59939cbcf33c65ec7626201cda9be6ca1c634f393e7cb215a5f2518b40630b33f2119502a60c13703af940dd92b4d8b27432
diff --git a/x11-wm/windowlab/files/windowlab-1.34-fixed-font.patch b/x11-wm/windowlab/files/windowlab-1.34-fixed-font.patch
new file mode 100644
index 000000000000..ed85936bbcd9
--- /dev/null
+++ b/x11-wm/windowlab/files/windowlab-1.34-fixed-font.patch
@@ -0,0 +1,11 @@
+--- a/windowlab.h    2006-09-01 23:47:36.000000000 +0200
++++ b/windowlab.h 2006-09-01 23:47:49.000000000 +0200
+@@ -49,7 +49,7 @@
+ #ifdef XFT
+ #define DEF_FONT "-bitstream-bitstream vera sans-medium-r-*-*-*-100-*-*-*-*-*-*"
+ #else
+-#define DEF_FONT "-b&h-lucida-medium-r-*-*-10-*-*-*-*-*-*-*"
++#define DEF_FONT "fixed"
+ #endif
+
+ // use named colours, #rgb, #rrggbb or #rrrgggbbb format
diff --git a/x11-wm/windowlab/files/windowlab-1.40-gentoo.diff b/x11-wm/windowlab/files/windowlab-1.40-gentoo.diff
new file mode 100644
index 000000000000..b0a9b490eb0c
--- /dev/null
+++ b/x11-wm/windowlab/files/windowlab-1.40-gentoo.diff
@@ -0,0 +1,53 @@
+--- a/Makefile	2009-11-05 21:04:45.000000000 +0000
++++ b/Makefile	2010-05-30 15:31:04.047559352 +0000
+@@ -5,18 +5,18 @@
+ EXTRA_LIBS += -lXext
+ 
+ # Set this to the hardcoded location of all files if it's not /
+-PREFIX = /usr/local
++PREFIX = /usr
+ 
+ # Set this to the directory, below PREFIX, where man pages 
+ # are expected. Below this directory, the target "install"
+ # will put "windowlab.1x" in section "man1".
+-MANBASE = /man
++MANBASE = /share/man
+ 
+ # Set this to the location of the X installation you want to compile against
+-XROOT = /usr/X11R6
++XROOT = /usr
+ 
+ # Some flexibility for configuration location
+-CONFPREFIX = $(PREFIX)
++CONFPREFIX =
+ CONFDIR = /etc/X11/windowlab
+ 
+ # Set this to the location of the global configuration files
+@@ -43,7 +43,6 @@
+ 
+ # --------------------------------------------------------------------
+ 
+-CC = gcc
+ ifndef CFLAGS
+ CFLAGS = -g -O2 -Wall -W
+ endif
+@@ -63,15 +62,15 @@
+ all: $(PROG)
+ 
+ $(PROG): $(OBJS)
+-	$(CC) $(OBJS) $(LDPATH) $(LIBS) -o $@
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LDPATH) $(LIBS) -o $@
+ 
+ $(OBJS): %.o: %.c $(HEADERS)
+ 	$(CC) $(CFLAGS) $(DEFINES) $(INCLUDES) -c $< -o $@
+ 
+ install: all
+-	mkdir -p $(BINDIR) && install -m 755 -s $(PROG) $(BINDIR)
+-	mkdir -p $(MANDIR) && install -m 644 $(MANPAGE) $(MANDIR) && gzip -9vfn $(MANDIR)/$(MANPAGE)
+-	mkdir -p $(CFGDIR) && cp -i windowlab.menurc $(CFGDIR)/windowlab.menurc && chmod 644 $(CFGDIR)/windowlab.menurc
++	install -D -m 755 $(PROG) $(BINDIR)/$(PROG)
++	install -D -m 644 $(MANPAGE) $(MANDIR)/windowlab.1
++	install -D -m 644 windowlab.menurc $(CFGDIR)/windowlab.menurc
+ 
+ clean:
+ 	rm -f $(PROG) $(OBJS)
diff --git a/x11-wm/windowlab/metadata.xml b/x11-wm/windowlab/metadata.xml
new file mode 100644
index 000000000000..126fb2b64c58
--- /dev/null
+++ b/x11-wm/windowlab/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+<longdescription>
+	WindowLab is a small and simple window manager of novel design.
+
+	It has a click-to-focus but not raise-on-focus policy, a
+	window resizing mechanism that allows one or many edges of a
+	window to be changed in one action, and an innovative menubar
+	that shares the same part of the screen as the taskbar. Window
+	titlebars are prevented from going off the edge of the screen
+	by constraining the mouse pointer, and when appropriate the
+	pointer is also constrained to the taskbar/menubar in order to
+	make target menu items easier to hit.
+	</longdescription>	
+</pkgmetadata>
diff --git a/x11-wm/windowlab/windowlab-1.34.ebuild b/x11-wm/windowlab/windowlab-1.34.ebuild
new file mode 100644
index 000000000000..1fe537d4ebd5
--- /dev/null
+++ b/x11-wm/windowlab/windowlab-1.34.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils
+
+DESCRIPTION="small and simple window manager of novel design"
+HOMEPAGE="http://www.nickgravgaard.com/windowlab/"
+SRC_URI="http://www.nickgravgaard.com/${PN}/${P}.tar"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~mips ppc x86"
+IUSE="truetype"
+
+RDEPEND="truetype? ( x11-libs/libXft )
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	x11-proto/xextproto
+	virtual/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-1.34-fixed-font.patch"
+}
+
+src_compile() {
+	if use truetype ; then
+		export DEFINES=-DXFT
+		export EXTRA_INC=$(pkg-config --cflags xft)
+		export EXTRA_LIBS=$(pkg-config --libs xft)
+	fi
+	emake CFLAGS="${CFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	dobin ${PN} || die
+
+	newman ${PN}.1x ${PN}.1 || die
+	dodoc CHANGELOG README TODO || die
+
+	dodir /etc/X11/${PN} || die
+	insinto /etc/X11/${PN}
+	doins ${PN}.menurc || die
+
+	dodir /etc/X11/Sessions || die
+	echo "/usr/bin/${PN}" > ${D}/etc/X11/Sessions/${PN}
+	fperms a+x /etc/X11/Sessions/${PN}
+}
+
+pkg_postinst() {
+	elog "${PN}'s menu config file has been changed from"
+	elog "/etc/X11/${PN}/menurc to /etc/X11/${PN}/${PN}.menurc"
+}
diff --git a/x11-wm/windowlab/windowlab-1.40-r1.ebuild b/x11-wm/windowlab/windowlab-1.40-r1.ebuild
new file mode 100644
index 000000000000..28f22b9e18ac
--- /dev/null
+++ b/x11-wm/windowlab/windowlab-1.40-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="small and simple window manager of novel design"
+HOMEPAGE="http://www.nickgravgaard.com/windowlab/"
+SRC_URI="http://www.nickgravgaard.com/${PN}/${P}.tar"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~x86"
+IUSE="truetype"
+
+RDEPEND="truetype? ( x11-libs/libXft )
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	x11-proto/xextproto
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${PN}-1.34-fixed-font.patch"
+	  "${FILESDIR}/${P}-gentoo.diff" )
+
+pkg_setup() {
+	if use truetype ; then
+		export DEFINES=-DXFT
+		export EXTRA_INC=$(pkg-config --cflags xft)
+		export EXTRA_LIBS=$(pkg-config --libs xft)
+	fi
+	tc-export CC
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc CHANGELOG README TODO
+
+	exeinto /etc/X11/Sessions
+	cat <<- EOF > "${T}"/${PN}
+		#!/bin/sh
+		exec /usr/bin/${PN}
+	EOF
+	doexe "${T}"/${PN}
+}
+
+pkg_postinst() {
+	elog "${PN}'s menu config file has been changed from"
+	elog "/etc/X11/${PN}/menurc to /etc/X11/${PN}/${PN}.menurc"
+}
diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest
new file mode 100644
index 000000000000..ed69604c7e7e
--- /dev/null
+++ b/x11-wm/windowmaker/Manifest
@@ -0,0 +1,11 @@
+AUX windowmaker-0.95.8-imagemagick7.patch 1340 SHA256 e89e8c7638f38296f1fc31d892672122a73ce89ce40c192bb404d852cca06692 SHA512 90316ffe66fe92f7db43afa504225bdb97ddb8ec8ff742f69760e4e233172e2b2f704449f014935f9851d6bd7ebe91cde97e5ae65dfb73284a21743a44b7492d WHIRLPOOL c014687fda2322dfa9ec29a0af1c499879da443cff191c23760174757b219bb95550bede6a9d4f7d1cf5d1f640b4bea3c5f980a25627ac88fffa5f1d04edf706
+AUX wmaker.desktop 206 SHA256 b17a028d32c5b174ce5a64624b26f0830db4fec3bdc0b03c5c0870b936683f43 SHA512 d1dc99aa29047434e1265c8f93ce366b7c026f27eec8a166904fda1ab4144e0d6142807ac09ba6cbcb86480257893e5553046a0ba1a8e1d6315f23dd8468482b WHIRLPOOL d2bd3bbf8f262cccd838a3dd53c0017b500507e8a2a8e2dbaea4fa060084db078f0f6eef0a971cfda6fc4015a65ce4afa61de1a53b9115730014f3497ba77c0d
+DIST WindowMaker-0.95.7.tar.gz 3238325 SHA256 842d486c4b212b19d10dbae2c315c6ff20c6e651471eaa45214b3b832d8097a9 SHA512 9c1190503efdc58c11a90d5ba80796979cdc9f2beb69a6d233ffc8d531a54c877c5270841bf6318738069098cd488e5ab77ac19f661ac888e892bf05ac22d93f WHIRLPOOL 090efc24fe47487b5f9ec68e821b0fea789ac4f7badccf639a5910f463613381701c6750db29f98e6777207387850e0c47324ffc8fcc1d1b4fe60ac05c05c25d
+DIST WindowMaker-0.95.8.tar.gz 3253515 SHA256 9dbf5c5571bb79c4b1584f496c960ee2cd7379af45ef0f58b4b0f487259de88a SHA512 6ab16ed4304aba20f0f3a4083adf63a47fa674ade7bc39aaa8aa6466c7842e3f10ab73af96e2afce0842b11c57a35eb69f43183a4044d8cd95d4e2a4d2c079a2 WHIRLPOOL e5027c70637b0a9204b9e71054a0351389fcb5c2773c8dbc1e7c15285a6e6caeaf6c04456b6d5fa7f4510abe0da4872db8a8bd870b78ef6369aaf9e81197b553
+DIST WindowMaker-extra-0.1.tar.gz 238018 SHA256 acd6e1fb790485b107daf2b710da372367b41383c55d9c8bdfdac521d850edc4 SHA512 0fe9b3ffc093942db167d8a01e15c0f6741f3a40959d1434ea4f23e7b9d4a9c13935a61eabef9691e5fdfd4e407564caafce15c2d65d66499960a6764a874ab8 WHIRLPOOL f2c61b318f64a2debb727ae79dfa1bb8101888bc9492633a96ace0e704c731c383e92882c871622987d5971b919359c066638fba05c5dade330fe3bee21bb034
+EBUILD windowmaker-0.95.7.ebuild 2929 SHA256 889f9a13e94aa0bcd13f226e8b4e57f85ff861ea806003e6d7a156320da9eed3 SHA512 0c58d269520c26045f1d64957de83c4890a7c4e150afdf47fdd55c5d279e6616e7f1af76bf2cb5d01568b3eaca553058c00a32ed4b245ec68dc59074363d277a WHIRLPOOL 1b51c707d533c16ac15909524792c5239f97ab5cef21bcb1ec5d1ab9c934945a7de35fc565cb8a3e477c3984728989496e7d217b63cf8b08aed97745ae72523b
+EBUILD windowmaker-0.95.8-r1.ebuild 3080 SHA256 b49ff413d8e0fb6986d091e913977bb5468984734dc5e12a3fcc6cf131687884 SHA512 b1ed148a86f090344d350d3977f531bd9e6c25ea54ea822443c8ea67e498f3d117a6211f2508ef9d7610c54303f888f2b96c03ec9b3faaf89dd5f212e587029c WHIRLPOOL d9621cca7f8291e005dda6c873c2cde5725efd551ddda69b25a73bb83a849bf37374e9c70829757d04cecf87c7fb155d76a68fabbfb6d13acc0b22dcb9605646
+EBUILD windowmaker-9999.ebuild 2956 SHA256 cc1356a1a366eb50d476b8be5238dccbebb5bb67425480138bc96ce1a2bf374e SHA512 f4f33e43b2bff957a446586e650c3a0f0c86cfbb288295fe80304928404635ad83a9ab354143589081324c621bb78d864136f0fbfdc4e2d0b068f637fc03bc4d WHIRLPOOL 77e8a8e1d0bf63dfca39dc99a7bf401c719250ce530533bf920870371a9e7f8c01a39f4d55ed0c45a50a910335bb3a8c367ffc9b123c221550e859d78155d3d4
+MISC ChangeLog 5378 SHA256 c9f4c812de27e8a6d2a79236e6ae967e65fbb321857952f044719f3a2907496c SHA512 956d02d33760651a9ec243b9ecc57f6e47c7b99faee8f99ae207ea69d4c0fde14a4be93ef9d2231658c327fbdef2506e2c4085db8d432af3b028eecee8df6519 WHIRLPOOL c5a17b433eae7cb28223e378b42efcfd57de2e687fcc07d653d0e666932a863cd69d11ff9279d6660d1d87c84c06e6be7b494fe071ae117d9054dc0b912812e2
+MISC ChangeLog-2015 31426 SHA256 3f942a72f46f131057a9bfe724fddb31fa0d3ef15c3eb5869e0954c47caf82ad SHA512 0518ce5b4a5444348b4238dfa5824908ef88b7156c7678461dd82b6b333611c31fa7f84a6ef8a38324f4cc16782e10651a7b615c4a6fb97f3bf14a7a6626723a WHIRLPOOL 0a1b0829855c38f889434e81825ce8b64aa3fe6fb0e134cf7ca47fee3e8b227ddd7b9002ab5ff4d797daf85bc6eb0d0d5a8677cb39ec934d9198ff658f088fb7
+MISC metadata.xml 587 SHA256 e40f034d6eff1ba0867ee794555c2ed475ae6d816f2f64586fec58763cd046c9 SHA512 6c84dc7cc81239d8acee4b155f91855a945b532e20c5c5d6a51fb1c85e2150f2b8013203112b9f87f8e72b888175b3e16885fb5ff81a5ada414ce2e556957981 WHIRLPOOL 1a42982554a5857e67dd82295059cc6a0d938c5e7400bee8645518812d39622e601f4f1aff963cc46327b80eb83ddb084c14e64b87ac9636b428aa1f774cdc2a
diff --git a/x11-wm/windowmaker/files/windowmaker-0.95.8-imagemagick7.patch b/x11-wm/windowmaker/files/windowmaker-0.95.8-imagemagick7.patch
new file mode 100644
index 000000000000..b4cccab5a71e
--- /dev/null
+++ b/x11-wm/windowmaker/files/windowmaker-0.95.8-imagemagick7.patch
@@ -0,0 +1,35 @@
+imagemagick 7.0 now uses MagickWand/
+---
+ m4/wm_imgfmt_check.m4 | 2 +-
+ wrlib/load_magick.c   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/m4/wm_imgfmt_check.m4 b/m4/wm_imgfmt_check.m4
+index 5dd9ec7f..14e52bb3 100644
+--- a/m4/wm_imgfmt_check.m4
++++ b/m4/wm_imgfmt_check.m4
+@@ -312,7 +312,7 @@ AS_IF([test "x$enable_magick" = "xno"],
+               dnl
+               dnl The library was found, check if header is available and compiles
+               wm_save_CFLAGS="$CFLAGS"
+-              AS_IF([wm_fn_lib_try_compile "wand/magick_wand.h" "MagickWand *wand;" "wand = NewMagickWand()" "$wm_cv_libchk_magick_cflags"],
++              AS_IF([wm_fn_lib_try_compile "MagickWand/MagickWand.h" "MagickWand *wand;" "wand = NewMagickWand()" "$wm_cv_libchk_magick_cflags"],
+                   [wm_cv_libchk_magick="$wm_cv_libchk_magick_cflags % $wm_cv_libchk_magick_libs"],
+                   [AC_MSG_ERROR([found MagickWand library but could not compile its header])])
+               CFLAGS="$wm_save_CFLAGS"])dnl
+diff --git a/wrlib/load_magick.c b/wrlib/load_magick.c
+index 3e809ba2..1edbebc3 100644
+--- a/wrlib/load_magick.c
++++ b/wrlib/load_magick.c
+@@ -22,7 +22,7 @@
+ 
+ #include "config.h"
+ 
+-#include <wand/MagickWand.h>
++#include <MagickWand/MagickWand.h>
+ 
+ #include "wraster.h"
+ #include "imgformat.h"
+-- 
+2.13.0
+
diff --git a/x11-wm/windowmaker/files/wmaker.desktop b/x11-wm/windowmaker/files/wmaker.desktop
new file mode 100644
index 000000000000..fd24a0b00e0c
--- /dev/null
+++ b/x11-wm/windowmaker/files/wmaker.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+# The names/descriptions should really be better
+Name=GNUStep WindowMaker
+Comment=Use this session to run WindowMaker as your desktop environment
+Exec=/usr/bin/wmaker
+Icon=
+Type=Application
diff --git a/x11-wm/windowmaker/metadata.xml b/x11-wm/windowmaker/metadata.xml
new file mode 100644
index 000000000000..1cc63f50be9a
--- /dev/null
+++ b/x11-wm/windowmaker/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnustep@gentoo.org</email>
+		<name>Gentoo GNUstep Project</name>
+	</maintainer>
+	<use>
+		<flag name="modelock">Enable XKB language status lock support. README
+			says: "If you don't know what it is you probably don't need
+			it."</flag>
+		<flag name="xrandr">Enable XRandR window extension support</flag>
+		<flag name="webp">Enables WebP image format support using <pkg>media-libs/libwebp</pkg></flag>
+	</use>
+</pkgmetadata>
diff --git a/x11-wm/windowmaker/windowmaker-0.95.7.ebuild b/x11-wm/windowmaker/windowmaker-0.95.7.ebuild
new file mode 100644
index 000000000000..0fa2c0fdf2b3
--- /dev/null
+++ b/x11-wm/windowmaker/windowmaker-0.95.7.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="The fast and light GNUstep window manager"
+HOMEPAGE="http://www.windowmaker.org/"
+SRC_URI=" http://windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.gz
+	http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="gif imagemagick jpeg modelock nls png tiff webp xinerama +xpm xrandr"
+KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="media-libs/fontconfig
+	>=x11-libs/libXft-2.1.0
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	x11-libs/libXv
+	gif? ( >=media-libs/giflib-4.1.0-r3 )
+	imagemagick? ( media-gfx/imagemagick )
+	jpeg? ( virtual/jpeg:0= )
+	png? ( media-libs/libpng:0= )
+	tiff? ( media-libs/tiff:0 )
+	webp? ( media-libs/libwebp )
+	xinerama? ( x11-libs/libXinerama )
+	xrandr? ( x11-libs/libXrandr )"
+RDEPEND="${DEPEND}
+	nls? ( >=sys-devel/gettext-0.10.39 )"
+
+S=${WORKDIR}/${P/windowm/WindowM}
+
+src_prepare() {
+	# Fix some paths
+	for file in WindowMaker/*menu* util/wmgenmenu.c; do
+		if [[ -r $file ]] ; then
+			sed -i -e "s:/usr/local/GNUstep/Applications/WPrefs.app:${EPREFIX}/usr/bin/:g;" "$file" || die
+			sed -i -e "s:/usr/local/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die
+			sed -i -e "s:/opt/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die
+		fi;
+	done;
+}
+
+src_configure() {
+	local myconf
+
+	# image format types
+	myconf="$(use_enable imagemagick magick) $(use_enable jpeg) $(use_enable gif) $(use_enable png) $(use_enable tiff) $(use_enable webp) $(use_enable xpm)"
+
+	# non required X capabilities
+	myconf="${myconf} $(use_enable modelock) $(use_enable xrandr randr) $(use_enable xinerama)"
+
+	if use nls; then
+		[[ -z $LINGUAS ]] && export LINGUAS="$(ls po/*.po | sed 's:po/\(.*\)\.po$:\1:' | xargs)"
+	else
+		myconf="${myconf} --disable-locale"
+	fi
+
+	# default settings with $myconf appended
+	econf \
+		--sysconfdir="${EPREFIX}"/etc/X11 \
+		--with-x \
+		--enable-usermenu \
+		--with-pixmapdir="${EPREFIX}"/usr/share/pixmaps \
+		--localedir="${EPREFIX}"/usr/share/locale \
+		${myconf}
+
+	cd ../WindowMaker-extra-0.1
+	econf
+}
+
+src_compile() {
+	emake
+
+	# WindowMaker Extra Package (themes and icons)
+	cd ../WindowMaker-extra-0.1
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS BUGFORM BUGS ChangeLog INSTALL* FAQ* \
+		  README* NEWS TODO
+
+	# WindowMaker Extra
+	cd ../WindowMaker-extra-0.1
+	emake DESTDIR="${D}" install
+
+	newdoc README README.extra
+
+	# create wmaker session shell script
+	echo "#!/usr/bin/env bash" > wmaker
+	echo "${EPREFIX}/usr/bin/wmaker" >> wmaker
+	exeinto /etc/X11/Sessions/
+	doexe wmaker
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/wmaker.desktop
+	make_desktop_entry /usr/bin/wmaker
+}
diff --git a/x11-wm/windowmaker/windowmaker-0.95.8-r1.ebuild b/x11-wm/windowmaker/windowmaker-0.95.8-r1.ebuild
new file mode 100644
index 000000000000..c644be13c9ad
--- /dev/null
+++ b/x11-wm/windowmaker/windowmaker-0.95.8-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils
+
+DESCRIPTION="The fast and light GNUstep window manager"
+HOMEPAGE="http://www.windowmaker.org/"
+SRC_URI=" http://windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.gz
+	http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="gif imagemagick jpeg modelock nls png tiff webp xinerama +xpm xrandr"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="media-libs/fontconfig
+	>=x11-libs/libXft-2.1.0
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	x11-libs/libXv
+	gif? ( >=media-libs/giflib-4.1.0-r3 )
+	imagemagick? ( media-gfx/imagemagick:0= )
+	jpeg? ( virtual/jpeg:0= )
+	png? ( media-libs/libpng:0= )
+	tiff? ( media-libs/tiff:0 )
+	webp? ( media-libs/libwebp )
+	xinerama? ( x11-libs/libXinerama )
+	xrandr? ( x11-libs/libXrandr )"
+RDEPEND="${DEPEND}
+	nls? ( >=sys-devel/gettext-0.10.39 )"
+
+S=${WORKDIR}/${P/windowm/WindowM}
+
+src_prepare() {
+	# Fix some paths
+	for file in WindowMaker/*menu* util/wmgenmenu.c; do
+		if [[ -r $file ]] ; then
+			sed -i -e "s:/usr/local/GNUstep/Applications/WPrefs.app:${EPREFIX}/usr/bin/:g;" "$file" || die
+			sed -i -e "s:/usr/local/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die
+			sed -i -e "s:/opt/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die
+		fi;
+	done;
+
+	if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then
+		eapply "${FILESDIR}/${P}-imagemagick7.patch"
+	fi
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# image format types
+	myconf="$(use_enable imagemagick magick) $(use_enable jpeg) $(use_enable gif) $(use_enable png) $(use_enable tiff) $(use_enable webp) $(use_enable xpm)"
+
+	# non required X capabilities
+	myconf="${myconf} $(use_enable modelock) $(use_enable xrandr randr) $(use_enable xinerama)"
+
+	if use nls; then
+		[[ -z $LINGUAS ]] && export LINGUAS="$(ls po/*.po | sed 's:po/\(.*\)\.po$:\1:' | xargs)"
+	else
+		myconf="${myconf} --disable-locale"
+	fi
+
+	# default settings with $myconf appended
+	econf \
+		--sysconfdir="${EPREFIX}"/etc/X11 \
+		--with-x \
+		--enable-usermenu \
+		--with-pixmapdir="${EPREFIX}"/usr/share/pixmaps \
+		--localedir="${EPREFIX}"/usr/share/locale \
+		${myconf}
+
+	cd ../WindowMaker-extra-0.1
+	econf
+}
+
+src_compile() {
+	emake
+
+	# WindowMaker Extra Package (themes and icons)
+	cd ../WindowMaker-extra-0.1
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS BUGFORM BUGS ChangeLog INSTALL* FAQ* \
+		  README* NEWS TODO
+
+	# WindowMaker Extra
+	cd ../WindowMaker-extra-0.1
+	emake DESTDIR="${D}" install
+
+	newdoc README README.extra
+
+	# create wmaker session shell script
+	echo "#!/usr/bin/env bash" > wmaker
+	echo "${EPREFIX}/usr/bin/wmaker" >> wmaker
+	exeinto /etc/X11/Sessions/
+	doexe wmaker
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/wmaker.desktop
+	make_desktop_entry /usr/bin/wmaker
+}
diff --git a/x11-wm/windowmaker/windowmaker-9999.ebuild b/x11-wm/windowmaker/windowmaker-9999.ebuild
new file mode 100644
index 000000000000..5378b5e3d343
--- /dev/null
+++ b/x11-wm/windowmaker/windowmaker-9999.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils git-r3
+
+DESCRIPTION="The fast and light GNUstep window manager"
+HOMEPAGE="http://www.windowmaker.org/"
+SRC_URI="http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz"
+EGIT_REPO_URI="git://repo.or.cz/wmaker-crm.git"
+EGIT_BRANCH="next"
+
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="gif imagemagick jpeg modelock nls png tiff webp xinerama +xpm xrandr"
+KEYWORDS=""
+
+DEPEND="media-libs/fontconfig
+	>=x11-libs/libXft-2.1.0
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	x11-libs/libXv
+	gif? ( >=media-libs/giflib-4.1.0-r3 )
+	imagemagick? ( media-gfx/imagemagick:0= )
+	jpeg? ( virtual/jpeg:0= )
+	png? ( media-libs/libpng:0= )
+	tiff? ( media-libs/tiff:0 )
+	webp? ( media-libs/libwebp )
+	xinerama? ( x11-libs/libXinerama )
+	xrandr? ( x11-libs/libXrandr )"
+RDEPEND="${DEPEND}
+	nls? ( >=sys-devel/gettext-0.10.39 )"
+
+src_unpack() {
+	# wm-extras
+	unpack ${A}
+
+	git-r3_src_unpack
+}
+
+src_prepare() {
+	# Fix some paths
+	for file in WindowMaker/*menu* util/wmgenmenu.c; do
+		if [[ -r $file ]] ; then
+			sed -i -e "s:/usr/local/GNUstep/Applications/WPrefs.app:${EPREFIX}/usr/bin/:g;" "$file" || die
+			sed -i -e "s:/usr/local/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die
+			sed -i -e "s:/opt/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die
+		fi;
+	done;
+
+	if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then
+		eapply "${FILESDIR}/${PN}-0.95.8-imagemagick7.patch"
+	fi
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# image format types
+	myconf="$(use_enable imagemagick magick) $(use_enable jpeg) $(use_enable gif) $(use_enable png) $(use_enable tiff) $(use_enable webp) $(use_enable xpm)"
+
+	# non required X capabilities
+	myconf="${myconf} $(use_enable modelock) $(use_enable xrandr randr) $(use_enable xinerama)"
+
+	if use nls; then
+		[[ -z $LINGUAS ]] && export LINGUAS="$(ls po/*.po | sed 's:po/\(.*\)\.po$:\1:' | xargs)"
+	else
+		myconf="${myconf} --disable-locale"
+	fi
+
+	# default settings with $myconf appended
+	econf \
+		--sysconfdir="${EPREFIX}"/etc/X11 \
+		--with-x \
+		--enable-usermenu \
+		--with-pixmapdir="${EPREFIX}"/usr/share/pixmaps \
+		--localedir="${EPREFIX}"/usr/share/locale \
+		${myconf}
+
+	cd ../WindowMaker-extra-0.1
+	econf
+}
+
+src_compile() {
+	emake
+
+	# WindowMaker Extra Package (themes and icons)
+	cd ../WindowMaker-extra-0.1
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS BUGFORM BUGS ChangeLog INSTALL* FAQ* \
+		  README* NEWS TODO
+
+	# WindowMaker Extra
+	cd ../WindowMaker-extra-0.1
+	emake DESTDIR="${D}" install
+
+	newdoc README README.extra
+
+	# create wmaker session shell script
+	echo "#!/usr/bin/env bash" > wmaker
+	echo "${EPREFIX}/usr/bin/wmaker" >> wmaker
+	exeinto /etc/X11/Sessions/
+	doexe wmaker
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/wmaker.desktop
+	make_desktop_entry /usr/bin/wmaker
+}
diff --git a/x11-wm/wm2/Manifest b/x11-wm/wm2/Manifest
new file mode 100644
index 000000000000..29e0ee64ec65
--- /dev/null
+++ b/x11-wm/wm2/Manifest
@@ -0,0 +1,6 @@
+AUX wm2-4-gentoo.patch 4265 SHA256 32d592a74f7f4f0f4f255eb2e735f2804278bea76e54e08da82a579463586875 SHA512 f3772d107c29e4c3a3f14459e80e130122d9be9cf7a1edcff507d1ed53efa67c42e9ba63ea08d1d846bc864507f48231a2c9e903bf9d46b085a75a478efa87df WHIRLPOOL 324af727ad71f1c4964cd30a8ff6855aa5c09f3849d5524bc855cacec1005080d80a2490b0be49d4379d249e28524add252049bd62628be3b03e3464b62444b8
+DIST wm2-4.tar.gz 32807 SHA256 a6c3352390f958c5033408ce73e1abd9677372a7c8c5949e39a62fda433b054d SHA512 9151267e5a6bf39587b15dc3e55b4acc05aa1b14a7a9bcb4e1ed25d474af8b0e7699343117f184c745645deb404d6f6e230809b88d9b7bb5c1f67ba0fbde72e9 WHIRLPOOL a2b8e77969fd21176db97d75be0b7e0136075b62d1f838fa08a774b7be0c28a781f5baace77518ee1a6a53167c8e0aa90c4f159dd3c2ad847d536bf78429591d
+EBUILD wm2-4-r1.ebuild 1387 SHA256 5da5e4539d80ba2bddd2ab0456dea88c4778fda00cf8fc576d5fe1df0fb59c3d SHA512 c1a4b09618177932826ac0d135eed89fbfa4bd97c7c1df22c1aca80235d7fe7c5349f844c4ab889901459b34c181a15f8cfe437bf77c157ce04fc4c11a98f7df WHIRLPOOL 343f1da33b61766020d2ae8dac471ac175763a80c9fbff37dccee666a741a225a9fd7e78295b3d2d42d7d74bc8f5e58cd6c61c2da644a1f7398897de1e83fc15
+MISC ChangeLog 2533 SHA256 1ab88259ff765dc05649c817f7427a7c8b6de79d471da51f11e0fe9ba66037ed SHA512 015c66ead49966aa804d8d77bfffa0e4636475b1521290da377a1e008f41143a50a5c6d99e2531674a94badd9b20c6203db552ce7ba72dd246164f796ac2ad89 WHIRLPOOL 2ff1cd3f2a8b3c67441b20445f30f909166a1757d16fc7572930cf52ce1d47b919f4875ed05ae9c295ddad680e24db5e97dd2a5427209e6637179f2ba46fb953
+MISC ChangeLog-2015 2016 SHA256 c564c1ed36b5bbd6fbdccc94817a65c1ddde85f367365b8139cc2922fa2dfe8e SHA512 03e93687ff48c5b0f938a42df500b5714ba3a404011046d1cb72f047cc42a47294819a27c78781b656b35229df757604721a5372469b50f51de3ed816377b667 WHIRLPOOL 0e16bbbbe859a50bf238c312081f3cf59ba7d41bdc0bce0027118828b998b7c855bfcbabc96be97fc5899dbe3a12fb008f679534d34aa15c588b87547cad277a
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/x11-wm/wm2/files/wm2-4-gentoo.patch b/x11-wm/wm2/files/wm2-4-gentoo.patch
new file mode 100644
index 000000000000..88c78080c542
--- /dev/null
+++ b/x11-wm/wm2/files/wm2-4-gentoo.patch
@@ -0,0 +1,146 @@
+diff -ur wm2-4/Border.C wm2-4.new/Border.C
+--- wm2-4/Border.C	1997-03-21 12:12:30.000000000 +0100
++++ wm2-4.new/Border.C	2007-06-30 16:56:10.000000000 +0200
+@@ -183,7 +183,7 @@
+ 
+     if (m_label) free(m_label);
+     m_label = m_client->iconName() ?
+-	NewString(m_client->iconName()) : NewString("incognito");
++	NewString(m_client->iconName()) : NewString(CONFIG_INCOGNITO);
+ 
+     int len = strlen(m_label);
+     m_tabHeight = XRotTextWidth(m_tabFont, m_label, len) + 6 + m_tabWidth;
+diff -ur wm2-4/Buttons.C wm2-4.new/Buttons.C
+--- wm2-4/Buttons.C	1997-03-21 12:12:30.000000000 +0100
++++ wm2-4.new/Buttons.C	2007-06-30 16:56:10.000000000 +0200
+@@ -139,7 +139,11 @@
+ 		       (allowExit && ((n) > clients.count())) ? "[Exit wm2]" \
+ 		       : clients.item((n)-1)->label())
+ 
++#ifdef CONFIG_MENU_REVERSE
++    for (i = m_hiddenClients.count() - 1; i>=0; --i) {
++#else
+     for (i = 0; i < m_hiddenClients.count(); ++i) {
++#endif
+ 	clients.append(m_hiddenClients.item(i));
+     }
+     int nh = clients.count() + 1;
+diff -ur wm2-4/Client.C wm2-4.new/Client.C
+--- wm2-4/Client.C	1997-03-21 12:12:30.000000000 +0100
++++ wm2-4.new/Client.C	2007-06-30 16:56:10.000000000 +0200
+@@ -4,7 +4,7 @@
+ 
+ #include <X11/Xutil.h>
+ 
+-const char *const Client::m_defaultLabel = "incognito";
++const char *const Client::m_defaultLabel = CONFIG_INCOGNITO;
+ 
+ 
+ 
+@@ -400,7 +400,7 @@
+ }
+ 
+ 
+-int Client::getAtomProperty(Atom a, Atom type)
++uintptr_t Client::getAtomProperty(Atom a, Atom type)
+ {
+     char **p, *x;
+     if (getProperty_aux(display(), m_window, a, type, 1L,
+@@ -410,7 +410,7 @@
+ 
+     x = *p;
+     XFree((void *)p);
+-    return (int)x;
++    return (uintptr_t)x;
+ }
+ 
+ 
+diff -ur wm2-4/Client.h wm2-4.new/Client.h
+--- wm2-4/Client.h	1997-03-21 12:12:30.000000000 +0100
++++ wm2-4.new/Client.h	2007-06-30 16:56:10.000000000 +0200
+@@ -2,6 +2,8 @@
+ #ifndef _CLIENT_H_
+ #define _CLIENT_H_
+ 
++#include <inttypes.h>
++
+ #include "General.h"
+ #include "Manager.h"
+ #include "Border.h"
+@@ -125,7 +127,7 @@
+     WindowManager *const m_windowManager;
+ 
+     char *getProperty(Atom);
+-    int getAtomProperty(Atom, Atom);
++    uintptr_t getAtomProperty(Atom, Atom);
+     int getIntegerProperty(Atom);
+ 
+     // accessors 
+diff -ur wm2-4/Config.h wm2-4.new/Config.h
+--- wm2-4/Config.h	1997-03-21 12:12:30.000000000 +0100
++++ wm2-4.new/Config.h	2007-06-30 16:56:10.000000000 +0200
+@@ -39,6 +39,9 @@
+ 
+ #define CONFIG_FRAME_THICKNESS    7
+ 
++#define CONFIG_INCOGNITO	  "incognito"
++#define CONFIG_MENU_REVERSE
++
+ // If CONFIG_PROD_SHAPE is True, all frame element shapes will be
+ // recalculated afresh every time their focus changes.  This will
+ // probably slow things down hideously, but has been reported as
+@@ -46,4 +49,3 @@
+ #define CONFIG_PROD_SHAPE False
+ 
+ #endif
+-
+diff -ur wm2-4/General.h wm2-4.new/General.h
+--- wm2-4/General.h	1997-03-21 12:12:30.000000000 +0100
++++ wm2-4.new/General.h	2007-06-30 16:56:10.000000000 +0200
+@@ -32,7 +32,7 @@
+ #define NewString(x) (strcpy((char *)malloc(strlen(x)+1),(x)))
+ 
+ #ifndef SIGNAL_CALLBACK_TYPE
+-#define SIGNAL_CALLBACK_TYPE (void (*)(...))
++#define SIGNAL_CALLBACK_TYPE (void (*)(int))
+ #endif
+ 
+ #define signal(x,y)     \
+diff -ur wm2-4/Makefile wm2-4.new/Makefile
+--- wm2-4/Makefile	1997-03-21 12:12:30.000000000 +0100
++++ wm2-4.new/Makefile	2007-06-30 16:56:10.000000000 +0200
+@@ -1,8 +1,8 @@
+ 
+-LIBS	=  -L/usr/X11/lib -lXext -lX11 -lXmu -lm
++LIBS	=  -L/usr/X11R6/lib -lXext -lX11 -lXmu -lm
+ 
+ CC	= gcc
+-CCC	= gcc
++CCC	= g++
+ CFLAGS	= -O2
+ OBJECTS	= Border.o Buttons.o Client.o Events.o Main.o Manager.o Rotated.o
+ 
+diff -ur wm2-4/Manager.C wm2-4.new/Manager.C
+--- wm2-4/Manager.C	1997-03-21 12:12:30.000000000 +0100
++++ wm2-4.new/Manager.C	2007-06-30 16:56:10.000000000 +0200
+@@ -368,7 +368,7 @@
+     return m_currentTime;
+ }
+ 
+-void WindowManager::sigHandler()
++void WindowManager::sigHandler(int n)
+ {
+     m_signalled = True;
+ }
+diff -ur wm2-4/Manager.h wm2-4.new/Manager.h
+--- wm2-4/Manager.h	1997-03-21 12:12:30.000000000 +0100
++++ wm2-4.new/Manager.h	2007-06-30 16:56:10.000000000 +0200
+@@ -85,7 +85,7 @@
+ 
+     static Boolean m_initialising;
+     static int errorHandler(Display *, XErrorEvent *);
+-    static void sigHandler();
++    static void sigHandler(int);
+     static int m_signalled;
+ 
+     void initialiseScreen();
diff --git a/x11-wm/wm2/metadata.xml b/x11-wm/wm2/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/x11-wm/wm2/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/x11-wm/wm2/wm2-4-r1.ebuild b/x11-wm/wm2/wm2-4-r1.ebuild
new file mode 100644
index 000000000000..1d023d08d20a
--- /dev/null
+++ b/x11-wm/wm2/wm2-4-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Small, unconfigurable window manager"
+HOMEPAGE="http://www.all-day-breakfast.com/wm2/"
+SRC_URI="http://www.all-day-breakfast.com/wm2/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="freedist"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXmu"
+DEPEND="${RDEPEND}
+	x11-proto/xextproto"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	sed -e "s/CFLAGS/CXXFLAGS/" \
+		-e "s/\$(CCC) -o/\$(CCC) \$(LDFLAGS) -o/" \
+		-i Makefile || die #334681
+
+	sed 's/^#//' Config.h > wm2.conf
+	if [ -e "/etc/wm2.conf" ]; then
+		echo "#undef _CONFIG_H_" >> Config.h
+		awk '/^[^/]/{print "#" $0}' /etc/wm2.conf >> Config.h
+	fi
+}
+
+src_compile() {
+	emake \
+		CXXFLAGS="${CXXFLAGS}" \
+		CCC="$(tc-getCXX)" \
+		LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin wm2
+	insinto /etc
+	doins wm2.conf
+	dodoc README
+}
+
+pkg_postinst() {
+	echo
+	elog "wm2 is unconfigurable after you have installed. If you want to"
+	elog "change settings of wm2, please have a look at /etc/wm2.conf"
+	elog "and rewrite it, then emerge wm2 again (wm2 ebuild uses settings"
+	elog "from that file automatically). If you think wm2 lacks some important"
+	elog "features that you want to use (such as background pixmaps),"
+	elog "consider using wmx, written by the same author."
+	echo
+}
diff --git a/x11-wm/wmfs/Manifest b/x11-wm/wmfs/Manifest
new file mode 100644
index 000000000000..2c5a3b0f6046
--- /dev/null
+++ b/x11-wm/wmfs/Manifest
@@ -0,0 +1,9 @@
+AUX wmfs-201003-desktop.patch 167 SHA256 6db157734f97877ed2fd749cb8742d3a1dee8367aa2318b90cb0efe8aaab95d1 SHA512 20d885f3496d039794f5f94df73936aeafd93e658fff8843af63b433773ec05dde369bdfae43329302614233f1e6a6b453929bcca2660c451d4b33b3a8451717 WHIRLPOOL 4bb252fd1025b67fc70d32ec992db6a625d02ce5c22f7fbc35032cd771a573754d1db0c44fa26f83351def2d8f1d3cc6c4e0ffd7d07e0dc268e0afbcbc587209
+AUX wmfs-201003-pthread.patch 191 SHA256 881c03c45b064ff556eb65fe2a2f6bd600acdf20da50cad68a7dfe90678bcbde SHA512 871a6558fc3201c2652e1a84d221d7d2bd90150f4e1afb8b4a7e6862797e47d012f832ecf0b1c205ad07942aa9b0cd3807a9c839cc6304ce3fae3746065493fc WHIRLPOOL 83b617e82f64ec6dd6c9a579615902380015115dd409b79ad7ffae2498fb5bf62d5fa4c62e730958cfdc34a0a99bf47d6ae06945fbb78fa8e73c3f87403c0e92
+AUX wmfs-99999999-desktop.patch 153 SHA256 3f43eaf4604632aeb23882b66ac795f4e10ba4e055c447b755c11ec74ccb51fa SHA512 5463fe8bbf312a003e48276fd15e6ad04075d28835f18e61260038278e31f4de4a2a7e38ad7358a12d669af973e2297d121adc0f5a2f07077874327e20362711 WHIRLPOOL 357f4091c0d23c0ca96f624be84a8f1fd45b26fa012b0fdd3d77eb51dd27c4fa4d3ce8fc83b6a38e8551935bbca78bef7e8da7261e76ad851a5d2479d4d6f665
+DIST wmfs-201003.tar.gz 59593 SHA256 d341c15a62998e0c9062168887232e1b5adcdc2092b74a7b825d416660777c4d SHA512 117a238d6a8d8d147291ec9fb4e0aaf2bf8bab8ea794cf00deeaeaac1df15f0122bc705cb1bff54abe80d7228a19e67a79e4b3e0de0ced82abaf98fab3778a90 WHIRLPOOL 908d96994501894099a16996260e77223a7c701ea5bd165046a79144c6db2fdce3d7e0ecbad21e55017c30857588e90e077d64d1a481c7ee37b2ba04ce0a1efb
+EBUILD wmfs-201003.ebuild 834 SHA256 1cb2e8bd2aa8f1990ddb68a3020f271a671d5c14803fc1836fda374ea58c47cc SHA512 db253b30cfc1d4989b33950d152b52401a78fdf026a0a13b25429d3c11cf9f79d6611cd802bca01f084ab2551585c31e832981c65bb6f979dccdb12e55be42ce WHIRLPOOL e5910586713c03de4c5e817c29c217575cc125eef470d41380100f4a8273a3a6eaf12d53bb6888b4a452b47d6a97e07e070083cdecd1cd0c6115c20a03e7ced1
+EBUILD wmfs-99999999.ebuild 1087 SHA256 2f7b1db0178e641e9fe5bf1d798f0b96db40c583f07faf4b3244575c4c9b5f43 SHA512 a725a3c3fe3c5249c18ede2116749aa79ebc66940fc9d449bb10e7e89f0ccf8103f11377c8027496ca7e9175bead7ee6f28253bed15a78ab52d1d3d4f9f06c65 WHIRLPOOL c5c7d18b77677d6508b8d00516cfe8992ba7279e3bbd6a223feee8bf216b0b23190a73eea1cbe015eeb654c578cebe6fc8d0440fd7e4ed116db9114b2f893653
+MISC ChangeLog 2720 SHA256 019a079ef54e36ff93576c27612366d3845e0eb57690e1ddcc365979d7187a75 SHA512 2858e26ece3b8f450d5e6a53e6f5d041e1f514020c95cfaceffbd48ae8a00bea9eeefd27fa21b7b83655309f951253f5dc55c7882f82418ce3b2fd58cd21f91d WHIRLPOOL 127e77c69ebc8f66deecde6f1460736daa16106f98cace824c0f1ab44c8ed78da22f571998de0de12050c73ae4af1c65e41868f141c31af283857c571f671cb2
+MISC ChangeLog-2015 823 SHA256 1448183b35bc1cefc496d4a364fbaeceeb140e5f2293f0f9e0ad77a8503cfd11 SHA512 434f49e486f933c60fee9f802f2c11ec7d8730aee2d7e5887dccf4a2aa64dd2fba07aaf88c94aa7d8c8d1e2da622e54443914926438841d3f52e8e87b81947c2 WHIRLPOOL 0d9efb361df1da79ef378059ae0da7ec2a5aa7fdb4d73f5bacee853bbf850deb518ea041813386864b229920a8b7f7e14f8e1638250af634e937845d0cf76739
+MISC metadata.xml 380 SHA256 62d20dda6d1dcf8be9319e2fcf92a6a89598a8ffa42f000520e3fa85af7d6cde SHA512 644e88ac0ca2d999cd273f807d45400a8438a9800b3b744f764c914fa41d819efd55ecaa27de6cbcf4403491f2986299fc1c032afd26fee67822cfc2c6368359 WHIRLPOOL 02fec4a85fd75abce97b3ab69215f1d4b64f5b8c5e0ac0d4140262a7fd5c5598d91dce4f3671a11561b65ca5fc25e93bfcd1aad1ca1083b2ba303746e4e678b1
diff --git a/x11-wm/wmfs/files/wmfs-201003-desktop.patch b/x11-wm/wmfs/files/wmfs-201003-desktop.patch
new file mode 100644
index 000000000000..91edac6d88be
--- /dev/null
+++ b/x11-wm/wmfs/files/wmfs-201003-desktop.patch
@@ -0,0 +1,9 @@
+--- a/wmfs.desktop
++++ b/wmfs.desktop
+@@ -1,5 +1,4 @@
+-[Desktop Entry] 
+-Encoding=UTF-8
++[Desktop Entry]
+ Name=wmfs
+ Comment=Window manager from scratch
+ TryExec=wmfs
diff --git a/x11-wm/wmfs/files/wmfs-201003-pthread.patch b/x11-wm/wmfs/files/wmfs-201003-pthread.patch
new file mode 100644
index 000000000000..cbbf6343bdfb
--- /dev/null
+++ b/x11-wm/wmfs/files/wmfs-201003-pthread.patch
@@ -0,0 +1,12 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -94,7 +92,8 @@
+ set(LIBRARIES_TO_LINK
+   ${FREETYPE_LIBRARIES}
+   ${X11_LIBRARIES}
+-  Xft)
++  Xft
++  pthread)
+ 
+ # Includes
+ include(FindDoxygen)
diff --git a/x11-wm/wmfs/files/wmfs-99999999-desktop.patch b/x11-wm/wmfs/files/wmfs-99999999-desktop.patch
new file mode 100644
index 000000000000..5a1514407e43
--- /dev/null
+++ b/x11-wm/wmfs/files/wmfs-99999999-desktop.patch
@@ -0,0 +1,8 @@
+--- a/wmfs.desktop
++++ b/wmfs.desktop
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Type=Application
+ Name=wmfs
+ Comment=Window Manager From Scratch
diff --git a/x11-wm/wmfs/metadata.xml b/x11-wm/wmfs/metadata.xml
new file mode 100644
index 000000000000..5938d928ad74
--- /dev/null
+++ b/x11-wm/wmfs/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>jer@gentoo.org</email>
+</maintainer>
+<use>
+<flag name="imlib2">Enable image support through <pkg>media-libs/imlib2</pkg></flag>
+</use>
+<upstream>
+<remote-id type="github">xorg62/wmfs</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/x11-wm/wmfs/wmfs-201003.ebuild b/x11-wm/wmfs/wmfs-201003.ebuild
new file mode 100644
index 000000000000..a61c8a355683
--- /dev/null
+++ b/x11-wm/wmfs/wmfs-201003.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit cmake-utils eutils
+
+DESCRIPTION="Window Manager From Scratch, A tiling window manager highly configurable"
+HOMEPAGE="https://github.com/xorg62/wmfs"
+SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	media-libs/freetype
+	media-libs/imlib2[X]
+	x11-libs/libX11
+	x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-proto/randrproto
+	x11-proto/xineramaproto
+	x11-proto/xproto
+"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-201003-desktop.patch \
+		"${FILESDIR}"/${PN}-201003-pthread.patch
+}
+
+src_install() {
+	cmake-utils_src_install
+	rm -r "${D}"/usr/share/${PN}
+	dodoc README TODO rc/status.sh
+}
diff --git a/x11-wm/wmfs/wmfs-99999999.ebuild b/x11-wm/wmfs/wmfs-99999999.ebuild
new file mode 100644
index 000000000000..accc125060ba
--- /dev/null
+++ b/x11-wm/wmfs/wmfs-99999999.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils git-r3
+
+DESCRIPTION="Window Manager From Scratch, A tiling window manager highly configurable"
+HOMEPAGE="https://github.com/xorg62/wmfs"
+EGIT_REPO_URI="${HOMEPAGE}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+IUSE="+imlib2 +xinerama"
+
+RDEPEND="
+	media-libs/freetype
+	media-libs/imlib2[X]
+	x11-libs/libX11
+	x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-proto/randrproto
+	x11-proto/xineramaproto
+	x11-proto/xproto
+"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-99999999-desktop.patch
+
+	sed -i -e '/^which dpkg/s|.*|false|g' configure || die
+}
+
+src_configure() {
+	# not autotools based
+	local ECHO
+	for ECHO in echo ''; do
+		${ECHO} sh configure \
+			$(usex xinerama '' --without-xinerama) \
+			$(usex imlib2 '' --without-imlib2) \
+			--prefix /usr \
+			--man-prefix /usr/share/man \
+			--xdg-config-dir /etc/xdg \
+			|| die
+	done
+}
+
+src_install() {
+	default
+	rm -r "${D}"/usr/share/${PN}
+	dodoc README
+}
diff --git a/x11-wm/wmii/Manifest b/x11-wm/wmii/Manifest
new file mode 100644
index 000000000000..d73d9507c274
--- /dev/null
+++ b/x11-wm/wmii/Manifest
@@ -0,0 +1,6 @@
+AUX wmii.desktop 106 SHA256 977337c9ca19c25265df36372038486f5de38e4422eec0271a5d71dc0ebc003c SHA512 4c2ce08f692996c20f3f8d3d7884ac82644e8d1782b3895a0e75ecfe6c8ee9faf68a7621226d3cd9fb75cee0942d46cc55373dd74832508368a7c9760a18b143 WHIRLPOOL 0e8b78a8e903c8b19454c65a570072d77db69b2244a82be2a00856ce0a7f02c9aaa019736c5c37536513b595be4ca7c8762ded31b09b935b1b382d72aee343d6
+DIST wmii+ixp-3.9.2.tbz 432032 SHA256 0466f1a5c534b0ee9fdace2c7a2d251845b7ec0ae80bdb8e68ae6584ebeebf2b SHA512 c75d6d3f80e2b263c8d7b9eb6d0e700a1ad642209fc0984908e9399d22372c6c0572f47ab61881d5d56c4cc4eeb2914a545f6af1bbb936b65848764577d75761 WHIRLPOOL 241d72da4cc1d55772f04143a4696a12a013870d1aa63b622fa086a85b093a66d343dee2414d7f121ff13321bc0dfaf3bb60180c2f8ef58bd3357e12fcc64686
+EBUILD wmii-3.9.2-r5.ebuild 1636 SHA256 f3d0761703e9ffc5f7aa8267749a4bb8bd0c4bba8578db3a5fcd9bb03f271679 SHA512 90750df481374f973539e8a705241b4b516a911dae8f92f27668805363598b569d1eea8605a8d9e6a0407c33878d299af301d7881e42953fc8763caa98b99455 WHIRLPOOL 8160d55dfd6fe86f72c2a71d1b3bb8a61144e5155c0ea84e08a0de67df05abd87399222908c0a5a638555d40098f0a53ba43f6541693235fe1a16223ef91a586
+MISC ChangeLog 3088 SHA256 dfa4595c6eda2226451e9906f5dc8874c476d105c5fd179764c8393009a139c1 SHA512 efcfaf772abe5242b96e590f6f625d3cf05dab7e0ae225810f663844b92d1833ddfe86d33f4c5b83523fc0cc3186eeaa8b6da15cd371cbc1c1f0f28350740350 WHIRLPOOL a36f65a7016854c40f8f0e5b6cd695d3c5d503b3ae5d6f1127d7d98810252d03c6f586c7e3860f41352b28c2770c3e98cc339293de184e7eb1d7de9331697c38
+MISC ChangeLog-2015 6815 SHA256 b11673ff4fd4915c0b4a332cc30991da586b2f4572309a84bef0ffbc1b68e64e SHA512 c7a9c3dd7f1d91634c97d4df019001c9e31d054205e973c0b3ed6045533a9f6bb88e072d2dbb8b9c1114eb6845f414d53f5020dd6e32bc20b0e9472f01e4748e WHIRLPOOL fcf7b38bbae9a2fe8dd40335e73027d8e15f591005591527b52229b54f1fd69619d86f73fe1033b32360d7610df64d12ed7c911e74ecfeecefd3f0e5ce7b6a71
+MISC metadata.xml 594 SHA256 da6e901a1e6787c2cf4a71b34801703de8c9afdb3c2647de9420bf776131438d SHA512 edcd06fe65f52b946193e53d348431ff81917c25c6c5fb7f52be1a202a81b7b05a575449f6bc6cf288f6e2c68d4db240c262378e5133c5b1b2b091e7bdb96baa WHIRLPOOL 451be8c6346154a4cade4d464e125d7b9c824e8deed33dcd69132bb118aeade2c41da0f2167d80613f1337d92dd66241c61e0d721a4f365b9a56802cc702f5ef
diff --git a/x11-wm/wmii/files/wmii.desktop b/x11-wm/wmii/files/wmii.desktop
new file mode 100644
index 000000000000..45dc8235e17b
--- /dev/null
+++ b/x11-wm/wmii/files/wmii.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=wmii
+Comment=window manager improved 2
+Exec=wmii
+TryExec=wmii
+Icon=
+Type=Application
diff --git a/x11-wm/wmii/metadata.xml b/x11-wm/wmii/metadata.xml
new file mode 100644
index 000000000000..b348316a7f7f
--- /dev/null
+++ b/x11-wm/wmii/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+<longdescription lang="en">
+    wmii is a dynamic window manager for X11. It is highly customizable and
+    usable with keyboard and mouse. It supports conventional, tabbed and
+    tiled window management and has a small memory footprint. It is highly
+    modularized and uses an inter-process communication interface which
+    conforms to the 9P2000 protocol introduced by the Plan 9 operating
+    system.
+  </longdescription>
+</pkgmetadata>
diff --git a/x11-wm/wmii/wmii-3.9.2-r5.ebuild b/x11-wm/wmii/wmii-3.9.2-r5.ebuild
new file mode 100644
index 000000000000..1fa788d6bf35
--- /dev/null
+++ b/x11-wm/wmii/wmii-3.9.2-r5.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic multilib toolchain-funcs
+
+MY_P="wmii+ixp-${PV}"
+
+DESCRIPTION="A dynamic window manager for X11"
+HOMEPAGE="http://wmii.suckless.org/"
+SRC_URI="http://dl.suckless.org/wmii/${MY_P}.tbz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+CDEPEND="
+	>=sys-libs/libixp-0.5_p20110208-r3
+	x11-libs/libXft
+	x11-libs/libXext
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libX11
+	x11-libs/libXinerama
+	>=media-libs/freetype-2
+"
+
+RDEPEND="
+	${CDEPEND}
+	x11-apps/xmessage
+	x11-apps/xsetroot
+	media-fonts/font-misc-misc
+"
+
+DEPEND="
+	${CDEPEND}
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( NEWS NOTES README TODO )
+
+# Force dynamic linking, bug #273332
+MAKEOPTS="${MAKEOPTS} STATIC= -j1"
+
+src_prepare() {
+	default
+	mywmiiconf=(
+		PREFIX=/usr
+		DOC=/usr/share/doc/${PF}
+		ETC=/etc
+		LIBDIR=/usr/$(get_libdir)
+		CC="$(tc-getCC) -c"
+		LD="$(tc-getCC)"
+		AR="$(tc-getAR) crs"
+		DESTDIR="${D}"
+		LIBIXP=/usr/$(get_libdir)/libixp.so
+	)
+
+	# punt internal copy of sys-libs/libixp #323037
+	rm -f include/ixp{,_srvutil}.h || die
+	sed -i -e '/libixp/d' Makefile || die
+
+	sed -i -e "/BINSH \!=/d" mk/hdr.mk || die #335083
+	sed -i -e 's/-lXext/& -lXrender -lX11/' cmd/Makefile || die #369115
+}
+
+src_compile() {
+	append-flags -I/usr/include/freetype2
+	emake "${mywmiiconf[@]}"
+}
+
+src_install() {
+	emake "${mywmiiconf[@]}" install
+
+	echo "${PN}" > "${T}/${PN}" || die
+	exeinto /etc/X11/Sessions
+	doexe "${T}/${PN}"
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}/${PN}.desktop"
+}
diff --git a/x11-wm/xmonad-contrib/Manifest b/x11-wm/xmonad-contrib/Manifest
new file mode 100644
index 000000000000..48f5f3198f9e
--- /dev/null
+++ b/x11-wm/xmonad-contrib/Manifest
@@ -0,0 +1,13 @@
+AUX xmonad-contrib-0.11.2-ghc-7.8.patch 1094 SHA256 31bf9319b6822badda94a039e23d444bcc71f2d73279c079658832d259c1e8ff SHA512 f4eff1596ef91e8b53a8cd9d31a315f83f3b2a0cb3d23bb9e045b7b38c9159583e3ea0a75c22557031bfafe72656cc01263c89bc5b83a41a76b03ae6b380e8f8 WHIRLPOOL 4fa126c55564410f6d733ec71afd113f285b5c34cf0f78ebeeef40acb5f3d470739b1a34299ae6841af6772af97884ab248039645180db0388f9c842c702257a
+AUX xmonad-contrib-0.11.4-import-Applicative.patch 918 SHA256 74d52d32c3cc04b1a9bbc22b7a651423713165f1dde484f0ed9f8b6480fcac13 SHA512 a1ebc7a6d6fa5f04242e966b2894ea128cbd4ef32f6c6d3339695a11836b09650edc0624ea587e227f71423f9794decfec54bf56d135636a5518640305cb8f4b WHIRLPOOL 3187996d4e88793474db1f008184559501d948c9ebfb01e537be2d5f0945e5f0b7128f62c1f26c6d0cf3220e185fe2fc74d0703e4cdce618997d0234ec34b067
+DIST xmonad-contrib-0.11.2.tar.gz 401758 SHA256 515d87838ad1f9622d0b491390c5961318d2cb84c96410dee91b5653c5388c62 SHA512 373e1ed1744cbdf26902402d74b4efafa043a4ccf1953c26ec55a03ef8de31818b0c4cfced08b43e664e5f052e52923c6dfb08d68be86726e9f0ed1d96ad7910 WHIRLPOOL 8356462938d9565ee010335c90646d5f23adf3b830bbf7727ef8fa89ff6c027ff94be44b99260ae3c57f9773b6cf985029ba2f183cc7b8c9e18d18fd260f90a9
+DIST xmonad-contrib-0.11.4.tar.gz 401743 SHA256 a379b3d4f2d3d8793d6c76812e90cbb055fa0598cfba944af47139bb77e2acbc SHA512 3d747988baa497475255be4cc96f7eba5cf6fc81658f8f877ca92148fb9a154423ee98ebeb23690de00b186d2e34ad13d94cf1fe332d4ca4f1f4a64790e46ed7 WHIRLPOOL 1f25fff0088f15942bddd6a8e285fcf283f723527cc10b120c81cbb9a74a56106d5f7c5f676cf6b3fcd118bc3843e510169161898267f160c73b35c0fba458df
+DIST xmonad-contrib-0.12.tar.gz 464978 SHA256 131d31c471ac02ece9c7e920497b4839a45df786a2096f56adb1f2de1221f311 SHA512 5bb145fc7d07ebc8e4dde5ba83b5340913fb089581d22e993663402fc6728eab9f6939466b7a262827c0098599073a928700e0acb8245b943b23e6cd01e63056 WHIRLPOOL 6618b4afafa8961745dda180c6375b9afdf48211eec93e561f450a3cb4d13a163dbc5175edc297cd324a9f3866a45d3b74cef59001a62bc0141908967d4b9688
+DIST xmonad-contrib-0.13.tar.gz 485351 SHA256 a760827fe5b1f99d783f52ccbb72b272d02d53daa26757363cde3ceba014476e SHA512 40b8a8fc8a1fa134f2726c273ff75eee26a43c9f18095bad9251e4b37b0cca5ee6c32eec5c42aa00c9e0c5c90ae54e6414739a2cee5b5d2917814358449d55f5 WHIRLPOOL b8fc2b803a12c453da2a1cf7c077ad71c64f2d9278e5c61bd11324087cd4670a86c0f37b2efaca0a3c208ea0c1945cb9debebc29c4862911fff878cb17cd61ad
+EBUILD xmonad-contrib-0.11.2.ebuild 1072 SHA256 7464c695b742052da22d5e21e0e3b4a2f31bf64416c90c5a8337cb3803056226 SHA512 b5efb5b4b81371e5390f1019721b3bdc66f749de928ef296a7fa31f571ed55fd867403d75864eaad2615052be800c07fe159d6d7ca135f6de82b04e876ecdebc WHIRLPOOL ca49cd1b55b41b96006720a82a32ad47bd67c20e0c14b6e2157366591b400cc87aa5107f8c46883246d37da59de646e9ea07a9e6ed47969983dda098956c6309
+EBUILD xmonad-contrib-0.11.4.ebuild 1474 SHA256 8e16a5e2125af11069fd3b80d65560684af58703e00758cc8e65ae3c5f4a24fe SHA512 6e6105f7cbee4cf008449bb986ce10801a53b221b1d81d4f39f1aa39d57eb86c0d574318ceb886e0a3f005f28d2373c078c405c6378be7c4f9fa9612e5e5e2dc WHIRLPOOL c44b4f1d7fb3ff60db54c6e4632ab0b0fa42076543a7533ee8c719955029bc648474e77d256e0fb81d505b85615e886336baff651cb9738ecd7137eff6e9ecec
+EBUILD xmonad-contrib-0.12.ebuild 1108 SHA256 2d69556bbde7bd3e35ab25b7b1c31ab137a27f25169d860df7e2ebf2f3f46190 SHA512 a99c25deb7e097a1f3948a8ae59f301728d9ea34da45b030472507c92802fffc7f4391462443d7f63359bfaa3d52d6f7c2456bbc6d38713ce07643086dd8e1ff WHIRLPOOL e91a02fba10881eb57405acbd074ee214e11ce581bd84b6fbbc76280a3a07c3800a0d5e5bb102ec21a2b30eb4da830b23be64378a0d601fc68025f15658a13f9
+EBUILD xmonad-contrib-0.13.ebuild 1101 SHA256 ec0657b686096fea5c3cb8a357fc7ebedac4dd39faa53248096c7cf47b893400 SHA512 d6defccc0dac8c6bb7754976f30b024a3ee4ed738eec970a3eee81e8e724592fdf8c455f07171d6d5221888fa27c72c9afe44b7e65497412000321745daf7e76 WHIRLPOOL b81b0e77af37334be05bd6795efc0a4aad5947feb1d03a4d219ae80b5c6c74b94bd627017d63808f7dbb5c82c95460a83c986001f559e755a46ec51fbdcd1f47
+MISC ChangeLog 3382 SHA256 0e0fc7a765c26c0d23ee739cf22bcda771428276ecfb69b71093204317825121 SHA512 536ac8c5065b6e4cc97e739ba7f2713527387559d88c331ab02919e4142641b24991b7a8a3a964997d623291adcf00bb07dee741a64e2f2e19e05fb776d3abb2 WHIRLPOOL 1e352a01019813cbf53a978cd67b5b1510ad4ac05ce66974a61a91213cec50d69802b548d8a4d28a2292cf46f353e49a2c7d10b41b550de03a36015da4a2382a
+MISC ChangeLog-2015 4857 SHA256 c359a344f9f22ee7e07407fac1f8a4e8f5a634f9af81303149c3eca56ab36ba5 SHA512 cdd54ca2ef10a03396b398b25fd943f510f16f5e290a46c3169b31128054951df3bd1bd6fc868070d8ac495cd166484588ea04cabde90bee966abdcaa33688d9 WHIRLPOOL 953c1722469900d0929991c365c4db250ae0b43357e12c822607dd1ce6cf566e798100756289cc41e19746a552e4b140004afa7538d16e949d74bc1884429f3a
+MISC metadata.xml 708 SHA256 0a5ba54fd8c27629aa33d7027f9dc89834ed94cf8f834b0e5fcaf2eed32495e9 SHA512 570916b2bcf06efaeccb486d3161d0b751c675955abae7efc57d471961e2c1649075bc155e75849cd1b56c0a5917341f7ef2cbb12e81255787cfb282a6ea1fb7 WHIRLPOOL e060d1c4e974bd1c44a204438b602368bcc142e83efc9de1f49a56aec6fcb5e3db3067f9bf407235cc837b60a0c528cd272e5783651a229abf29fe8631eebe53
diff --git a/x11-wm/xmonad-contrib/files/xmonad-contrib-0.11.2-ghc-7.8.patch b/x11-wm/xmonad-contrib/files/xmonad-contrib-0.11.2-ghc-7.8.patch
new file mode 100644
index 000000000000..67e1f8cd8def
--- /dev/null
+++ b/x11-wm/xmonad-contrib/files/xmonad-contrib-0.11.2-ghc-7.8.patch
@@ -0,0 +1,23 @@
+Sun Feb 17 19:33:56 FET 2013  Adam Vogt <vogt.adam@gmail.com>
+  * Remove unnecessary contexts from L.MultiToggle
+diff -rN -u old-XMonadContrib/XMonad/Layout/MultiToggle.hs new-XMonadContrib/XMonad/Layout/MultiToggle.hs
+--- old-XMonadContrib/XMonad/Layout/MultiToggle.hs	2014-02-06 00:58:32.422844682 +0300
++++ new-XMonadContrib/XMonad/Layout/MultiToggle.hs	2014-02-06 00:58:32.462844684 +0300
+@@ -99,7 +99,7 @@
+     transform :: (LayoutClass l a) => t -> l a ->
+         (forall l'. (LayoutClass l' a) => l' a -> (l' a -> l a) -> b) -> b
+ 
+-data (LayoutClass l a) => EL l a = forall l'. (LayoutClass l' a) => EL (l' a) (l' a -> l a)
++data  EL l a = forall l'. (LayoutClass l' a) => EL (l' a) (l' a -> l a)
+ 
+ unEL :: (LayoutClass l a) => EL l a -> (forall l'. (LayoutClass l' a) => l' a -> b) -> b
+ unEL (EL x _) k = k x
+@@ -159,7 +159,7 @@
+ infixr 0 ??
+ -- | Prepend an element to a heterogeneous list. Used to build transformer
+ -- tables for 'mkToggle'.
+-(??) :: (HList b w) => a -> b -> HCons a b
++(??) ::  a -> b -> HCons a b
+ (??) = HCons
+ 
+ -- | Construct a singleton transformer table.
diff --git a/x11-wm/xmonad-contrib/files/xmonad-contrib-0.11.4-import-Applicative.patch b/x11-wm/xmonad-contrib/files/xmonad-contrib-0.11.4-import-Applicative.patch
new file mode 100644
index 000000000000..d887e857da03
--- /dev/null
+++ b/x11-wm/xmonad-contrib/files/xmonad-contrib-0.11.4-import-Applicative.patch
@@ -0,0 +1,21 @@
+--- xmonad-contrib-0.11.4-orig/XMonad/Util/Invisible.hs	2015-03-28 05:00:21.000000000 +1100
++++ xmonad-contrib-0.11.4/XMonad/Util/Invisible.hs	2015-04-03 15:12:17.485143018 +1100
+@@ -22,6 +22,8 @@
+                             , fromIMaybe
+                             ) where
+ 
++import Control.Applicative
++
+ -- $usage
+ -- A wrapper data type to store layout state that shouldn't be persisted across
+ -- restarts. A common wrapped type to use is @Maybe a@.
+--- xmonad-contrib-0.11.4-orig/XMonad/Hooks/DebugEvents.hs	2015-03-28 05:00:21.000000000 +1100
++++ xmonad-contrib-0.11.4/XMonad/Hooks/DebugEvents.hs	2015-04-03 15:17:02.207816322 +1100
+@@ -30,6 +30,7 @@
+ 
+ -- import           Graphics.X11.Xlib.Extras.GetAtomName        (getAtomName)
+ 
++import           Control.Applicative
+ import           Control.Exception.Extensible         as E
+ import           Control.Monad.State
+ import           Control.Monad.Reader
diff --git a/x11-wm/xmonad-contrib/metadata.xml b/x11-wm/xmonad-contrib/metadata.xml
new file mode 100644
index 000000000000..e71f7d605d7c
--- /dev/null
+++ b/x11-wm/xmonad-contrib/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		Third party tiling algorithms, configurations and scripts to xmonad,
+		a tiling window manager for X.
+		
+		For an introduction to building, configuring and using xmonad
+		extensions, see "XMonad.Doc". In particular:
+		
+		"XMonad.Doc.Configuring", a guide to configuring xmonad
+		
+		"XMonad.Doc.Extending", using the contributed extensions library
+		
+		"XMonad.Doc.Developing", introduction to xmonad internals and writing
+		your own extensions.
+		
+	</longdescription>
+</pkgmetadata>
diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-0.11.2.ebuild b/x11-wm/xmonad-contrib/xmonad-contrib-0.11.2.ebuild
new file mode 100644
index 000000000000..517e805c10fd
--- /dev/null
+++ b/x11-wm/xmonad-contrib/xmonad-contrib-0.11.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.2.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit base haskell-cabal
+
+DESCRIPTION="Third party extensions for xmonad"
+HOMEPAGE="http://xmonad.org/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~ppc64 x86"
+# hackport-args: --always-disabled='testing'
+IUSE="+xft"
+
+RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
+		>=dev-haskell/mtl-1:=[profile?]
+		<dev-haskell/mtl-3:=[profile?]
+		dev-haskell/random:=[profile?]
+		dev-haskell/utf8-string:=[profile?]
+		>=dev-haskell/x11-1.6.1:=[profile?]
+		<dev-haskell/x11-1.7:=[profile?]
+		>=dev-lang/ghc-6.10.4:=
+		=x11-wm/xmonad-0.11*:=[profile?]
+		xft? ( >=dev-haskell/x11-xft-0.2:=[profile?]
+		)"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.6"
+
+PATCHES=("${FILESDIR}"/${P}-ghc-7.8.patch)
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flags=-testing \
+		$(cabal_flag xft use_xft)
+}
diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-0.11.4.ebuild b/x11-wm/xmonad-contrib/xmonad-contrib-0.11.4.ebuild
new file mode 100644
index 000000000000..85758d51f441
--- /dev/null
+++ b/x11-wm/xmonad-contrib/xmonad-contrib-0.11.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.4.9999
+#hackport: flags: -testing,use_xft:xft
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit eutils haskell-cabal
+
+DESCRIPTION="Third party extensions for xmonad"
+HOMEPAGE="http://xmonad.org/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="+xft"
+
+RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
+	>=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?]
+	dev-haskell/old-locale:=[profile?]
+	dev-haskell/old-time:=[profile?]
+	dev-haskell/random:=[profile?]
+	dev-haskell/utf8-string:=[profile?]
+	>=dev-haskell/x11-1.6.1:=[profile?] <dev-haskell/x11-1.7:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	>=x11-wm/xmonad-0.11:=[profile?] <x11-wm/xmonad-0.12:=[profile?]
+	xft? ( >=dev-haskell/x11-xft-0.2:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
+
+src_prepare() {
+	# Upstream bug 597 xmonad-contrib-0.11.4 does not compile
+	# https://code.google.com/p/xmonad/issues/detail?id=597
+	epatch "${FILESDIR}"/${P}-import-Applicative.patch
+
+	# https://ghc.haskell.org/trac/ghc/ticket/10667
+	[[ $(ghc-version) == 7.10.1.20150630 ]] && replace-hcflags -g ''
+	[[ $(ghc-version) == 7.10.2 ]] && replace-hcflags -g ''
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-testing \
+		$(cabal_flag xft use_xft)
+}
diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-0.12.ebuild b/x11-wm/xmonad-contrib/xmonad-contrib-0.12.ebuild
new file mode 100644
index 000000000000..e712e747cb87
--- /dev/null
+++ b/x11-wm/xmonad-contrib/xmonad-contrib-0.12.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+#hackport: flags: -testing,use_xft:xft
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Third party extensions for xmonad"
+HOMEPAGE="http://xmonad.org/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~ppc64 x86"
+IUSE="+xft"
+
+RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
+	>=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?]
+	dev-haskell/old-locale:=[profile?]
+	dev-haskell/old-time:=[profile?]
+	dev-haskell/random:=[profile?]
+	dev-haskell/utf8-string:=[profile?]
+	>=dev-haskell/x11-1.6.1:=[profile?] <dev-haskell/x11-1.7:=[profile?]
+	>=dev-lang/ghc-7.6.1:=
+	>=x11-wm/xmonad-0.12:=[profile?] <x11-wm/xmonad-0.13:=[profile?]
+	xft? ( >=dev-haskell/x11-xft-0.2:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.16.0
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-testing \
+		$(cabal_flag xft use_xft)
+}
diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-0.13.ebuild b/x11-wm/xmonad-contrib/xmonad-contrib-0.13.ebuild
new file mode 100644
index 000000000000..602d8d669863
--- /dev/null
+++ b/x11-wm/xmonad-contrib/xmonad-contrib-0.13.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.1.9999
+#hackport: flags: -testing,use_xft:xft
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Third party extensions for xmonad"
+HOMEPAGE="http://xmonad.org/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 x86"
+IUSE="+xft"
+
+RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
+	>=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?]
+	dev-haskell/old-locale:=[profile?]
+	dev-haskell/old-time:=[profile?]
+	dev-haskell/random:=[profile?]
+	dev-haskell/utf8-string:=[profile?]
+	>=dev-haskell/x11-1.6.1:=[profile?] <dev-haskell/x11-1.9:=[profile?]
+	>=dev-lang/ghc-7.6.1:=
+	>=x11-wm/xmonad-0.13:=[profile?] <x11-wm/xmonad-0.14:=[profile?]
+	xft? ( >=dev-haskell/x11-xft-0.2:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.16.0
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-testing \
+		$(cabal_flag xft use_xft)
+}
diff --git a/x11-wm/xmonad/Manifest b/x11-wm/xmonad/Manifest
new file mode 100644
index 000000000000..0a452e4be253
--- /dev/null
+++ b/x11-wm/xmonad/Manifest
@@ -0,0 +1,17 @@
+AUX xmonad-0.11-ghc-7.10.patch 622 SHA256 9aa06537353b42725e1bf63d4304706480d1c6c82e5e76ebcb7b13cf1db95e3c SHA512 82fc07ffae272a3e87b3bf7bcbe94d815c8f5f8f6865ffa99d76f76f352d2f46cf88eefa49d6e993249a6365018e711276e782503ab76160775e4ae1411aa3ff WHIRLPOOL e4a5816b9905f5036238f1e168b05b66fac410b3f05bd4a32cd88a6d60a817d9041d504fea0f70a7c55682d519a12ca040a301af6c55225807142e388e715274
+AUX xmonad-0.11-sample.patch 3525 SHA256 22cb27276eb8f56b6edac69ac5fa1b5b1f26aa0b8757d27b8b0806005582b43d SHA512 4beb6452ac1609bd9be90f34eab87c0eee5bd02b982a88c59ad0d0efc5378de3e6a5cf4c1dd28bca6d550cff123258bfcb265b7357764a8c50b3780c5384bd7f WHIRLPOOL 015df53a2fb3f82859ed441ec90c1e17f5b9935255ccbfe6e1b7d3dc40500d9da684ad4e382f3b1dc443054fbc43d347bf1d75111241f3e578421ce0c8ec6804
+AUX xmonad-0.12-check-repeat.patch 1882 SHA256 4b54109dfd73a3ceff3dcdb9c85e39f7c7d68d0906cfa6496447dad0125728fe SHA512 cca001f3fc644e0454d30161d9643acadd3e17f0071633379866c00709423734c17e1f32ea118da72ff3679cf079604a8b6c3bbe9b97f3e61ab2475222855861 WHIRLPOOL 216e5887aad9e67fb45b5c687807f97c181cbf45125b2270f8a32e5e70870b6836012e0e45293b0713450c4e5c3965f2dd09660b776d3aa4ca0575aa793229c7
+AUX xmonad-check-repeat.patch 1869 SHA256 61e3967ef3243a8629ecf3bfa1e738c0350e160f6901f7c8611fec7ac00c11b7 SHA512 531ba249222941c675ee3726f802824d7716e4a746c9fa8bc26914f4d6f4133111c2fa2c39bbcedb0cee78ddb85fdf9f80197b7db1a5587cd5b49e6070728d0c WHIRLPOOL dc7ee5d39e419ef63bfe8e8ae9d253a7ecd824ee4722824f51fd7d6121501f43ae13c2289c5fd7fa9008fe3b946b4b81343513dd60f8eda268487a525c13d51b
+AUX xmonad.desktop 285 SHA256 cca59025f61f4d2aa61bd8410528dab67223696be6bfc3c0eb17ec7e22e4fc1a SHA512 ef26e3c3d54bafaf46ddde7a3b0d1cba93268dc3dc7b9ba7aa591545d1dfd01683491206bb6606207a23ec73fbb8db72cf8b4ca594b8b7e43db7b7c31536a9ac WHIRLPOOL 2b616f40db3349af27fd264ca6752e4d39a4b60eb50f3b77c3cd2a92da17cfba0e9969ae545657cbb32b0c429c4ecc42a81d43931c64afe40892d8789efb24a1
+DIST xmonad-0.11.1.tar.gz 59307 SHA256 39e0bf227df782d7a5799c811ad0d8b70c9d6eaaa94e8cc395fcf25895d6d2dd SHA512 4916451d81d359dbbf508f3b20f649f956255f526f14b1eb6c0d32bc789474db30d7acac768663ca32784c7fe361195a50f45a7cb7371ee9a29c9b8f1c64d528 WHIRLPOOL 5707bd5763f525b196deea6ead806af74707e2bbd31ff67039b292f3b97f607c2351ef45e57373f0f7313e5c307335cb5f4a84820d8e658b7d864927f109891c
+DIST xmonad-0.11.tar.gz 59119 SHA256 e5bd36d5184facad66acf2688b02922bfc6de32b576758f4b00688253c425bdb SHA512 34740f032508584f34f6b138d21394eca17e8020bccc4d8c6e8b3cb6b7ca64b153077cfd16636a6130768ebd145fe993569f8a229862d7816d0c89c905ee08bc WHIRLPOOL 9bab495c4094f21427afa797f97b6af13d9c156484b33087b6378191b0d99255f070adc09df3da9eba3ff55a59a8f03830110a4ab2aa9ad9d93d2f1a35d5dc54
+DIST xmonad-0.12.tar.gz 61436 SHA256 e8f649dbd4a8d5f75fdac9ceb5ee38b64fd351910ade81c188f5dd7bc21dfdd7 SHA512 e519c038d90db037bc81e7baf7b07cfa53922509e98ffddacfc4a6cc2c7376383be1e721f613057a5febbfcc661807b6382124eb673ac7a7cda23c738d3539ab WHIRLPOOL f0d37d35a9730b68b38c46ec7694ccd922b2fab96b3e8d99d007ccb887a06b3f88e6f1ea818124d427378246caab1f7d3ec4338eab1007431cdf5a19fc1cc3b9
+DIST xmonad-0.13.tar.gz 72034 SHA256 f9f81b63569f18c777a939741024ec3ae34e4ec84015e5cc50f6622034a303ca SHA512 9d9436f36fe0f6a9732502b0211fc41a224b1320b843d266b6d2dd201e4329b688f7eed5b08597b2edd713cc25f2b88a2a1f1ee43e18615c0a78e97e4716b122 WHIRLPOOL 3c845bc562b60b6af46d259b5f162fc2b0545401e85eb1eace8494abeeb121ea78f8ecb1e58260dd7b2a7762d25d71e045997ca798efa79dba21ef19c4cd59f8
+EBUILD xmonad-0.11-r1.ebuild 1966 SHA256 8e6a888ade1703d5badcebcbbca089e23605933ca7530342999c3bcab27c9629 SHA512 432552c99a1b8ed006d61205d0b7347a51b61ec8fcdf578caaf5ebae96af751d6ab813c8cb5e85ddc2111766d21ee1075866fe19a83219f379b2fe9a8601c240 WHIRLPOOL 0ad60bdb6f5c328c46f2c2b42d8c7e65cd0e5059847e2f9492d2ca4713da2049edc3ee82e16474f992faffb187db954da39ea309b82fcd7b439e88eb5cf5d473
+EBUILD xmonad-0.11-r3.ebuild 2216 SHA256 aa3b4cd68cb3ff0436f99843f56686d3b03876406b89c3df363f7f35df5aca8d SHA512 bd4c7b7bc44db0ebfa07634e0ebe581fdf1a448c6b647d0d5d5b6ceb97869ad717ad65e580d9712ca652759331cbfe55846912bc82221671c39f899914ad63a4 WHIRLPOOL 9ce6b1d3b919b9850ab534375b503b02040c86162515f3b1801484fc2245d5301eeb0e3b7cae27bffb0d77bdeee77f917867fe3ab373fce9592467fa7041f41c
+EBUILD xmonad-0.11.1.ebuild 2181 SHA256 5f20763e4bade88662dcf77031122fe1894b769d96b1ea21d5f1ed99ae0ba966 SHA512 861d8b49952528edd2203aef880e772320beecb26c3ba05073c9fa2940b5e74fb48add517c70219706dfbf7cb4f064ad041a25436c2539d47361f0152bcc24c7 WHIRLPOOL 6ad5989d97e79e6f0d43ec8391c53c74205186b9b14eb565188e48215b8a11cfd7b3ed7ce08387c1313848ae8819734483449f81bec3586d8931bb9078078774
+EBUILD xmonad-0.12.ebuild 2458 SHA256 9e3cda338033262d62ae9b6a2921ca6a1dbba36cf0b1b9873341dd5be2b7e6ce SHA512 bda429abcd1339e61d1c8442d124909976906d013069eec12df4a70c2d8770ba72a1ba458a70aad9061c1f5c9481877b1daf645708e877c69dcbcc884998daac WHIRLPOOL 783c3a5c4e3d7ba4caa2fed6dc91dd6aa15d24c3d3f8f1a742db5ef1c43d1a25d220aaff1b37e142465f683ef6e5061cc8f691146a466e246176a18cd3b9fc6b
+EBUILD xmonad-0.13.ebuild 2193 SHA256 9d7d1231a6b138157fc82dcca42616954dc683ec17b53bb1ea39224f8ae14f2b SHA512 a1a6c8b870aa05bd7a4e22272a684ccf6514ee50b0b6dcb2694de5e5ef3e4be06a41c4210b4b4c6520f992a5a1f07e76eccbd6887592b6299fc9b71c0c6dc1e3 WHIRLPOOL 39c503e727a75d7223aa2bae734e5022331de4bc77d6f75ad4823e7a167b66f254b4b27d2f9c51d1ae834cab36f402be5b69270d114d0d10199c9b4d63e0d855
+MISC ChangeLog 3971 SHA256 b6f6a6a3222d2e1687d2b874e6765b516daa96c0b3cf11de342a5a4c302af747 SHA512 bd70cafd9f46c7326a0cceab3deb98c7410d157ed10e67ece0f9a4ef1af72536521b05dbc756f81e2d7d301cc113d4a9fe68525921a9bb8b14d50162e984b0e2 WHIRLPOOL 8e0ae63a301f27c6fd31f8203cf4b0a137c386c7c10c517575955b5d5505ee8a32c887e5b01cdc47a7087ecb1f8d4b7f8caf8dd8bed94ed2232924aa0bf566b2
+MISC ChangeLog-2015 5585 SHA256 41fc3de9309b79269029b1bc31c9f0814e6ff2dbde1d3a185abe83680e624ca7 SHA512 308f825c1c547c87ad948cd68dfa2dde3562a81ceff37490daff9625d6d10fbd01acc53ffffdb6bc4a974030be3956089ad43b2d6fac24d7b7ba15a0ca773257 WHIRLPOOL ac64a97bdfff8a8d990b13ea2402b20d09ea2d8d53c39faea390b61677a654dbd8233ac66cec57fd927f1e48a8416361ed75049cb244d78e52d28d031f9b7b96
+MISC metadata.xml 1068 SHA256 648c613311dd1b85e732ab20f27a02c1f2c2be05a4c30ecbe079bb16e32eb7b8 SHA512 96efc16a7a57b188e72f2db9fdd90c06cc6460e9a596ac68ca5a8187fd7fbb88feb9ab9ff4e9d8436df014a6c6203c459da317cda0f5ada779096ee0806da8d8 WHIRLPOOL 9b0fee3a5a6cf722f0557378b058d3e010ccee82e283b7eede08014dc8094868914b35a24ab4636bcc638de666f9de207fbf864c1b4ac91198ca0d2ff744110b
diff --git a/x11-wm/xmonad/files/xmonad-0.11-ghc-7.10.patch b/x11-wm/xmonad/files/xmonad-0.11-ghc-7.10.patch
new file mode 100644
index 000000000000..e92a31ec7044
--- /dev/null
+++ b/x11-wm/xmonad/files/xmonad-0.11-ghc-7.10.patch
@@ -0,0 +1,14 @@
+Fri May  2 06:57:43 BST 2014  Adam Vogt <vogt.adam@gmail.com>
+  * derive Applicative instance for Query
+diff -rN -u old-xmonad/XMonad/Core.hs new-xmonad/XMonad/Core.hs
+--- old-xmonad/XMonad/Core.hs	2015-01-08 21:40:45.320979242 +0000
++++ new-xmonad/XMonad/Core.hs	2015-01-08 21:40:45.367979193 +0000
+@@ -155,7 +155,7 @@
+ 
+ type ManageHook = Query (Endo WindowSet)
+ newtype Query a = Query (ReaderT Window X a)
+-    deriving (Functor, Monad, MonadReader Window, MonadIO)
++    deriving (Functor, Applicative, Monad, MonadReader Window, MonadIO)
+ 
+ runQuery :: Query a -> Window -> X a
+ runQuery (Query m) w = runReaderT m w
diff --git a/x11-wm/xmonad/files/xmonad-0.11-sample.patch b/x11-wm/xmonad/files/xmonad-0.11-sample.patch
new file mode 100644
index 000000000000..0780af8c18d4
--- /dev/null
+++ b/x11-wm/xmonad/files/xmonad-0.11-sample.patch
@@ -0,0 +1,74 @@
+Sun Jan  6 17:42:54 GMT 2013  Daniel Wagner <daniel@wagner-home.com>
+  * define the "help" string in the sample configuration bundled with xmonad
+diff -rN -u old-xmonad/man/xmonad.hs new-xmonad/man/xmonad.hs
+--- old-xmonad/man/xmonad.hs	2015-02-27 08:38:26.993365307 +0000
++++ new-xmonad/man/xmonad.hs	2015-02-27 08:38:27.046365303 +0000
+@@ -280,3 +280,54 @@
+         logHook            = myLogHook,
+         startupHook        = myStartupHook
+     }
++
++-- | Finally, a copy of the default bindings in simple textual tabular format.
++help :: String
++help = unlines ["The default modifier key is 'alt'. Default keybindings:",
++    "",
++    "-- launching and killing programs",
++    "mod-Shift-Enter  Launch xterminal",
++    "mod-p            Launch dmenu",
++    "mod-Shift-p      Launch gmrun",
++    "mod-Shift-c      Close/kill the focused window",
++    "mod-Space        Rotate through the available layout algorithms",
++    "mod-Shift-Space  Reset the layouts on the current workSpace to default",
++    "mod-n            Resize/refresh viewed windows to the correct size",
++    "",
++    "-- move focus up or down the window stack",
++    "mod-Tab        Move focus to the next window",
++    "mod-Shift-Tab  Move focus to the previous window",
++    "mod-j          Move focus to the next window",
++    "mod-k          Move focus to the previous window",
++    "mod-m          Move focus to the master window",
++    "",
++    "-- modifying the window order",
++    "mod-Return   Swap the focused window and the master window",
++    "mod-Shift-j  Swap the focused window with the next window",
++    "mod-Shift-k  Swap the focused window with the previous window",
++    "",
++    "-- resizing the master/slave ratio",
++    "mod-h  Shrink the master area",
++    "mod-l  Expand the master area",
++    "",
++    "-- floating layer support",
++    "mod-t  Push window back into tiling; unfloat and re-tile it",
++    "",
++    "-- increase or decrease number of windows in the master area",
++    "mod-comma  (mod-,)   Increment the number of windows in the master area",
++    "mod-period (mod-.)   Deincrement the number of windows in the master area",
++    "",
++    "-- quit, or restart",
++    "mod-Shift-q  Quit xmonad",
++    "mod-q        Restart xmonad",
++    "mod-[1..9]   Switch to workSpace N",
++    "",
++    "-- Workspaces & screens",
++    "mod-Shift-[1..9]   Move client to workspace N",
++    "mod-{w,e,r}        Switch to physical/Xinerama screens 1, 2, or 3",
++    "mod-Shift-{w,e,r}  Move client to screen 1, 2, or 3",
++    "",
++    "-- Mouse bindings: default actions bound to mouse events",
++    "mod-button1  Set the window to floating mode and move by dragging",
++    "mod-button2  Raise the window to the top of the stack",
++    "mod-button3  Set the window to floating mode and resize by dragging"]
+Sun Jan  6 17:44:14 GMT 2013  Daniel Wagner <daniel@wagner-home.com>
+  * use "modm" instead of "modMask" in the sample config
+diff -rN -u old-xmonad/man/xmonad.hs new-xmonad/man/xmonad.hs
+--- old-xmonad/man/xmonad.hs	2015-02-27 08:39:59.280358012 +0000
++++ new-xmonad/man/xmonad.hs	2015-02-27 08:39:59.333358007 +0000
+@@ -129,7 +129,7 @@
+     , ((modm              , xK_q     ), spawn "xmonad --recompile; xmonad --restart")
+ 
+     -- Run xmessage with a summary of the default keybindings (useful for beginners)
+-    , ((modMask .|. shiftMask, xK_slash ), spawn ("echo \"" ++ help ++ "\" | xmessage -file -"))
++    , ((modm .|. shiftMask, xK_slash ), spawn ("echo \"" ++ help ++ "\" | xmessage -file -"))
+     ]
+     ++
+ 
diff --git a/x11-wm/xmonad/files/xmonad-0.12-check-repeat.patch b/x11-wm/xmonad/files/xmonad-0.12-check-repeat.patch
new file mode 100644
index 000000000000..79bd2c2d21fa
--- /dev/null
+++ b/x11-wm/xmonad/files/xmonad-0.12-check-repeat.patch
@@ -0,0 +1,40 @@
+--- xmonad/src/XMonad/Core.hs	2010-09-05 05:11:42.000000000 +0400
++++ xmonad/src/XMonad/Core.hs	2010-09-18 07:59:14.000000000 +0400
+@@ -65,6 +65,7 @@
+     , waitingUnmap     :: !(M.Map Window Int)            -- ^ the number of expected UnmapEvents
+     , dragging         :: !(Maybe (Position -> Position -> X (), X ()))
+     , numberlockMask   :: !KeyMask                       -- ^ The numlock modifier
++    , keyPressed       :: !KeyCode                       -- ^ keycode of the key being pressed if any
+     , extensibleState  :: !(M.Map String (Either String StateExtension))
+     -- ^ stores custom state information.
+     --
+--- xmonad/src/XMonad/Main.hs	2010-09-05 05:11:42.000000000 +0400
++++ xmonad/src/XMonad/Main.hs	2010-09-18 08:03:11.000000000 +0400
+@@ -129,6 +129,7 @@
+             , mapped          = S.empty
+             , waitingUnmap    = M.empty
+             , dragging        = Nothing
++            , keyPressed      = 0
+             , extensibleState = extState
+             }
+     allocaXEvent $ \e ->
+@@ -190,10 +191,15 @@
+ -- run window manager command
+ handle (KeyEvent {ev_event_type = t, ev_state = m, ev_keycode = code})
+     | t == keyPress = withDisplay $ \dpy -> do
+-        s  <- io $ keycodeToKeysym dpy code 0
+-        mClean <- cleanMask m
+-        ks <- asks keyActions
+-        userCodeDef () $ whenJust (M.lookup (mClean, s) ks) id
++        kp <- gets keyPressed
++        if kp /= code then do
++                modify $ \s -> s { keyPressed = code }
++                s  <- io $ keycodeToKeysym dpy code 0
++                mClean <- cleanMask m
++                ks <- asks keyActions
++                userCodeDef () $ whenJust (M.lookup (mClean, s) ks) id
++            else return ()
++    | t == keyRelease = modify $ \s -> s { keyPressed = 0 }
+ 
+ -- manage a new window
+ handle (MapRequestEvent    {ev_window = w}) = withDisplay $ \dpy -> do
diff --git a/x11-wm/xmonad/files/xmonad-check-repeat.patch b/x11-wm/xmonad/files/xmonad-check-repeat.patch
new file mode 100644
index 000000000000..9b30cb5ece31
--- /dev/null
+++ b/x11-wm/xmonad/files/xmonad-check-repeat.patch
@@ -0,0 +1,40 @@
+--- xmonad//XMonad/Core.hs	2010-09-05 05:11:42.000000000 +0400
++++ xmonad//XMonad/Core.hs	2010-09-18 07:59:14.000000000 +0400
+@@ -65,6 +65,7 @@
+     , waitingUnmap     :: !(M.Map Window Int)            -- ^ the number of expected UnmapEvents
+     , dragging         :: !(Maybe (Position -> Position -> X (), X ()))
+     , numberlockMask   :: !KeyMask                       -- ^ The numlock modifier
++    , keyPressed       :: !KeyCode                       -- ^ keycode of the key being pressed if any
+     , extensibleState  :: !(M.Map String (Either String StateExtension))
+     -- ^ stores custom state information.
+     --
+--- xmonad//XMonad/Main.hsc	2010-09-05 05:11:42.000000000 +0400
++++ xmonad//XMonad/Main.hsc	2010-09-18 08:03:11.000000000 +0400
+@@ -129,6 +129,7 @@
+             , mapped          = S.empty
+             , waitingUnmap    = M.empty
+             , dragging        = Nothing
++            , keyPressed      = 0
+             , extensibleState = extState
+             }
+     allocaXEvent $ \e ->
+@@ -190,10 +191,15 @@
+ -- run window manager command
+ handle (KeyEvent {ev_event_type = t, ev_state = m, ev_keycode = code})
+     | t == keyPress = withDisplay $ \dpy -> do
+-        s  <- io $ keycodeToKeysym dpy code 0
+-        mClean <- cleanMask m
+-        ks <- asks keyActions
+-        userCodeDef () $ whenJust (M.lookup (mClean, s) ks) id
++    	kp <- gets keyPressed
++        if kp /= code then do
++                modify $ \s -> s { keyPressed = code }
++                s  <- io $ keycodeToKeysym dpy code 0
++                mClean <- cleanMask m
++                ks <- asks keyActions
++                userCodeDef () $ whenJust (M.lookup (mClean, s) ks) id
++            else return ()
++    | t == keyRelease = modify $ \s -> s { keyPressed = 0 }
+ 
+ -- manage a new window
+ handle (MapRequestEvent    {ev_window = w}) = withDisplay $ \dpy -> do
diff --git a/x11-wm/xmonad/files/xmonad.desktop b/x11-wm/xmonad/files/xmonad.desktop
new file mode 100644
index 000000000000..9c0bf6e44f51
--- /dev/null
+++ b/x11-wm/xmonad/files/xmonad.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Name=xmonad
+Comment=A lightweight window manager
+Exec=/etc/X11/Sessions/xmonad
+TryExec=xmonad
+NoDisplay=true
+Icon=
+X-GNOME-WMName=Xmonad
+X-GNOME-Autostart-Phase=WindowManager
+X-GNOME-Provides=windowmanager
+X-GNOME-Autostart-Notify=false
diff --git a/x11-wm/xmonad/metadata.xml b/x11-wm/xmonad/metadata.xml
new file mode 100644
index 000000000000..7ec6ab241848
--- /dev/null
+++ b/x11-wm/xmonad/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<use>
+		<flag name="default-term">Pull terminal specified in default xmonad config
+			to be a bit less hostile by default.</flag>
+		<flag name="no-autorepeat-keys">Allow ignoring of keyboard autorepeat.</flag>
+	</use>
+	<longdescription>
+		xmonad is a tiling window manager for X. Windows are arranged
+		automatically to tile the screen without gaps or overlap, maximising
+		screen use. All features of the window manager are accessible from
+		the keyboard: a mouse is strictly optional. xmonad is written and
+		extensible in Haskell. Custom layout algorithms, and other
+		extensions, may be written by the user in config files. Layouts are
+		applied dynamically, and different layouts may be used on each
+		workspace. Xinerama is fully supported, allowing windows to be tiled
+		on several screens.
+	</longdescription>
+</pkgmetadata>
diff --git a/x11-wm/xmonad/xmonad-0.11-r1.ebuild b/x11-wm/xmonad/xmonad-0.11-r1.ebuild
new file mode 100644
index 000000000000..bbd2c9e330c5
--- /dev/null
+++ b/x11-wm/xmonad/xmonad-0.11-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.1
+
+CABAL_FEATURES="bin lib profile haddock hscolour hoogle"
+inherit haskell-cabal
+
+DESCRIPTION="A tiling window manager"
+HOMEPAGE="http://xmonad.org"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~ppc64 ~sparc x86"
+IUSE="+default-term"
+
+RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
+		dev-haskell/mtl:=[profile?]
+		=dev-haskell/utf8-string-0.3*:=[profile?]
+		>=dev-haskell/x11-1.5:=[profile?]
+		<dev-haskell/x11-1.7:=[profile?]
+		>=dev-lang/ghc-6.10.4:="
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.6"
+PDEPEND="default-term? ( x11-terms/xterm )
+	x11-apps/xmessage
+"
+
+SAMPLE_CONFIG="xmonad.hs"
+SAMPLE_CONFIG_LOC="man"
+
+src_prepare() {
+	# allow user patches
+	epatch_user
+}
+
+src_install() {
+	cabal_src_install
+
+	echo -e "#!/bin/sh\n/usr/bin/xmonad" > "${T}/${PN}"
+	exeinto /etc/X11/Sessions
+	doexe "${T}/${PN}"
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}/${PN}.desktop"
+
+	doman man/xmonad.1
+	dohtml man/xmonad.1.html
+
+	dodoc CONFIG README
+}
+
+pkg_postinst() {
+	haskell-cabal_pkg_postinst
+
+	elog "A sample ${SAMPLE_CONFIG} configuration file can be found here:"
+	elog "    /usr/share/${PF}/ghc-$(ghc-version)/${SAMPLE_CONFIG_LOC}/${SAMPLE_CONFIG}"
+	elog "The parameters in this file are the defaults used by xmonad."
+	elog "To customize xmonad, copy this file to:"
+	elog "    ~/.xmonad/${SAMPLE_CONFIG}"
+	elog "After editing, use 'mod-q' to dynamically restart xmonad "
+	elog "(where the 'mod' key defaults to 'Alt')."
+	elog ""
+	elog "Read the README or man page for more information, and to see "
+	elog "other possible configurations go to:"
+	elog "    http://haskell.org/haskellwiki/Xmonad/Config_archive"
+	elog "Please note that many of these configurations will require the "
+	elog "x11-wm/xmonad-contrib package to be installed."
+}
diff --git a/x11-wm/xmonad/xmonad-0.11-r3.ebuild b/x11-wm/xmonad/xmonad-0.11-r3.ebuild
new file mode 100644
index 000000000000..a929e260e880
--- /dev/null
+++ b/x11-wm/xmonad/xmonad-0.11-r3.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.1
+
+CABAL_FEATURES="bin lib profile haddock hscolour hoogle"
+inherit haskell-cabal
+
+DESCRIPTION="A tiling window manager"
+HOMEPAGE="http://xmonad.org"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
+IUSE="+default-term no-autorepeat-keys"
+
+RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
+		dev-haskell/mtl:=[profile?]
+		>=dev-haskell/utf8-string-0.3:=[profile?]
+		>=dev-haskell/x11-1.5:=[profile?]
+		<dev-haskell/x11-1.7:=[profile?]
+		>=dev-lang/ghc-6.10.4:="
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.6"
+PDEPEND="default-term? ( x11-terms/xterm )
+	x11-apps/xmessage
+"
+
+SAMPLE_CONFIG="xmonad.hs"
+SAMPLE_CONFIG_LOC="man"
+
+src_prepare() {
+	epatch "$FILESDIR"/${P}-ghc-7.10.patch
+	epatch "$FILESDIR"/${P}-sample.patch
+	use no-autorepeat-keys && epatch "$FILESDIR"/${PN}-check-repeat.patch
+
+	cabal_chdeps \
+		"utf8-string >= 0.3 && < 0.4" "utf8-string >= 0.3 && < 1.1"
+
+	# allow user patches
+	epatch_user
+}
+
+src_install() {
+	cabal_src_install
+
+	echo -e "#!/bin/sh\n/usr/bin/xmonad" > "${T}/${PN}"
+	exeinto /etc/X11/Sessions
+	doexe "${T}/${PN}"
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}/${PN}.desktop"
+
+	doman man/xmonad.1
+	dohtml man/xmonad.1.html
+
+	dodoc CONFIG README
+}
+
+pkg_postinst() {
+	haskell-cabal_pkg_postinst
+
+	elog "A sample ${SAMPLE_CONFIG} configuration file can be found here:"
+	elog "    /usr/share/${PF}/ghc-$(ghc-version)/${SAMPLE_CONFIG_LOC}/${SAMPLE_CONFIG}"
+	elog "The parameters in this file are the defaults used by xmonad."
+	elog "To customize xmonad, copy this file to:"
+	elog "    ~/.xmonad/${SAMPLE_CONFIG}"
+	elog "After editing, use 'mod-q' to dynamically restart xmonad "
+	elog "(where the 'mod' key defaults to 'Alt')."
+	elog ""
+	elog "Read the README or man page for more information, and to see "
+	elog "other possible configurations go to:"
+	elog "    http://haskell.org/haskellwiki/Xmonad/Config_archive"
+	elog "Please note that many of these configurations will require the "
+	elog "x11-wm/xmonad-contrib package to be installed."
+}
diff --git a/x11-wm/xmonad/xmonad-0.11.1.ebuild b/x11-wm/xmonad/xmonad-0.11.1.ebuild
new file mode 100644
index 000000000000..74f0a815225f
--- /dev/null
+++ b/x11-wm/xmonad/xmonad-0.11.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.4.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A tiling window manager"
+HOMEPAGE="http://xmonad.org"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
+IUSE="+default-term no-autorepeat-keys"
+
+RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	>=dev-haskell/utf8-string-0.3:=[profile?]
+	>=dev-haskell/x11-1.5:=[profile?] <dev-haskell/x11-1.7:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
+PDEPEND="default-term? ( x11-terms/xterm )
+	x11-apps/xmessage
+"
+
+SAMPLE_CONFIG="xmonad.hs"
+SAMPLE_CONFIG_LOC="man"
+
+src_prepare() {
+	epatch "$FILESDIR"/${PN}-0.11-sample.patch
+	use no-autorepeat-keys && epatch "$FILESDIR"/${PN}-check-repeat.patch
+
+	cabal_chdeps \
+		"utf8-string >= 0.3 && < 0.4" "utf8-string >= 0.3 && < 1.1"
+
+	# allow user patches
+	epatch_user
+}
+
+src_install() {
+	cabal_src_install
+
+	echo -e "#!/bin/sh\n/usr/bin/xmonad" > "${T}/${PN}"
+	exeinto /etc/X11/Sessions
+	doexe "${T}/${PN}"
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}/${PN}.desktop"
+
+	doman man/xmonad.1
+	dohtml man/xmonad.1.html
+
+	dodoc CONFIG README
+}
+
+pkg_postinst() {
+	haskell-cabal_pkg_postinst
+
+	elog "A sample ${SAMPLE_CONFIG} configuration file can be found here:"
+	elog "    /usr/share/${PF}/ghc-$(ghc-version)/${SAMPLE_CONFIG_LOC}/${SAMPLE_CONFIG}"
+	elog "The parameters in this file are the defaults used by xmonad."
+	elog "To customize xmonad, copy this file to:"
+	elog "    ~/.xmonad/${SAMPLE_CONFIG}"
+	elog "After editing, use 'mod-q' to dynamically restart xmonad "
+	elog "(where the 'mod' key defaults to 'Alt')."
+	elog ""
+	elog "Read the README or man page for more information, and to see "
+	elog "other possible configurations go to:"
+	elog "    http://haskell.org/haskellwiki/Xmonad/Config_archive"
+	elog "Please note that many of these configurations will require the "
+	elog "x11-wm/xmonad-contrib package to be installed."
+}
diff --git a/x11-wm/xmonad/xmonad-0.12.ebuild b/x11-wm/xmonad/xmonad-0.12.ebuild
new file mode 100644
index 000000000000..8745eba3fd89
--- /dev/null
+++ b/x11-wm/xmonad/xmonad-0.12.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+#hackport: flags: -generatemanpage,-testing
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A tiling window manager"
+HOMEPAGE="http://xmonad.org"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~ppc64 ~sparc x86"
+IUSE="+default-term no-autorepeat-keys"
+
+RESTRICT=test # fails test on ghc-8 (assert has different text of exception)
+
+RDEPEND="dev-haskell/data-default:=[profile?]
+	dev-haskell/extensible-exceptions:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	dev-haskell/setlocale:=[profile?]
+	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+	>=dev-haskell/x11-1.5:=[profile?] <dev-haskell/x11-1.7:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/quickcheck-2 )
+"
+PDEPEND="default-term? ( x11-terms/xterm )
+	x11-apps/xmessage
+"
+
+SAMPLE_CONFIG="xmonad.hs"
+SAMPLE_CONFIG_LOC="man"
+
+src_prepare() {
+	use no-autorepeat-keys && epatch "$FILESDIR"/${PN}-0.12-check-repeat.patch
+
+	# allow user patches
+	epatch_user
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-generatemanpage \
+		--flag=-testing
+}
+
+src_install() {
+	cabal_src_install
+
+	echo -e "#!/bin/sh\n/usr/bin/xmonad" > "${T}/${PN}"
+	exeinto /etc/X11/Sessions
+	doexe "${T}/${PN}"
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}/${PN}.desktop"
+
+	doman man/xmonad.1
+	dohtml man/xmonad.1.html
+
+	dodoc CONFIG README.md CHANGES.md
+}
+
+pkg_postinst() {
+	haskell-cabal_pkg_postinst
+
+	elog "A sample ${SAMPLE_CONFIG} configuration file can be found here:"
+	elog "    /usr/share/${PF}/ghc-$(ghc-version)/${SAMPLE_CONFIG_LOC}/${SAMPLE_CONFIG}"
+	elog "The parameters in this file are the defaults used by xmonad."
+	elog "To customize xmonad, copy this file to:"
+	elog "    ~/.xmonad/${SAMPLE_CONFIG}"
+	elog "After editing, use 'mod-q' to dynamically restart xmonad "
+	elog "(where the 'mod' key defaults to 'Alt')."
+	elog ""
+	elog "Read the README or man page for more information, and to see "
+	elog "other possible configurations go to:"
+	elog "    http://haskell.org/haskellwiki/Xmonad/Config_archive"
+	elog "Please note that many of these configurations will require the "
+	elog "x11-wm/xmonad-contrib package to be installed."
+}
diff --git a/x11-wm/xmonad/xmonad-0.13.ebuild b/x11-wm/xmonad/xmonad-0.13.ebuild
new file mode 100644
index 000000000000..141d10f46d5f
--- /dev/null
+++ b/x11-wm/xmonad/xmonad-0.13.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.1.9999
+#hackport: flags: -generatemanpage,-testing,-profiling
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A tiling window manager"
+HOMEPAGE="http://xmonad.org"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 x86"
+IUSE="+default-term"
+
+RDEPEND="dev-haskell/data-default:=[profile?]
+	dev-haskell/extensible-exceptions:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	dev-haskell/setlocale:=[profile?]
+	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+	>=dev-haskell/x11-1.8:=[profile?] <dev-haskell/x11-1.9:=[profile?]
+	>=dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.0.0
+	test? ( >=dev-haskell/quickcheck-2 )
+"
+PDEPEND="default-term? ( x11-terms/xterm )
+	x11-apps/xmessage
+"
+
+DOCS=( CONFIG README.md CHANGES.md )
+HTML_DOCS=( man/xmonad.1.html )
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-generatemanpage \
+		--flag=-profiling \
+		--flag=-testing
+}
+
+src_install() {
+	default
+
+	cabal_src_install
+
+	echo -e "#!/bin/sh\n/usr/bin/xmonad" > "${T}/${PN}"
+	exeinto /etc/X11/Sessions
+	doexe "${T}/${PN}"
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}/${PN}.desktop"
+
+	doman man/xmonad.1
+}
+
+pkg_postinst() {
+	haskell-cabal_pkg_postinst
+
+	elog "A sample ${SAMPLE_CONFIG} configuration file can be found here:"
+	elog "    /usr/share/${PF}/ghc-$(ghc-version)/man/xmonad.hs"
+	elog "The parameters in this file are the defaults used by xmonad."
+	elog "To customize xmonad, copy this file to:"
+	elog "    ~/.xmonad/${SAMPLE_CONFIG}"
+	elog "After editing, use 'mod-q' to dynamically restart xmonad "
+	elog "(where the 'mod' key defaults to 'Alt')."
+	elog ""
+	elog "Read the README or man page for more information, and to see "
+	elog "other possible configurations go to:"
+	elog "    http://haskell.org/haskellwiki/Xmonad/Config_archive"
+	elog "Please note that many of these configurations will require the "
+	elog "x11-wm/xmonad-contrib package to be installed."
+}
diff --git a/x11-wm/xoat/Manifest b/x11-wm/xoat/Manifest
new file mode 100644
index 000000000000..dc369feda3eb
--- /dev/null
+++ b/x11-wm/xoat/Manifest
@@ -0,0 +1,2 @@
+EBUILD xoat-9999.ebuild 875 SHA256 c09b4a9804636886f749e9d9e1e99aa63048b7d829d0d27d764aa00233c845dd SHA512 3f596b225fd0f428ecb74e45240eb70f77ad2e6ee38a01f0b862c1455680708aef836c21b09b3526910b0a4d31217431895d075cdba1a16719a95839d06b54da WHIRLPOOL 02542a8c7b9397aa503216b0026db2c308a20592ae95801331b7721107b920bec2e8b19b4947b4a09cece7e7c6c205fbe320808ea4794ea8949bfbac0cb89b6e
+MISC metadata.xml 295 SHA256 3a550c7b27810dee4dfd447204772d33a450e47b84ccadb76356721ed0750cf9 SHA512 dcf39022dd854a3682c0f4bbd85c3d37ef76d374ffec74b6f3b78108e8eac4c4328937d5476958e00c74d9fd721f82c1555c079425daa9e81b5b5b5018768211 WHIRLPOOL 2310fc89992a5c876a5dea0bf722b3548c153911b74a379a95ce697ef37240eb8f65a1663d6073759a214d9ebc5da85ce56819fc3cc11c7288e2349ddd70631d
diff --git a/x11-wm/xoat/metadata.xml b/x11-wm/xoat/metadata.xml
new file mode 100644
index 000000000000..cb3714e24077
--- /dev/null
+++ b/x11-wm/xoat/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>jer@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">seanpringle/xoat</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-wm/xoat/xoat-9999.ebuild b/x11-wm/xoat/xoat-9999.ebuild
new file mode 100644
index 000000000000..5ddef98cef3e
--- /dev/null
+++ b/x11-wm/xoat/xoat-9999.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic git-r3 savedconfig toolchain-funcs
+
+DESCRIPTION="X Obstinate Asymmetric Tiler"
+HOMEPAGE="https://github.com/seanpringle/xoat"
+EGIT_REPO_URI="https://github.com/seanpringle/xoat"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+
+DEPEND="
+	x11-libs/libX11
+	x11-libs/libXft
+	x11-libs/libXinerama
+"
+RDEPEND="
+	${DEPEND}
+	!savedconfig? ( x11-misc/dmenu )
+"
+
+src_prepare() {
+	default
+	restore_config config.h
+}
+
+src_configure() {
+	tc-export CC PKG_CONFIG
+}
+
+src_compile() {
+	XOAT_COMPILE=(
+		${CC} -o ${PN} ${PN}.c ${CFLAGS} -std=c99 ${LDFLAGS}
+		$(${PKG_CONFIG} --cflags --libs x11 xinerama xft)
+	)
+	echo ${XOAT_COMPILE[@]}
+	${XOAT_COMPILE[@]} || die
+}
+
+src_install() {
+	dobin xoat
+	dodoc status xinitrc xoat.md xoatrc
+	doman xoat.1
+	save_config config.h
+}
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
new file mode 100644
index 000000000000..780d1e2b29ac
--- /dev/null
+++ b/x11-wm/xpra/Manifest
@@ -0,0 +1,17 @@
+AUX xpra-0.13.1-ignore-gentoo-no-compile.patch 485 SHA256 9cf251f53cc13fc79875928717266a27ee63e61e23331eae4912b21e77242ba5 SHA512 244d6aaa805ef0f99238a0f1ff592efc9fda9d7c3898c0e3ff8a40bfb2d27597737e941b90d1d86c794a50dc61ade8862a4be97ef4938005b0f918565dc7abe9 WHIRLPOOL 101acd539e76d7d036e361c6d1c6af86bacd37c271f01d101efa5fe1fec57c7b2b6106c76a79e6ec6acfab5999837995f17faaf4874b01a906c20050332f3848
+AUX xpra-0.17.4-deprecated-avcodec.patch 552 SHA256 454133124a314d90151b398d5196053b06da6d6f875dbbfe822dd106cb5673be SHA512 9b703001634916516a82cf1a72ec9bdcb626269a5b17daa93964cb204d351986184c6597c6fc0801061bf8856f8811a68eddfe9fed331dd108d9d692f5e153fe WHIRLPOOL 5f90936face3d31abfe90b32708a26fd976ddff0eea4d40ec5f445f979118e2f3fd13dcaa1c75d877a9b077b08285b1a903a136581d6ff2b5b913757905b81e7
+AUX xpra-1.0.4-suid-warning.patch 653 SHA256 a742985c45fcbf119e895c36db04e84f9de16e0a1d9911df749e1ce63a17fd83 SHA512 1b12b309eba08914af59017b6f3a76f743a27cea13bee9d17d2c73334d8c762fc1c8459f32783275eed1d0de83f571a4104cf0bfc3a334d4ff09ee873458ec9c WHIRLPOOL cad433f9bbd82a5c8610fe951e4e4f0b8345f6d8ce3243f8c1fc31a8d2c80fecfcadf9d05cfca74d173eabcd51bbf062de61db48d609468ef591aa600f621592
+AUX xpra-2.0-suid-warning.patch 617 SHA256 1fe6d02ac4a9e9b5f31775a6bd29b1fc0e88e5a74a2b19594535d8feeaa522c8 SHA512 f0d69a6e57435d6c9ef1ecb10e9fa6916b2a8b11f5979b7dffcc37c0a8ec387306b651d50ca3fe10a489cb28f6c2384fbe578510bd7f9bc7a51249e66c4d17ab WHIRLPOOL 0e0a70a2a42d8bd624300eaa574014502c602410a80688660fe594b9cc2390893a9501c9984b11bc340de19e50be856b5bdab3276446cd5cb2632ee5b098a2f5
+DIST xpra-1.0.6.tar.xz 1892736 SHA256 2ba9212333ee5dc437955ce95d15eb8a9713cf4881914b1d2fe30b1fce188c2d SHA512 d99cceca56c226f8d52d3992e790337fa9e785671c6e2ae00f119492df402c350218bb7c60e1ecd8ccd02e379d59e99bb5601bd35d433095d4a04024ec0f99b4 WHIRLPOOL 6380e2748db3aeaf532e30b70e1956036823f505540c4339a62e0576f8ff108cd5e8f33631dedfdcd5b6d01695e9f2bd11c6287485ecb1c8f0c659073002bfbb
+DIST xpra-1.0.7.tar.xz 1895052 SHA256 179653f29deccf943c55dfe2f04375bdd747258d72fdc7a44f643ec588ce429f SHA512 a02f4afea4dae845f8ab3456270773361d6ab4bfd76c1a8b3cbda42e2df2eaffd5cadd2a1ef7871f0efc485f294eb1c000553531a3fe2f2f87f09623a628814e WHIRLPOOL 1f3e1fb71e32ff2f49caf290e5bed2901b5eeb0ebf7f90ee87dcbdacf3cf0f94da31d1e6d183c7ebfacea697f80ffcd3d3c1f7c4cef7be7fa8f08549e0b7c350
+DIST xpra-2.0.2.tar.xz 1926876 SHA256 4341bb6652d6e7784dddc02c63a634019c782332e9af1c08f4b8ec24f57a1f26 SHA512 4b36cf9cf96f094011412214368bc452ed597f1927f6488d6856ad80b575d7f37273cf49b8682fdbc137cf581d5a88b17a9241d508278e45e48f9451ba628b68 WHIRLPOOL d8919e8b9d40539a1c59dba2b1455924f276e5233e3674fd756e833c6bf2a132a5a27c9686cabdff2f4dc05b616245cdf0d06ce215ceb615c7c4c04861cfc41a
+DIST xpra-2.0.3.tar.xz 1928296 SHA256 caa97630b40de8e144328e80d002f3521acbc252ab17dc0bdcd1512ddf9a55b8 SHA512 25d8c5956462bd286c96a70b8f8fa8e9e75cfa27ec65438d72c0f6846b6ba7e5b61c3079ed6c663153d4abab0dddff906d6c22b40f97b77cc81728441798891e WHIRLPOOL 0017ab8f8f6db944bbc9ef8900c51ac5a78f4e935de36b4f1cc1a3cc7fd1871bbebe79bc713eb647fb4dc7811a8dd0a2243795438d1984b8f19922e41f1e3043
+DIST xpra-2.1.1.tar.xz 2065280 SHA256 0777e8b4bb7efc2cf5dae1424f6c8383dc5ea377de415b3895d776a7606bed39 SHA512 913c6952b12bdc01ef8cbbb62b05cfc9bd564b6d425f7edd2448bc3bfbdd9dc0bf9a890b1c85d3e39c387468b9738de7de4336e80b4e715856746197e1e93b20 WHIRLPOOL 72bf5405deb2fed5612d5126f7717d54273a64bdbd3f6c1e99737a9aee023c8d606508976f872a16ee91c4065a90f7aec6ed187110084e4a332a7dac512aaa45
+EBUILD xpra-1.0.6.ebuild 3954 SHA256 eb3cb06eddeabe7f7767d7609567d1a337a6820262123cffd7670ca454f5ae71 SHA512 adfc00b39fa458b1a178d723ff589f151a488c97ed4a35dd834d6beb3d8334150dce2cf59c189a6d6fe75d0117ea34d641560c14f0ca75c41b8c42396dc45ccc WHIRLPOOL 4654cbd59ffc653321dfeed840968e807387b218fc5881460c0fc80c0d9638f085c68048c13526eeb9355c5963027749e5126b9bf3959497a90de7eaf78e3f8d
+EBUILD xpra-1.0.7.ebuild 3956 SHA256 cceedf16be132df366cb3e9b7ff418725acd1d35991847579d17f14927c3d4c7 SHA512 063e353fd1964b82dd3f2f462993a1d2fd27b696068b3c90cbf8b84f7841f3b9318c4388202283d0eaba715b4775105ceea0998019442b83e3d4d0eddfbf9a9d WHIRLPOOL a65bb0ec351c43aab853b0f068c3df84dd13d6fcaafb314c8ad5abb705aedacb0d0aa3f6f1f5b2b8f4649e76d6d64046a37aaa645f660bc6a11d0db72211099f
+EBUILD xpra-2.0.2.ebuild 3940 SHA256 9567d49581d941ca4a574f17de872820caec63eb3cd739c105223693e4abc3ac SHA512 de48c1d149d6aed26a4bfa9609b25de384a67ff65e24340a1091f10d6a07ce98d33acdcca18ec7ef5e915154a06f33e4f7bd73f91b3bf179c235ed52a0d792a7 WHIRLPOOL 67ecd2b52fda69aabe36d3b4f1a1c3eadc191186b56023b952c686c1687e61994ecca3f7e816f5817362fc2835180de1dad9ebb96c2631a10701420f98312f21
+EBUILD xpra-2.0.3.ebuild 3942 SHA256 e8e8ed0575b235ecc0cf16151ef91c6d5a1cb0e9865eada76bf5463b52a0240f SHA512 a76f95359f16f0960b3d90d15761ccfe9981d339558f482bafdc696e1f6af5a5c7c601dc9a931c3f47092d5683c240084255fee324ef2dfb5e47cf4fb805c68c WHIRLPOOL b4fd2205ee29554804a0c4e387ae6e0c257d1d719e0c68162bd17089a05191a41e82747551b603cc7c9764cc942e81d32d70b3393e99e2e9507a413ca7066f10
+EBUILD xpra-2.1.1.ebuild 3889 SHA256 feff46dc4ce9ba8cb6c8a7e72e12b5051a7d241c67eed8353dd532cc38c3aa27 SHA512 04f5b8970fa310de05c6df23236108c4b0bb967b52152962a4e722f0f38ef32ec20fde590a72c9c81604739d0d7182340c8c6213a1d76a2ed0b037999cf93e26 WHIRLPOOL 21b4ed025771e3631b712a863eb4e2ce7ef7050222153fcdc6470a3dc71c6ea8b6f03dd31d80e89a821b2eccbc1f0f816007ae9c32b00ceeb374c5ea4f23a134
+MISC ChangeLog 7851 SHA256 d879f5c64db889ffd26d096a246fbb369380e416f950f09d69c3dd6036912787 SHA512 11ef7c5ad5f45b25c9b7f85642001393b4158a9559cb2f322c977ebf4edbdbe5b7d81bbeb53712425f4b66d00dfe5142e332c969a210458ae466d385499c7d31 WHIRLPOOL 4d50dccb842117b5f5557aadecef5f590add65559dd7ca2577e5508b2f9505e9f455d2798196363cbdbbce73488b379a97f377699cd93abff42387078efed64a
+MISC ChangeLog-2015 18339 SHA256 152c89568570fe3359c454a085bea9eb60bb5897421489123e519d04a0c4918b SHA512 06dc268b20994bba588a79b556e679e8148309fd1372112842cd14e366b7fefb3b8d78b93215f4ef8378c64b3bc64235d9d0b669e7983ca975e188153b393b4b WHIRLPOOL cda35b926e6422e56dc7c05c6a3104e0ff1660d726e6749228da4855c824e7ad1391a549441491effaa4bda8e38faad9d9b5167da8e4ce017c6d8453f2efbeda
+MISC metadata.xml 1087 SHA256 9919eb748d3a03ca324de2aa8490ab0a887dc07f777d12049a6acffd7b1ac317 SHA512 8bf4ba96000fdf8b0c66d655194d4e5bf2f41f3e06754a7411cf5dc9c130d80519419cad73fff69418d01ae59db07b15aa96acd4ec4581958c22572abec6031c WHIRLPOOL b6b85c9fe80e12a4af318f5a31b6f3c41c79194df5b5b4bc9bb41834b1bcdfecf2e410b5001c62afdd6476c6ee3c8857e09674e3ad46b751b1e9d4a049475ef9
diff --git a/x11-wm/xpra/files/xpra-0.13.1-ignore-gentoo-no-compile.patch b/x11-wm/xpra/files/xpra-0.13.1-ignore-gentoo-no-compile.patch
new file mode 100644
index 000000000000..9c580a513557
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-0.13.1-ignore-gentoo-no-compile.patch
@@ -0,0 +1,11 @@
+--- xpra-0.13.1/setup.py
++++ xpra-0.13.1/setup.py
+@@ -395,7 +395,7 @@
+     #then expects to find the cython modules!? ie:
+     #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
+     cython_version_check(min_version)
+     from Cython.Distutils import build_ext
+     ext_modules.append(extension)
diff --git a/x11-wm/xpra/files/xpra-0.17.4-deprecated-avcodec.patch b/x11-wm/xpra/files/xpra-0.17.4-deprecated-avcodec.patch
new file mode 100644
index 000000000000..13bd4be892d5
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-0.17.4-deprecated-avcodec.patch
@@ -0,0 +1,11 @@
+--- xpra-0.17.4/setup.py
++++ xpra-0.17.4/setup.py
+@@ -660,7 +660,7 @@
+                         "-Wno-unused-function",
+                         "-Wno-sometimes-uninitialized"]
+             elif get_gcc_version()>=[4, 4]:
+-                eifd = ["-Werror",
++                eifd = ["-Werror", "-Wno-error=deprecated-declarations",
+                         #CentOS 6.x gives us some invalid warnings in nvenc, ignore those:
+                         #"-Wno-error=uninitialized",
+                         #needed on Debian and Ubuntu to avoid this error:
diff --git a/x11-wm/xpra/files/xpra-1.0.4-suid-warning.patch b/x11-wm/xpra/files/xpra-1.0.4-suid-warning.patch
new file mode 100644
index 000000000000..9af267cb4505
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-1.0.4-suid-warning.patch
@@ -0,0 +1,11 @@
+--- xpra-1.0.4/xpra/scripts/config.py
++++ xpra-1.0.4/xpra/scripts/config.py
+@@ -130,7 +130,7 @@
+                 xorg_stat = os.stat(xorg_bin)
+                 if (xorg_stat.st_mode & stat.S_ISUID)!=0:
+                     if (xorg_stat.st_mode & stat.S_IROTH)==0:
+-                        warn("%s is suid and not readable, Xdummy support unavailable" % xorg_bin)
++                        debug("%s is suid and not readable, Xdummy support unavailable" % xorg_bin)
+                         return get_Xvfb_command()
+                     debug("%s is suid and readable, using the xpra_Xdummy wrapper" % xorg_bin)
+                     use_wrapper = True
diff --git a/x11-wm/xpra/files/xpra-2.0-suid-warning.patch b/x11-wm/xpra/files/xpra-2.0-suid-warning.patch
new file mode 100644
index 000000000000..806694f24312
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-2.0-suid-warning.patch
@@ -0,0 +1,11 @@
+--- xpra-2.0/xpra/scripts/config.py
++++ xpra-2.0/xpra/scripts/config.py
+@@ -127,7 +127,7 @@
+             xorg_stat = os.stat(xorg_bin)
+             if (xorg_stat.st_mode & stat.S_ISUID)!=0:
+                 if (xorg_stat.st_mode & stat.S_IROTH)==0:
+-                    warn("%s is suid and not readable, Xdummy support unavailable" % xorg_bin)
++                    debug("%s is suid and not readable, Xdummy support unavailable" % xorg_bin)
+                     return get_Xvfb_command()
+                 debug("%s is suid and readable, using the xpra_Xdummy wrapper" % xorg_bin)
+                 use_wrapper = True
diff --git a/x11-wm/xpra/metadata.xml b/x11-wm/xpra/metadata.xml
new file mode 100644
index 000000000000..4e1ba55af217
--- /dev/null
+++ b/x11-wm/xpra/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>xmw@gentoo.org</email>
+	<name>Michael Weber</name>
+</maintainer>
+<upstream>
+	<bugs-to>https://www.xpra.org/trac/report</bugs-to>
+</upstream>
+<use>
+	<flag name="client">Build client-side code</flag>
+	<flag name="clipboard">Enable clipboard support</flag>
+	<flag name="csc">Enable csc softscaler support</flag>
+	<flag name="dec_avcodec2">Enable avcodec2 decoder support</flag>
+	<flag name="enc_ffmpeg">Enable advanced ffmpeg/libav encoder support</flag>
+	<flag name="enc_x264">Enable x264 encoder support</flag>
+	<flag name="enc_x265">Enable x265 encoder support</flag>
+	<flag name="lz4">Enable support for lz4 compression</flag>
+	<flag name="pillow">Enable pillow support</flag>
+	<flag name="server">Build server-side code</flag>
+	<flag name="vpx">Enable vpx image format support</flag>
+	<flag name="webp">Enable webp image format support</flag>
+	<flag name="webcam">Enable webcam support via opencv</flag>
+</use>
+</pkgmetadata>
diff --git a/x11-wm/xpra/xpra-1.0.6.ebuild b/x11-wm/xpra/xpra-1.0.6.ebuild
new file mode 100644
index 000000000000..39eccb30ba88
--- /dev/null
+++ b/x11-wm/xpra/xpra-1.0.6.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# PyCObject_Check and PyCObject_AsVoidPtr vanished with python 3.3, and setup.py not python3.2 compat
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1 eutils flag-o-matic user tmpfiles
+
+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 ~amd64-linux ~x86-linux"
+IUSE="+client +clipboard csc cups dbus dec_avcodec2 enc_ffmpeg enc_x264 enc_x265 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:2[${PYTHON_USEDEP}]
+	dev-python/pygtk:2[${PYTHON_USEDEP}]
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	csc? (
+		!libav? ( >=media-video/ffmpeg-1.2.2:0= )
+		libav? ( media-video/libav:0= )
+	)
+	dec_avcodec2? (
+		!libav? ( >=media-video/ffmpeg-2:0= )
+		libav? ( media-video/libav:0= )
+	)
+	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= )
+		libav? ( media-video/libav:0= )
+	)
+	enc_x265? ( media-libs/x265
+		!libav? ( >=media-video/ffmpeg-2:0= )
+		libav? ( media-video/libav:0= )
+	opengl? ( dev-python/pygtkglext )
+	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/ipython[${PYTHON_USEDEP}]
+	dev-python/netifaces[${PYTHON_USEDEP}]
+	dev-python/rencode[${PYTHON_USEDEP}]
+	virtual/ssh
+	x11-apps/xmodmap
+	cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
+	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+	lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
+	lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
+	opengl? (
+		client? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
+	)
+	pillow? ( dev-python/pillow[${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}]"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.13.1-ignore-gentoo-no-compile.patch
+	"${FILESDIR}"/${PN}-0.17.4-deprecated-avcodec.patch
+	"${FILESDIR}"/${PN}-1.0.4-suid-warning.patch )
+
+pkg_postinst() {
+	enewgroup ${PN}
+	tmpfiles_process /usr/lib/tmpfiles.d/xpra.conf
+}
+
+python_prepare_all() {
+	sed -e "s:/var/run/xpra:${EROOT}run/xpra:" \
+		-i tmpfiles.d/xpra.conf
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	sed -e "/'pulseaudio'/s:not OSX and not WIN32:$(usex pulseaudio True False):" \
+		-i setup.py || die
+
+	mydistutilsargs=(
+		--without-PIC
+		--without-Xdummy
+		$(use_with client)
+		$(use_with clipboard)
+		$(use_with csc csc_swscale)
+		$(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)
+		--with-gtk2
+		--without-gtk3
+		--without-html5
+		--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="${EROOT}run/xpra"
+}
diff --git a/x11-wm/xpra/xpra-1.0.7.ebuild b/x11-wm/xpra/xpra-1.0.7.ebuild
new file mode 100644
index 000000000000..2aa260c03d6b
--- /dev/null
+++ b/x11-wm/xpra/xpra-1.0.7.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# PyCObject_Check and PyCObject_AsVoidPtr vanished with python 3.3, and setup.py not python3.2 compat
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1 eutils flag-o-matic user tmpfiles
+
+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 ~amd64-linux ~x86-linux"
+IUSE="+client +clipboard csc cups dbus dec_avcodec2 enc_ffmpeg enc_x264 enc_x265 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:2[${PYTHON_USEDEP}]
+	dev-python/pygtk:2[${PYTHON_USEDEP}]
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	csc? (
+		!libav? ( >=media-video/ffmpeg-1.2.2:0= )
+		libav? ( media-video/libav:0= )
+	)
+	dec_avcodec2? (
+		!libav? ( >=media-video/ffmpeg-2:0= )
+		libav? ( media-video/libav:0= )
+	)
+	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= )
+		libav? ( media-video/libav:0= )
+	)
+	enc_x265? ( media-libs/x265
+		!libav? ( >=media-video/ffmpeg-2:0= )
+		libav? ( media-video/libav:0= )
+	opengl? ( dev-python/pygtkglext )
+	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/ipython[${PYTHON_USEDEP}]
+	dev-python/netifaces[${PYTHON_USEDEP}]
+	dev-python/rencode[${PYTHON_USEDEP}]
+	virtual/ssh
+	x11-apps/xmodmap
+	cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
+	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+	lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
+	lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
+	opengl? (
+		client? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
+	)
+	pillow? ( dev-python/pillow[${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}]"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.13.1-ignore-gentoo-no-compile.patch
+	"${FILESDIR}"/${PN}-0.17.4-deprecated-avcodec.patch
+	"${FILESDIR}"/${PN}-1.0.4-suid-warning.patch )
+
+pkg_postinst() {
+	enewgroup ${PN}
+	tmpfiles_process /usr/lib/tmpfiles.d/xpra.conf
+}
+
+python_prepare_all() {
+	sed -e "s:/var/run/xpra:${EROOT}run/xpra:" \
+		-i tmpfiles.d/xpra.conf
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	sed -e "/'pulseaudio'/s:not OSX and not WIN32:$(usex pulseaudio True False):" \
+		-i setup.py || die
+
+	mydistutilsargs=(
+		--without-PIC
+		--without-Xdummy
+		$(use_with client)
+		$(use_with clipboard)
+		$(use_with csc csc_swscale)
+		$(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)
+		--with-gtk2
+		--without-gtk3
+		--without-html5
+		--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="${EROOT}run/xpra"
+}
diff --git a/x11-wm/xpra/xpra-2.0.2.ebuild b/x11-wm/xpra/xpra-2.0.2.ebuild
new file mode 100644
index 000000000000..5ab67f9e277e
--- /dev/null
+++ b/x11-wm/xpra/xpra-2.0.2.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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=( python2_7 )
+inherit distutils-r1 eutils flag-o-matic user tmpfiles
+
+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 ~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"
+
+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:2[${PYTHON_USEDEP}]
+	dev-python/pygtk:2[${PYTHON_USEDEP}]
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	csc? (
+		!libav? ( >=media-video/ffmpeg-1.2.2:0= )
+		libav? ( media-video/libav:0= )
+	)
+	dec_avcodec2? (
+		!libav? ( >=media-video/ffmpeg-2:0= )
+		libav? ( media-video/libav:0= )
+	)
+	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= )
+		libav? ( media-video/libav:0= )
+	)
+	enc_x265? ( media-libs/x265
+		!libav? ( >=media-video/ffmpeg-2:0= )
+		libav? ( media-video/libav:0= ) )
+	jpeg? ( media-libs/libjpeg-turbo )
+	opengl? ( dev-python/pygtkglext )
+	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 )"
+
+RDEPEND="${COMMON_DEPEND}
+	dev-python/ipython[${PYTHON_USEDEP}]
+	dev-python/netifaces[${PYTHON_USEDEP}]
+	dev-python/rencode[${PYTHON_USEDEP}]
+	virtual/ssh
+	x11-apps/xmodmap
+	cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
+	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+	lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
+	lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
+	opengl? (
+		client? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
+	)
+	pillow? ( dev-python/pillow[${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}]"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.13.1-ignore-gentoo-no-compile.patch
+	"${FILESDIR}"/${PN}-0.17.4-deprecated-avcodec.patch
+	"${FILESDIR}"/${PN}-2.0-suid-warning.patch )
+
+pkg_postinst() {
+	enewgroup ${PN}
+	tmpfiles_process /usr/lib/tmpfiles.d/xpra.conf
+}
+
+python_prepare_all() {
+	sed -e "s:/var/run/xpra:${EROOT}run/xpra:" \
+		-i tmpfiles.d/xpra.conf
+
+	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
+		$(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)
+		--with-gtk2
+		--without-gtk3
+		--without-html5
+		$(use_with jpeg)
+		--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)
+		--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="${EROOT}run/xpra"
+}
diff --git a/x11-wm/xpra/xpra-2.0.3.ebuild b/x11-wm/xpra/xpra-2.0.3.ebuild
new file mode 100644
index 000000000000..011698e250a3
--- /dev/null
+++ b/x11-wm/xpra/xpra-2.0.3.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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=( python2_7 )
+inherit distutils-r1 eutils flag-o-matic user tmpfiles
+
+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 ~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"
+
+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:2[${PYTHON_USEDEP}]
+	dev-python/pygtk:2[${PYTHON_USEDEP}]
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	csc? (
+		!libav? ( >=media-video/ffmpeg-1.2.2:0= )
+		libav? ( media-video/libav:0= )
+	)
+	dec_avcodec2? (
+		!libav? ( >=media-video/ffmpeg-2:0= )
+		libav? ( media-video/libav:0= )
+	)
+	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= )
+		libav? ( media-video/libav:0= )
+	)
+	enc_x265? ( media-libs/x265
+		!libav? ( >=media-video/ffmpeg-2:0= )
+		libav? ( media-video/libav:0= ) )
+	jpeg? ( media-libs/libjpeg-turbo )
+	opengl? ( dev-python/pygtkglext )
+	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 )"
+
+RDEPEND="${COMMON_DEPEND}
+	dev-python/ipython[${PYTHON_USEDEP}]
+	dev-python/netifaces[${PYTHON_USEDEP}]
+	dev-python/rencode[${PYTHON_USEDEP}]
+	virtual/ssh
+	x11-apps/xmodmap
+	cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
+	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+	lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
+	lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
+	opengl? (
+		client? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
+	)
+	pillow? ( dev-python/pillow[${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}]"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.13.1-ignore-gentoo-no-compile.patch
+	"${FILESDIR}"/${PN}-0.17.4-deprecated-avcodec.patch
+	"${FILESDIR}"/${PN}-2.0-suid-warning.patch )
+
+pkg_postinst() {
+	enewgroup ${PN}
+	tmpfiles_process /usr/lib/tmpfiles.d/xpra.conf
+}
+
+python_prepare_all() {
+	sed -e "s:/var/run/xpra:${EROOT}run/xpra:" \
+		-i tmpfiles.d/xpra.conf
+
+	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
+		$(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)
+		--with-gtk2
+		--without-gtk3
+		--without-html5
+		$(use_with jpeg)
+		--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)
+		--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="${EROOT}run/xpra"
+}
diff --git a/x11-wm/xpra/xpra-2.1.1.ebuild b/x11-wm/xpra/xpra-2.1.1.ebuild
new file mode 100644
index 000000000000..4c0c8a994be7
--- /dev/null
+++ b/x11-wm/xpra/xpra-2.1.1.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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=( python2_7 )
+inherit distutils-r1 eutils flag-o-matic user tmpfiles
+
+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 ~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"
+
+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:2[${PYTHON_USEDEP}]
+	dev-python/pygtk:2[${PYTHON_USEDEP}]
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	csc? (
+		!libav? ( >=media-video/ffmpeg-1.2.2:0= )
+		libav? ( media-video/libav:0= )
+	)
+	dec_avcodec2? (
+		!libav? ( >=media-video/ffmpeg-2:0= )
+		libav? ( media-video/libav:0= )
+	)
+	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= )
+		libav? ( media-video/libav:0= )
+	)
+	enc_x265? ( media-libs/x265
+		!libav? ( >=media-video/ffmpeg-2:0= )
+		libav? ( media-video/libav:0= ) )
+	jpeg? ( media-libs/libjpeg-turbo )
+	opengl? ( dev-python/pygtkglext )
+	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 )"
+
+RDEPEND="${COMMON_DEPEND}
+	dev-python/ipython[${PYTHON_USEDEP}]
+	dev-python/netifaces[${PYTHON_USEDEP}]
+	dev-python/rencode[${PYTHON_USEDEP}]
+	virtual/ssh
+	x11-apps/xmodmap
+	cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
+	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+	lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
+	lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
+	opengl? (
+		client? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
+	)
+	pillow? ( dev-python/pillow[${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}]"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.13.1-ignore-gentoo-no-compile.patch
+	"${FILESDIR}"/${PN}-2.0-suid-warning.patch )
+
+pkg_postinst() {
+	enewgroup ${PN}
+	tmpfiles_process /usr/lib/tmpfiles.d/xpra.conf
+}
+
+python_prepare_all() {
+	sed -e "s:/var/run/xpra:${EROOT}run/xpra:" \
+		-i tmpfiles.d/xpra.conf
+
+	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
+		$(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)
+		--with-gtk2
+		--without-gtk3
+		--without-html5
+		$(use_with jpeg)
+		--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)
+		--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="${EROOT}run/xpra"
+}
author	V3n3RiX <venerix@redcorelinux.org>	2017-10-09 18:53:29 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2017-10-09 18:53:29 +0100
commit	4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
tree	ba5f07bf3f9d22d82e54a462313f5d244036c768 /x11-wm