gentoo resync : 20.10.2021

3 files changed, 10 insertions, 24 deletions

diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index 155b71cc8d89..c4b2c390f07a 100644
--- a/gui-wm/Manifest.gz
+++ b/gui-wm/Manifest.gz
diff --git a/gui-wm/sway/Manifest b/gui-wm/sway/Manifest
index 3d5629d99135..c3c362b2427e 100644
--- a/gui-wm/sway/Manifest
+++ b/gui-wm/sway/Manifest
@@ -1,4 +1,4 @@
 DIST sway-1.6.1.tar.gz 5550126 BLAKE2B a4ecc93df0eb16fcd9037ce62dd39c63e1712b3bc9e8ae36331a815759b18576f4a2c1b78a26545922038974f226f02e2d91f78d6e3933125d9b808871b7a887 SHA512 7f37fea99970db42c5485277df06d69bef5225fa03d25be179893b14d73c1d681f0355a1bc74091b4173bbccc88994a63ad0f9322e070811ba963648cf68cdeb
 EBUILD sway-1.6.1-r1.ebuild 2344 BLAKE2B 68447972210cbecf79dbc7fcffdf70296d574c94ca9ccb7270c3f416f41cba7d430c8a0b8655dc52625d3906351c7fa6fe7b3f7ce982d08b04e122f27455707e SHA512 89b0e797a827702c60e4f9c7f81bf283e71803138c4e69230e73bf60979c36b17319475897a48921a80938b54c5dba1106b7674c7dd1a9fd54f263261c97cc76
-EBUILD sway-9999.ebuild 2340 BLAKE2B 57e417902e201901b1b983e3e7ac9e6da4c314cfd43cd676037c689427b88e5e766dce5a75a136230a0bde42e6d1fe2279da2d7cab972b278b1353514f0d3f2a SHA512 a83c7d868f6653d2e15deae9bfc4de6041bb31bfd160e1886572c4d0432956a6e93200d4bf0101b29c8e81178935286943584b4af834ca974ffe9aa7d50d34b0
+EBUILD sway-9999.ebuild 1824 BLAKE2B 1a6c704d1d7f74cf505becb9fee46db0fbe66751756a9de2b7f2d38cc3e66525b830daf55b46796df287e27a4c637490fa65ce29ad008f39c74bc8ae1f900203 SHA512 02a3b36e9ae0bfa0c65e59be0b9aedeb106bc0f0c6b7ab37cfa230e539cb669826603c8141da1574e0201c4cb5295f920b24f8efa320950133b707edf7d492d4
 MISC metadata.xml 2188 BLAKE2B 5e8eb1e6cb3ef8e7398972a8a38556674469008a1531a5c44a35e2eb6c4a43ef01d1fe5f39d560c467b300aa3d9237268ae6a7768beccf4fa268563ac7bdd485 SHA512 a59f659d2b575d7db284dae3fe1c784c0ff2824365d8a96455e5cdc9850d20bf0ae66d3129884b15c8fb8a0fdd88316998a504558fa938c0403e1de64b922783
diff --git a/gui-wm/sway/sway-9999.ebuild b/gui-wm/sway/sway-9999.ebuild
index cfaa40e09859..799f71a6a9dc 100644
--- a/gui-wm/sway/sway-9999.ebuild
+++ b/gui-wm/sway/sway-9999.ebuild
@@ -44,8 +44,8 @@ if [[ ${PV} == 9999 ]]; then
 	DEPEND+="~gui-libs/wlroots-9999:=[X=]"
 else
 	DEPEND+="
-		>=gui-libs/wlroots-0.14:=[X=]
-		<gui-libs/wlroots-0.15:=[X=]
+		>=gui-libs/wlroots-0.15:=[X=]
+		<gui-libs/wlroots-0.16:=[X=]
 	"
 fi
 RDEPEND="
@@ -54,7 +54,7 @@ RDEPEND="
 "
 BDEPEND="
 	>=dev-libs/wayland-protocols-1.14
-	>=dev-util/meson-0.53.0
+	>=dev-util/meson-0.59.0
 	virtual/pkgconfig
 "
 if [[ ${PV} == 9999 ]]; then
@@ -63,22 +63,14 @@ else
 	BDEPEND+="man? ( >=app-text/scdoc-1.9.3 )"
 fi
 
-src_prepare() {
-	default
-
-	use swaybar || sed -e "s/subdir('swaybar')//g" -e "/sway-bar.[0-9].scd/d" \
-		-e "/completions\/[a-z]\+\/_\?swaybar/d" -i meson.build || die
-	use swaymsg || sed -e "s/subdir('swaymsg')//g" -e "/swaymsg.[0-9].scd/d" \
-		-e "/completions\/[a-z]\+\/_\?swaymsg/d" -i meson.build || die
-	use swaynag || sed -e "s/subdir('swaynag')//g" -e "/swaynag.[0-9].scd/d" \
-		-e "/completions\/[a-z]\+\/_\?swaynag/d" -i meson.build || die
-}
-
 src_configure() {
 	local emesonargs=(
-		-Dman-pages=$(usex man enabled disabled)
-		-Dtray=$(usex tray enabled disabled)
-		-Dxwayland=$(usex X enabled disabled)
+		$(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
@@ -86,11 +78,5 @@ src_configure() {
 		-Dwerror=false
 	)
 
-	if use swaybar; then
-		emesonargs+=( -Dgdk-pixbuf=enabled )
-	else
-		emesonargs+=( -Dgdk-pixbuf=disabled )
-	fi
-
 	meson_src_configure
 }