[gentoo-commits] repo/proj/guru:dev commit in: x11-misc/ly/

[Michal Vu]

commit:     09034012fe080a10d6ff6a2c34dfd863e7498f75
Author:     Michal Vu <saigon-tech <AT> tuta <DOT> io>
AuthorDate: Tue Aug 13 09:11:44 2024 +0000
Commit:     Michal Vu <saigon-tech <AT> tuta <DOT> io>
CommitDate: Tue Aug 13 09:11:44 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=09034012

x11-misc/ly: Fixing Prefixes in ly-9999 and adjusting X11 related dependencies 
in 1.0.2/9999

Signed-off-by: Michal Vu <saigon-tech <AT> tuta.io>

 x11-misc/ly/ly-1.0.2.ebuild |  4 ++--
 x11-misc/ly/ly-9999.ebuild  | 14 ++++++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/x11-misc/ly/ly-1.0.2.ebuild b/x11-misc/ly/ly-1.0.2.ebuild
index d46e48aa8..bd378ed69 100644
--- a/x11-misc/ly/ly-1.0.2.ebuild
+++ b/x11-misc/ly/ly-1.0.2.ebuild
@@ -30,12 +30,12 @@ DEPEND="
        || ( dev-lang/zig-bin:${EZIG_MIN} dev-lang/zig:${EZIG_MIN} )
        sys-libs/pam
        x11-libs/libxcb
-       x11-apps/xrdb
-       x11-apps/xmessage
 "
 RDEPEND="
        x11-base/xorg-server
        x11-apps/xauth
+       x11-apps/xrdb
+       x11-apps/xmessage
        sys-libs/ncurses
 "
 

diff --git a/x11-misc/ly/ly-9999.ebuild b/x11-misc/ly/ly-9999.ebuild
index c6ff07ce3..9b84da7ce 100644
--- a/x11-misc/ly/ly-9999.ebuild
+++ b/x11-misc/ly/ly-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit edo pam systemd git-r3
+inherit edo pam systemd git-r3 prefix
 
 DESCRIPTION="Ly - a TUI display manager (live ebuild)"
 HOMEPAGE="https://github.com/fairyglade/ly";
@@ -13,8 +13,6 @@ EGIT_REPO_URI="https://github.com/fairyglade/ly.git";
 LICENSE="WTFPL-2"
 SLOT="0"
 
-# KEYWORDS is omitted for live ebuilds
-
 # Specify the required Zig version range
 EZIG_MIN="0.12"
 EZIG_MAX_EXCLUSIVE="0.13"
@@ -28,6 +26,7 @@ RDEPEND="
        x11-base/xorg-server
        x11-apps/xauth
        sys-libs/ncurses
+       x11-apps/xrdb
 "
 
 # Ignore QA warnings about missing build-id for Zig binaries
@@ -172,8 +171,15 @@ src_unpack() {
        ezig fetch --global-cache-dir "${WORKDIR}/deps" 
"https://github.com/ziglibs/ini/archive/${ZIGLIBINI}.tar.gz";
 }
 
-# Compile the project
+
+src_prepare(){
+       default
+       # Adjusting absolute paths in the following files to use Gentoo's 
${EPREFIX}
+       hprefixify "${RES}/config.ini" "${RES}/xsetup.sh" "${RES}/wsetup.sh"
+}
+
 src_compile() {
+       # Building ly & accomodate for prefixed environment
        ezig build --system "${WORKDIR}/deps/p" -Doptimize=ReleaseSafe
 }