public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/analog/
Date: Thu, 26 Jun 2025 19:55:06 +0000 (UTC)	[thread overview]
Message-ID: <1750967677.4573f05f715b896ef86418f23f70e5f54acd473b.sam@gentoo> (raw)

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	other threads:[~2025-06-26 19:55 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-06-26 19:55 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-09-26 16:15 [gentoo-commits] repo/gentoo:master commit in: app-admin/analog/ Arthur Zamarin
2025-09-23 14:26 Sam James
2025-09-23 14:26 Sam James
2025-09-22 15:29 Sam James
2024-11-23 15:05 Michał Górny
2024-11-23 12:24 Arthur Zamarin
2024-06-23 19:49 Conrad Kostecki
2024-06-23 19:49 Conrad Kostecki
2022-11-01  9:57 Yixun Lan
2019-11-27 20:45 Aaron Bauman
2019-11-27 20:15 Sergei Trofimovich
2019-11-19 19:45 Sergei Trofimovich
2019-07-29 14:28 Mikle Kolyada
2019-06-08 18:20 Agostino Sarubbo
2019-06-05  7:12 Agostino Sarubbo
2019-06-05  6:48 Agostino Sarubbo
2019-06-04 16:47 Agostino Sarubbo
2019-03-26 16:45 Patrice Clement
2019-03-26 16:45 Patrice Clement
2017-08-22 19:59 Michał Górny
2016-06-07 16:10 Amy Winston

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1750967677.4573f05f715b896ef86418f23f70e5f54acd473b.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox