gentoo resync : 18.11.2018

11 files changed, 381 insertions, 6 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 60dec1f44eaf..f7da860f18cd 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/i3-gaps/Manifest b/x11-wm/i3-gaps/Manifest
index c0132d71561b..2ece17c76706 100644
--- a/x11-wm/i3-gaps/Manifest
+++ b/x11-wm/i3-gaps/Manifest
@@ -1,4 +1,7 @@
 AUX i3-gaps-4.15-musl.patch 2473 BLAKE2B acb148b7a7f14f7e75523ade9ae4374d6b18d3397f97d6b639f416f86abfd114bddd97fab19a61385fff5504bcd0f614c53175da4c30cf31e00f6b612dfb3d0d SHA512 8ce7d00371c43b93dabbe0dadf9caf7c58a68f4a0079f5a9b9552c15c55bfa0df16d7e87a281595af2ac5254632ba28ccf82a467cea16159b41490f6f2910299
+AUX i3-gaps-4.16-musl.patch 2783 BLAKE2B 9dea47af64b78a77006d3aa641273aa7a77846d4425e1da17424528445450112ab275cdf7098ba8c2a76f1b08561b1d1a852cb9fd4ee4c61e53832ca702ad55d SHA512 fdff65255e7c9b30eefdbf032e04ba568d5b75a5b7dfc5fce1aecaac0f0d376b6bb4f87338e1eaf5f20b1c5882ebfc7349f8ab43c804349b5f5c626f9fc1d340
 DIST i3-gaps-4.15.0.1.tar.gz 3965631 BLAKE2B ea65886c40f377125bafbd80e2d56c1d66a4c5c06d942d645b2cb226323a0903e98aa58b67da9c31c60240b5d99d10ecc20864aeede95a5039ea0ffdff8dcb8b SHA512 76ff860e4ca0edd0e22bdff9ae9b1bc150df2b5bc15b0d7ea7a63d373e8d156a43bd91f8a40c48b4c771603f7de7c18c6d16c53fef582e53f51c53a197fa7a0a
+DIST i3-gaps-4.16.tar.gz 3985226 BLAKE2B da61ab6b476a30a4acab24590cd5ca51f0f51318988890e66530fdd76d99236378d9c678e1e37da99e22e70b0e5e0e5895b8146bd5a93b23957cb1e0178e08b1 SHA512 64a392d2b4175e063f0740ee04885156dbd2571262c22df6276e8eaac36765cd03822723208118a1998ff6cbbcd973fb7f6305df9744c477262d5d33b792ee23
 EBUILD i3-gaps-4.15.0.1.ebuild 1751 BLAKE2B bd1da83f5652b82ca30f1fe6b3eafcb582f1359d29e88066ef82469e5bb30900ecbc490f9758b1d31455aa204ed859e4e40ccf20d2f5a2b005cf45bdef90afd1 SHA512 57a83814bc1758ef00930c1fd05b1636314360a6f183238920257a1d7870c25b225f2e78477dca2fc9223dfe0b685580662326bd2ffaea8757fc730076d0eb7b
+EBUILD i3-gaps-4.16.ebuild 1729 BLAKE2B b2bab05e08b8585a79591731a26459b79402b8911797872fd31e1695e57db587fd3a72c3cb865c9854df8a6010f58622b23f8a457314e02e52848bbb258a90e8 SHA512 e3e8f4ac928561c434c43af45e8a1da107c370b2b6d16ce9b1bfad75dfa4030f18eb695301ea7694010ad53264741d07e399bc007631f2de73f8425c7be26d02
 MISC metadata.xml 322 BLAKE2B bdba5a4519158f97944784fc4e2813c1b8e8d4f6f90d43b3a935e8b2565ecc5d2444c4b7b4d11266263d25a76b5c2dba55ec6535fdaab03129bb022206abbce2 SHA512 d3ca96f88473d21b81c420795c6eee5dd41f43354de85fd549a9ae8127e46f10d00034730bf850ddd6df8607821d30fce17aa349b1b2575f43fd3303a2da1cf6
diff --git a/x11-wm/i3-gaps/files/i3-gaps-4.16-musl.patch b/x11-wm/i3-gaps/files/i3-gaps-4.16-musl.patch
new file mode 100644
index 000000000000..1e67ec2a3c4f
--- /dev/null
+++ b/x11-wm/i3-gaps/files/i3-gaps-4.16-musl.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
+---
+--- a/i3bar/src/main.c
++++ b/i3bar/src/main.c
+@@ -48,14 +48,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);
+ }
+
+ 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);
+ }
diff --git a/x11-wm/i3-gaps/i3-gaps-4.16.ebuild b/x11-wm/i3-gaps/i3-gaps-4.16.ebuild
new file mode 100644
index 000000000000..d3e62d0fb172
--- /dev/null
+++ b/x11-wm/i3-gaps/i3-gaps-4.16.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+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 ~x86"
+IUSE=""
+
+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="
+	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-2) )
+
+PATCHES=( "${FILESDIR}/${PN}-$(ver_cut 1-2)-musl.patch" )
+
+src_prepare() {
+	default
+	sed -e '/AC_PATH_PROG(\[PATH_ASCIIDOC/d' -i configure.ac || die
+	eautoreconf
+	cat <<- EOF > "${T}"/i3wm
+		#!/bin/sh
+		exec /usr/bin/i3
+	EOF
+}
+
+src_configure() {
+	# disable sanitizer: otherwise injects -O0 -g
+	local myeconfargs=(
+		--enable-debug=no
+		--disable-sanitizers
+	)
+	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/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 f2512f7f1a9e..89f8605ac7fe 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -1,12 +1,15 @@
 AUX i3-4.13-remove-git-polling.patch 580 BLAKE2B d1597903a553231a953e87381ca3462d9e4f4f0ced231308861e6cd8e3740008fdebe8f78cc40f9b615354f06e4a66d3be3ae5c8c5e294154cb6a42674a57f42 SHA512 169eafa91f9499944f65c3b016d6760780d7ada21d718bb96e3bd822741f0d5b30e13dd7493233338e193f1f565872cf896e3e4344a1228fed596c33ed68db8b
+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.13.tar.bz2 1121298 BLAKE2B 94f3940406d43083c8dc577b4216a32a08ad4c4b58e7707cc9e3129038f4d13043c1f86e8de03d0fdfcff73f0de582fc8b3c88d71c0161ac3eefe28329f67a64 SHA512 1bb1044e8d86e78d3ccb79d49f0eb26665dcd05a348058a5e57138151d74f57d77830efc3025893170fe1b8ec612f739f75247a427410f96286b09afd2c5f14c
 DIST i3-4.14.1.tar.bz2 1173560 BLAKE2B 96a0e1d75be13098fd530c3970464ce7710063f517c0d538939de6e7c799ab6b3ec005fb50216b1db4ccefd44584c584b263ac359bd9a86be53418d8f8d4beba SHA512 ef628af002947b40e1c88b0e872c6e93d4377a9674a120bd9adc3f323a38570b05124cd3047b5a26659e72070de2d00d83fb93186510c74ad8ddbf4f3df85472
 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.tar.bz2 1213251 BLAKE2B a65d15278a83bac9903a611628ea53c64cd554ab9fff2a8864e649fd962858b2f3e77fe69d0dc70affc93dc69b3cbbd7b3ee670a2af9d697e28e9e4ea3323f67 SHA512 99abd15349ee8e61c084b3664ef3a189c92ea07812ac59eb6a5441df7cebea8211be52204e39bddcc33d8c714447fddbbe2c5c8a25b756a96e2dc6732526cbf8
 EBUILD i3-4.13-r1.ebuild 1993 BLAKE2B 60d2df3b1f17b4e0fe0a547a736c64dd46ab46642f68837730498038348615e69dde8a80f035591ef1486cb6d8b07127fb4cbfd299ea6ef9795eeaf7412e3697 SHA512 d56ad669b2c30627401cce39b4a8489e3657aa9ec42a3443305a4d3453dd876ec969544ff2a862fafcb84d17c9ebe3074bbb2ba8176a30c88ea5181a0225362c
 EBUILD i3-4.14.1.ebuild 2376 BLAKE2B 00f9ca5d7c45ee211a834a50da364a72c0968a778a4846065bec847a927c52b066e2e673d96d372ecd6f10fa70fddf49631f4c806dd5009207850b572ff67f87 SHA512 03a988ac0ab63792d7712e18eb622077b29bbd280030bf435096741a65024a1f9ea6ac01cacd64e09b336c3c2e792319ae1f18b8e03938268aeb00a0381a70ab
 EBUILD i3-4.14.ebuild 2113 BLAKE2B c602bbb48b166ffa70d735f9181ec81a4174fe7df08830bff5c2cd955f668d2e34453f421dd1c8fb616497be5cc5707332f412d73397287ed55ea5468ffc755d SHA512 709efb5ca49d7e2e1aa6426c631e653b66f15e261eb1462036b4bdef61cd68a690a03a71ae787d221939808b9b15f3d7604551c1cc3227b9194efea076b1390e
 EBUILD i3-4.15.ebuild 2323 BLAKE2B bf5ead0f91a4a040866f00f3dfe4b0c71a2d4e41eb9480c27e464790c37cbf641069729d34e48152223e4f7545a6b6b43be3f45213774219fe49eaa594491ad2 SHA512 95cf2e6f2053ffe180418dda38535a08ed8447085d65cd3ac342ba0e0468e8320d95ed8468bdcc11ec637ea2f2ef4926a0df8bacad186109fc5f2c42330e3692
+EBUILD i3-4.16.ebuild 2318 BLAKE2B 5897090120c632fc6385196d48e8bb14c9c1346699df738230b28c954842a8cf192adc9e690fdee208003e4d514b76d850970e8e12624c7ff17ef7dff0d1046b SHA512 ec02ae998edfa9f4188b51d4038f44cf3a910b5ac7a1e75552bce5387d3b93b77bfa5770adcb04bf4bd82d2b25c79dee6420561d18f9a7ad2062eda3969884a8
 EBUILD i3-9999.ebuild 1812 BLAKE2B ce78f54be6f2cd1949342fa8b24fa4b162679edaa062eef113619af1aca0c976dc3d50302bd49ed80e3a8dc417816b0fdb802f71f31d16305a4a02be9962bfc7 SHA512 77bee1cddd30f86bfbea6276c44aea2112be335aa6d8720856be4aa6f8d77c84282f7c2e2fa32adba35fddfd2e1ac60cd7924f779e1b9bd4705e3a068dcb82cf
 MISC metadata.xml 470 BLAKE2B 1c4fd7b44860934e88fb5165254fe0e8ca7e647c11af9af7d959f240e51002e6a454d9b93b30da8944891a1aa6a989f7a3e2a8af44ba41de174e78745393dd79 SHA512 52eddb56541d1172b04ca3ae646d01e52fb300dd62f5dfeaf2abe9d791965813e87b24a1477743797227bf8d407051f79076d54edb599524f89f3cfc716cc47e
diff --git a/x11-wm/i3/files/i3-4.16-musl-GLOB_TILDE.patch b/x11-wm/i3/files/i3-4.16-musl-GLOB_TILDE.patch
new file mode 100644
index 000000000000..1e67ec2a3c4f
--- /dev/null
+++ b/x11-wm/i3/files/i3-4.16-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
+---
+--- a/i3bar/src/main.c
++++ b/i3bar/src/main.c
+@@ -48,14 +48,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);
+ }
+
+ 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);
+ }
diff --git a/x11-wm/i3/i3-4.16.ebuild b/x11-wm/i3/i3-4.16.ebuild
new file mode 100644
index 000000000000..270dae55f6aa
--- /dev/null
+++ b/x11-wm/i3/i3-4.16.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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/mutter/Manifest b/x11-wm/mutter/Manifest
index dc69739c50b1..b9a0319c68f2 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -10,7 +10,7 @@ DIST mutter-3.22.4.tar.xz 3536792 BLAKE2B e395dec6a8f5f46864ab5d7da3c345c20adf65
 DIST mutter-3.24.4.tar.xz 3583916 BLAKE2B 86a9e16ed96270713e400ccb4dc64b91c263125ea4a04373ed1f8364e906031ef26dc991fa13d01cf0e50895360c87be6773e3332d823c2ce1991cd57d59b292 SHA512 7ae579ab3e9df09cae37fbc1b277e382c9f610058b914b69a7bdb89f3bec510403210c0cded16a6487111507151f4d7075d161e051c0b88585d6ab6b4575b8d3
 DIST mutter-3.26.2-patchset.tar.xz 48156 BLAKE2B 7b33495a8bb7ac69f5610e1dfcb1fef49a983403fd176b229a75bcc7691e83e76a3dd87b7663ece0fcdc4077becd3ffa5e33217584f156456813769646730bf9 SHA512 2eeb9dfe137d6ea65f957ed19aa5ef83106aa16a049531c0c41d3ab6afac6c1b345cc68f2a9a9c41658172cc0dde61b946e6bf2507979ff4155e79770adf5e90
 DIST mutter-3.26.2.tar.xz 3622904 BLAKE2B b32af24c6ffcd0e6af38ab1ff7cd0ba16ea3ceb84c62ed21d9e38fff5357eda2648050beada3fc8727474407a419a2c218331c8a87f7eb68eddf824d26ca9c51 SHA512 95885b4c053d4bc467a7c11615ee3d1a3086a674ae10e7cb9bb241f692e66dd8190508db1cdf1760bc2f19100e532e68d5e147d344e94d1430d80dd26ca0156b
-EBUILD mutter-3.22.4-r1.ebuild 4092 BLAKE2B a0ccf9508af2cf98cc54a48d39f1eb35ff07bc0b8f5da7f10348ee51974a66993a964c72aeda9288d8aa30263338a6cf54e2771eec60fd86e5dcf66f9179e578 SHA512 4e77a16dce245c654a3dba1abcabeb3115fa60a09c3748261f3bda1443a183f8611b9d3d52b22e73dc53c2607dcf1f9b7921d8a9e71acf470b05d6132377f20a
-EBUILD mutter-3.24.4.ebuild 3690 BLAKE2B 318c35b0902a8c6805231ac9878b364a7b266a0a2f7c9751c3e44680e29fbbaf19945db05adc8f14a5325581fe1d0b1151580d31506b7951c7fc037fcd0ebb8e SHA512 26e2dde5942f74e15aad3ceba56987228e21c7229829aee2dd35d1fad1e8b7795a9ec80ff965a5ea44822cb27c844e73eb8459cf82e0bf4b8d628eda3ca56c85
-EBUILD mutter-3.26.2-r1.ebuild 4034 BLAKE2B 6eac303303c5d14baaf6f35eb93d2a38083b5bbe49520af2bc36fcdbb05a1bfcf5ac85d7fb9ff869abebeaa678cd8758950a4c01435867bcfedd8e9425c82be5 SHA512 555e9d5cf89f37dcf3e1033bbf636a2d1a447b3212d848054989a4dc878caf94532122a73d7648bbac97ce13dc70e75b385032e10078e17af2c4c295358018ac
+EBUILD mutter-3.22.4-r1.ebuild 4094 BLAKE2B de24b62132b4b954a6984fadcb4fee2dcbf7bdbb5f6baf4ea34a5f61675265abcdc085528485931d1ae8a600501dbc6dc3f1e68db7dc1c3c936e6b6ee64a4e6d SHA512 d56659236712d90848b51e84f2890f0369c1e45b7bd611589a729b261f82d8f47413d86fb78c9cb165105a1e908ed98cf1dcc2268b1ffd2625271b3ab2965947
+EBUILD mutter-3.24.4.ebuild 3692 BLAKE2B e548157553fa97d84821a7a3c5cda25dd85ac1b9ac7301352810228ebfc12a1a91e5c332dc153d77038dba74a0598d0409d4fa0d7d30afceb63ff1531b795a6c SHA512 91e4831d296738b21a14846e5e6d9edc30cbad82845c2e2fc7c8a5df992944e2b6168f51eeb58c12ea61d8424c7a9980dbad04b18edbfdf9d7973e32a4537440
+EBUILD mutter-3.26.2-r1.ebuild 4036 BLAKE2B ac9aba438fa514748247827c3d6eb87b036c36528fad4818292778605de06423cbb9ef1fce00cca51c4a90581f7429079e563416ab656664e5c3a6d7a45d74ad SHA512 d4d168a12dd1fd3b3f32b036808fd55c976a9234d5f4c4d944fd6c88277d72d260c6e23dea57fd86d7e556029c6a5d6619c8af871e06f60598cbf8bc83388373
 MISC metadata.xml 325 BLAKE2B 3ee20e50b2bbbab4ac5083cf64dd2817b397a0e8a77895f5aa7197f016af1e958d6debe92e6e69c10319b1d468f80f16831aa57a0dda1f57173732056b5856c4 SHA512 2732e366e7870b21a854e6bccf57d479c754fe5a9cf17673c3a78e231a1b476b684fd97497f8ab51c57137d066f9bfa6590458f56e5f42c5c38e1cd00962fe80
diff --git a/x11-wm/mutter/mutter-3.22.4-r1.ebuild b/x11-wm/mutter/mutter-3.22.4-r1.ebuild
index 01419c52e5c7..db6c355e133d 100644
--- a/x11-wm/mutter/mutter-3.22.4-r1.ebuild
+++ b/x11-wm/mutter/mutter-3.22.4-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit gnome2 virtualx
 
 DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
-HOMEPAGE="https://git.gnome.org/browse/mutter/"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
 
 LICENSE="GPL-2+"
 SLOT="0"
diff --git a/x11-wm/mutter/mutter-3.24.4.ebuild b/x11-wm/mutter/mutter-3.24.4.ebuild
index 8a196f8d6038..0479c4fea710 100644
--- a/x11-wm/mutter/mutter-3.24.4.ebuild
+++ b/x11-wm/mutter/mutter-3.24.4.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit gnome2 virtualx
 
 DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
-HOMEPAGE="https://git.gnome.org/browse/mutter/"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
 
 LICENSE="GPL-2+"
 SLOT="0/0"
diff --git a/x11-wm/mutter/mutter-3.26.2-r1.ebuild b/x11-wm/mutter/mutter-3.26.2-r1.ebuild
index 209182f780be..6ba7697388f3 100644
--- a/x11-wm/mutter/mutter-3.26.2-r1.ebuild
+++ b/x11-wm/mutter/mutter-3.26.2-r1.ebuild
@@ -6,7 +6,7 @@ GNOME2_EAUTORECONF="yes"
 inherit gnome2 virtualx
 
 DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
-HOMEPAGE="https://git.gnome.org/browse/mutter/"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
 SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
 
 LICENSE="GPL-2+"