gentoo resync : 06.04.2022

4 files changed, 12 insertions, 100 deletions

diff --git a/gui-wm/sway/Manifest b/gui-wm/sway/Manifest
index fc391f86d593..a35772689b10 100644
--- a/gui-wm/sway/Manifest
+++ b/gui-wm/sway/Manifest
@@ -1,6 +1,4 @@
-DIST sway-1.6.1.tar.gz 5550126 BLAKE2B a4ecc93df0eb16fcd9037ce62dd39c63e1712b3bc9e8ae36331a815759b18576f4a2c1b78a26545922038974f226f02e2d91f78d6e3933125d9b808871b7a887 SHA512 7f37fea99970db42c5485277df06d69bef5225fa03d25be179893b14d73c1d681f0355a1bc74091b4173bbccc88994a63ad0f9322e070811ba963648cf68cdeb
 DIST sway-1.7.tar.gz 5559075 BLAKE2B 702b9a209d603c88743f2e89d0787431b7a30e8b7554c9596edb9735af862d23c585158737a0943a470637138cbc5275bee37bd2d820a7489cdd0747d98e6e22 SHA512 028cf5d504d5914bfb78d44156d6a290de660c5ed0638f4e2c56e5be76db9b0baeda035e1fa1ae23559016bd7e4312f7ff70c2fb4904df25358577c1a3d21243
-EBUILD sway-1.6.1-r1.ebuild 2344 BLAKE2B 68447972210cbecf79dbc7fcffdf70296d574c94ca9ccb7270c3f416f41cba7d430c8a0b8655dc52625d3906351c7fa6fe7b3f7ce982d08b04e122f27455707e SHA512 89b0e797a827702c60e4f9c7f81bf283e71803138c4e69230e73bf60979c36b17319475897a48921a80938b54c5dba1106b7674c7dd1a9fd54f263261c97cc76
-EBUILD sway-1.7.ebuild 1837 BLAKE2B 766fd84f75397b25ada30efe774486a8666287d36a9ca40577101bc19492c08d27f660c0c04bedf8ba08561a620ffd51aed25cd22a7849a05e19e05d08f5a5a0 SHA512 f0212f03c20592090dd6460e4e18c3b9108a307650f9c438c6d2317f0763e43cc0a4d47a6d51aefe03d00d6b6cc5383d42ad134f3c94fbb1ba525c3f484f20c1
-EBUILD sway-9999.ebuild 1840 BLAKE2B 50ee3eaea7183eb6c70e40b98ec3da860daf20fe906c216b49e3c70a4162e640eb57c949024d66feb7500d2557b9cbf9e4d5aee791a1da25113774f54ed8cfb6 SHA512 1ff51fc0c34cb02095a0e9f7f840de3f85190d7c8dd14ddd73238623486b8c809f4434901d5e7f466fdfc0e381c2615e2da3a21d91545f7908f7e09a8ccb5b6f
+EBUILD sway-1.7.ebuild 1910 BLAKE2B 6f58cfd1f56c199080eb6371ce9942bfc20087a72f4449819482e76112ac2f364508c87437b3e90205d6fed15e03034c6a9472a072b7a3792f63be205f9be3e2 SHA512 8265db44904725d22f8b304b9461cc0d345dc339f3b18d45c061ea877b957bd37de7bc538468f7e8ceac9728d201769a782d2906c2f787a6666970d4eb4847c4
+EBUILD sway-9999.ebuild 1913 BLAKE2B 06122a65e468cc58a1ecaae8f89ae1f6625cfc7ba1c531e3b6ea62075363afbc4c14cea176c072267340882af6091d1bec837e732fc1601684865dcda3b78ebf SHA512 480835fc162758fd0b893eeb91da1dc6988a0ae5d8c897e5d369b0b771913e448684ed790d147e31a29947275c9593e5d80669f51d71de874ad36b4f48e9e50e
 MISC metadata.xml 2188 BLAKE2B 5e8eb1e6cb3ef8e7398972a8a38556674469008a1531a5c44a35e2eb6c4a43ef01d1fe5f39d560c467b300aa3d9237268ae6a7768beccf4fa268563ac7bdd485 SHA512 a59f659d2b575d7db284dae3fe1c784c0ff2824365d8a96455e5cdc9850d20bf0ae66d3129884b15c8fb8a0fdd88316998a504558fa938c0403e1de64b922783
diff --git a/gui-wm/sway/sway-1.6.1-r1.ebuild b/gui-wm/sway/sway-1.6.1-r1.ebuild
deleted file mode 100644
index 7373d695f647..000000000000
--- a/gui-wm/sway/sway-1.6.1-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2021 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 ~ppc64 ~riscv x86"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="+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
-	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 )
-	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.14:=[X=]
-		<gui-libs/wlroots-0.15:=[X=]
-	"
-fi
-RDEPEND="
-	x11-misc/xkeyboard-config
-	${DEPEND}
-"
-BDEPEND="
-	>=dev-libs/wayland-protocols-1.14
-	>=dev-util/meson-0.53.0
-	virtual/pkgconfig
-"
-if [[ ${PV} == 9999 ]]; then
-	BDEPEND+="man? ( ~app-text/scdoc-9999 )"
-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_use wallpapers default-wallpaper)
-		-Dfish-completions=true
-		-Dzsh-completions=true
-		-Dbash-completions=true
-		-Dwerror=false
-	)
-
-	if use swaybar; then
-		emesonargs+=( -Dgdk-pixbuf=enabled )
-	else
-		emesonargs+=( -Dgdk-pixbuf=disabled )
-	fi
-
-	meson_src_configure
-}
diff --git a/gui-wm/sway/sway-1.7.ebuild b/gui-wm/sway/sway-1.7.ebuild
index d32a9d629435..2d194a94d1c8 100644
--- a/gui-wm/sway/sway-1.7.ebuild
+++ b/gui-wm/sway/sway-1.7.ebuild
@@ -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= )
 "
diff --git a/gui-wm/sway/sway-9999.ebuild b/gui-wm/sway/sway-9999.ebuild
index 376a229bbf80..33f0a17752a8 100644
--- a/gui-wm/sway/sway-9999.ebuild
+++ b/gui-wm/sway/sway-9999.ebuild
@@ -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= )
 "