[gentoo-commits] repo/gentoo:master commit in: gui-wm/sway/

["Matthew Thode" <prometheanfire@gentoo.org>]

commit:     5073f0faab8c73622ba39bf1b2e3d67cea6d315a
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Apr 16 14:25:50 2022 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Jul  8 15:29:10 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5073f0fa

gui-wm/sway: introduce grimshot: utility for taking screenshots

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>

 gui-wm/sway/sway-1.7-r1.ebuild |  9 +++++++--
 gui-wm/sway/sway-9999.ebuild   | 19 ++++++++++++++++++-
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/gui-wm/sway/sway-1.7-r1.ebuild b/gui-wm/sway/sway-1.7-r1.ebuild
index ebf427818f84..7ad45789f21a 100644
--- a/gui-wm/sway/sway-1.7-r1.ebuild
+++ b/gui-wm/sway/sway-1.7-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	MY_PV=${PV/_rc/-rc}
 	SRC_URI="https://github.com/swaywm/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 	S="${WORKDIR}/${PN}-${MY_PV}"
 fi
 
@@ -37,6 +37,11 @@ DEPEND="
 	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= )
 "
@@ -69,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=(
@@ -82,7 +88,6 @@ src_configure() {
 		-Dfish-completions=true
 		-Dzsh-completions=true
 		-Dbash-completions=true
-		-Dwerror=false
 	)
 
 	meson_src_configure

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
+}