Adding metadata

6 files changed, 311 insertions, 13 deletions

diff --git a/gui-wm/phoc/metadata.xml b/gui-wm/phoc/metadata.xml
index 04786820dd7a..9db621a59770 100644
--- a/gui-wm/phoc/metadata.xml
+++ b/gui-wm/phoc/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>cyber+gentoo@sysrq.in</email>
-    <name>Anna</name>
-  </maintainer>
-  <maintainer type="person">
     <email>gjdijkman@gjdwebserver.nl</email>
     <name>Gerben Jan Dijkman</name>
   </maintainer>
diff --git a/gui-wm/river/Manifest b/gui-wm/river/Manifest
index 47c09d8511b5..acbea3737669 100644
--- a/gui-wm/river/Manifest
+++ b/gui-wm/river/Manifest
@@ -2,6 +2,7 @@ DIST aro-0.0.0-JSD1Qi7QNgDnfcrdEJf82v3o6MhZySjYVrtdfEf3E4Se.tar.gz 944918 BLAKE2
 DIST pixman-0.3.0-LClMnz2VAAAs7QSCGwLimV5VUYx0JFnX5xWU6HwtMuDX.tar.gz 7976 BLAKE2B ea7fb2eab22a3b340ba9ddfde45e5b296a0a2dae866c274041a8953856e6b2ff76120c2577576258a2f0c1bb05958f4d1058a596da840f28c9de263a335e6134 SHA512 273066bf8a6b3fbfe5e8732c0d114b4d3cc678015a1782395bf16b78e0cc3404b894b9e27bc754f2e3b2b7193d8833e500df9b54439a957477a1059853b9b56b
 DIST river-0.4.3.tar.gz 164735 BLAKE2B 969e5eb612b2155e99e0b58ff28439021f3353642d1568b0e3b12533a3d689c859fd6e88c9afd5fd975ff510bed479c9d97750f76b87608a96cc56d10c20009e SHA512 799a4951f8b4fe30ae4c6a3eefc133f74cc55ab9eaf947bd43160b275392cc7ea4692467ba18bf09bdf61a01964059695e9719f32c15563af94414262ea4b7fd
 DIST river-0.4.5.tar.gz 162386 BLAKE2B 717b8327944508c7608b104af2d7ead074830b99db44b2882ef9aea20f87484202f879ec3346dfcb84c6df016f3b12aaa1f777a3e2d497c4da9834692b3c6915 SHA512 30e7f0a1d881f5208e6f4f028d03c75d2c6ab86e10fcfee324fc89594a57385207d6ba003082cb8797c6d6b0091ac47f9bb03f07a9c6e1a05b8675413916ee8e
+DIST river-0.4.6.tar.gz 167954 BLAKE2B 31ea80d1053626c6f2f4962eb0518a747653f6c6e62711adaf7c46bd74073ddc0c03cd145024830ec366d5dada59d10462edc410c56011517b1d284f4bf2336c SHA512 b6e213b1095bf3da1a0674e9b16f835db1b075cedbd082ae5f16451683ed03f595acf1332d1228b161dbc721419087a5bc1bbc295c50eb2e52f590c6fc1f38a8
 DIST river-classic-0.3.15.tar.gz 178643 BLAKE2B 80ce56d3f0d255ce2ffbd46c8140eb9bf4fbe307d05473e68bd12dac71988c9cac2cf51b4ecc56bdd39ba1ef0c67dfe9483adb7c73842fd1f4b13dc20fa97156 SHA512 3b6fbe0868f27728767e637df5551acdc34fe856d78cd8510a0fa2978fdf5db8e72137eea928a76599d2abced5026326a4f53605ea53f611b152281aaa5efdc6
 DIST river-classic-0.3.17.tar.gz 178596 BLAKE2B 771d0127e3ab530ac7e27b3cf1cfd3f3bc14d85986c4545dc8b6927e70f0dfe4cf91d2c1425036f64604cf43532a6cce0697fd3d54de512094da0f2592d3486f SHA512 e3fe02f2906052476d61b40f6543accc7573e0ded0f9e39fb4650717f8d98cfbaf681bd3dd62e2dc726ecd3208201fdd5263c4acd3e59a379133e0c80df3b208
 DIST translate_c-0.0.0-Q_BUWlX1BgCD1wo6uo97prlp9VJ4gxAjwN_vZ7nsSjGN.tar.gz 146648 BLAKE2B 3e2a3e6bc73ba1bcbd9c2974d313a38125eb4db85cd8055d1fb5321510a5d1a90d98f30f75743aa3955a880cefba64e4dd2c0c0245fc226478d03563d6617862 SHA512 fb5edcae6414487a7008cc84411da3a4396a1dd19d31ae450db3e6fa9475a2d5c742e1e560923bfb49f372541b1c3c46cf51aa33749027b270aaaa50e524b8d6
diff --git a/gui-wm/river/river-0.4.6.ebuild b/gui-wm/river/river-0.4.6.ebuild
new file mode 100644
index 000000000000..a390cf468a45
--- /dev/null
+++ b/gui-wm/river/river-0.4.6.ebuild
@@ -0,0 +1,103 @@
+# Copyright 2024-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+declare -g -r -A ZBS_DEPENDENCIES=(
+	[pixman-0.3.0-LClMnz2VAAAs7QSCGwLimV5VUYx0JFnX5xWU6HwtMuDX.tar.gz]='https://codeberg.org/ifreund/zig-pixman/archive/v0.3.0.tar.gz'
+	[wayland-0.6.0-lQa1kqz8AQADQmdNJsNhLoNHcnEGEUjrOaPV-dtEnEmX.tar.gz]='https://codeberg.org/ifreund/zig-wayland/archive/v0.6.0.tar.gz'
+	[wlroots-0.20.1-jmOlcqNVBAB3uB5oqBTzpRlwu-FmMyyZMVAWCe5kmcSt.tar.gz]='https://codeberg.org/ifreund/zig-wlroots/archive/v0.20.1.tar.gz'
+	[xkbcommon-0.4.0-VDqIe0i2AgDRsok2GpMFYJ8SVhQS10_PI2M_CnHXsJJZ.tar.gz]='https://codeberg.org/ifreund/zig-xkbcommon/archive/v0.4.0.tar.gz'
+	[translate_c-0.0.0-Q_BUWlX1BgCD1wo6uo97prlp9VJ4gxAjwN_vZ7nsSjGN.tar.gz]='https://codeberg.org/ziglang/translate-c/archive/57c559cf581b1fcad90494eda219f98abeb155ce.tar.gz'
+	# Inherited from translate-c
+	[aro-0.0.0-JSD1Qi7QNgDnfcrdEJf82v3o6MhZySjYVrtdfEf3E4Se.tar.gz]='https://github.com/Vexu/arocc/archive/5f5a050569a95ecc40a426f0c3666ae7ef987ede.tar.gz'
+)
+ZIG_SLOT="0.16"
+
+inherit eapi9-ver zig
+
+DESCRIPTION="A dynamic tiling Wayland compositor"
+HOMEPAGE="https://isaacfreund.com/software/river/ https://codeberg.org/river/river"
+
+if [[ "${PV}" = "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://codeberg.org/river/river.git"
+else
+	# TODO verify-sig support
+	SRC_URI="
+		https://codeberg.org/river/river/releases/download/v${PV}/${P}.tar.gz
+		${ZBS_DEPENDENCIES_SRC_URI}
+	"
+	KEYWORDS="~amd64 ~arm64"
+fi
+
+# river: GPL-3-or-later
+# zig-pixman, zig-wayland, zig-wlroots, zig-xkbcommon: MIT
+LICENSE="GPL-3+ MIT"
+SLOT="0"
+IUSE="X man"
+
+BDEPEND="
+	dev-libs/wayland-protocols
+	dev-util/wayland-scanner
+	man? ( app-text/scdoc )
+	|| (
+		dev-lang/zig:${ZIG_SLOT}
+		dev-lang/zig-bin:${ZIG_SLOT}
+	)
+"
+DEPEND="
+	dev-libs/libevdev
+	dev-libs/libinput:=
+	dev-libs/wayland
+	gui-libs/wlroots:0.20[X?]
+	x11-libs/libxkbcommon[wayland,X?]
+	x11-libs/pixman
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( "README.md" )
+
+PATCHES=(
+	"${FILESDIR}/river-0.4.1-fix-scdoc-path.patch"
+)
+
+src_unpack() {
+	if [[ "${PV}" = "9999" ]]; then
+		git-r3_src_unpack
+		zig_live_src_unpack
+	else
+		zig_src_unpack
+	fi
+}
+
+src_configure() {
+	local my_zbs_args=(
+		-Dstrip=false # Let Portage control this
+		-Dpie=true
+		-Dllvm=$(usex amd64 false true)
+		-Dman-pages=$(usex man true false)
+		-Dxwayland=$(usex X true false)
+	)
+
+	zig_src_configure
+}
+
+src_install() {
+	zig_src_install
+
+	insinto /usr/share/wayland-sessions/
+	doins contrib/river.desktop
+}
+
+pkg_postinst() {
+	if ver_replacing -lt 0.4; then
+		ewarn "River 0.4.x is a significant rework of the compositor's architecture,"
+		ewarn "and requires significant manual migration. If you would like to stay on"
+		ewarn "river 0.3.x, simply add '>=gui-wm/river-0.4' to your package.mask to"
+		ewarn "use river-classic continuation of the 0.3.x branch."
+	fi
+
+	einfo "River requires an separate window manager in addition to the main"
+	einfo "compositor. For some options, see gui-wm/canoe and gui-wm/kwm."
+}
diff --git a/gui-wm/wayfire/Manifest b/gui-wm/wayfire/Manifest
index 8daf19658584..33512ef4d75e 100644
--- a/gui-wm/wayfire/Manifest
+++ b/gui-wm/wayfire/Manifest
@@ -1 +1,2 @@
 DIST wayfire-0.10.1.tar.xz 941092 BLAKE2B 857610f2e4df4f9b1e6a39d10f3d935b8948ac8811723ac376f48afd9376098574a1da8ab22b8507dcc896ca1bb6e32041242853bd0c371473f05022e6e25e14 SHA512 39cca8c57220fac80ce8103e8b0468a108dca16e5a4cacb3c5bdb778e47a31adf3263d77c67ce19cbb026ff5c3300d05b53a2639379bd0d28569161a04c73c32
+DIST wayfire-0.11.0.tar.xz 1045204 BLAKE2B 2f8a1a56c75cf39498d12f5cc2284e0c370b1def8745d8e356ac0a4032fd86ce0370b08af6d9f0f48836d740608359c60ab04e52c4f03c1e1c33c5991fbc23dd SHA512 192a4d6974fbee9e531ef349bd032233a162dfb5d2dbb302706b31f83d6eb5f57519e27e02fb3db4057c8b7d476fbaf0bc90a2cadd17628c5ef0133810dcb4e1
diff --git a/gui-wm/wayfire/wayfire-0.11.0.ebuild b/gui-wm/wayfire/wayfire-0.11.0.ebuild
new file mode 100644
index 000000000000..8576ffbbca9b
--- /dev/null
+++ b/gui-wm/wayfire/wayfire-0.11.0.ebuild
@@ -0,0 +1,158 @@
+# Copyright 2019-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dot-a meson toolchain-funcs
+
+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/0.12"
+
+	IUSE="vulkan"
+
+	# vulkan support is experimental and uses a bundled fork of wlroots
+	# keep it only in the live ebuild for now
+	RDEPEND="vulkan? ( media-libs/vulkan-loader )"
+	DEPEND="vulkan? ( dev-util/vulkan-headers )"
+	COMMON_DEPEND="
+		!vulkan? (
+			gui-libs/wlroots:0.20[drm(+),libinput(+),x11-backend,X?]
+		)
+		vulkan? (
+			dev-libs/libliftoff
+			media-libs/lcms:2
+			media-libs/libdisplay-info:=
+			media-libs/mesa
+			sys-auth/seatd:=
+			x11-libs/libdrm
+			x11-libs/xcb-util-errors
+			x11-libs/xcb-util-renderutil
+			x11-libs/xcb-util-wm
+		)
+	"
+else
+	SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~riscv"
+	SLOT="0/$(ver_cut 1-2)"
+
+	COMMON_DEPEND="gui-libs/wlroots:0.20[drm(+),libinput(+),x11-backend,X?]"
+fi
+
+LICENSE="MIT"
+IUSE+=" X +dbus +gles3 nls openmp test"
+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
+COMMON_DEPEND+="
+	dev-cpp/nlohmann_json
+	dev-libs/glib:2
+	dev-libs/libevdev
+	dev-libs/libinput:=
+	dev-libs/wayland
+	dev-libs/yyjson
+	>=dev-libs/wayland-protocols-1.12
+	gui-libs/wf-config:${SLOT}
+	media-libs/glm
+	media-libs/libglvnd
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	virtual/libudev:=
+	x11-libs/cairo
+	x11-libs/libxkbcommon
+	x11-libs/pango
+	x11-libs/pixman
+	dbus? ( sys-apps/dbus )
+	X? ( x11-libs/libxcb:= )
+"
+
+RDEPEND+="
+	${COMMON_DEPEND}
+	x11-misc/xkeyboard-config
+"
+DEPEND+="
+	${COMMON_DEPEND}
+	test? ( dev-cpp/doctest )
+"
+BDEPEND="
+	dev-util/wayland-scanner
+	virtual/pkgconfig
+	openmp? (
+		|| (
+			sys-devel/gcc[openmp]
+			llvm-runtimes/clang-runtime[openmp]
+		)
+	)
+	nls? (
+		sys-devel/gettext
+	)
+"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+
+	local dbusrunsession=$(usev dbus dbus-run-session)
+	sed -e "s:@EPREFIX@:${EPREFIX}:g" -e "s:@DBUS_RUN_SESSION@:${dbusrunsession}:" \
+		"${FILESDIR}"/wayfire-session-2 > "${T}"/wayfire-session || die
+	sed -e "s:@EPREFIX@:${EPREFIX}:" \
+		"${FILESDIR}"/wayfire-session.desktop > "${T}"/wayfire-session.desktop || die
+}
+
+src_configure() {
+	lto-guarantee-fat
+
+	local emesonargs=(
+		$(meson_feature test tests)
+		$(meson_feature X xwayland)
+		$(meson_use gles3 enable_gles32)
+		$(meson_feature nls build_locales)
+		$(meson_use openmp enable_openmp)
+		-Duse_system_wfconfig=enabled
+	)
+
+	if [[ ${PV} == 9999 ]]; then
+		emesonargs+=(
+			$(meson_feature !vulkan use_system_wlroots)
+			$(meson_use vulkan vulkan_effects)
+		)
+	else
+		emesonargs+=(
+		-Duse_system_wlroots=enabled
+		-Dvulkan_effects=false
+		)
+	fi
+
+	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
+
+	insinto "/etc"
+	doins "${FILESDIR}"/wayfire.env
+
+	strip-lto-bytecode
+}
diff --git a/gui-wm/wayfire/wayfire-9999.ebuild b/gui-wm/wayfire/wayfire-9999.ebuild
index 637674666d54..8576ffbbca9b 100644
--- a/gui-wm/wayfire/wayfire-9999.ebuild
+++ b/gui-wm/wayfire/wayfire-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2025 Gentoo Authors
+# Copyright 2019-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,21 +11,46 @@ HOMEPAGE="https://github.com/WayfireWM/wayfire"
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/WayfireWM/${PN}.git"
-	SLOT="0/0.11"
+	SLOT="0/0.12"
+
+	IUSE="vulkan"
+
+	# vulkan support is experimental and uses a bundled fork of wlroots
+	# keep it only in the live ebuild for now
+	RDEPEND="vulkan? ( media-libs/vulkan-loader )"
+	DEPEND="vulkan? ( dev-util/vulkan-headers )"
+	COMMON_DEPEND="
+		!vulkan? (
+			gui-libs/wlroots:0.20[drm(+),libinput(+),x11-backend,X?]
+		)
+		vulkan? (
+			dev-libs/libliftoff
+			media-libs/lcms:2
+			media-libs/libdisplay-info:=
+			media-libs/mesa
+			sys-auth/seatd:=
+			x11-libs/libdrm
+			x11-libs/xcb-util-errors
+			x11-libs/xcb-util-renderutil
+			x11-libs/xcb-util-wm
+		)
+	"
 else
 	SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm64 ~riscv"
 	SLOT="0/$(ver_cut 1-2)"
+
+	COMMON_DEPEND="gui-libs/wlroots:0.20[drm(+),libinput(+),x11-backend,X?]"
 fi
 
 LICENSE="MIT"
-IUSE="X +dbus +gles3 openmp test"
+IUSE+=" X +dbus +gles3 nls openmp test"
 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
-COMMON_DEPEND="
+COMMON_DEPEND+="
 	dev-cpp/nlohmann_json
 	dev-libs/glib:2
 	dev-libs/libevdev
@@ -34,12 +59,10 @@ COMMON_DEPEND="
 	dev-libs/yyjson
 	>=dev-libs/wayland-protocols-1.12
 	gui-libs/wf-config:${SLOT}
-	gui-libs/wlroots:0.19[drm(+),libinput(+),x11-backend,X?]
 	media-libs/glm
 	media-libs/libglvnd
 	media-libs/libjpeg-turbo:=
 	media-libs/libpng:=
-	media-libs/vulkan-loader
 	virtual/libudev:=
 	x11-libs/cairo
 	x11-libs/libxkbcommon
@@ -49,11 +72,11 @@ COMMON_DEPEND="
 	X? ( x11-libs/libxcb:= )
 "
 
-RDEPEND="
+RDEPEND+="
 	${COMMON_DEPEND}
 	x11-misc/xkeyboard-config
 "
-DEPEND="
+DEPEND+="
 	${COMMON_DEPEND}
 	test? ( dev-cpp/doctest )
 "
@@ -66,6 +89,9 @@ BDEPEND="
 			llvm-runtimes/clang-runtime[openmp]
 		)
 	)
+	nls? (
+		sys-devel/gettext
+	)
 "
 
 pkg_pretend() {
@@ -93,10 +119,23 @@ src_configure() {
 		$(meson_feature test tests)
 		$(meson_feature X xwayland)
 		$(meson_use gles3 enable_gles32)
+		$(meson_feature nls build_locales)
 		$(meson_use openmp enable_openmp)
 		-Duse_system_wfconfig=enabled
-		-Duse_system_wlroots=enabled
 	)
+
+	if [[ ${PV} == 9999 ]]; then
+		emesonargs+=(
+			$(meson_feature !vulkan use_system_wlroots)
+			$(meson_use vulkan vulkan_effects)
+		)
+	else
+		emesonargs+=(
+		-Duse_system_wlroots=enabled
+		-Dvulkan_effects=false
+		)
+	fi
+
 	meson_src_configure
 }