gentoo resync : 11.05.2018

12 files changed, 217 insertions, 154 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 8aa272c99310..87fab96e601f 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/ctwm/Manifest b/x11-wm/ctwm/Manifest
index 8f056d5c8abb..6ecbc81d2bc6 100644
--- a/x11-wm/ctwm/Manifest
+++ b/x11-wm/ctwm/Manifest
@@ -1,7 +1,3 @@
-DIST ctwm-3.7.tar.gz 1139461 BLAKE2B 7c96f6434dea660dcbcc017b89bb9df533b6b26688392ba7baf14b4b701d093f8ff4e0c0c3af61bd5ea32d0b88b336d6958e1d4f524de1cb4d4577e20cfe3380 SHA512 e3c1e4bed68ffbf3efbc6057743889d706ed16e74bd334ebb689c8283f1288778dc368f0a6064aa7e24a6416592f22d1eeffc09c76cb0cd4ea64467718c62cfd
-DIST ctwm-3.8.2.tar.xz 549984 BLAKE2B 90b1d7c872e2ca8960853829d9ad5b19476ca8cdbcda9d3fcb180787aa85ff13b3d63e6c6d19e38193d71c2175c939d65d9581ce2629314c78dc0a56bf8cb139 SHA512 4633b7bf7b8528ecfd2a753f443fd5286fd394df37ebe885138d30a498f0d721076835d135974a2bd11ca9c32ffd288f84788cb0407ae346a29c5f6371dca497
 DIST ctwm-4.0.1.tar.xz 656776 BLAKE2B 37d6011d04f8d64552a86608a4d3867e6e1b0135f45457886daee6be1ae23ca1e3079caa1a63befd1d17bcc640e40ba0f1ed92e0a0caf2c6182f6e282f012bf7 SHA512 8c5c0bf868ba36cf5acca1ac5dbcea9327f63892698ace5086fabe563632acbb578cefea44ac3de91dc15afdbdce0370169e14156525507b90dc8aca8d305bc6
-EBUILD ctwm-3.7.ebuild 1212 BLAKE2B 8c4d63738ac7b5c179e4870d44ba1afb9bfc6d63e993a3c00c17cb3fea1b11851b8733dc20f66ea0d88e6f251c92b1085e98464bc813cafd9ad4c66a767a72a5 SHA512 03c706d0d6a8678e6a781ea260bb4faa49399b6e74df46d3b7bb56d810099fbf3a09ac05c1356dbe762c119d7b06873a06e91f3411d2cd7d9094158eb2b8e9e6
-EBUILD ctwm-3.8.2.ebuild 1546 BLAKE2B 037631059eb8ef42eb50d70359574a57e23c17f1a4fe40a2fb1327a50b0c5e6a4c596cdb0da73136958dac726b6c5bc2d20d2c524f0791c76e24b0f33089051d SHA512 4bdc01a3290cc7293d9c38acbb0c2d6dad77b18d6b57c0b72844fe304c42bb5025af98d7e7ce49187079c4f6ec45d3175f12b7b0921ef73bfebe61057fca00d1
-EBUILD ctwm-4.0.1.ebuild 900 BLAKE2B 3f3c744060c15fd226d657d87ee8ca0d85a68d044526a59894aa72ad7cb56b8d455e61500e3ecfbfbe1abfb24beedd886f23992843c515380d8d787704f622fc SHA512 6d49ea92d4490956bc9b6d5ecb1afe6e6097b44b04cecfb844160fb802ce855b381ba9a93430eb9ac2d099a42ac6fb2b9d5e95e907168a63c5c4d31967738c91
+EBUILD ctwm-4.0.1.ebuild 899 BLAKE2B 1fbb14215e8b31096c81fec17b3be053f375f65e43dba22ad9568f2d42f4dfb80f9043ced5cd81b2569f15a2b82e8384e0d0c84f946e96ba9aea403974fdcb1c SHA512 6e93d0b57ea19d2a7cfa329f8dbf75d5d6747f2c63c3bcfeb1f06692d935fefcc6ef0d1cfe3c6e4efc0438dd52a458eb56c85e5703721362bc2ffee5cbe659b5
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-wm/ctwm/ctwm-3.7.ebuild b/x11-wm/ctwm/ctwm-3.7.ebuild
deleted file mode 100644
index a558de71004b..000000000000
--- a/x11-wm/ctwm/ctwm-3.7.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-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
deleted file mode 100644
index 050ce634b582..000000000000
--- a/x11-wm/ctwm/ctwm-3.8.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# 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-4.0.1.ebuild b/x11-wm/ctwm/ctwm-4.0.1.ebuild
index f95c140b4236..ecd97a4a914c 100644
--- a/x11-wm/ctwm/ctwm-4.0.1.ebuild
+++ b/x11-wm/ctwm/ctwm-4.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}dist/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
 
 RDEPEND="
 	x11-libs/libICE
diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
index f17d542bc5d2..cdd2fd0edf56 100644
--- a/x11-wm/enlightenment/Manifest
+++ b/x11-wm/enlightenment/Manifest
@@ -6,8 +6,8 @@ DIST enlightenment-0.20.6.tar.xz 25030572 BLAKE2B 7ce9b89ec56a741e81bb6ebae690c8
 DIST enlightenment-0.21.7.tar.xz 25307500 BLAKE2B 54b0bb7f76390d46f7eec40aecafb1b8769ba659acaffe8ade61ef9cd6fcb28d843bc185a3cc6c478fa30f917946d331569a394132c3351215a3d1d051d7d2ac SHA512 9d10116990f83b6a2f066b81fab08a9b49779df22d92b5823bf579d786a3f4602094cf8c4d08b3e23a1cfc0cd7032004b2e389e234a189fb2479d23287bf1277
 EBUILD enlightenment-0.16.9999.ebuild 1841 BLAKE2B 5b10dd80c94ffb9f55ba6211a6c2f214130eae27683382b17bb378943ae40b6c43ab698581c8c96ea8e35aad0b52f4106cca4b262d396da177f440a5e1d696a4 SHA512 e9684440ba5876d0acad750f7f4b9a3dfb3fb77dea17b2963ec623e143f67f049b309e1b4806c19c25eefbfccc282302910673bbd6b7af9c3da425f122887a75
 EBUILD enlightenment-0.17.9999.ebuild 3227 BLAKE2B c37c736f8bc4d681f044a36a355fd5e1ec463b4d6f771d0cf4b32f43b5a5fc682d96291d9c767a6f2920e5b6b3e33a34fbecdfd8521933652e92bcea1f384cf4 SHA512 5eb72120a2448a82bea63ae5a3c817d9474648931564e95d883bada8eef5471e20602a36bbba33a5df84f28d40ab3d5f8d8ea8a9b00ee160f00beda8ebfe0c46
-EBUILD enlightenment-0.20.5.ebuild 3258 BLAKE2B a2b3161215d338a21c8fb7eddc7d06397328157981c68159e2f838aaab7c071b86337974d76452006526a91ee07e9f3094a3ad909e7adb32331ad6ff5d51489f SHA512 00c3c7d77a2a09e4c719e93b8c1a58d720a157a5cf14f4360f21cb1ac80cb082a0d75cdff64dc3347afaa3fcde7d76b61245b4d707e458d3cbdd326147529d8c
-EBUILD enlightenment-0.20.6.ebuild 3261 BLAKE2B 058d1d18523add195a322ab3835fd468187e05d1985f07262a1679b6456bb55b673a2fc201546a601de8d0e7dd911d2d927df812ae25a0b1722e657b97bf754d SHA512 f172b95540799ee1f098fd4ccff6b3ec8a356c2f31aa8ecee62d3eed2928b5141195c9839e2e36fd8ec66cc16287bb577ea8ac2cef2c48df9c46e38e00105b25
+EBUILD enlightenment-0.20.5.ebuild 3582 BLAKE2B d8ca7622c40b90e7eb1326ea5ae6a4a78e71bc7f4de1473403521bedad35e303a8aee37a6e78e498e571b35eca208dca993ef781e018ce862887f6b151fb26be SHA512 af054b708d87e08123888867041eccef68921220650ead5003fa097fecc252a25aa5c26959fb7a1d7af7e257b84291cb44f9183d523569c4548b32a5998df5f7
+EBUILD enlightenment-0.20.6.ebuild 3585 BLAKE2B cebdabb24670587ebb5c5ae96d41c6ba3bf50e9b1737336cfd9f5c397571eb41ae9f63f8c8c96bf85d429230561f3db8167c03b231bcf357a679db960e9c0fef SHA512 4e794929e1792decd901e0ce8f14d51aaca4ee045be3e34df108314e3b48ee620bc3c9efc45729e5a9d4af20c34a8c6ccc51aca424e0627e8f587b61e1744f81
 EBUILD enlightenment-0.21.7.ebuild 3551 BLAKE2B 2888568499c2906ca84924c0d78444e3d9c47370f36eb85355a4b4370fe5abc4bf2f720057489a9973e93c296c5ebe632b104a5db0d69e0355b6c838abd726f7 SHA512 5b5a52d62b9bd68520818e6f225a92cb133ee3ff068a07618e73e01c0f2d25c2bf7af443d1df47d4dc0ef82e614dc26cd5d7e72056a590ad89eb6ca8c553b549
 EBUILD enlightenment-1.0.17.ebuild 1831 BLAKE2B 8cab55f842085e212d695ba8513416eb4d8280be4a0292fa5073f109b33db90bb1a9759dce5f6c889271fda7c9078f516f108ee21d9cd6adc130ea23780f900e SHA512 37308359aec83a4f7b8640646f24263805f1306e9d1b4d8e8dc0f94990bbbe670298711d611f5a30d798bd69c10b3ead951b4b233b3b39dcbfb4fc9e98e831aa
 MISC metadata.xml 7104 BLAKE2B 26bd0a360fe1e49b3f3a4c7e053618d6c431c71fe69221808ee90901691919b3761a27351c65b6ac957ad2dd2ca9358dd43804a676d44c0e2a95819eba729f79 SHA512 7a8432fe55f9afdba600a8ced6e3f761994cda8c0c217278f5600f06aabdacebbda4984505f0b093c6aea4afaf21b56cb69b0202489ddfaeafd216c751868d34
diff --git a/x11-wm/enlightenment/enlightenment-0.20.5.ebuild b/x11-wm/enlightenment/enlightenment-0.20.5.ebuild
index 88a5cec9394c..9d9e764576ef 100644
--- a/x11-wm/enlightenment/enlightenment-0.20.5.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.20.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,7 @@ else
 	EKEY_STATE="snap"
 fi
 
-inherit enlightenment
+inherit enlightenment xdg-utils
 
 DESCRIPTION="Enlightenment DR17 window manager"
 
@@ -57,7 +57,10 @@ RDEPEND="
 	>=dev-libs/efl-1.17[X]
 	>=media-libs/elementary-1.17
 	x11-libs/xcb-util-keysyms"
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+	sys-devel/automake:1.15
+"
 
 S=${WORKDIR}/${MY_P}
 
@@ -91,7 +94,9 @@ check_modules() {
 }
 
 src_configure() {
-	check_modules
+	# sanity check fails after commit e25cf18ca19463a7d05519aa843cc76a189ab75c
+	# see #648896. Can be restored with future release
+	# check_modules
 
 	E_ECONF=(
 		--disable-install-sysactions
@@ -125,3 +130,13 @@ src_install() {
 	insinto /etc/enlightenment
 	newins "${FILESDIR}"/gentoo-sysactions.conf sysactions.conf
 }
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/x11-wm/enlightenment/enlightenment-0.20.6.ebuild b/x11-wm/enlightenment/enlightenment-0.20.6.ebuild
index 0cd5bfe72614..130c64f8a4c3 100644
--- a/x11-wm/enlightenment/enlightenment-0.20.6.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.20.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,7 @@ else
 	EKEY_STATE="snap"
 fi
 
-inherit enlightenment
+inherit enlightenment xdg-utils
 
 DESCRIPTION="Enlightenment DR17 window manager"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
@@ -57,7 +57,10 @@ RDEPEND="
 	>=dev-libs/efl-1.17[X]
 	>=media-libs/elementary-1.17
 	x11-libs/xcb-util-keysyms"
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+	sys-devel/automake:1.15
+"
 
 S=${WORKDIR}/${MY_P}
 
@@ -91,7 +94,9 @@ check_modules() {
 }
 
 src_configure() {
-	check_modules
+	# sanity check fails after commit e25cf18ca19463a7d05519aa843cc76a189ab75c
+	# see #648896. Can be restored with future release
+	# check_modules
 
 	E_ECONF=(
 		--disable-install-sysactions
@@ -125,3 +130,13 @@ src_install() {
 	insinto /etc/enlightenment
 	newins "${FILESDIR}"/gentoo-sysactions.conf sysactions.conf
 }
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/x11-wm/i3-gaps/Manifest b/x11-wm/i3-gaps/Manifest
new file mode 100644
index 000000000000..c8808217dd10
--- /dev/null
+++ b/x11-wm/i3-gaps/Manifest
@@ -0,0 +1,4 @@
+AUX i3-gaps-4.15-musl.patch 2473 BLAKE2B acb148b7a7f14f7e75523ade9ae4374d6b18d3397f97d6b639f416f86abfd114bddd97fab19a61385fff5504bcd0f614c53175da4c30cf31e00f6b612dfb3d0d SHA512 8ce7d00371c43b93dabbe0dadf9caf7c58a68f4a0079f5a9b9552c15c55bfa0df16d7e87a281595af2ac5254632ba28ccf82a467cea16159b41490f6f2910299
+DIST i3-gaps-4.15.0.1.tar.gz 3965631 BLAKE2B ea65886c40f377125bafbd80e2d56c1d66a4c5c06d942d645b2cb226323a0903e98aa58b67da9c31c60240b5d99d10ecc20864aeede95a5039ea0ffdff8dcb8b SHA512 76ff860e4ca0edd0e22bdff9ae9b1bc150df2b5bc15b0d7ea7a63d373e8d156a43bd91f8a40c48b4c771603f7de7c18c6d16c53fef582e53f51c53a197fa7a0a
+EBUILD i3-gaps-4.15.0.1.ebuild 1753 BLAKE2B 95f3e06c6fb70ef53d902f47711500ab1a759b3e0a1b0e5dd57cd35457c4e122280ed0d8f15a3ab3dfb6e42464ada71b5febb5c0c84d7ad266ca8aa175670f57 SHA512 5e7db76be9088f77fd26a3114d38a7ab80b163d5678a99f2252e1d3a170f9bad7d334312c7147e336b061deb2435fe66cb7131b8f917041fbc73f86ded1b1d0e
+MISC metadata.xml 322 BLAKE2B bdba5a4519158f97944784fc4e2813c1b8e8d4f6f90d43b3a935e8b2565ecc5d2444c4b7b4d11266263d25a76b5c2dba55ec6535fdaab03129bb022206abbce2 SHA512 d3ca96f88473d21b81c420795c6eee5dd41f43354de85fd549a9ae8127e46f10d00034730bf850ddd6df8607821d30fce17aa349b1b2575f43fd3303a2da1cf6
diff --git a/x11-wm/i3-gaps/files/i3-gaps-4.15-musl.patch b/x11-wm/i3-gaps/files/i3-gaps-4.15-musl.patch
new file mode 100644
index 000000000000..82ad6195b8e5
--- /dev/null
+++ b/x11-wm/i3-gaps/files/i3-gaps-4.15-musl.patch
@@ -0,0 +1,73 @@
+diff -urp i3-4.11/i3bar/src/main.c i3-4.11.new/i3bar/src/main.c
+--- i3-4.11/i3bar/src/main.c	2015-09-30 07:55:10.000000000 +0100
++++ i3-4.11.new/i3bar/src/main.c	2016-02-08 20:03:41.777392482 +0000
+@@ -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) {
+diff -urp i3-4.11/libi3/resolve_tilde.c i3-4.11.new/libi3/resolve_tilde.c
+--- i3-4.11/libi3/resolve_tilde.c	2015-09-30 07:55:10.000000000 +0100
++++ i3-4.11.new/libi3/resolve_tilde.c	2016-02-08 20:03:47.849230953 +0000
+@@ -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-gaps/i3-gaps-4.15.0.1.ebuild b/x11-wm/i3-gaps/i3-gaps-4.15.0.1.ebuild
new file mode 100644
index 000000000000..54936b5b78b8
--- /dev/null
+++ b/x11-wm/i3-gaps/i3-gaps-4.15.0.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eapi7-ver
+
+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=""
+
+CDEPEND="
+	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
+"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="${CDEPEND}
+	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-gaps/metadata.xml b/x11-wm/i3-gaps/metadata.xml
new file mode 100644
index 000000000000..1a5dfaf1b54d
--- /dev/null
+++ b/x11-wm/i3-gaps/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>johu@gentoo.org</email>
+		<name>Johannes Huber</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Airblader/i3</remote-id>
+	</upstream>
+</pkgmetadata>