gentoo resync : 21.06.2020

18 files changed, 342 insertions, 248 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 23f7deaa9b13..39173b75a5bd 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/cwm/Manifest b/x11-wm/cwm/Manifest
index e0509a090fb2..5d1aac3d2088 100644
--- a/x11-wm/cwm/Manifest
+++ b/x11-wm/cwm/Manifest
@@ -3,6 +3,6 @@ DIST cwm-5.6-chneukirchen.tar.gz 50799 BLAKE2B 4d9341e89b21187044bbcbc658dea2eac
 DIST cwm-5.6-xmw.tar.gz 53738 BLAKE2B 9c36c42fc35a8206035ed59fb8fe2e8eb13effcdb43d488bcc99c2d0f48476e206e46fd52c0928afdb51d55c68d9be03a186aaf4c49d03bcdf8754df0c5d81db SHA512 cf0174523838dba5997206be904ab667efc5ff7e413e98bb81cc3a69d40a79b54e21405787e088486feb8790d1094a2d3cce0be08d7ee36a2b9b0dadd78466c7
 DIST cwm-6.6.tar.gz 53062 BLAKE2B 3da762f0c1a48c83c773a1f355cc970c5e4f6100e7294a00f44c6b5b7e1ffe954fde0e3d106991b05cd1f8c898fe055b5305b0bd7bf533df5868d32adbae2c5f SHA512 ff94fd1b7d263f9de538e5b338db58a08e1bec3e4233b84ab0a3ac94c47a45e10b2c772f93b897e70baf9a3c04e1a6fa04604ac71655acb7ebd1d10edb381042
 EBUILD cwm-5.6.ebuild 1004 BLAKE2B 27ef899c7d0fb99f273a31a0cfa0f5429bbd0b24c692af1e15fa5cd5c22f347d65e93120b1564ed6b9fc0d563801340f6dfaa7d2559dac5693c791a0beca2f2c SHA512 bcfcb3689de10912b31c88601185bb23e1f99305cf0c6a79d3ea02760b5ea0b8f213f63b6b84b1e3471049b9b3a7fb3df374580883e972e3fde69921dcd92493
-EBUILD cwm-6.6.ebuild 1007 BLAKE2B 8dd3cce566d8a43b65af117948475389caa6df4844a430ca8df071efed0061351cb2c27c60efafcf6f880f5f07a05ef3855260d50417a2f7a057656b2aecebcd SHA512 5c16be2f52bf886e11cfe126b6f4435c19af503d2bbff53e609bbf72e01d2d6a596221b74dc130663ecb8734d56c2db443f8c885be4627c7476e9afaf2cbb2d0
+EBUILD cwm-6.6.ebuild 1017 BLAKE2B 2da4f398acfe5e1bb351cdaf75d8cf46af19a78a75741f9a40121495f9f9207ab9d181b8e604339dd74c607a1388b58e37e33b1b26d593d8b65f800caae5b990 SHA512 015d5b4d8eb74fc7d1af00e95c8cf33ef390571a999138430965435688f1f1a6b059a3f140b63a074ed38cf9df70c78ec6f45a0ba12d86f93cb7a32857d962d1
 EBUILD cwm-9999.ebuild 958 BLAKE2B 592d23a69e9ad7bc664354df19000a726dd64f93452c1f4e4fa4a8439de8050c12cee941ea91fb82a831af1fb97cd0b52bf80312dd71649c473fea6479c36b49 SHA512 0cd8900c7f3d23733752d348e67882bc26bcbaf25c89742c7279a410369ea15ca76186cff91d3a7a6d1c7df8bd7421f23a9c506f3f9d909a1ac51a971c70eb7f
 MISC metadata.xml 440 BLAKE2B a1ed14101aa667304e039f287fcec44a7f125585b20af9b1e9c35d68520f567d7eb4306ceabc888dbf25c3effffed13fbadf0a2703ed7cee1424b7a5225a3157 SHA512 97dace19645fdebf1f37d8023d689eb6b8bd5747f0c88d1c5cae410862d5123a46bfc112f8d77c6259144138381a866509986ae774dc058e422c11fd2d6c5478
diff --git a/x11-wm/cwm/cwm-6.6.ebuild b/x11-wm/cwm/cwm-6.6.ebuild
index 083e7d8776c3..4ea85a7680c6 100644
--- a/x11-wm/cwm/cwm-6.6.ebuild
+++ b/x11-wm/cwm/cwm-6.6.ebuild
@@ -12,10 +12,10 @@ HOMEPAGE="https://www.openbsd.org/cgi-bin/cvsweb/xenocara/app/cwm/
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/leahneukirchen/${PN}.git"
-	KEYWORDS=""
+	KEYWORDS="amd64 arm x86"
 else
 	SRC_URI="https://github.com/leahneukirchen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 arm ~arm64 x86"
 fi
 
 LICENSE="ISC"
diff --git a/x11-wm/i3-gaps/Manifest b/x11-wm/i3-gaps/Manifest
index 56aafa276127..8f4590475b38 100644
--- a/x11-wm/i3-gaps/Manifest
+++ b/x11-wm/i3-gaps/Manifest
@@ -1,7 +1,10 @@
 AUX i3-gaps-4.16-musl.patch 2783 BLAKE2B 9dea47af64b78a77006d3aa641273aa7a77846d4425e1da17424528445450112ab275cdf7098ba8c2a76f1b08561b1d1a852cb9fd4ee4c61e53832ca702ad55d SHA512 fdff65255e7c9b30eefdbf032e04ba568d5b75a5b7dfc5fce1aecaac0f0d376b6bb4f87338e1eaf5f20b1c5882ebfc7349f8ab43c804349b5f5c626f9fc1d340
 AUX i3-gaps-4.17-musl.patch 2135 BLAKE2B 7b8609a5377cafc823798fd0d712d5d81e3de2c746f8d246907bfc791c7ec626cb26a8b3843d337c64bf0c28850703976d384e5a38303d6b5f342cad68eb6b80 SHA512 c6ae3f22d0303da5de7ca4c92734b043a76d7447559fe2ffc308a8d135076cf05ee53ef63eb28c1bd628a1edfb2d1a0ed2d090836cb5fc70f2b882ee1105dad3
+AUX i3-gaps-4.18-musl.patch 2157 BLAKE2B 4fef024279d11e996c5c204f27b5a8b9fb654b392aeef19b92d5c3f9dfb203290fad7c31c003a046ee91c1201d940f3050a950721da8f58bdfd75495cb9be05c SHA512 14f70f067679b952e1ffc1965ea460173799292a33b5df6d3b2ca2c091219d6cd1f14b2d41b187452a83923b5b34cabe218ecb6fa70702accbef7562dd01f021
 DIST i3-gaps-4.16.1.tar.gz 3983420 BLAKE2B f0d5a85b06ce33e1cc177af6da29f9cdf42ed754bb767aa9eaa5ab52f3b9f4f688d251f2a16fb222fc8cf5052e79859891c4185b1325b2ef6c1a813aa220468c SHA512 904c2f63c6a35573f13fd216625c1349ac71de70ae8f0440667c9d76048cdaf30a398ab358f2366d5f46502d87e801713b625cb509a05f39dbca1371d2b8d0e9
 DIST i3-gaps-4.17.1.tar.gz 3991747 BLAKE2B e5ff8293abf41ffbd15c35590a0594861d7c8b70c0f42886ef7f15fb34b8da57a92cf9bcae76576e7db6db9bacc2356722e5653b1cf35b8446716f8845468b4b SHA512 31e47487f6f662f27b2642925f4ddfc553f1fd075e612d0d2661db723897b12eeae0a2bcefa8a43e7f1d4c15aec2222d3a63e37c8f7e1f9fc96567faa380ebff
+DIST i3-gaps-4.18.1.tar.gz 3999609 BLAKE2B 1a7f0d83831505fb8b75c00efeff276d3a837166029ff6d63dec7aa746a0d9c31245fdcf075f27a43f8c7456f178e30c8c8ddc87e30fbc53b244cf141a41aa34 SHA512 63a37e5920b3945be58e54f86b75523499e6b3a8dd9a05a952118e5609c9bd50fedabe05160eef0ebc377020042508a552f2a32272afcf1c913efcf48ac3e460
 EBUILD i3-gaps-4.16.1-r2.ebuild 1727 BLAKE2B a6c81dd66ff5280b58960b05404cd4aa7b2d221db4546f1dfea8ad78451bc448b8d06871d226dfefb16353fcac9262aaffbcfa7edcc055d2b3716470dbfaa5c5 SHA512 8b172d622aebdf34d0cc85f68449f50d1820d0cd9506bafba2aa11d29fb7ce9206e43c55e73c9926637f77083adbe7b15133664ab3a084e2d70176c85bb7b114
 EBUILD i3-gaps-4.17.1-r1.ebuild 1736 BLAKE2B ec7b2e25a1b12dc2bfcbe24944a9ecf5147efebf281da92c852b8aaa8d47ef83554fc48fcd7dbdc4d55f7626a5c8ce0ddede14b072c928b00cc0db28b4eb249e SHA512 36fca124501a8d903b9a4e27e61d7aa49ad1dec67994279207aa879203d59754205b51ad1b9edad9e982032d228fa002e91d544ba0cbba52e047fedc6cca7f58
+EBUILD i3-gaps-4.18.1.ebuild 1736 BLAKE2B ec7b2e25a1b12dc2bfcbe24944a9ecf5147efebf281da92c852b8aaa8d47ef83554fc48fcd7dbdc4d55f7626a5c8ce0ddede14b072c928b00cc0db28b4eb249e SHA512 36fca124501a8d903b9a4e27e61d7aa49ad1dec67994279207aa879203d59754205b51ad1b9edad9e982032d228fa002e91d544ba0cbba52e047fedc6cca7f58
 MISC metadata.xml 322 BLAKE2B bdba5a4519158f97944784fc4e2813c1b8e8d4f6f90d43b3a935e8b2565ecc5d2444c4b7b4d11266263d25a76b5c2dba55ec6535fdaab03129bb022206abbce2 SHA512 d3ca96f88473d21b81c420795c6eee5dd41f43354de85fd549a9ae8127e46f10d00034730bf850ddd6df8607821d30fce17aa349b1b2575f43fd3303a2da1cf6
diff --git a/x11-wm/i3-gaps/files/i3-gaps-4.18-musl.patch b/x11-wm/i3-gaps/files/i3-gaps-4.18-musl.patch
new file mode 100644
index 000000000000..bf59b32e3f70
--- /dev/null
+++ b/x11-wm/i3-gaps/files/i3-gaps-4.18-musl.patch
@@ -0,0 +1,74 @@
+--- a/i3bar/src/main.c
++++ b/i3bar/src/main.c
+@@ -45,14 +45,20 @@ void debuglog(char *fmt, ...) {
+  *
+  */
+ static 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);
+ }
+ 
+ static void print_usage(char *elf_name) {
+--- a/libi3/resolve_tilde.c
++++ b/libi3/resolve_tilde.c
+@@ -19,28 +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);
+-        strcpy(result, head);
+-        if (tail) {
+-            strcat(result, 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);
+ }
+-- 
+2.27.0
+
diff --git a/x11-wm/i3-gaps/i3-gaps-4.18.1.ebuild b/x11-wm/i3-gaps/i3-gaps-4.18.1.ebuild
new file mode 100644
index 000000000000..760a674fe049
--- /dev/null
+++ b/x11-wm/i3-gaps/i3-gaps-4.18.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools out-of-source
+
+DESCRIPTION="i3 fork with gaps and some more features"
+HOMEPAGE="https://github.com/Airblader/i3"
+SRC_URI="https://github.com/Airblader/i3/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="doc"
+
+DEPEND="
+	dev-libs/glib:2
+	dev-libs/libev
+	dev-libs/libpcre
+	dev-libs/yajl
+	x11-libs/cairo[X,xcb(+)]
+	x11-libs/libxcb[xkb]
+	x11-libs/libxkbcommon[X]
+	x11-libs/pango[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
+"
+BDEPEND="
+	app-text/asciidoc
+	app-text/xmlto
+	dev-lang/perl
+	virtual/pkgconfig
+"
+RDEPEND="${DEPEND}
+	dev-lang/perl
+	dev-perl/AnyEvent-I3
+	dev-perl/JSON-XS
+	!x11-wm/i3
+"
+
+S=${WORKDIR}/i3-${PV}
+
+DOCS=( RELEASE-NOTES-$(ver_cut 1-3) )
+
+PATCHES=( "${FILESDIR}/${PN}-$(ver_cut 1-2)-musl.patch" )
+
+src_prepare() {
+	default
+	eautoreconf
+	cat <<- EOF > "${T}"/i3wm
+		#!/bin/sh
+		exec /usr/bin/i3
+	EOF
+}
+
+my_src_configure() {
+	# disable sanitizer: otherwise injects -O0 -g
+	local myeconfargs=(
+		$(use_enable doc docs)
+		--enable-debug=no
+		--enable-mans
+		--disable-sanitizers
+	)
+	econf "${myeconfargs[@]}"
+}
+
+my_src_install_all() {
+	doman "${BUILD_DIR}"/man/*.1
+	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/i3lock"
+	einfo "  x11-misc/i3status"
+	einfo "Please refer to their description for additional info."
+}
diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index c8640d99dff6..31f5067a2fdc 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -1,16 +1,12 @@
 AUX i3-4.16-musl-GLOB_TILDE.patch 2783 BLAKE2B 9dea47af64b78a77006d3aa641273aa7a77846d4425e1da17424528445450112ab275cdf7098ba8c2a76f1b08561b1d1a852cb9fd4ee4c61e53832ca702ad55d SHA512 fdff65255e7c9b30eefdbf032e04ba568d5b75a5b7dfc5fce1aecaac0f0d376b6bb4f87338e1eaf5f20b1c5882ebfc7349f8ab43c804349b5f5c626f9fc1d340
 AUX i3-musl-GLOB_TILDE.patch 2828 BLAKE2B 6ab0b8e92aacfe648891da99ad6ae7058b7abcd9bb0d54d062ccfe45d6b1b56039b38272afb725605df77eaefc0e82167588637dd60204abc1b22a59ced9e8e7 SHA512 8ccf5c558327f099ac6881bc3a5b2006aac491f21fea429a4b7184594974815836f3eea517a33b8e852ba30b913bcd3637b08ea92c0bc1f5d3d9f778c2ce087a
 DIST i3-4.14.tar.gz 3936748 BLAKE2B 42678130be56bc695e5700e978ddbd34bfdaeda7a65252a05568581d76fe613e80e710f3a507110e7988077fe62048bf984d4009e722d877b178206cef600221 SHA512 fe3db78813987a15ed93d182968bcd5139e1d03f29d3e8effd9fce59f87bc8309407af0b2fa5f1cd83b8583e50ea0ade6b8eafc5dda6dea9161832dc9cebfdfe
-DIST i3-4.15.tar.bz2 1196263 BLAKE2B 36f20327202957dba30aface91af4d2c6261979e726584712a508a11cb4a612d812e771dc9f28ec4cfcbf3ebc9d92c72f5e940048516cca0f185eab20f95ae32 SHA512 60ab61b7e380342126bea12fb4371f98fcf18f6435f79a9519d3f59cfabdb170634366036e1aa20c5592da0832b03140ad1f0c72bad3cfaace0b7c57ad01dfc4
-DIST i3-4.16.1.tar.bz2 1211532 BLAKE2B 64a6996c0b89516069b58bf1cba92908a7f61ab04d66659b612b27411eb92fa9d49a7214eccdba33e7c33605b5f9247f69c1f0e23de629552edf113ab7520747 SHA512 3e328f8c7216697c5e484ca854605350f78844e24cc6cfb9c10e71368c2c0457387a14f819abdf8be2370d437889297f452fbf63f3924766ca81c157ab27e1b0
-DIST i3-4.16.tar.bz2 1213251 BLAKE2B a65d15278a83bac9903a611628ea53c64cd554ab9fff2a8864e649fd962858b2f3e77fe69d0dc70affc93dc69b3cbbd7b3ee670a2af9d697e28e9e4ea3323f67 SHA512 99abd15349ee8e61c084b3664ef3a189c92ea07812ac59eb6a5441df7cebea8211be52204e39bddcc33d8c714447fddbbe2c5c8a25b756a96e2dc6732526cbf8
 DIST i3-4.17.1.tar.bz2 1218418 BLAKE2B eb798eee2b618691ceb47b72c08fe09b09e2913c17fe667fab95426069c86497bff67278bea5fc97fdf90ebdfc6574e68cad36b21036a63d053edced1edf8592 SHA512 af397dc1768ea6530e4b2ce8ef21b20ecff8ab9eebf380df224456173eea4c3bacf28b55c8efcdc70f76f0d66543c163564a94cfd66028221ace481fa3c2913f
+DIST i3-4.18.1.tar.bz2 1217703 BLAKE2B 469a6ac09004f95861655858c47d9e6b2f378152bec7b7c6e7b08f06ee387043b8e2c382f888f14daf806ae8764d934025118e997f072709eee23c5cc52de21d SHA512 b001f539b1daf78be6dd9335a7c0474d30f8d969f79d131391ebd9ca310a058a1cc1234e4a9e60552efd520fc4983571f3c0b8cbd7be978e45957daaf86b3e90
 DIST i3-4.18.tar.bz2 1218591 BLAKE2B 582b7ba3a54edf8dd2657add05eb54a64b7c004761a1a248d91dfcb061cb9df215ff35301c125b11aa69b571daeacd5732b498934c1fb17f69404a101fd16ec8 SHA512 0bbfda7f4b20a92a50ffb6abbfc3f6bfe6bb4c987ad4b5b1791192eb23b8c3389cc9949a699901797370c14de1ff8e12447a3b8ce330ab7d300fafdb60a432ec
 EBUILD i3-4.14-r1.ebuild 2140 BLAKE2B 941ebc7e16c4376bed180964e610ce38ff216b3d8b7c406edc07deb7b91f03390fe1dd064d3288048b1d77b47572ecc9c7d2643c868abd5c0d257b1dac89af22 SHA512 10d791310d6617ce95253d4dafc97291558e229dabea1c8ad44ecb1061d2baa9edeab2aef5c2b36ebceac85171339bddc81d33494f2fb244facc6c256cef2e6b
-EBUILD i3-4.15-r1.ebuild 2323 BLAKE2B cc8f7d2d4565bcf7c8ddea111223fb357326e9012e8225d42f976818a308a49dc32c20b3f6af0d52b48393c21c01ec7c282bf6b2f13c7f79149d64c144be6278 SHA512 dac2e0e43a3a1ed58664b49e5f29c0af6008095380ad061a606802fa6239c87272ea99a970c09d04a3a862366843b422592d12058a1064765ec64bf08f2cc2e5
-EBUILD i3-4.16-r1.ebuild 2318 BLAKE2B cf613187d4105fbb66ab77ccf1d7dc7d6aff2171e0509b7cc99e72b5b93353583847bb07f994c432bc33f0cb38b3448367c4cb8f063daf5cdb0eaf0803bd2455 SHA512 335cc3cea82d35055c322bef7cdd141ddd51ea96ccacd27bf2ac431dd03691047711d6679aa7b74cb529ffa732a3e337e7d3f6676d899ef453faf24416514227
-EBUILD i3-4.16.1-r1.ebuild 2328 BLAKE2B ad26677f4353183174614bfa92361f4752c5e9acb4c0a6bf7328a65e8e63e3ccdc4afc1b7fa83eda96144a9bed72d6a62edf74da41300aba4639cf75dfbd54d5 SHA512 8078b647012fa62baccd4536c5b6e6925adbef228fcd0f274786a45820a1dcfa01402c2b58b3cb0b684114cc57a1bf4e049ca0ccdc23d60dcd047e954f104943
 EBUILD i3-4.17.1-r1.ebuild 2327 BLAKE2B 8f307ab43874156d97b3db51ac68fef7ca58f3f2381c495d815326076c1368473974143f00f0909ef66b1efb6e0ff2fda4ccfd7161d336e4d80ae6f6f9da5be0 SHA512 9405eaafba8cac4c6918cdd8343f61c558f58460c2a8dcda2321b1ad38e7318f8a7f6a51d4a3afcc450dcdc9a139d8baf158179c9bf6165c421288e1dc99b1e9
+EBUILD i3-4.18.1.ebuild 2128 BLAKE2B 99d9309ce3cf1673708ebdc5830db5c67c467df78295963d19c920e26704510dfa694762f74b638ebeb4fc937e964409c8332e00e2f1da6af1316dfb629eec65 SHA512 cd8e635c5c60b4d1e8372e8bfe597bff93c5449154842ae5b9bc966900105ed948eae98f965cac20740870d5e092318cea0218a6ace8ad87c0f5cc04eff844fa
 EBUILD i3-4.18.ebuild 2126 BLAKE2B 29048fa9165965ccd572cbacc8fdcc15697384bb75039c2c77caa3970040b31592359c1aa4b8df9242fd8c455e0b1a44d33c76422a9e603235651828cb7020d3 SHA512 527a652e1c6e05b1730a404c38a612820aebc2619ea8baf63c3403cbaaa8a4a5608ba63586c4f5ab09d7d57225727ed3f1207da317110b2b50b31b224440820c
 EBUILD i3-9999.ebuild 1817 BLAKE2B e812d4a04b34d2afb67da16370baace1a3d3376e2a15f73ff77aabbb8a061104f750abd84721266926bcd4d8f05b60d0014f38643c1a706e3ba5126ce68139f5 SHA512 0a31fd5d8ceeeda0c6f8fe06e595be9aa9f0aeca7547c9a8dc24cb2f6c0034255269d256cd88f265d77517da7df0cc8cd116b02404207cc4163df8e27132e086
 MISC metadata.xml 470 BLAKE2B 1c4fd7b44860934e88fb5165254fe0e8ca7e647c11af9af7d959f240e51002e6a454d9b93b30da8944891a1aa6a989f7a3e2a8af44ba41de174e78745393dd79 SHA512 52eddb56541d1172b04ca3ae646d01e52fb300dd62f5dfeaf2abe9d791965813e87b24a1477743797227bf8d407051f79076d54edb599524f89f3cfc716cc47e
diff --git a/x11-wm/i3/i3-4.15-r1.ebuild b/x11-wm/i3/i3-4.15-r1.ebuild
deleted file mode 100644
index a6e9f190536a..000000000000
--- a/x11-wm/i3/i3-4.15-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-AEVER=0.17
-
-inherit autotools out-of-source virtualx
-
-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 ~arm64 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-misc/xkeyboard-config
-	>=x11-libs/cairo-1.14.4[X,xcb(+)]
-	>=x11-libs/pango-1.30.0[X]"
-DEPEND="${CDEPEND}
-	test? (
-		dev-perl/AnyEvent
-		>=dev-perl/X11-XCB-0.120.0
-		dev-perl/Inline
-		dev-perl/Inline-C
-		dev-perl/IPC-Run
-		dev-perl/ExtUtils-PkgConfig
-		dev-perl/local-lib
-		>=virtual/perl-Test-Simple-0.940.0
-		x11-base/xorg-server[xephyr]
-	)
-	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 )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-musl-GLOB_TILDE.patch"
-)
-
-# https://github.com/i3/i3/issues/3013
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	cat <<- EOF > "${T}"/i3wm
-		#!/bin/sh
-		exec /usr/bin/i3
-	EOF
-
-	eautoreconf
-}
-
-my_src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-my_src_test() {
-	emake \
-		test.commands_parser \
-		test.config_parser \
-		test.inject_randr15
-
-	virtx perl \
-		-I "${S}/testcases/lib" \
-		-I "${BUILD_DIR}/testcases/lib" \
-		testcases/complete-run.pl
-}
-
-my_src_install_all() {
-	doman man/*.1
-
-	einstalldocs
-	use doc && dodoc -r docs "RELEASE-NOTES-${PV}"
-
-	exeinto /etc/X11/Sessions
-	doexe "${T}/i3wm"
-}
-
-pkg_postinst() {
-	# Only show the elog information on a new install
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog "There are several packages that you may find useful with ${PN} and"
-		elog "their usage is suggested by the upstream maintainers, namely:"
-		elog "  x11-misc/dmenu"
-		elog "  x11-misc/i3status"
-		elog "  x11-misc/i3lock"
-		elog "Please refer to their description for additional info."
-	fi
-}
diff --git a/x11-wm/i3/i3-4.16-r1.ebuild b/x11-wm/i3/i3-4.16-r1.ebuild
deleted file mode 100644
index dad9f3156252..000000000000
--- a/x11-wm/i3/i3-4.16-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools out-of-source virtualx
-
-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 ~arm64 ~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-misc/xkeyboard-config
-	>=x11-libs/cairo-1.14.4[X,xcb(+)]
-	>=x11-libs/pango-1.30.0[X]"
-DEPEND="${CDEPEND}
-	test? (
-		dev-perl/AnyEvent
-		>=dev-perl/X11-XCB-0.120.0
-		dev-perl/Inline
-		dev-perl/Inline-C
-		dev-perl/IPC-Run
-		dev-perl/ExtUtils-PkgConfig
-		dev-perl/local-lib
-		>=virtual/perl-Test-Simple-0.940.0
-		x11-base/xorg-server[xephyr]
-	)
-	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 )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.16-musl-GLOB_TILDE.patch"
-)
-
-# https://github.com/i3/i3/issues/3013
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	cat <<- EOF > "${T}"/i3wm
-		#!/bin/sh
-		exec /usr/bin/i3
-	EOF
-
-	eautoreconf
-}
-
-my_src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-my_src_test() {
-	emake \
-		test.commands_parser \
-		test.config_parser \
-		test.inject_randr15
-
-	virtx perl \
-		-I "${S}/testcases/lib" \
-		-I "${BUILD_DIR}/testcases/lib" \
-		testcases/complete-run.pl
-}
-
-my_src_install_all() {
-	doman man/*.1
-
-	einstalldocs
-	use doc && dodoc -r docs "RELEASE-NOTES-${PV}"
-
-	exeinto /etc/X11/Sessions
-	doexe "${T}/i3wm"
-}
-
-pkg_postinst() {
-	# Only show the elog information on a new install
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog "There are several packages that you may find useful with ${PN} and"
-		elog "their usage is suggested by the upstream maintainers, namely:"
-		elog "  x11-misc/dmenu"
-		elog "  x11-misc/i3status"
-		elog "  x11-misc/i3lock"
-		elog "Please refer to their description for additional info."
-	fi
-}
diff --git a/x11-wm/i3/i3-4.16.1-r1.ebuild b/x11-wm/i3/i3-4.18.1.ebuild
index 4fa3ea9394f7..d7064cfb971e 100644
--- a/x11-wm/i3/i3-4.16.1-r1.ebuild
+++ b/x11-wm/i3/i3-4.18.1.ebuild
@@ -16,7 +16,7 @@ IUSE="doc debug test"
 
 CDEPEND="dev-libs/libev
 	dev-libs/libpcre
-	>=dev-libs/yajl-2.0.3
+	dev-libs/yajl
 	x11-libs/libxcb[xkb]
 	x11-libs/libxkbcommon[X]
 	x11-libs/startup-notification
@@ -26,21 +26,21 @@ CDEPEND="dev-libs/libev
 	x11-libs/xcb-util-wm
 	x11-libs/xcb-util-xrm
 	x11-misc/xkeyboard-config
-	>=x11-libs/cairo-1.14.4[X,xcb(+)]
-	>=x11-libs/pango-1.30.0[X]"
+	x11-libs/cairo[X,xcb(+)]
+	x11-libs/pango[X]"
 DEPEND="${CDEPEND}
 	test? (
 		dev-perl/AnyEvent
-		>=dev-perl/X11-XCB-0.120.0
+		dev-perl/X11-XCB
 		dev-perl/Inline
 		dev-perl/Inline-C
 		dev-perl/IPC-Run
 		dev-perl/ExtUtils-PkgConfig
 		dev-perl/local-lib
-		>=virtual/perl-Test-Simple-0.940.0
+		virtual/perl-Test-Simple
 		x11-base/xorg-server[xephyr]
-	)
-"
+		x11-misc/xvfb-run
+	)"
 RDEPEND="${CDEPEND}
 	dev-lang/perl
 	dev-perl/AnyEvent-I3
@@ -77,15 +77,7 @@ my_src_configure() {
 }
 
 my_src_test() {
-	emake \
-		test.commands_parser \
-		test.config_parser \
-		test.inject_randr15
-
-	virtx perl \
-		-I "${S}/testcases/lib" \
-		-I "${BUILD_DIR}/testcases/lib" \
-		testcases/complete-run.pl
+	emake check
 }
 
 my_src_install_all() {
diff --git a/x11-wm/page/Manifest b/x11-wm/page/Manifest
index 4b8ebc3e9478..985fe8236d69 100644
--- a/x11-wm/page/Manifest
+++ b/x11-wm/page/Manifest
@@ -1,3 +1,5 @@
+DIST page-1.9.8.tar.gz 162352 BLAKE2B acde0feb62d58f66708ec09545137978540fb8c5fab651961b6e87d7c9d7be3170b8e2171c80ec553a9059ae2c23869759f37953da783be3a8fb3ea471e8b15b SHA512 758b1efbecb6d0a3d6ea0f7261b1c55db0927aa46d871f1a30b77e5aa7b9819ae74ca6fb821692656f2150da758793ba5653bdd94ab92ba2b79b39e0d4a4882e
 DIST page-1.9.9-r1.tar.gz 1009216 BLAKE2B 8248705f9e5eceaeea37889a9859249d9eb236f215da804f5edad3c36007179f63f132c161c1e4a6a97df6240f87799242140c97877775ae00f2e86dd7eed69d SHA512 9e7594590b1fdeadcf59d715d30727bee9f640903a34cadd8c0d92b3e94059c183d931a7d8e96763adb74f59a94acb03f7bfbbd4f1f8b57371fe886e6a227012
-EBUILD page-1.9.9-r3.ebuild 1271 BLAKE2B e38995b80e514de8ef73595631ad5eee74ec08dcf35f8d0742cd40dad9703e57b304417e655d66b81ac45d2c28871737b0566d05f9dfb60fe600fc669dd43b1f SHA512 677149c5515854fc168057e72d550cfa1f055569abf0af32ab223949a8fd9eba9c384c8c3312c8adc5dc93b178d97c343e6ddd56e0deab9d3f1d82a96de449b2
+EBUILD page-1.9.8.ebuild 1348 BLAKE2B fd2f8a03df95bd652bb253568e7c0ca8348eeb834d06f223c0d6d601f67e6ada45c36ef20d33ae5b90b88494f469853d0cc9af7dd110143b29d8a207adf133c7 SHA512 cd7719566b074cf9f074ed4e94298a1ffdfc1f852a9494fd63c55077bfef9c2f41116e2209ed3b78620172a9238266c8f869ffdbf46a1755aabb8a68fa16a602
+EBUILD page-1.9.9-r3.ebuild 1331 BLAKE2B 13fefcb79f087ebd25c92e4ec6d0e35eb11e2250bb2d7ae18d8bf2dd3144a3a5dd0f9dee75ed3d5faebaed2280bf14c9f934a24e9d906d7678ea3aa9fcdd0336 SHA512 225dc789aa4eb83a97a6d2be3e83e180491ff82a8c889bffe8844abe2a5603d38be947ba47471a7eba5e541a03c051d543f9ea6a8be559f6d6ea435012588078
 MISC metadata.xml 498 BLAKE2B 5b05ebd39950f440c83dc9c2893f52e7d39d9515427aa29d04e6c7b9069787117aff644e795f6ce3e125b84f179d6c073294292f75b77f1af14828659f8bec4b SHA512 145a1353db0d958c3a2198f57c2d3e7e163b723ca794c96ca76a76e385e22233683a55bc62528193ca87444889423f38d4ab4fda833ecc8a51c1c87bc6400fca
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..8fcd55186a3b
--- /dev/null
+++ b/x11-wm/page/page-1.9.8.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="A mouse friendly tiling window manager"
+HOMEPAGE="https://github.com/gschwind/page"
+SRC_URI="https://github.com/gschwind/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=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-libs/libXrandr-1.5.1
+	>=x11-libs/libXcomposite-0.4.4-r1
+	>=x11-libs/libXrender-0.9.10
+	>=x11-libs/libXext-1.3.3
+	>=x11-libs/cairo-1.14.6[X,xcb(+)]
+	>=x11-libs/pango-1.40.5
+	>=dev-libs/glib-2.50.3-r1:2"
+
+DEPEND="${RDEPEND}
+	>=x11-base/xcb-proto-1.12-r2
+	x11-base/xorg-proto"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+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-r3.ebuild b/x11-wm/page/page-1.9.9-r3.ebuild
index 371773a560af..d69704305042 100644
--- a/x11-wm/page/page-1.9.9-r3.ebuild
+++ b/x11-wm/page/page-1.9.9-r3.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=6
 
+inherit autotools
+
 DESCRIPTION="A mouse friendly tiling window manager"
 HOMEPAGE="https://www.hzog.net/index.php/Main_Page"
 SRC_URI="http://www.hzog.net/pub/${PN}-1.9.9-r1.tar.gz"
@@ -28,6 +30,11 @@ DEPEND="${RDEPEND}
 	>=x11-base/xcb-proto-1.12-r2
 	x11-base/xorg-proto"
 
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_install() {
 	default
 
diff --git a/x11-wm/spectrwm/Manifest b/x11-wm/spectrwm/Manifest
index a1a0da6f7fcf..4b7117cab1b1 100644
--- a/x11-wm/spectrwm/Manifest
+++ b/x11-wm/spectrwm/Manifest
@@ -1,9 +1,12 @@
 AUX spectrwm-3.1.0-Makefile.patch 977 BLAKE2B 1f76bc331ee1d048387ab82900b44339e092986a793f5d03fa317f4247987ebb8ede090c0b157ae508d2a3ed05a374a9d06910e99fa9c5dd6df2169c54cfc3b3 SHA512 5d2be769544e4446e4e6780793bd61fe88a63c26b865d79e19892aca4734e600f16d55184b2e35d3f8e0d8456ac0c5c229854fcd607bd32c036a4397150ce118
 AUX spectrwm-3.2.0-gentoo.patch 1571 BLAKE2B b100631f6c47f45789c4931fcfd38c380404f38610cf91a3dbe5d857c2bf3ff31f7b14fd8f9f787f0fb3068aff50eaf1e51dcef5cfa88d062bf923d64b0c23ac SHA512 996c9f6dc9ac3cedf1178d0d2c9b678d3019d420e59e538233a0739e39dc33d08d7bdaab15d2e43aeddbedaf7df5d762829b1fe8c8f1c64f023bd2337d479b82
+AUX spectrwm-3.4.0-gentoo.patch 1134 BLAKE2B 01f472388c38b276fc91747cb1e06bf4709b1a53caacd1e16f3ef7d0817eb3d127aac76c665e92d05c41c9f01ce8b79525dd0bacbeecdd5d36c1d012bcdcb1c5 SHA512 9c8450fcdd198dd0ef88d13c38edb0cc48c7324cc8a3b3e2c331d9ca5608cfa9fa041b9cae466429e8b77fcb9eb28a29d484590106ea604f27163d07ee428508
 DIST spectrwm-3.1.0.tar.gz 147206 BLAKE2B abcce22bc7859dbcc109f02ea832d65091c842562579d47cd1dd83c5de82a015b02343972d4d85cf291b63bfbaf0e901616cca94d911014672ffc35436bdd3c1 SHA512 dd8e16361b979a55b210a88a1ae5d53e7086fd854e92320e09b6407d374580cc271c0e974e38606481ab57a504a86e16293edee967d251b043a1eb65e8c77687
 DIST spectrwm-3.2.0.tar.gz 150691 BLAKE2B a90fb556f0572709df51272a259724c3a497ac3b9852722646058ffb92914ca49581f3f95884c8a6bab2cb6475c4c3b475ff7ed3ea0ff125e76f202696dfd2bd SHA512 038d7fc5716fbca324a078a311939ec23db6ff53e9ef33b2804c687838e729f0e7bb7f724c539e8ac8efed9607358962d4dd742db7f1a30bf3c6ab72eade1039
 DIST spectrwm-3.3.0.tar.gz 161806 BLAKE2B 07470511486c7b5c61e65eb33e5a9ec7fbfec97390057311fab27bd5608d428b3a53c379fe6c5436000b4847769db9d175154e696b39d3175175bae173e8e68e SHA512 743affffd0437641a760ae29ccbd0084baee3354dadc48f3fc9ab70bffa2413ffe3af67f1223413aa1bbf8c679fbae1fbbdd71a840b3e44f5df83b527f63c1cc
+DIST spectrwm-3.4.0.tar.gz 164188 BLAKE2B a79feb7f1e667728d237ec97aa5753eb5d0a1ae96ea63a5f14348cbc63ddde7a49639664fa19bffb564d0342727e558498a7a72ec3442899462ad8800075e32e SHA512 f55785976ffefaa93601cdc509880cc7e1c13df6f676d3dc0ee8121240b221b0d3db5968d32486673e2ab172165dd55da3d28b1e088fbf4f77ccecb8c6e57519
 EBUILD spectrwm-3.1.0.ebuild 1132 BLAKE2B dacd1cfb94ef799132eef7ee5d7f0c4d521b417529403ca81c4657074df5e61f52af0bd3baee5d53a8652f8e5456fb835ae9c11320a902b99cbb4eb97e7bf06e SHA512 b31a2e6cd77ae1117929f063f8b6cc7cd3a0167189fd3fd86d95254ea91bc6173414b7354af029d2671e08b6f62c9f0cefccc509ea89108fdb562fdf906096bf
 EBUILD spectrwm-3.2.0.ebuild 1023 BLAKE2B f966d0420844ca3dee536f60a12a81677f2a9a6eb64983bf727992956490256721a374b7f144da7b54111499f7d7b9fe4668ea130e50c3cb6c71855295ef9f19 SHA512 79410cf8fc5859f0e7e5f9bfbc135cca3f69c38721c317acc582228fd9755e2667febbe9015fccb205963ed65512c86d2fb3ae05fb5fe8ffed2b67e9194861e2
 EBUILD spectrwm-3.3.0.ebuild 1128 BLAKE2B 731f6a1988fd23082740086b6d1c4600a0f9ca1486a8aaf7895b10c50be91ef034e68a747a6c0258d5b6a14155b693c24c7efe1f183d43ebfb160d48776e7737 SHA512 e5fb1c60b25d64fa499c1e0d69b12a325a28904dd8f1bb7c296b8daa131b2ddbb2b217f131e6443ef46cdcf30c00d14e60ee22c28d98a9bfea83db61384bbd38
+EBUILD spectrwm-3.4.0.ebuild 1128 BLAKE2B 8747ca9aba5e6a65d5b622729a3c1ac35f2b7c2e078bf34a43a43f5069a9bf78aa2b03b31c79b36319ed71d63cc7b6a62f43100cfe6462844b9c76544ab544c7 SHA512 de30080599900e14beb0d982ff237f8a45e37df764328a748afab6898a7528a456229c199cf3c5195a81d8a07c5700ffefdd249cdc58e81b854be04260b65757
 MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784
diff --git a/x11-wm/spectrwm/files/spectrwm-3.4.0-gentoo.patch b/x11-wm/spectrwm/files/spectrwm-3.4.0-gentoo.patch
new file mode 100644
index 000000000000..3b923b6a1256
--- /dev/null
+++ b/x11-wm/spectrwm/files/spectrwm-3.4.0-gentoo.patch
@@ -0,0 +1,24 @@
+diff -ur a/linux/Makefile b/linux/Makefile
+--- a/linux/Makefile	2020-06-20 07:31:46.794877103 -0500
++++ b/linux/Makefile	2020-06-20 07:33:10.283526519 -0500
+@@ -12,16 +12,16 @@
+ 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_LDFLAGS  = -Wl,--as-needed
++MAINT_CFLAGS   = -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow -Wno-uninitialized
++MAINT_LDFLAGS  =
+ MAINT_CPPFLAGS = -I. -D_GNU_SOURCE -DSWM_LIB=\"$(LIBDIR)/libswmhack.so.$(LIBVERSION)\"
+ 
+ ifneq ("${BUILDVERSION}", "")
+ MAINT_CPPFLAGS += -DSPECTRWM_BUILDSTR=\"$(BUILDVERSION)\"
+ endif
+ 
+-BIN_CFLAGS   = -fPIE
+-BIN_LDFLAGS  = -fPIE -pie
++BIN_CFLAGS   =
++BIN_LDFLAGS  =
+ BIN_CPPFLAGS = $(shell $(PKG_CONFIG) --cflags x11 x11-xcb xcb-icccm xcb-keysyms xcb-randr xcb-util xcb-xinput xcb-xtest xcursor xft)
+ BIN_LDLIBS   = $(shell $(PKG_CONFIG) --libs   x11 x11-xcb xcb-icccm xcb-keysyms xcb-randr xcb-util xcb-xinput xcb-xtest xcursor xft)
+ LIB_CFLAGS   = -fPIC
diff --git a/x11-wm/spectrwm/spectrwm-3.4.0.ebuild b/x11-wm/spectrwm/spectrwm-3.4.0.ebuild
new file mode 100644
index 000000000000..67195eaf70bb
--- /dev/null
+++ b/x11-wm/spectrwm/spectrwm-3.4.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop multilib toolchain-funcs
+
+DESCRIPTION="Small dynamic tiling window manager for X11"
+HOMEPAGE="https://github.com/conformal/spectrwm"
+SRC_URI="https://github.com/conformal/spectrwm/archive/${PN^^}_${PV//./_}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!x11-wm/scrotwm
+	x11-misc/dmenu
+"
+DEPEND="
+	elibc_musl? ( sys-libs/queue-standalone )
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXrandr
+	x11-libs/libXt
+	x11-libs/xcb-util
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.4.0-gentoo.patch
+)
+S=${WORKDIR}/${PN}-${PN^^}_${PV//./_}
+
+src_prepare() {
+	sed -i -e '/LICENSE.md/d' linux/Makefile || die
+	default
+}
+
+src_compile() {
+	tc-export CC PKG_CONFIG
+	emake -C linux PREFIX="${EROOT}/usr" LIBDIR="${EROOT}/usr/$(get_libdir)"
+}
+
+src_install() {
+	emake -C linux PREFIX="${EROOT}/usr" LIBDIR="${EROOT}/usr/$(get_libdir)" \
+		SYSCONFDIR="${EROOT}/etc" DOCDIR="${EROOT}/usr/share/doc/${P}" \
+		DESTDIR="${D}" install
+
+	dodoc README.md ${PN}_*.conf {initscreen,screenshot}.sh
+}
diff --git a/x11-wm/twm/Manifest b/x11-wm/twm/Manifest
index 0ba9d2cfeb23..0021daaaf25c 100644
--- a/x11-wm/twm/Manifest
+++ b/x11-wm/twm/Manifest
@@ -1,3 +1,5 @@
 DIST twm-1.0.10.tar.bz2 287094 BLAKE2B c84d26119c2a9ed1b6482dc35a421e3d745af506d2faf6dff1027aa84752accc32ff6fffba0e9e8468bfd583bee17c774a88960fc4c5268e82b69c4dc6ae8e81 SHA512 1280683fce7ebbf5670239cb1f3cee2b40612bd9850d98827e793cf8bf298bdb58e48387cab943ea6befc6f7b34da2567353c22b8eaeb8bcf1b9e303cd7e6a9e
+DIST twm-1.0.11.tar.xz 261176 BLAKE2B 775ee483f34b1f45e737e0f1a907c07398883bd7bb2c17f729b38a2562af1a85f27b4dfa76b5fa1f88768e01c17c8cb364baaf39d80307aee3732183c5964653 SHA512 948034bba23e6b6c4412fcd2e46bb11a9980297601218a54a5055165ab0229a44dde0d50f338b24e82d76f390597e2fa09d11ff7f3fe1b1d736b10083c7da20d
 EBUILD twm-1.0.10.ebuild 440 BLAKE2B 502cc0b610b9264d479c1c9f32c77f21202e191650c38f3af04471cddb917783105e0a38ecb4997780eb9067a4a7ec1dece2341970215e7bc3d47e86f6d8f27b SHA512 b50d158ccd60a9547056324b61fb38f0b3f6085a4e533984a25395c123cc9023f01b84ff96639ca311f0ff7d5e0d34bd36a9da51f39290a2331ceaadcb9e7bc8
+EBUILD twm-1.0.11.ebuild 570 BLAKE2B 0d6eda16361c15dd9ba0523be4120038e4a43d1ba234c12e598d02ecb97164d5f2dc20cc915605685c1708a76120caa3eaff082c6bec12359cd41e8b19d74fa2 SHA512 b321373081d1a180c4ea2f495d5ef49c548fd78e2bfe9edb6621b6b1e455979daddec895bc3145da2ad305bdda443bae434753ff35f37684d387cffffd8c8109
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-wm/twm/twm-1.0.11.ebuild b/x11-wm/twm/twm-1.0.11.ebuild
new file mode 100644
index 000000000000..051480ae348d
--- /dev/null
+++ b/x11-wm/twm/twm-1.0.11.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_STATIC=no
+XORG_TARBALL_SUFFIX="xz"
+inherit xorg-3
+
+DESCRIPTION="X.Org Tab Window Manager"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+COMMON_DEPEND="
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXrandr
+	x11-libs/libXt
+"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto"
+RDEPEND="${COMMON_DEPEND}
+	media-fonts/font-adobe-75dpi"