gentoo auto-resync : 25:01:2023 - 14:07:44

3 files changed, 108 insertions, 6 deletions

diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index 8afb4f50a68e..2af8443c13d2 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -1,5 +1,7 @@
 AUX i3-4.16-musl-GLOB_TILDE.patch 2783 BLAKE2B 9dea47af64b78a77006d3aa641273aa7a77846d4425e1da17424528445450112ab275cdf7098ba8c2a76f1b08561b1d1a852cb9fd4ee4c61e53832ca702ad55d SHA512 fdff65255e7c9b30eefdbf032e04ba568d5b75a5b7dfc5fce1aecaac0f0d376b6bb4f87338e1eaf5f20b1c5882ebfc7349f8ab43c804349b5f5c626f9fc1d340
 DIST i3-4.21.1.tar.xz 1297400 BLAKE2B 44661bd9edf0bee384b8be88cbf2361bb2ad26fdbaee9a2e010ebdee662b31129057a1a183f46bef0839a545f63c70d00903b0ec4693c1bc9390c84d7a78ac44 SHA512 9656b302d6654f38c48bfa1d97a89eaf3ed395027039b6903005d81a9e95d2c4aeba561cf8d1aa36962ba9975996f133ce4298132cddde0f70ba36f57af3197d
+DIST i3-4.22.tar.xz 1349276 BLAKE2B fa179f445ba4286bfeec98dc7a2e1dfad14bda6874e84878a48ee5890ed4cf3a90fc542e8e14aedaaba3abebc8d280284a3b00e838da70a783064a4bd271ca41 SHA512 4e4536fb4108e92a1c918b5869232c0f7eb0feca2d3a49ba87250b970df0614cfe256d1e41fbd825a81c43b82898651e5d3fc11ca8101978916754dfa885266a
 EBUILD i3-4.21.1.ebuild 1979 BLAKE2B cb8c94ca4b59e0e39befcd14cebbfcdbbe97117bd20badbaaead8e765dcef011de56deefe1cf8fa233af96bb6bd2bbb0f19328eb80b9375710c014ae854dd056 SHA512 a927997aea4a47961ed35616f532e6eae25d548c28ab0a373e75b06fbd735be94e991ea1cf7967582c9774ed6b15efca83976dcd3840c920d22e7c0c4698aeac
-EBUILD i3-9999.ebuild 1971 BLAKE2B 7d627a0960037769fa1172c57338a484ca1c1e60079491217e4eaff595336d1d337c6ac870c734c7a5a7ac2374a210d3bc2244431079553160215b2bf6a4ccf3 SHA512 9eb9db06fc6cd891a6f296b599c3c96fc309e0c5553c4385f9efb2c9440590c079fb5897b9aa8c3d423a651d34aa329b3e941b2ca7478f68dcfc09902cd5f860
+EBUILD i3-4.22.ebuild 1918 BLAKE2B 376c511b91f5435cc2dafc9ebd0ebe0c3ab8b30f2ff176400a5cba8a980d441e7e68c30e303ac64eb11c638c9006c399dc9a1e0ccb6f9e9c368729f38a3157a9 SHA512 bfc4a657e05a59ce03ac03072056b53c07cf86c5f53a0281e99e8e41843c7894ae353d98ee89e8628b3f88edfd7a40f7d1511a7feac6e2b4d8f67f5f8fc679b9
+EBUILD i3-9999.ebuild 1910 BLAKE2B 7b066fe5cc374d9419f88703690de0b50b6a0acf485efe897aad943d2fb0c99d2f2672a4379390bd9ff5bb41445b5b03efa8ff4eac1600af632647468ef7c2a9 SHA512 75d8425ce90a13c192c14e92e7ad04ded387318d0b3d7b5d3a63bb5b4466def25e3c8a042e0405267c27ea85be1c399a1ee6f5082b001a8c15700ac0f3b8b6a6
 MISC metadata.xml 537 BLAKE2B 81033b6b7a90a15350b23f77fe6c99d277025ae1f36ef6b5d78bf28f0b5c9fab608c165809433577551f0b478e5a154bc7b95b64b19f7ef9be18f6c7772473f8 SHA512 157b7fc03f7d9c9a455b787061a3e806701e98e3335a0f9edb50fbd5f7712ee3ed6e9573046d8fe72093e162c3253bad3e564b73633f4c67c60a326a103583be
diff --git a/x11-wm/i3/i3-4.22.ebuild b/x11-wm/i3/i3-4.22.ebuild
new file mode 100644
index 000000000000..603faaeef0a4
--- /dev/null
+++ b/x11-wm/i3/i3-4.22.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson optfeature virtualx
+
+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"
+	inherit git-r3
+else
+	SRC_URI="https://i3wm.org/downloads/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dev-libs/libev
+	dev-libs/libpcre2
+	dev-libs/yajl
+	x11-libs/cairo[X,xcb(+)]
+	x11-libs/libxcb:=
+	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
+	x11-misc/xkeyboard-config
+"
+DEPEND="
+	${COMMON_DEPEND}
+	test? (
+		dev-perl/AnyEvent
+		dev-perl/ExtUtils-PkgConfig
+		dev-perl/Inline
+		dev-perl/Inline-C
+		dev-perl/IPC-Run
+		dev-perl/local-lib
+		dev-perl/X11-XCB
+		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"
+
+src_prepare() {
+	default
+
+	cat > "${T}"/i3wm <<- EOF || die
+		#!/bin/sh
+		exec /usr/bin/i3
+	EOF
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(meson_use doc docs)
+		$(meson_use doc mans)
+	)
+
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+src_install() {
+	meson_src_install
+
+	exeinto /etc/X11/Sessions
+	doexe "${T}"/i3wm
+}
+
+pkg_postinst() {
+	optfeature_header "There are several packages that may be useful with i3:"
+	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 a54a7ed9d5f7..6d8b7839b4c5 100644
--- a/x11-wm/i3/i3-9999.ebuild
+++ b/x11-wm/i3/i3-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -65,10 +65,6 @@ RDEPEND="
 "
 BDEPEND="virtual/pkgconfig"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.16-musl-GLOB_TILDE.patch
-)
-
 src_prepare() {
 	default