commit:     4573f05f715b896ef86418f23f70e5f54acd473b
Author:     Cristian Othón Martínez Vera <cfuga <AT> cfuga <DOT> mx>
AuthorDate: Thu Jun 26 19:25:16 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 26 19:54:37 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4573f05f

app-admin/analog: apply fixes suggested by @thesamesam

Link: https://github.com/gentoo/gentoo/pull/42447#discussion_r2127539884
Link: https://github.com/gentoo/gentoo/pull/42447#discussion_r2127540069
Signed-off-by: Cristian Othón Martínez Vera <cfuga <AT> cfuga.mx>
Part-of: https://github.com/gentoo/gentoo/pull/42766
Closes: https://github.com/gentoo/gentoo/pull/42766
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-admin/analog/analog-6.0.18.ebuild | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/app-admin/analog/analog-6.0.18.ebuild 
b/app-admin/analog/analog-6.0.18.ebuild
index b69735e1e467..b32c839f5962 100644
--- a/app-admin/analog/analog-6.0.18.ebuild
+++ b/app-admin/analog/analog-6.0.18.ebuild
@@ -27,7 +27,8 @@ RDEPEND="${DEPEND}"
 PATCHES=(
        "${FILESDIR}"/${PN}-5.1-gentoo.diff
        "${FILESDIR}"/${PN}-6.0-undefined-macro.patch
-       "${FILESDIR}"/${PN}-6.0.18-Makefile.patch
+       "${FILESDIR}"/${PN}-6.0.18-posix-makefiles.patch
+       "${FILESDIR}"/${PN}-6.0.18-src-Makefile.patch
        "${FILESDIR}"/${PN}-6.0.18-c23.patch
 )
 
@@ -40,9 +41,7 @@ src_prepare() {
 
 src_compile() {
        tc-export CC
-       # emake in main dir just executes "cd src && make",
-       # i.e. MAKEOPTS are ignored
-       emake -C src
+       emake
 }
 
 src_install() {
@@ -59,7 +58,7 @@ src_install() {
        insinto /usr/share/analog/images ; doins images/*
        insinto /usr/share/analog/lang ; doins lang/*
        dodir /var/log/analog
-       dosym ../../../usr/share/analog/images /var/log/analog/images
+       dosym -r /usr/share/analog/images /var/log/analog/images
        insinto /etc/analog ; doins "${FILESDIR}/analog.cfg"
        dobin analog
 }

Reply via email to