From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 876A9158074 for ; Thu, 26 Jun 2025 19:55:28 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 74CAC341085 for ; Thu, 26 Jun 2025 19:55:28 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id CA868110565; Thu, 26 Jun 2025 19:55:08 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id B5378110566 for ; Thu, 26 Jun 2025 19:55:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5BB16340DCC for ; Thu, 26 Jun 2025 19:55:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 20F5A2AAB for ; Thu, 26 Jun 2025 19:55:06 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1750967677.4573f05f715b896ef86418f23f70e5f54acd473b.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/analog/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/analog/analog-6.0.18.ebuild X-VCS-Directories: app-admin/analog/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 4573f05f715b896ef86418f23f70e5f54acd473b X-VCS-Branch: master Date: Thu, 26 Jun 2025 19:55:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 43bb2da0-7ce7-4560-854e-706d2ee84fd7 X-Archives-Hash: 692e09c5b92a30bf801d48470c1fa8c7 commit: 4573f05f715b896ef86418f23f70e5f54acd473b Author: Cristian Othón Martínez Vera cfuga mx> AuthorDate: Thu Jun 26 19:25:16 2025 +0000 Commit: Sam James gentoo 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.mx> Part-of: https://github.com/gentoo/gentoo/pull/42766 Closes: https://github.com/gentoo/gentoo/pull/42766 Signed-off-by: Sam James 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 }