gentoo resync : 25.11.2020

4 files changed, 19 insertions, 18 deletions

diff --git a/gui-apps/wf-shell/Manifest b/gui-apps/wf-shell/Manifest
index 12ca7deaf5a1..530b8a6f4aa0 100644
--- a/gui-apps/wf-shell/Manifest
+++ b/gui-apps/wf-shell/Manifest
@@ -1,6 +1,6 @@
-DIST wf-shell-0.4.0.tar.xz 8996656 BLAKE2B 609668bcf00fcc7a0b8142d84a7101f07578c2d6a88616da286a615076372e5a356387cf5e3fdee9b4aba6f027d8d081a5cce32f7f00682a756d4ee9bc46916d SHA512 1b293ce3fc2b12acbadb75e0de28217ed24f733e26d7ad12ada9a5f0673df911e75eea5af6841c466f031151f881a8e36dda229ea4dc2f91825e2e6df42d4903
 DIST wf-shell-0.5.0.tar.xz 8998296 BLAKE2B c32232fc08292b15a0048d11d0f179a82fd21b3179223d898057ac95b42ac35ec063467f67c0f1261857c3b643edc4367112a05bb63f002788b64ed86559addd SHA512 d0029746ea10625bb47381a7ed74aadb8aa3823f83f751b539eefd49da5aa1643a2d16c55fe23d30bd71528ad5c1ea8d389909fe8cc1026746b3b76aa5dabd2b
-EBUILD wf-shell-0.4.0-r1.ebuild 857 BLAKE2B 3e8de3dae426baabd74e059fdd63ed01f6b8c7c24b7b7a5c36831e04eb0951cba2c021b4611c2ff102b6cc15991f4c562b908f05e997d0ef96f68f3bb2f42a18 SHA512 650121ca9f78ee525e201123235980042c76d0c94bdb2f130729bbc62f6c5a4a3e2527e6760616bf633ea12cdd007c52eba98153e97377b6d51a6cf81929a29f
-EBUILD wf-shell-0.5.0.ebuild 847 BLAKE2B 62e9e459c1f35bc24768605f3acc4fba611bfe4c8bf62cd703b325e4ac7574ea8cf6bdc82c8cfb246d4c29ca59f2e8649d62523c5d189de7ff7bb91bc12f237f SHA512 aabba26c4a428be6cfce3a7570012cbaaf7111dbea35f5cd2045ecc72b051e564237373670e019b9422d3c2161bd21d08c86afe231f306dd81d0733ab538986d
-EBUILD wf-shell-9999.ebuild 847 BLAKE2B 62e9e459c1f35bc24768605f3acc4fba611bfe4c8bf62cd703b325e4ac7574ea8cf6bdc82c8cfb246d4c29ca59f2e8649d62523c5d189de7ff7bb91bc12f237f SHA512 aabba26c4a428be6cfce3a7570012cbaaf7111dbea35f5cd2045ecc72b051e564237373670e019b9422d3c2161bd21d08c86afe231f306dd81d0733ab538986d
+DIST wf-shell-0.6.1.tar.xz 9014596 BLAKE2B 5256ceb8dc2b3dd4cf5d4503595c46b72bcde1dd4804a5871e225cee5b028ac69b02618d9c348fca4e21f2fd81b2be51fb0122126dd200dcdaeac894ec902c21 SHA512 d710cf703f5671bba01d056c7733724f90e6510a50e45a1a30cacde33a689c065335d802a3fd556cf9f8f0f420266ed2a8616706ecf5a68dcdf45a79876a4bcf
+EBUILD wf-shell-0.5.0.ebuild 846 BLAKE2B faee64563ed5ab34455b4eb063b26ff0cef9c755e9d12967da6bb8572ece57316af560c4fe41710a7cc4b52122c936e4c9a0ea66e7fc13bea970e22e954153cc SHA512 e40c19893ca81d7447c1eded0a732839c15fdf694531e84158778e4debeba8e1d945bc7ed4d06539e582a94f73b9d3f1066ac5d187bfecee8b6ad350fc5faab5
+EBUILD wf-shell-0.6.1.ebuild 894 BLAKE2B dcba8696d9c2e9cab3f404c7e4af71b5575016d929687d033242bbdd6139231c0e48c746417d711ede3d96f5a321f341b0c2382834877f7aa30c4ed217fd28e9 SHA512 a3cb41c0eb247b65fde86a8b87d150bac6f037ab208e64367bb2f86ff487edef589754abe210c80f955dbe9aa5b84431976a9c367ed9485e48fc89e17ee15b19
+EBUILD wf-shell-9999.ebuild 894 BLAKE2B dcba8696d9c2e9cab3f404c7e4af71b5575016d929687d033242bbdd6139231c0e48c746417d711ede3d96f5a321f341b0c2382834877f7aa30c4ed217fd28e9 SHA512 a3cb41c0eb247b65fde86a8b87d150bac6f037ab208e64367bb2f86ff487edef589754abe210c80f955dbe9aa5b84431976a9c367ed9485e48fc89e17ee15b19
 MISC metadata.xml 653 BLAKE2B 537544446f8e320beafd02fe766de2c3ff66225aba3f69b852484f5251c3c1caeb68cd50d29e036ec96167b336bc9599319fcf324e7f9ecfaa9ddeee4bb52c67 SHA512 a8d332a80f7355424abd6f5b588c8cc9ef0f84bacea3c29b50bb56735d5c1b1753bc94c72737918152bdc6241ce90e8105f4da4bea5cc9a7f94c658d833a08cc
diff --git a/gui-apps/wf-shell/wf-shell-0.5.0.ebuild b/gui-apps/wf-shell/wf-shell-0.5.0.ebuild
index 94c26507f32a..f4c6ec5dafef 100644
--- a/gui-apps/wf-shell/wf-shell-0.5.0.ebuild
+++ b/gui-apps/wf-shell/wf-shell-0.5.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/WayfireWM/${PN}.git"
 else
 	SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/gui-apps/wf-shell/wf-shell-0.4.0-r1.ebuild b/gui-apps/wf-shell/wf-shell-0.6.1.ebuild
index 21fc54e4ef78..08f4995b15b2 100644
--- a/gui-apps/wf-shell/wf-shell-0.4.0-r1.ebuild
+++ b/gui-apps/wf-shell/wf-shell-0.6.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/WayfireWM/${PN}.git"
 else
-	SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/${PV}/${P}.tar.xz"
+	SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
@@ -23,15 +23,14 @@ IUSE="+pulseaudio"
 DEPEND="
 	dev-cpp/gtkmm:3.0=[wayland]
 	dev-libs/gobject-introspection
-	~gui-wm/wayfire-${PV}
-	>=gui-libs/gtk-layer-shell-0.1
+	gui-libs/gtk-layer-shell
+	>=gui-wm/wayfire-${PV%.*}
 	pulseaudio? ( media-sound/pulseaudio )
 "
-
-RDEPEND="${DEPEND}"
-
+RDEPEND="${DEPEND}
+	gui-apps/wayland-logout
+"
 BDEPEND="
-	${DEPEND}
 	dev-libs/wayland-protocols
 	virtual/pkgconfig
 "
@@ -39,6 +38,7 @@ BDEPEND="
 src_configure () {
 	local emesonargs=(
 		"$(meson_feature pulseaudio pulse)"
+		-Dwayland-logout=false
 	)
 	meson_src_configure
 }
diff --git a/gui-apps/wf-shell/wf-shell-9999.ebuild b/gui-apps/wf-shell/wf-shell-9999.ebuild
index 94c26507f32a..08f4995b15b2 100644
--- a/gui-apps/wf-shell/wf-shell-9999.ebuild
+++ b/gui-apps/wf-shell/wf-shell-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/WayfireWM/${PN}.git"
 else
-	SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/${PV}/${P}.tar.xz"
+	SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
@@ -23,13 +23,13 @@ IUSE="+pulseaudio"
 DEPEND="
 	dev-cpp/gtkmm:3.0=[wayland]
 	dev-libs/gobject-introspection
-	>=gui-libs/gtk-layer-shell-0.1
-	>=gui-wm/wayfire-${PV}
+	gui-libs/gtk-layer-shell
+	>=gui-wm/wayfire-${PV%.*}
 	pulseaudio? ( media-sound/pulseaudio )
 "
-
-RDEPEND="${DEPEND}"
-
+RDEPEND="${DEPEND}
+	gui-apps/wayland-logout
+"
 BDEPEND="
 	dev-libs/wayland-protocols
 	virtual/pkgconfig
@@ -38,6 +38,7 @@ BDEPEND="
 src_configure () {
 	local emesonargs=(
 		"$(meson_feature pulseaudio pulse)"
+		-Dwayland-logout=false
 	)
 	meson_src_configure
 }