From 585ae6c3be5f12b2a26eadcae161fde25c555411 Mon Sep 17 00:00:00 2001
From: Lucio Sauer <watermanpaint@posteo.net>
Date: Wed, 8 May 2024 04:06:03 +0200
Subject: gui-wm/*: fix variable order

Signed-off-by: Lucio Sauer <watermanpaint@posteo.net>
Signed-off-by: Julien Roy <julien@jroy.ca>
---
 gui-wm/hyprland-contrib/hyprland-contrib-0.1-r1.ebuild |  4 ++--
 gui-wm/swayfx/swayfx-0.2.ebuild                        | 15 ++++++---------
 2 files changed, 8 insertions(+), 11 deletions(-)

(limited to 'gui-wm')

diff --git a/gui-wm/hyprland-contrib/hyprland-contrib-0.1-r1.ebuild b/gui-wm/hyprland-contrib/hyprland-contrib-0.1-r1.ebuild
index 687cfd39d..f2d1657d7 100644
--- a/gui-wm/hyprland-contrib/hyprland-contrib-0.1-r1.ebuild
+++ b/gui-wm/hyprland-contrib/hyprland-contrib-0.1-r1.ebuild
@@ -12,10 +12,11 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/hyprwm/contrib/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/contrib-${PV}"
 	KEYWORDS="~amd64"
 fi
 
+S="${WORKDIR}/contrib-${PV}"
+
 LICENSE="MIT"
 SLOT="0"
 IUSE="+grimblast +hyprprop +scratchpad +shellevents +swap"
@@ -51,7 +52,6 @@ BDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/contrib-${PV}"
 src_install() {
 	if use grimblast; then
 	   pushd grimblast || die
diff --git a/gui-wm/swayfx/swayfx-0.2.ebuild b/gui-wm/swayfx/swayfx-0.2.ebuild
index ddbd18989..2daeb19e1 100644
--- a/gui-wm/swayfx/swayfx-0.2.ebuild
+++ b/gui-wm/swayfx/swayfx-0.2.ebuild
@@ -7,13 +7,14 @@ inherit meson optfeature
 
 DESCRIPTION="SwayFX: Sway, but with eye candy!"
 HOMEPAGE="https://github.com/WillPower3309/swayfx"
-
 SRC_URI="https://github.com/WillPower3309/swayfx/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
 
 LICENSE="MIT"
 SLOT="0"
+KEYWORDS="~amd64"
+
 IUSE="grimshot +man +swaybar +swaynag tray wallpapers X"
+REQUIRED_USE="tray? ( swaybar )"
 
 DEPEND="
 	>=dev-libs/json-c-0.13:0=
@@ -21,6 +22,8 @@ DEPEND="
 	sys-auth/seatd:=
 	dev-libs/libpcre
 	>=dev-libs/wayland-1.20.0
+	>=gui-libs/wlroots-0.16:=[X?]
+	<gui-libs/wlroots-0.17:=[X?]
 	x11-libs/cairo
 	x11-libs/libxkbcommon
 	x11-libs/pango
@@ -35,10 +38,6 @@ DEPEND="
 	wallpapers? ( gui-apps/swaybg[gdk-pixbuf(+)] )
 	X? ( x11-libs/libxcb:0= )
 "
-DEPEND+="
-	>=gui-libs/wlroots-0.16:=[X?]
-	<gui-libs/wlroots-0.17:=[X?]
-"
 RDEPEND="
 	x11-misc/xkeyboard-config
 	grimshot? (
@@ -55,9 +54,7 @@ BDEPEND="
 	>=dev-libs/wayland-protocols-1.24
 	>=dev-build/meson-0.60.0
 	virtual/pkgconfig
-"
-BDEPEND+="man? ( >=app-text/scdoc-1.9.3 )"
-REQUIRED_USE="tray? ( swaybar )"
+	man? ( >=app-text/scdoc-1.9.3 )"
 
 src_configure() {
 	local emesonargs=(
-- 
cgit v1.2.3-65-gdbad