gentoo auto-resync : 25:12:2022 - 20:05:44

3 files changed, 121 insertions, 2 deletions

diff --git a/gui-wm/sway/Manifest b/gui-wm/sway/Manifest
index 17cd236b5d3f..a327628e3020 100644
--- a/gui-wm/sway/Manifest
+++ b/gui-wm/sway/Manifest
@@ -1,6 +1,8 @@
 DIST sway-1.7.tar.gz 5559075 BLAKE2B 702b9a209d603c88743f2e89d0787431b7a30e8b7554c9596edb9735af862d23c585158737a0943a470637138cbc5275bee37bd2d820a7489cdd0747d98e6e22 SHA512 028cf5d504d5914bfb78d44156d6a290de660c5ed0638f4e2c56e5be76db9b0baeda035e1fa1ae23559016bd7e4312f7ff70c2fb4904df25358577c1a3d21243
+DIST sway-1.8.tar.gz 5577138 BLAKE2B cf93db2d7722be5a14f3557087c8298cbbbaa7268ffb8540c5473581200323b6ba24c9a669e2b7fb31afe3cbe49314eef9f224c438ad3c4cd93ef939285be365 SHA512 9f4f24ecc16c2ffe0e2b17fa5f0da871493073fc96f2daf20323459b3adfb29bae3c369833d713ae254b5ac036d9b6625f76595ca31c3d216626095d1ef29615
 EBUILD sway-1.7-r1.ebuild 2175 BLAKE2B 9847fd44899ef922fa04ddfeb810b0ad4c9ae930f785c2393b6b5e1d348c893b19c0e9f791fbd661b76eed3e4c4f9eb16ecaac1c794479f1e86680180eb115e9 SHA512 c25c1776915883c42113c358783706181402c5f052ef08a81c20380af4bae37da5e3c53b59f0ac9d6bdfc197f94b33ba713830d9e85ad4a9ed74d5b3825fd85d
 EBUILD sway-1.7-r2.ebuild 2629 BLAKE2B 09ae1cd2a056ff6b775225ecc3fd81012fdd44d66cd2ec97e68874148872931a09b4ca9988fbf10287f9b032ac4e8f52766ef8f44a2b052f41aaaf381d515aec SHA512 88398a3f549b9c356c305df3a40a86987a842c05df320826195230585ca7da2a9c7a5f65f62ef73f9fe8c7f331926c8b5efb18bfd0e064ef8a2e00552f5ba94e
 EBUILD sway-1.7.ebuild 1900 BLAKE2B 7969c477bc7a65cb67ad007e9105c7046af2a873bd3fdd1924ed37e74f60819973ca96061dbb5b97fedd20d47bd1832f939c4ad9ae0885c2549dc03972f980b4 SHA512 a702d1a00d4019c72e0bd54262ac4d0d7304835df6cbd92e93f94e8aee56f556331b0452c10c4dd3e221cd31fd04859804f62027d1080a2c1fece797b9359bdb
-EBUILD sway-9999.ebuild 2630 BLAKE2B 912a1baa69f5f63e79a23e0fb258ad0294ca6a2ee9e456d737ebe01c49cdc9d420f4c035f9b313b6242b7a1196977d6f788cb0dbe951b2cc9ae9d234cbea78d7 SHA512 1546cf71f1a24eb18201e93cd8defd9592aef5a50dc7cef540fe5436d99f334c0463910d413947229dedc4a594e9cb55e05b0a052337c58b42fe49fc5eaab2d0
+EBUILD sway-1.8.ebuild 2696 BLAKE2B acd2582869e7baee1dc75b1e2292eb1a483c55680c277258b32f9481cbaee63b927dfcf47fe875a84077dce2a23c91d53adabcd01089658e144ffc390cdad85d SHA512 72df1dfee270ce5dd06e45ff5144b31718993a8be56945f864fd5f20dd5b18e52d7b6c42ff4b66cefc81176fe532476d6f80460884324508ac777928f57fb62a
+EBUILD sway-9999.ebuild 2696 BLAKE2B acd2582869e7baee1dc75b1e2292eb1a483c55680c277258b32f9481cbaee63b927dfcf47fe875a84077dce2a23c91d53adabcd01089658e144ffc390cdad85d SHA512 72df1dfee270ce5dd06e45ff5144b31718993a8be56945f864fd5f20dd5b18e52d7b6c42ff4b66cefc81176fe532476d6f80460884324508ac777928f57fb62a
 MISC metadata.xml 2165 BLAKE2B 5ebce1764fdd8aad171787dbf32dc5c1388506bbab5ef6a85c8990099f177edfed722c5d98a50e54620a7aad62c38072d2f8dbb34d28200902ad2d276e27164c SHA512 c8d70170b63cad752a666e75085f679b28ea520b460f01027d078dc178409dd43ab0f1b79033a149fbb2206a9e0fa6620623cb9df66343a734bdc3920c6c762c
diff --git a/gui-wm/sway/sway-1.8.ebuild b/gui-wm/sway/sway-1.8.ebuild
new file mode 100644
index 000000000000..8468aba7acc3
--- /dev/null
+++ b/gui-wm/sway/sway-1.8.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson optfeature
+
+DESCRIPTION="i3-compatible Wayland window manager"
+HOMEPAGE="https://swaywm.org"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
+else
+	MY_PV=${PV/_rc/-rc}
+	SRC_URI="https://github.com/swaywm/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="grimshot +man +swaybar +swaynag tray wallpapers X"
+
+DEPEND="
+	>=dev-libs/json-c-0.13:0=
+	>=dev-libs/libinput-1.21.0:0=
+	sys-auth/seatd:=
+	dev-libs/libpcre2
+	>=dev-libs/wayland-1.20.0
+	x11-libs/cairo
+	x11-libs/libxkbcommon
+	x11-libs/pango
+	x11-libs/pixman
+	x11-libs/xcb-util-wm
+	media-libs/mesa[gles2,libglvnd(+)]
+	swaybar? ( x11-libs/gdk-pixbuf:2 )
+	tray? ( || (
+		sys-apps/systemd
+		sys-auth/elogind
+		sys-libs/basu
+	) )
+	wallpapers? ( gui-apps/swaybg[gdk-pixbuf(+)] )
+	X? ( x11-libs/libxcb:0= )
+"
+# x11-libs/xcb-util-wm needed for xcb-iccm
+if [[ ${PV} == 9999 ]]; then
+	DEPEND+="~gui-libs/wlroots-9999:=[X?]"
+else
+	DEPEND+="
+		>=gui-libs/wlroots-0.16:=[X?]
+		<gui-libs/wlroots-0.17:=[X?]
+	"
+fi
+RDEPEND="
+	x11-misc/xkeyboard-config
+	grimshot? (
+		app-misc/jq
+		gui-apps/grim
+		gui-apps/slurp
+		gui-apps/wl-clipboard
+		x11-libs/libnotify
+	)
+	${DEPEND}
+"
+BDEPEND="
+	>=dev-libs/wayland-protocols-1.24
+	>=dev-util/meson-0.60.0
+	virtual/pkgconfig
+"
+if [[ ${PV} == 9999 ]]; then
+	BDEPEND+="man? ( ~app-text/scdoc-9999 )"
+else
+	BDEPEND+="man? ( >=app-text/scdoc-1.9.3 )"
+fi
+REQUIRED_USE="tray? ( swaybar )"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature man man-pages)
+		$(meson_feature tray)
+		$(meson_feature X xwayland)
+		$(meson_feature swaybar gdk-pixbuf)
+		$(meson_use swaynag)
+		$(meson_use swaybar)
+		$(meson_use wallpapers default-wallpaper)
+		-Dfish-completions=true
+		-Dzsh-completions=true
+		-Dbash-completions=true
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if use grimshot; then
+		doman contrib/grimshot.1
+		dobin contrib/grimshot
+	fi
+}
+
+pkg_postinst() {
+	optfeature_header "There are several packages that may be useful with sway:"
+	optfeature "wallpaper utility" gui-apps/swaybg
+	optfeature "idle management utility" gui-apps/swayidle
+	optfeature "simple screen locker" gui-apps/swaylock
+	optfeature "lightweight notification daemon" gui-apps/mako
+	echo
+	einfo "For a list of additional addons and tools usable with sway please"
+	einfo "visit the offical wiki at:"
+	einfo "https://github.com/swaywm/sway/wiki/Useful-add-ons-for-sway"
+	einfo "Please note that some of them might not (yet) available on gentoo"
+}
diff --git a/gui-wm/sway/sway-9999.ebuild b/gui-wm/sway/sway-9999.ebuild
index a84e8282f192..8468aba7acc3 100644
--- a/gui-wm/sway/sway-9999.ebuild
+++ b/gui-wm/sway/sway-9999.ebuild
@@ -24,7 +24,7 @@ IUSE="grimshot +man +swaybar +swaynag tray wallpapers X"
 
 DEPEND="
 	>=dev-libs/json-c-0.13:0=
-	>=dev-libs/libinput-1.6.0:0=
+	>=dev-libs/libinput-1.21.0:0=
 	sys-auth/seatd:=
 	dev-libs/libpcre2
 	>=dev-libs/wayland-1.20.0
@@ -32,6 +32,7 @@ DEPEND="
 	x11-libs/libxkbcommon
 	x11-libs/pango
 	x11-libs/pixman
+	x11-libs/xcb-util-wm
 	media-libs/mesa[gles2,libglvnd(+)]
 	swaybar? ( x11-libs/gdk-pixbuf:2 )
 	tray? ( || (
@@ -42,6 +43,7 @@ DEPEND="
 	wallpapers? ( gui-apps/swaybg[gdk-pixbuf(+)] )
 	X? ( x11-libs/libxcb:0= )
 "
+# x11-libs/xcb-util-wm needed for xcb-iccm
 if [[ ${PV} == 9999 ]]; then
 	DEPEND+="~gui-libs/wlroots-9999:=[X?]"
 else