gentoo resync : 15.06.2021

3 files changed, 23 insertions, 25 deletions

diff --git a/gui-wm/wayfire/Manifest b/gui-wm/wayfire/Manifest
index 1255f59294b4..8eab3fc61075 100644
--- a/gui-wm/wayfire/Manifest
+++ b/gui-wm/wayfire/Manifest
@@ -1,10 +1,10 @@
 AUX wayfire-session 540 BLAKE2B 02970ebece43c8643ab68f0108d2166f7946d54cea7c6143c9badf0e9852bed4af14bb0c4dd3101a179958b06904889204915e965c46f64073fb8f05800553e3 SHA512 616bbf244a358fb7fbeb1230a3ba862a7ca373fdf3b181819a05ca63da82c78fcd80d0f7167d50488c38820559f007702d2c86ac861f214775c3a6271351bb1d
 AUX wayfire-session.desktop 204 BLAKE2B a8e01f911881c651ec67b5945b91dca6151866599c0a7d0ef5b17c2b88ff6178c6f6d42506f1d6f6cbce8f9231388fa63e2a870116a45c677bd9faee94eabfac SHA512 0c7fd2f04c5b2c413bda02f2c43090dc8c64503d372e8eb19df8a4d7190f6ba703db672753bfa0629a2f627b505886c33f874a933cc6cf7f876caf60a4e70039
 DIST wayfire-0.5.0.tar.xz 670680 BLAKE2B 6a1555669352dd1303f7472db4fbb8ada6173c09825f4e999a2862787bd5bf31e070e9e12110249b9407d8c380235f4a9d3c5be6b23defe36094822526eed6ef SHA512 9c2d116a5d6e77e37b0e4eef26624d43d6ab3a80e56e19a2de1fdd28a2a522c24b9e346eb4529848f3b2c3668460a51f428a0c196286ec8300e4823250eae811
-DIST wayfire-0.6.0.tar.xz 701084 BLAKE2B 3ee0274c706aaa4690e9eb9617d2f272dd1e6573529c40b43d3fd05e79a4ddceef8dec34a7d2363aff8603fb3fd7490c4d2e79e67bff825a3bb68cc8090ad301 SHA512 dc6b5378dc51352ab41ac3c5713e73f341caa2a119a91826818b0a7cde629e63ce855a4376b5c60b468717336dda4806fb1195d534cd7ab2e5d6285c8075102e
 DIST wayfire-0.7.0.tar.xz 735756 BLAKE2B 8298cc92938f5196e3dc5bac39d4d9db370e69209461feb5d7abe685e0277efd4bd42ef2c18dc41d79e20d794dae5889efec56f8278fde6efc37b8017c5e65ea SHA512 eaaa193619a6cb0c7a0879aa24a7f6d468e81aeef0b9f17a282f5f930c00557a021f4d45de4aae6f57ce5e427148387c3fdf344ea9c6843a75e777eeeeb96f79
+DIST wayfire-0.7.1.tar.xz 753104 BLAKE2B e26b5e770fff44ef04a9d832ed404f05d37448c8ecc0be1e976b8bd0866c2716150bc43394fc4d2fbba1854696eaf54f16dabc632b686f236e66313d0d1eaf59 SHA512 c045ed16d2eb24b508f84d6616021638ec139b99618f5cb834f2b3675d1e549a6cc1bc3150dd97965a16a2a23fe54abe34e4671ce345350a7fb4084f13d7e969
 EBUILD wayfire-0.5.0.ebuild 2224 BLAKE2B 8723cb41fa204ecdd6a5b95936ba385750f63eaa76fd56e837536b489a7a06e50e026a02f3875188df7be62e761a7252e27353c97165b97ab1972654807c35ff SHA512 08a13c4cf252e83e1010b7d7a4b98a4fc445d5f8b64801d146034dc830c8a1bf6efe6252c355d3aff5ea7a47cdbca43dc2235635a713ed94fa78dc8a468f5130
-EBUILD wayfire-0.6.0.ebuild 2518 BLAKE2B 5dacd5c710808d54720bd6eba5fd070019c866ddbced26afe61db360da9a17c70413a5fdbdfc96169c5be55d31aa72b8324c5a96483570b78035b1a7fa5c889b SHA512 19eb652df74b90bfafdfa0833cf4429a99ce023ddd315cd5078c567df4bd7d025106806519ba941264ead8893edff2ee7b0824b25ecd657ce7539cfc12899ab2
 EBUILD wayfire-0.7.0.ebuild 2519 BLAKE2B ebe7e65b995e74774e769257542923c63a2a662ca960f2dcadeb5ed8c9908d652cb2b2122fc8d379a3417e7fe1cc8c9a6ac7fa0639184c0bebc147546c64d721 SHA512 60938d6efbd743b87264e8466080eb0e6ff87cc13ddbdcbc168492fb0d1218244c9ee1fdb6adae5d7bdf1144157110e293f0095b2f40ca8490bef220fa166203
-EBUILD wayfire-9999.ebuild 2519 BLAKE2B ebe7e65b995e74774e769257542923c63a2a662ca960f2dcadeb5ed8c9908d652cb2b2122fc8d379a3417e7fe1cc8c9a6ac7fa0639184c0bebc147546c64d721 SHA512 60938d6efbd743b87264e8466080eb0e6ff87cc13ddbdcbc168492fb0d1218244c9ee1fdb6adae5d7bdf1144157110e293f0095b2f40ca8490bef220fa166203
+EBUILD wayfire-0.7.1.ebuild 2581 BLAKE2B 95a23b10891982067e48753460f83f8e26b17ae9c45efca6ac1f258e4529e489d25ea68eff0cf2a0edceb98c4c70fb6288aaa748286f7f5dda2af6ad08568172 SHA512 dffbed9a203298171113a142acc6ba90b75e46eddf16c315a2547a8e0b2b0a2df36df67741290e4429f965aead5d99db119d17e05e097e1f01a9da0df406eab4
+EBUILD wayfire-9999.ebuild 2239 BLAKE2B ef25ef945f009d6e4cc824fe91fdd5f5c53220b6082299c5b4aee322001765cfc22dcad861c504efa326fd042d8facb8cb0324389aa477379d8032a6268a6d35 SHA512 62aa06ab7ba2f4b26fdcaa93f5c1c2a7ac8a8334a2e99cef923fea1e5217aab19a1f92387ca144d9379c82279e6a47df5ff876dcefc81cfce8d991a99c8c5ef0
 MISC metadata.xml 1080 BLAKE2B 4bdf18556fcdd4e1c5f10e658dc0c7c7237d19d3678b2cd9025f703f29f3faffc1f9c7b1adcf8aa930ad819c932d55281169cec624e05000adeac17eff3caef9 SHA512 fff94cb62f8362b451f1843bf440109e4d4a941c866197cc249e209443ec373e6b7cfb491fadeebdfb84f2165cee3ee58d498c07056f5e8cb4040b9029f41f80
diff --git a/gui-wm/wayfire/wayfire-0.6.0.ebuild b/gui-wm/wayfire/wayfire-0.7.1.ebuild
index 96f551ce51ca..e5889895cfa4 100644
--- a/gui-wm/wayfire/wayfire-0.6.0.ebuild
+++ b/gui-wm/wayfire/wayfire-0.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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
 
@@ -36,9 +36,15 @@ DEPEND="
 	X? ( x11-libs/libxkbcommon:=[X] )
 	x11-libs/pixman
 	gles? ( media-libs/libglvnd[X?] )
-	system-wfconfig? ( >=gui-libs/wf-config-${PV%.*} )
+	system-wfconfig? (
+		>=gui-libs/wf-config-0.7.1
+		<gui-libs/wf-config-0.8.0
+	)
 	!system-wfconfig? ( !gui-libs/wf-config )
-	system-wlroots? ( >=gui-libs/wlroots-0.12.0[elogind=,systemd=,X?] )
+	system-wlroots? (
+		>=gui-libs/wlroots-0.13.0:=[elogind=,systemd=,X?]
+		<gui-libs/wlroots-0.14.0:=
+	)
 	!system-wlroots? ( !gui-libs/wlroots )
 "
 
diff --git a/gui-wm/wayfire/wayfire-9999.ebuild b/gui-wm/wayfire/wayfire-9999.ebuild
index 339de620d255..ed76917f7d82 100644
--- a/gui-wm/wayfire/wayfire-9999.ebuild
+++ b/gui-wm/wayfire/wayfire-9999.ebuild
@@ -18,8 +18,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="+gles +system-wfconfig +system-wlroots elogind systemd X"
-REQUIRED_USE="?? ( elogind systemd )"
+IUSE="+gles +system-wfconfig +system-wlroots X"
 
 DEPEND="
 	dev-libs/libevdev
@@ -27,25 +26,24 @@ DEPEND="
 	gui-libs/gtk-layer-shell
 	media-libs/glm
 	media-libs/mesa:=[gles2,wayland,X?]
+	media-libs/libglvnd[X?]
 	media-libs/libjpeg-turbo
 	media-libs/libpng
 	media-libs/freetype:=[X?]
 	x11-libs/libdrm
 	x11-libs/gtk+:3=[wayland,X?]
 	x11-libs/cairo:=[X?,svg]
-	X? ( x11-libs/libxkbcommon:=[X] )
+	x11-libs/libxkbcommon:=[X?]
 	x11-libs/pixman
-	gles? ( media-libs/libglvnd[X?] )
-	system-wfconfig? ( >=gui-libs/wf-config-${PV%.*} )
+	X? ( x11-libs/libxcb )
+	system-wfconfig? ( ~gui-libs/wf-config-9999:= )
 	!system-wfconfig? ( !gui-libs/wf-config )
-	system-wlroots? ( >=gui-libs/wlroots-0.12.0[elogind=,systemd=,X?] )
+	system-wlroots? ( ~gui-libs/wlroots-9999:=[X?] )
 	!system-wlroots? ( !gui-libs/wlroots )
 "
 
 RDEPEND="
 	${DEPEND}
-	elogind? ( sys-auth/elogind )
-	systemd? ( sys-apps/systemd )
 	x11-misc/xkeyboard-config
 "
 
@@ -69,30 +67,24 @@ src_configure() {
 }
 
 src_install() {
-	default
 	meson_src_install
 	dobin "${T}"/wayfire-session
-	einstalldocs
 
 	insinto "/usr/share/wayland-sessions/"
 	insopts -m644
 	doins wayfire.desktop
 	doins "${T}"/wayfire-session.desktop
 
-	dodoc wayfire.ini
-
-	if ! use systemd && ! use elogind; then
-		fowners root:0 /usr/bin/wayfire
-		fperms 4511 /usr/bin/wayfire
-	fi
+	insinto "/usr/share/wayfire/"
+	doins wayfire.ini
 }
 
 pkg_postinst() {
 	if [ -z "${REPLACING_VERSIONS}" ]; then
 		elog "Wayfire has been installed but the session cannot be used"
 		elog "until you install a configuration file. The default config"
-		elog "file is installed at \"/usr/share/doc/${PF}/wayfire.ini.bz2\""
+		elog "file is installed at \"/usr/share/wayfire/wayfire.ini\""
 		elog "To install the file execute"
-		elog "\$ mkdir -p ~/.config && bzcat /usr/share/doc/${PF}/wayfire.ini.bz2 > ~/.config/wayfire.ini"
+		elog "\$ cp /usr/share/wayfire.ini ~/.config/wayfire.ini"
 	fi
 }