gentoo resync : 09.07.2022

4 files changed, 125 insertions, 3 deletions

diff --git a/gui-wm/sway/Manifest b/gui-wm/sway/Manifest
index 3157ae76d1f0..5836fb817433 100644
--- a/gui-wm/sway/Manifest
+++ b/gui-wm/sway/Manifest
@@ -1,4 +1,5 @@
 DIST sway-1.7.tar.gz 5559075 BLAKE2B 702b9a209d603c88743f2e89d0787431b7a30e8b7554c9596edb9735af862d23c585158737a0943a470637138cbc5275bee37bd2d820a7489cdd0747d98e6e22 SHA512 028cf5d504d5914bfb78d44156d6a290de660c5ed0638f4e2c56e5be76db9b0baeda035e1fa1ae23559016bd7e4312f7ff70c2fb4904df25358577c1a3d21243
+EBUILD sway-1.7-r1.ebuild 2175 BLAKE2B 9847fd44899ef922fa04ddfeb810b0ad4c9ae930f785c2393b6b5e1d348c893b19c0e9f791fbd661b76eed3e4c4f9eb16ecaac1c794479f1e86680180eb115e9 SHA512 c25c1776915883c42113c358783706181402c5f052ef08a81c20380af4bae37da5e3c53b59f0ac9d6bdfc197f94b33ba713830d9e85ad4a9ed74d5b3825fd85d
 EBUILD sway-1.7.ebuild 1900 BLAKE2B 7969c477bc7a65cb67ad007e9105c7046af2a873bd3fdd1924ed37e74f60819973ca96061dbb5b97fedd20d47bd1832f939c4ad9ae0885c2549dc03972f980b4 SHA512 a702d1a00d4019c72e0bd54262ac4d0d7304835df6cbd92e93f94e8aee56f556331b0452c10c4dd3e221cd31fd04859804f62027d1080a2c1fece797b9359bdb
-EBUILD sway-9999.ebuild 1903 BLAKE2B 113b2fc429d5548cddffea57879960b17118ef2981f0b41c30c63eb0c30e7addeb16fcd496b458fe0657e4469bdc12a1d367b3deabbf9a8f20ac62519a9e8166 SHA512 57994aed03d7daa941f9e5c11babd6bbe8aea7ec1ecea819ee65f146b3eeee15ebbe388278dd21fc9fe5a6a4f1f1783493ce1257f840b392d49a4326ec1b6b2b
-MISC metadata.xml 2188 BLAKE2B 5e8eb1e6cb3ef8e7398972a8a38556674469008a1531a5c44a35e2eb6c4a43ef01d1fe5f39d560c467b300aa3d9237268ae6a7768beccf4fa268563ac7bdd485 SHA512 a59f659d2b575d7db284dae3fe1c784c0ff2824365d8a96455e5cdc9850d20bf0ae66d3129884b15c8fb8a0fdd88316998a504558fa938c0403e1de64b922783
+EBUILD sway-9999.ebuild 2175 BLAKE2B 4fedd4d1dc45409a149fbfd112b055bb7921ccde21504fd1a88fe427c1b36ea5b4abb93d7e4a9aff9836bb5fb3d94ebb006724e8dcc825f6d88b8a02e428d9b4 SHA512 cb7b7b1972e7ecc104aa7203bb2f4925ff3dce838faeb6de818dfea5a468080d76c5c7f7c0584409bd0fa11014e37368b256cf6bddab6ac165f56f4cd19e6629
+MISC metadata.xml 2269 BLAKE2B 75c8e2e2550cdb3ca970806b724068e0e78d3b9f70dba320db25fe8637ecc5c70ebba9a9d604d30e8a79f2155949e9aabb0993e3fbb8fe4b626c471231eeb46f SHA512 07c978ed2c7e351b0f72c69e707c409344bdbf0ef1348d85b71d9876284b1f632439c74a924818d0401ad31dd2e1d328c7446dabbbda1c4db27b67cbd68d8546
diff --git a/gui-wm/sway/metadata.xml b/gui-wm/sway/metadata.xml
index 0f236d0a69f7..83ff81b0d4e2 100644
--- a/gui-wm/sway/metadata.xml
+++ b/gui-wm/sway/metadata.xml
@@ -26,6 +26,7 @@
 		something else.
 	</longdescription>
 	<use>
+		<flag name="grimshot">Install 'grimshot': script for taking screenshots</flag>
 		<flag name="swaybar">Install 'swaybar': sway's status bar component</flag>
 		<flag name="swaybg">Install 'swaybg': allows to set a desktop background image</flag>
 		<flag name="swayidle">Install 'swayidle': idle manager to run commands when user is inactive</flag>
diff --git a/gui-wm/sway/sway-1.7-r1.ebuild b/gui-wm/sway/sway-1.7-r1.ebuild
new file mode 100644
index 000000000000..7ad45789f21a
--- /dev/null
+++ b/gui-wm/sway/sway-1.7-r1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+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 +swaybg +swayidle +swaylock +swaymsg +swaynag tray wallpapers X"
+
+DEPEND="
+	>=dev-libs/json-c-0.13:0=
+	>=dev-libs/libinput-1.6.0:0=
+	sys-auth/seatd:=
+	dev-libs/libpcre
+	>=dev-libs/wayland-1.20.0
+	x11-libs/cairo
+	x11-libs/libxkbcommon
+	x11-libs/pango
+	x11-libs/pixman
+	media-libs/mesa[gles2,libglvnd(+)]
+	swaybar? ( x11-libs/gdk-pixbuf:2 )
+	swaybg? ( gui-apps/swaybg )
+	swayidle? ( gui-apps/swayidle )
+	swaylock? ( gui-apps/swaylock )
+	tray? ( || (
+		sys-apps/systemd
+		sys-auth/elogind
+		sys-libs/basu
+	) )
+	wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] )
+	X? ( x11-libs/libxcb:0= )
+"
+if [[ ${PV} == 9999 ]]; then
+	DEPEND+="~gui-libs/wlroots-9999:=[X=]"
+else
+	DEPEND+="
+		>=gui-libs/wlroots-0.15:=[X=]
+		<gui-libs/wlroots-0.16:=[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="grimshot? ( swaymsg )"
+
+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
+}
diff --git a/gui-wm/sway/sway-9999.ebuild b/gui-wm/sway/sway-9999.ebuild
index 3f38a9b21df9..3c0073c3c363 100644
--- a/gui-wm/sway/sway-9999.ebuild
+++ b/gui-wm/sway/sway-9999.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="+man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag tray wallpapers X"
+IUSE="grimshot +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag tray wallpapers X"
 
 DEPEND="
 	>=dev-libs/json-c-0.13:0=
@@ -55,6 +55,13 @@ else
 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="
@@ -67,6 +74,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	BDEPEND+="man? ( >=app-text/scdoc-1.9.3 )"
 fi
+REQUIRED_USE="grimshot? ( swaymsg )"
 
 src_configure() {
 	local emesonargs=(
@@ -84,3 +92,12 @@ src_configure() {
 
 	meson_src_configure
 }
+
+src_install() {
+	meson_src_install
+
+	if use grimshot; then
+		doman contrib/grimshot.1
+		dobin contrib/grimshot
+	fi
+}