gentoo resync : 25.11.2020

9 files changed, 187 insertions, 449 deletions

diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index 18ddc7d9bc5b..283118e919c2 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -1,14 +1,10 @@
 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.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.2.tar.bz2 1218440 BLAKE2B 55fba66b2399730cb3bc63d76efff18a439aad755c943f06d7622bd7c4d91502b3750cff638b98ef86d6f99746bc1858ffbd9396e2d89a7220f513575879e08a SHA512 997c7cdf32f95ba25cfcd483a09f7e37e5219e4501baefa5c1865ddffd206bc9725211e4082663fab4174dc947b663ff454d343a7e30340ac3ea451f999417fc
+AUX i3-gaps-4.19-fix-docdir.patch 508 BLAKE2B 44aa2a2a7d0b77429345c4b62be66437714851481ca968098596c28aae8769036b8238b0295f4f80ca8e6e0f2c3e25c60130f3b941cb763d2069deb07d884dfd SHA512 8169cd9fdc2a4506af3d93eda672484a43ab30cf99afcdfc10094be36e6fcccf53d416376a475a95a80d34afb6dbec32bb657a81ccc7e5244c23b34717d5201a
+DIST i3-4.18.3.tar.bz2 1218766 BLAKE2B c394bbe9882dc893107f0c948632a3a79c52db75b75b2890f6f43fa60d80ce82d1c8a8c32a8793f59d9a6f929ab038765dbe3813c3c6bc1b79bebbbbde772451 SHA512 61599b79247ec546819bab22666a78fc8dc77eecbcf6055efb6b52720290fa7f72719ac6670396a6dfb54858781e438b5207c15fdf2cf9e2424a1b84ffeb749c
 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.17.1-r1.ebuild 2327 BLAKE2B 8f307ab43874156d97b3db51ac68fef7ca58f3f2381c495d815326076c1368473974143f00f0909ef66b1efb6e0ff2fda4ccfd7161d336e4d80ae6f6f9da5be0 SHA512 9405eaafba8cac4c6918cdd8343f61c558f58460c2a8dcda2321b1ad38e7318f8a7f6a51d4a3afcc450dcdc9a139d8baf158179c9bf6165c421288e1dc99b1e9
-EBUILD i3-4.18.1.ebuild 2133 BLAKE2B f5b1ca5ab47d57102c358e72d958d4b0153d24b41573067f8760f80860150567a16839b5baf9270f80c9ac2daeb751c103a893ca4c8246e7f476f401200451d9 SHA512 6006b8efd31270c81b4ab4047ef22abc15779729d71ff6a6e3ab2a82376bf84c1e19eb80a6e5d22d7f68ea03d78ca088edd9d4c35e9aa5093a39e2d689d6648a
-EBUILD i3-4.18.2.ebuild 2133 BLAKE2B f5b1ca5ab47d57102c358e72d958d4b0153d24b41573067f8760f80860150567a16839b5baf9270f80c9ac2daeb751c103a893ca4c8246e7f476f401200451d9 SHA512 6006b8efd31270c81b4ab4047ef22abc15779729d71ff6a6e3ab2a82376bf84c1e19eb80a6e5d22d7f68ea03d78ca088edd9d4c35e9aa5093a39e2d689d6648a
+DIST i3-4.19.tar.xz 1278600 BLAKE2B 3af5eac9cb618bc3b3da0bca430e1882701802f49e092d1e6fa7a35ceb3f2c0287b66eceeb0123a7dfda9976df06227bec34d7d98873aedc2292a2ba94584d84 SHA512 e9e85dfa099751e95f05e8ed5048535bc669d73c51d3bd7e83740ee79d613f981a1130c35f54fb4725b31d18bed63d6bd5efacce8e086483e28d7c778407653a
+EBUILD i3-4.18.3.ebuild 2133 BLAKE2B f5b1ca5ab47d57102c358e72d958d4b0153d24b41573067f8760f80860150567a16839b5baf9270f80c9ac2daeb751c103a893ca4c8246e7f476f401200451d9 SHA512 6006b8efd31270c81b4ab4047ef22abc15779729d71ff6a6e3ab2a82376bf84c1e19eb80a6e5d22d7f68ea03d78ca088edd9d4c35e9aa5093a39e2d689d6648a
 EBUILD i3-4.18.ebuild 2126 BLAKE2B 29048fa9165965ccd572cbacc8fdcc15697384bb75039c2c77caa3970040b31592359c1aa4b8df9242fd8c455e0b1a44d33c76422a9e603235651828cb7020d3 SHA512 527a652e1c6e05b1730a404c38a612820aebc2619ea8baf63c3403cbaaa8a4a5608ba63586c4f5ab09d7d57225727ed3f1207da317110b2b50b31b224440820c
-EBUILD i3-9999.ebuild 1817 BLAKE2B e812d4a04b34d2afb67da16370baace1a3d3376e2a15f73ff77aabbb8a061104f750abd84721266926bcd4d8f05b60d0014f38643c1a706e3ba5126ce68139f5 SHA512 0a31fd5d8ceeeda0c6f8fe06e595be9aa9f0aeca7547c9a8dc24cb2f6c0034255269d256cd88f265d77517da7df0cc8cd116b02404207cc4163df8e27132e086
+EBUILD i3-4.19-r1.ebuild 2100 BLAKE2B d6db9d136708179704ecac40c31200200661dcd85a1de8122ed87885ca07b3a3b039d394d1b0f2c541964ed58b74ee5ecb610eae868a94fa29c80a31621969e8 SHA512 73f0b934ac6aa89d6f75b1d3f4e41266b8b9170becde54015fbe513adf6a40f4787023ff9d31575edbe9f5d3a9376c5f1a62fb2620eb6e3336b4e2daa9c07a3a
+EBUILD i3-9999.ebuild 2055 BLAKE2B 65c10e891c2dd9971b25ce0e9d4c616aeb77dabca964aba24d2291c9fd57456f1dfb3ae35697e9db9685ccd025ac60e41b2ff03385f352dafa241414d0b2cfa8 SHA512 05d51b87521aeddd0468b114ee61b3d25b1953de5da2f92e548bafc9bf71226674056b5083a35b728f20c2415980a643a94ce55d97a20a8fababac468dbdd54b
 MISC metadata.xml 470 BLAKE2B 1c4fd7b44860934e88fb5165254fe0e8ca7e647c11af9af7d959f240e51002e6a454d9b93b30da8944891a1aa6a989f7a3e2a8af44ba41de174e78745393dd79 SHA512 52eddb56541d1172b04ca3ae646d01e52fb300dd62f5dfeaf2abe9d791965813e87b24a1477743797227bf8d407051f79076d54edb599524f89f3cfc716cc47e
diff --git a/x11-wm/i3/files/i3-gaps-4.19-fix-docdir.patch b/x11-wm/i3/files/i3-gaps-4.19-fix-docdir.patch
new file mode 100644
index 000000000000..6917aa091dff
--- /dev/null
+++ b/x11-wm/i3/files/i3-gaps-4.19-fix-docdir.patch
@@ -0,0 +1,22 @@
+diff --git a/meson.build b/meson.build
+index 11541e21..a6f8974e 100644
+--- a/meson.build
++++ b/meson.build
+@@ -642,7 +642,7 @@ if get_option('docs')
+       '@OUTPUT@',
+     ],
+     install: true,
+-    install_dir: join_paths(get_option('datadir'), 'doc', 'i3'),
++    install_dir: docdir,
+   )
+ 
+   custom_target(
+@@ -655,7 +655,7 @@ if get_option('docs')
+       '@OUTPUT@',
+     ],
+     install: true,
+-    install_dir: join_paths(get_option('datadir'), 'doc', 'i3'),
++    install_dir: docdir,
+   )
+ endif
+ 
diff --git a/x11-wm/i3/files/i3-musl-GLOB_TILDE.patch b/x11-wm/i3/files/i3-musl-GLOB_TILDE.patch
deleted file mode 100644
index d241a748186e..000000000000
--- a/x11-wm/i3/files/i3-musl-GLOB_TILDE.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-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.14-r1.ebuild b/x11-wm/i3/i3-4.14-r1.ebuild
deleted file mode 100644
index 8f1c907d1b10..000000000000
--- a/x11-wm/i3/i3-4.14-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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"
-RESTRICT="!test? ( 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() {
-	# 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.17.1-r1.ebuild b/x11-wm/i3/i3-4.17.1-r1.ebuild
deleted file mode 100644
index ef11b20be559..000000000000
--- a/x11-wm/i3/i3-4.17.1-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]
-	)"
-RDEPEND="${CDEPEND}
-	dev-lang/perl
-	dev-perl/AnyEvent-I3
-	dev-perl/JSON-XS"
-BDEPEND="virtual/pkgconfig"
-
-# 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.18.2.ebuild b/x11-wm/i3/i3-4.18.2.ebuild
deleted file mode 100644
index 58a3f832182c..000000000000
--- a/x11-wm/i3/i3-4.18.2.ebuild
+++ /dev/null
@@ -1,103 +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 ~arm ~arm64 ~x86"
-IUSE="doc debug test"
-
-CDEPEND="dev-libs/libev
-	dev-libs/libpcre
-	dev-libs/yajl
-	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[X,xcb(+)]
-	x11-libs/pango[X]"
-DEPEND="${CDEPEND}
-	test? (
-		dev-perl/AnyEvent
-		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
-		x11-base/xorg-server[xephyr]
-		x11-misc/xvfb-run
-	)"
-RDEPEND="${CDEPEND}
-	dev-lang/perl
-	dev-perl/AnyEvent-I3
-	dev-perl/JSON-XS"
-BDEPEND="virtual/pkgconfig"
-
-# 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 check
-}
-
-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.18.1.ebuild b/x11-wm/i3/i3-4.18.3.ebuild
index 58a3f832182c..58a3f832182c 100644
--- a/x11-wm/i3/i3-4.18.1.ebuild
+++ b/x11-wm/i3/i3-4.18.3.ebuild
diff --git a/x11-wm/i3/i3-4.19-r1.ebuild b/x11-wm/i3/i3-4.19-r1.ebuild
new file mode 100644
index 000000000000..3ef5738daddf
--- /dev/null
+++ b/x11-wm/i3/i3-4.19-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson optfeature virtualx
+if [[ "${PV}" = *9999 ]]; then
+	inherit git-r3
+fi
+
+DESCRIPTION="An improved dynamic tiling window manager"
+HOMEPAGE="https://i3wm.org/"
+if [[ "${PV}" = *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/i3/i3"
+	EGIT_BRANCH="next"
+else
+	SRC_URI="https://i3wm.org/downloads/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc test"
+
+COMMON_DEPEND="dev-libs/libev
+	dev-libs/libpcre
+	dev-libs/yajl
+	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[X,xcb(+)]
+	x11-libs/pango[X]"
+DEPEND="${COMMON_DEPEND}
+	test? (
+		dev-perl/AnyEvent
+		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
+		x11-base/xorg-server[xephyr]
+		x11-misc/xvfb-run
+	)
+	doc? (
+		app-text/asciidoc
+		app-text/xmlto
+		dev-lang/perl
+	)"
+RDEPEND="${COMMON_DEPEND}
+	dev-lang/perl
+	dev-perl/AnyEvent-I3
+	dev-perl/JSON-XS"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.16-musl-GLOB_TILDE.patch"
+	"${FILESDIR}/i3-gaps-4.19-fix-docdir.patch"
+)
+
+src_prepare() {
+	default
+
+	cat <<- EOF > "${T}"/i3wm
+		#!/bin/sh
+		exec /usr/bin/i3
+	EOF
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddocdir="/usr/share/doc/${PF}"
+		$(meson_use doc docs)
+		$(meson_use doc mans)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	exeinto /etc/X11/Sessions
+	doexe "${T}"/i3wm
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	elog "There are several packages that you may find useful with i3 and"
+	elog "their usage is suggested by the upstream maintainers."
+	elog "Uninstalled optional dependencies:"
+	optfeature "Application launcher" x11-misc/dmenu
+	optfeature "Simple screen locker" x11-misc/i3lock
+	optfeature "Status bar generator" x11-misc/i3status
+}
diff --git a/x11-wm/i3/i3-9999.ebuild b/x11-wm/i3/i3-9999.ebuild
index f87cfbc00631..e644fcb77f54 100644
--- a/x11-wm/i3/i3-9999.ebuild
+++ b/x11-wm/i3/i3-9999.ebuild
@@ -1,24 +1,30 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools git-r3
+inherit meson optfeature virtualx
+if [[ "${PV}" = *9999 ]]; then
+	inherit git-r3
+fi
 
 DESCRIPTION="An improved dynamic tiling window manager"
 HOMEPAGE="https://i3wm.org/"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/i3/i3"
-EGIT_BRANCH="next"
+if [[ "${PV}" = *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/i3/i3"
+	EGIT_BRANCH="next"
+else
+	SRC_URI="https://i3wm.org/downloads/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS=""
-IUSE="doc"
+IUSE="doc test"
 
-CDEPEND="dev-libs/libev
+COMMON_DEPEND="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
@@ -28,15 +34,31 @@ 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]"
-DEPEND="${CDEPEND}
-	doc? ( app-text/asciidoc app-text/xmlto dev-lang/perl )
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
+	x11-libs/cairo[X,xcb(+)]
+	x11-libs/pango[X]"
+DEPEND="${COMMON_DEPEND}
+	test? (
+		dev-perl/AnyEvent
+		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
+		x11-base/xorg-server[xephyr]
+		x11-misc/xvfb-run
+	)
+	doc? (
+		app-text/asciidoc
+		app-text/xmlto
+		dev-lang/perl
+	)"
+RDEPEND="${COMMON_DEPEND}
 	dev-lang/perl
 	dev-perl/AnyEvent-I3
 	dev-perl/JSON-XS"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.16-musl-GLOB_TILDE.patch"
@@ -45,11 +67,6 @@ PATCHES=(
 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
@@ -57,31 +74,31 @@ src_prepare() {
 }
 
 src_configure() {
-	local myeconfargs=( --enable-debug=no )  # otherwise injects -O0 -g
-	econf "${myeconfargs[@]}"
-}
+	local emesonargs=(
+		-Ddocdir="/usr/share/doc/${PF}"
+		$(meson_use doc docs)
+		$(meson_use doc mans)
+	)
 
-src_compile() {
-	emake -C "${CBUILD}"
+	meson_src_configure
 }
 
 src_install() {
-	emake -C "${CBUILD}" DESTDIR="${D}" install
-	einstalldocs
+	meson_src_install
 
 	exeinto /etc/X11/Sessions
 	doexe "${T}"/i3wm
 }
 
-pkg_postinst() {
+src_test() {
+	virtx meson_src_test
+}
 
-	# 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
+pkg_postinst() {
+	elog "There are several packages that you may find useful with i3 and"
+	elog "their usage is suggested by the upstream maintainers."
+	elog "Uninstalled optional dependencies:"
+	optfeature "Application launcher" x11-misc/dmenu
+	optfeature "Simple screen locker" x11-misc/i3lock
+	optfeature "Status bar generator" x11-misc/i3status
 }