From 31e7d5cdbca36cbff3f5bfe2c28e0c7b06cc8024 Mon Sep 17 00:00:00 2001
From: Theron York <theron.york@cloudnuke.org>
Date: Sun, 10 May 2026 23:28:31 -0500
Subject: [PATCH] x11-wm/oxwm: 	modified:   oxwm-0.11.4.ebuild

Signed-off-by: Theron York <theron.york@cloudnuke.org>
---
 x11-wm/oxwm/oxwm-0.11.4.ebuild | 79 ++++++++++++++++------------------
 1 file changed, 38 insertions(+), 41 deletions(-)

diff --git a/x11-wm/oxwm/oxwm-0.11.4.ebuild b/x11-wm/oxwm/oxwm-0.11.4.ebuild
index d688ccf5a2..956d0b5ed8 100644
--- a/x11-wm/oxwm/oxwm-0.11.4.ebuild
+++ b/x11-wm/oxwm/oxwm-0.11.4.ebuild
@@ -3,15 +3,18 @@
 
 EAPI=8
 
+ZIG_MIN_VERSION="0.15.0"
+ZIG_SLOT="0.15"
+ZIG_INSOURCE_BUILD=1
+
+inherit zig
+
 DESCRIPTION="OXWM — DWM but better. Dynamic window manager written in Zig with Lua config"
 HOMEPAGE="https://github.com/tonybanters/oxwm"
 
 COMMIT="f699f6d1ff9e07cdd3831591bda84400e784b2c1"
-
 SRC_URI="https://codeload.github.com/tonybanters/oxwm/tar.gz/${COMMIT} -> ${P}.tar.gz"
 
-S="${WORKDIR}/oxwm-${COMMIT}"
-
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
@@ -19,56 +22,50 @@ KEYWORDS="~amd64"
 RESTRICT="mirror"
 
 RDEPEND="
-    x11-libs/libX11
-    x11-libs/libXft
-    x11-libs/libXinerama
-    media-libs/fontconfig
-    media-libs/freetype
-    dev-lang/lua
-"
-
-DEPEND="
-    ${RDEPEND}
-    dev-lang/zig
-"
-
-BDEPEND="
-    virtual/pkgconfig
+	x11-libs/libX11
+	x11-libs/libXft
+	x11-libs/libXinerama
+	media-libs/fontconfig
+	media-libs/freetype
+	dev-lang/lua
 "
+DEPEND="${RDEPEND}"
 
 src_unpack() {
-    default
-    local unpacked_dir
-    unpacked_dir=$(find "${WORKDIR}" -maxdepth 1 -type d -name "oxwm-*" | head -n1) || die "Source folder not found"
-    if [[ "${unpacked_dir}" != "${WORKDIR}/${P}" ]]; then
-        mv "${unpacked_dir}" "${WORKDIR}/${P}" || die "Failed to rename source folder"
-    fi
-    S="${WORKDIR}/${P}"
+	default
+	local unpacked_dir
+	unpacked_dir=$(find "${WORKDIR}" -maxdepth 1 -type d -name "oxwm-*" | head -n1) \
+		|| die "Source folder not found"
+	mv "${unpacked_dir}" "${WORKDIR}/${P}" || die "Failed to rename source folder"
 }
 
 src_configure() {
-    mkdir -p build
-    cd build || die
-    zig build -Doptimize=ReleaseSmall
+	# Use eclass's configure to set up prefix, libc, etc.
+	zig_src_configure
 }
 
 src_compile() {
-    cd build || die
-    zig build -Doptimize=ReleaseSmall
+	# Build in the source tree (forced by ZIG_INSOURCE_BUILD already,
+	# but explicitly cd there to be safe) with ReleaseSmall.
+	cd "${S}" || die
+	ezig build -Doptimize=ReleaseSmall || die "Build failed"
 }
 
 src_install() {
-    cd build || die
-    zig build install
-    insinto /usr/share/xsessions
-    doins "${S}/resources/oxwm.desktop" 2>/dev/null || true
-    insinto /usr/share/oxwm
-    doins -r "${S}/templates"
-    doman "${S}/resources/oxwm.1" 2>/dev/null || true
+	# Let eclass install from the build (it will go to zig-out)
+	zig_src_install
+
+	insinto /usr/share/xsessions
+	doins "${S}/resources/oxwm.desktop" 2>/dev/null || true
+
+	insinto /usr/share/oxwm
+	doins -r "${S}/templates"
+
+	doman "${S}/resources/oxwm.1" 2>/dev/null || true
 }
 
 pkg_postinst() {
-    elog "OXWM installed successfully!"
-    elog "First launch will create ~/.config/oxwm/config.lua"
-    elog "Or run: oxwm --init"
-}
+	elog "OXWM installed successfully!"
+	elog "First launch will create ~/.config/oxwm/config.lua"
+	elog "Or run: oxwm --init"
+}
\ No newline at end of file