gentoo auto-resync : 30:01:2024 - 17:49:05

7 files changed, 191 insertions, 26 deletions

diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index cd73b0514a1a..1f9eec941220 100644
--- a/gui-wm/Manifest.gz
+++ b/gui-wm/Manifest.gz
diff --git a/gui-wm/wayfire/Manifest b/gui-wm/wayfire/Manifest
index 74b9ffd946fb..62df5496700d 100644
--- a/gui-wm/wayfire/Manifest
+++ b/gui-wm/wayfire/Manifest
@@ -1,9 +1,11 @@
 AUX wayfire-0.7.5-gcc13.patch 824 BLAKE2B 1825db0a5bfa1ace6e6d99889b4934e863e338e62ae15db806b4cfe3b5923f8c7c6c4fe3a45b31db9d909b3250bed3d3a0bd5d3b0c2ab77d957313ce4842b39b SHA512 f03b85bdd69876fa5624148e2b1f6e7627f0abd605615d4314b46d460427c62be2689157b6c5648b6b2f1f53edb9a0c80e1ca4c017c0167733b72306f6e26624
+AUX wayfire-0.8.0-fix-duplicate-manpage.patch 755 BLAKE2B c4e3fec4c5861eadd58480d098f92ae5d24b798d29e2e5898eda80132df53705e440516b6af67de4eadd7d788c106b72693e315467f3397be12ab6d03da5082c SHA512 77930c892938d3f27e12e9a2f1ac31f9552c91869e011b933d2bb1f6b986abda75f71d1bb008f71665d3edf9a2fb0e650ad1fc397f4dc0c9bcb77f94d7f8ea24
 AUX wayfire-session 540 BLAKE2B 02970ebece43c8643ab68f0108d2166f7946d54cea7c6143c9badf0e9852bed4af14bb0c4dd3101a179958b06904889204915e965c46f64073fb8f05800553e3 SHA512 616bbf244a358fb7fbeb1230a3ba862a7ca373fdf3b181819a05ca63da82c78fcd80d0f7167d50488c38820559f007702d2c86ac861f214775c3a6271351bb1d
 AUX wayfire-session.desktop 204 BLAKE2B a8e01f911881c651ec67b5945b91dca6151866599c0a7d0ef5b17c2b88ff6178c6f6d42506f1d6f6cbce8f9231388fa63e2a870116a45c677bd9faee94eabfac SHA512 0c7fd2f04c5b2c413bda02f2c43090dc8c64503d372e8eb19df8a4d7190f6ba703db672753bfa0629a2f627b505886c33f874a933cc6cf7f876caf60a4e70039
 DIST wayfire-0.7.5.tar.xz 781952 BLAKE2B 10f4927d793ad2f8047ab5608db72bb5988fbb4df805dc65a87b011453729109ca0b3a92cf89e867266fae52268e1e2ac452bbd6efcc81e8f1a0c0640008adc1 SHA512 fce6d4c81fa3675df1e656f8bf504f7fc9d1b7104687bcc6d669950582f46bd0ad084c6a487434077df029438243cd91cf6ec60dc7d584b40bfd7a4c8d069f53
 DIST wayfire-0.8.0.tar.xz 828576 BLAKE2B 4d80a0d43061a4564d45f7c077fd97737b426c4036c12f004815dbad120f51b38b2fac9a010e2df27a6a96205cd0dcceb81864bdccbd6e337d81f6c37926e019 SHA512 fab55f6112c462312edf43d41b29f476d493449eca8f0c5cfee8f3aae73dcb98be46c589fc23d10d961f738bdf6d1fe78286b4c96e1d4444fdc8b1b898d998a9
-EBUILD wayfire-0.7.5-r1.ebuild 2929 BLAKE2B 5c68c962d70e318ca9595cc02a0599ce46af04b38a2117214748d5bb0ff05237cafe1bd02651d9bb1acdf7673ab3313ada4e64c9b312783bec8d8eb6da237979 SHA512 d79143cd9d9eefe9c10abcdb2c64dd33937c383695579474a256cdcf8f53692a79e9b7978d05263b815802416277c43aeb7667adcb72c076c7ea7b3942406fc1
-EBUILD wayfire-0.8.0.ebuild 3860 BLAKE2B 756f6327a7d3c1ad55405f704b3dec173589392f0d3713f42beec241cc2db69a0796caaf7a9a2e02aa7a31aebf91a574811134dab8ee49677e0cfc5be5a39d0b SHA512 53c2352d0bb478190747c66f51e3796127a3b8cd9a03fc9f003eea2bc2b3f4172705c107d6aff4727c9b00c192f685c2bd07b1f743298a0c3a5a2a84435f8a79
-EBUILD wayfire-9999.ebuild 3883 BLAKE2B 8907f853664522bbc0ebab3c789801444f6c35306ed2e04628fe45be5ecce049e5cce6da3942ff71b79896eca6b5aab4b4c96981f757f160736da3e9f0dc4d04 SHA512 cf6c71c477e4bb0163beae77cef53d4f5e5fcae4703a8ce8acca5ff626cbfbed680f57050fd6772610807b02bae4aaf10076ca8ea1c0be9467a830fcb85c349d
+EBUILD wayfire-0.7.5-r1.ebuild 2713 BLAKE2B 31c696b51d11a6ac6fa1888a5f426e9169ee16c37307519471536d32bf63ab3e2719b064e1dde4ca279eb682a86585cdd830bc9f02ab1e9b837f4dde70951150 SHA512 3c0ab1ab5680d90681edc838c02ea67590ca5c648d72b7bd0533274c0769edb2439bf46927e137cc43571acbc8a871d24136e360e2fc66a4e161e3f955dc1c1b
+EBUILD wayfire-0.8.0-r1.ebuild 3711 BLAKE2B aa19b8337ed6e3e0d593f7041c032aace5a5e8884ff0fba604c26980bb479e02166ab7fdedb373cb6c91cdeffaa598ac27dff62c9022ad01e99f77f1a2240567 SHA512 a08a418ade773104a640e9639be26a83ad8526fbb61a563a386fa57936022de4bfdba85ceb7c2cbcfb663b23a1765131dea87fef0c72f439f8d744e151a15d57
+EBUILD wayfire-0.8.0.ebuild 3644 BLAKE2B c7b4cfe3f9dd95924b30408a55e0c56e834f0ecd008c90e05b02f8e768ec89909ab7819ac2430450c8c2b69c25d9284f4026fd78c72bc8f43a115f716b3c133e SHA512 4b9500a79e00d85592fd1ca3db5321ef7af9b318831ae817039ca5ca77e4b7daf12b60acc44680f52e6941ab805f6b3ed9ee66622744bb63ecf3bb9d23b5bb53
+EBUILD wayfire-9999.ebuild 3667 BLAKE2B 31749f91a69cec00f8c40513f75c534366b89379fd5180fd11be5d777b95e1b3cdeb5b27430cf9552e776cc85f5340deaebb97393702727b6d55d501d03a9503 SHA512 c01badcb642bff5f548550d468811c116a3ca6de8b65528df7a6f5bc44632c31d0c8a1e011e29afe7d9bbf1a0cbd21fd208cb9da4b02d432e878372f91d87d39
 MISC metadata.xml 920 BLAKE2B 0b0ad723f8383bc65a87cbab8b7195d33a3dabd9ea73c8c2f91957151b9f324e63ea4b25c480d44eba391f595ffe3a9d0c39800eaa9bf4b81b47cb8e3262222f SHA512 c0eb23bcfc87b274bcb2c96b0e52cb91fb6dd3ffb51ef4285f34af3a9861122c0d30179c5989070de85ebcd0dff282906bb4c15c4983bfdce123c5c3b101561e
diff --git a/gui-wm/wayfire/files/wayfire-0.8.0-fix-duplicate-manpage.patch b/gui-wm/wayfire/files/wayfire-0.8.0-fix-duplicate-manpage.patch
new file mode 100644
index 000000000000..393de41d0ccb
--- /dev/null
+++ b/gui-wm/wayfire/files/wayfire-0.8.0-fix-duplicate-manpage.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/922898
+https://github.com/WayfireWM/wayfire/issues/1942
+https://github.com/WayfireWM/wayfire/pull/1943
+https://github.com/WayfireWM/wayfire/commit/564b75a45d7c844b61b510e68fa527109fce4a75
+
+From 564b75a45d7c844b61b510e68fa527109fce4a75 Mon Sep 17 00:00:00 2001
+From: alice <alice@ayaya.dev>
+Date: Sat, 7 Oct 2023 22:51:35 +0200
+Subject: [PATCH] meson: fix duplicate installation of manpage (#1943)
+
+closes #1942
+--- a/man/meson.build
++++ b/man/meson.build
+@@ -1,7 +1,5 @@
+ configure_file(input: 'wayfire.1.in',
+                output: 'wayfire.1',
+-               install: true,
+-               install_dir: 'man',
+                configuration: conf_data)
+ 
+ install_man(join_paths(meson.project_build_root(), 'man', 'wayfire.1'))
diff --git a/gui-wm/wayfire/wayfire-0.7.5-r1.ebuild b/gui-wm/wayfire/wayfire-0.7.5-r1.ebuild
index d2d80d37344a..eed7d341eeca 100644
--- a/gui-wm/wayfire/wayfire-0.7.5-r1.ebuild
+++ b/gui-wm/wayfire/wayfire-0.7.5-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2023 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit meson toolchain-funcs
+inherit meson
 
 DESCRIPTION="compiz like 3D wayland compositor"
 HOMEPAGE="https://github.com/WayfireWM/wayfire"
@@ -18,7 +18,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="debug +gles +system-wfconfig +system-wlroots X"
+IUSE="+gles +system-wfconfig +system-wlroots X"
 
 DEPEND="
 	dev-libs/libinput:=
@@ -87,13 +87,8 @@ src_configure() {
 		$(meson_feature system-wlroots use_system_wlroots)
 		$(meson_feature X xwayland)
 		$(meson_use gles enable_gles32)
-		$(usex debug --buildtype=debug "")
-		$(usex debug -Db_sanitize=address,undefined "")
 	)
 
-	# Clang will fail to link without this
-	tc-is-clang && emesonargs+=( $(usex debug -Db_lundef=false "") )
-
 	meson_src_configure
 }
 
diff --git a/gui-wm/wayfire/wayfire-0.8.0-r1.ebuild b/gui-wm/wayfire/wayfire-0.8.0-r1.ebuild
new file mode 100644
index 000000000000..21f177deca0c
--- /dev/null
+++ b/gui-wm/wayfire/wayfire-0.8.0-r1.ebuild
@@ -0,0 +1,157 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="compiz like 3D wayland compositor"
+HOMEPAGE="https://github.com/WayfireWM/wayfire"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/WayfireWM/${PN}.git"
+	SLOT="0/9999"
+else
+	SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+	SLOT="0/$(ver_cut 1-2)"
+fi
+
+LICENSE="MIT"
+IUSE="+gles +system-wfconfig +system-wlroots test X"
+RESTRICT="!test? ( test )"
+
+# bundled wlroots has the following dependency string according to included headers.
+# wlroots[drm,gles2-renderer,libinput,x11-backend?,X?]
+# enable x11-backend with X and vice versa
+WLROOTS_CDEPEND="
+	>=dev-libs/libinput-1.14.0:=
+	>=dev-libs/wayland-1.21
+	media-libs/libglvnd
+	media-libs/mesa[egl(+),gles2]
+	sys-apps/hwdata:=
+	sys-auth/seatd:=
+	>=x11-libs/libdrm-2.4.114:=
+	x11-libs/libxkbcommon
+	>=x11-libs/pixman-0.42.0
+	virtual/libudev
+	X? (
+		x11-base/xwayland
+		x11-libs/libxcb:0=
+		x11-libs/xcb-util-image
+		x11-libs/xcb-util-renderutil
+		x11-libs/xcb-util-wm
+	)
+"
+WLROOTS_DEPEND="
+	>=dev-libs/wayland-protocols-1.28
+"
+WLROOTS_BDEPEND="
+	dev-util/glslang
+	dev-util/wayland-scanner
+"
+
+CDEPEND="
+	dev-cpp/nlohmann_json
+	dev-libs/libevdev
+	>=dev-libs/libinput-1.7.0
+	dev-libs/wayland
+	>=dev-libs/wayland-protocols-1.12
+	media-libs/glm
+	media-libs/libglvnd
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	x11-libs/cairo
+	x11-libs/libdrm:=
+	x11-libs/libxkbcommon
+	x11-libs/pango
+	x11-libs/pixman
+	system-wfconfig? ( gui-libs/wf-config:${SLOT} )
+	!system-wfconfig? ( dev-libs/libxml2 )
+	!system-wlroots? ( ${WLROOTS_CDEPEND} )
+"
+
+if [[ ${PV} == 9999 ]] ; then
+	CDEPEND+="
+		system-wlroots? ( gui-libs/wlroots:0/9999[drm(+),libinput(+),x11-backend,X?] )
+	"
+else
+	CDEPEND+="
+		system-wlroots? ( gui-libs/wlroots:0/16[drm(+),libinput(+),x11-backend,X?] )
+	"
+fi
+
+RDEPEND="
+	${CDEPEND}
+	x11-misc/xkeyboard-config
+	!system-wfconfig? ( !gui-libs/wf-config )
+	!system-wlroots? ( !gui-libs/wlroots )
+"
+DEPEND="
+	${CDEPEND}
+	!system-wlroots? ( ${WLROOTS_DEPEND} )
+	test? ( dev-cpp/doctest )
+"
+BDEPEND="
+	dev-util/wayland-scanner
+	virtual/pkgconfig
+	!system-wlroots? ( ${WLROOTS_BDEPEND} )
+"
+
+PATCHES=(
+	"${FILESDIR}/wayfire-0.8.0-fix-duplicate-manpage.patch"
+)
+
+src_prepare() {
+	default
+
+	sed -e "s:@EPREFIX@:${EPREFIX}:" \
+		"${FILESDIR}"/wayfire-session > "${T}"/wayfire-session || die
+	sed -e "s:@EPREFIX@:${EPREFIX}:" \
+		"${FILESDIR}"/wayfire-session.desktop > "${T}"/wayfire-session.desktop || die
+
+	if [[ "${PV}" != 9999 ]]; then
+		# Don't run git if git is installed and its not a git dir
+		sed -i \
+			-e "/git = find_program/ifs = import\('fs'\)" \
+			-e "s/if git.found()/if git.found() and fs.is_dir('.git')/" \
+			meson.build || die
+	fi
+
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature system-wfconfig use_system_wfconfig)
+		$(meson_feature system-wlroots use_system_wlroots)
+		$(meson_feature test tests)
+		$(meson_feature X xwayland)
+		$(meson_use gles enable_gles32)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	dobin "${T}"/wayfire-session
+
+	insinto "/usr/share/wayland-sessions/"
+	insopts -m644
+	doins wayfire.desktop
+	doins "${T}"/wayfire-session.desktop
+
+	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/wayfire/wayfire.ini\""
+		elog "To install the file execute"
+		elog "\$ cp /usr/share/wayfire/wayfire.ini ~/.config/wayfire.ini"
+	fi
+}
diff --git a/gui-wm/wayfire/wayfire-0.8.0.ebuild b/gui-wm/wayfire/wayfire-0.8.0.ebuild
index 82a5b045146c..15e5598edc0f 100644
--- a/gui-wm/wayfire/wayfire-0.8.0.ebuild
+++ b/gui-wm/wayfire/wayfire-0.8.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit meson toolchain-funcs
+inherit meson
 
 DESCRIPTION="compiz like 3D wayland compositor"
 HOMEPAGE="https://github.com/WayfireWM/wayfire"
@@ -19,7 +19,7 @@ else
 fi
 
 LICENSE="MIT"
-IUSE="debug +gles +system-wfconfig +system-wlroots test X"
+IUSE="+gles +system-wfconfig +system-wlroots test X"
 RESTRICT="!test? ( test )"
 
 # bundled wlroots has the following dependency string according to included headers.
@@ -124,13 +124,8 @@ src_configure() {
 		$(meson_feature test tests)
 		$(meson_feature X xwayland)
 		$(meson_use gles enable_gles32)
-		$(usex debug --buildtype=debug "")
-		$(usex debug -Db_sanitize=address,undefined "")
 	)
 
-	# Clang will fail to link without this
-	tc-is-clang && emesonargs+=( $(usex debug -Db_lundef=false "") )
-
 	meson_src_configure
 }
 
diff --git a/gui-wm/wayfire/wayfire-9999.ebuild b/gui-wm/wayfire/wayfire-9999.ebuild
index 98fb0ebc32f0..d1cadbe72df8 100644
--- a/gui-wm/wayfire/wayfire-9999.ebuild
+++ b/gui-wm/wayfire/wayfire-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2023 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit meson toolchain-funcs
+inherit meson
 
 DESCRIPTION="compiz like 3D wayland compositor"
 HOMEPAGE="https://github.com/WayfireWM/wayfire"
@@ -19,7 +19,7 @@ else
 fi
 
 LICENSE="MIT"
-IUSE="debug +gles +system-wfconfig +system-wlroots test X"
+IUSE="+gles +system-wfconfig +system-wlroots test X"
 RESTRICT="!test? ( test )"
 
 # bundled wlroots has the following dependency string according to included headers.
@@ -125,13 +125,8 @@ src_configure() {
 		$(meson_feature test tests)
 		$(meson_feature X xwayland)
 		$(meson_use gles enable_gles32)
-		$(usex debug --buildtype=debug "")
-		$(usex debug -Db_sanitize=address,undefined "")
 	)
 
-	# Clang will fail to link without this
-	tc-is-clang && emesonargs+=( $(usex debug -Db_lundef=false "") )
-
 	meson_src_configure
 }