From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1416385-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B6B3F158095 for <garchives@archives.gentoo.org>; Fri, 8 Jul 2022 15:29:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E7020E0E55; Fri, 8 Jul 2022 15:29:17 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 46BFFE0E55 for <gentoo-commits@lists.gentoo.org>; Fri, 8 Jul 2022 15:29:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3244933BEFE for <gentoo-commits@lists.gentoo.org>; Fri, 8 Jul 2022 15:29:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 88A4F523 for <gentoo-commits@lists.gentoo.org>; Fri, 8 Jul 2022 15:29:14 +0000 (UTC) From: "Matthew Thode" <prometheanfire@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthew Thode" <prometheanfire@gentoo.org> Message-ID: <1657294150.5073f0faab8c73622ba39bf1b2e3d67cea6d315a.prometheanfire@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gui-wm/sway/ X-VCS-Repository: repo/gentoo X-VCS-Files: gui-wm/sway/sway-1.7-r1.ebuild gui-wm/sway/sway-9999.ebuild X-VCS-Directories: gui-wm/sway/ X-VCS-Committer: prometheanfire X-VCS-Committer-Name: Matthew Thode X-VCS-Revision: 5073f0faab8c73622ba39bf1b2e3d67cea6d315a X-VCS-Branch: master Date: Fri, 8 Jul 2022 15:29:14 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e24afbcb-0053-48cc-8651-bba986cf2cf3 X-Archives-Hash: 2b03b31ada8d1c964366219a60019401 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 +}