From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1681575-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 3318D158042
for <garchives@archives.gentoo.org>; Fri, 18 Oct 2024 21:19:31 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 65AA3E0844;
Fri, 18 Oct 2024 21:19:30 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.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 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 50E04E0844
for <gentoo-commits@lists.gentoo.org>; Fri, 18 Oct 2024 21:19:30 +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 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 9069F3430CA
for <gentoo-commits@lists.gentoo.org>; Fri, 18 Oct 2024 21:19:29 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id A4CD2AE7
for <gentoo-commits@lists.gentoo.org>; Fri, 18 Oct 2024 21:19:27 +0000 (UTC)
From: "Maciej Barć" <xgqt@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Maciej Barć" <xgqt@gentoo.org>
Message-ID: <1729286364.3ae024ce4a31cc63c0df3ba55e756129dc8d65d8.xgqt@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/unison/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-misc/unison/unison-2.53.5-r1.ebuild net-misc/unison/unison-2.53.5-r2.ebuild
X-VCS-Directories: net-misc/unison/
X-VCS-Committer: xgqt
X-VCS-Committer-Name: Maciej Barć
X-VCS-Revision: 3ae024ce4a31cc63c0df3ba55e756129dc8d65d8
X-VCS-Branch: master
Date: Fri, 18 Oct 2024 21:19:27 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: a6639c07-a410-46c6-baba-755c206acde8
X-Archives-Hash: 85a4fe68324ed2edc629368aba48ab63
commit: 3ae024ce4a31cc63c0df3ba55e756129dc8d65d8
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 18 21:11:59 2024 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Fri Oct 18 21:19:24 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ae024ce
net-misc/unison: for USE=gui install unison-gui exe as unison
Closes: https://bugs.gentoo.org/941780
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
.../unison/{unison-2.53.5-r1.ebuild => unison-2.53.5-r2.ebuild} | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/net-misc/unison/unison-2.53.5-r1.ebuild b/net-misc/unison/unison-2.53.5-r2.ebuild
similarity index 93%
rename from net-misc/unison/unison-2.53.5-r1.ebuild
rename to net-misc/unison/unison-2.53.5-r2.ebuild
index 778fdbd73f62..3f72ec9dd476 100644
--- a/net-misc/unison/unison-2.53.5-r1.ebuild
+++ b/net-misc/unison/unison-2.53.5-r2.ebuild
@@ -96,18 +96,21 @@ src_install() {
cd "${S}/src" || die
local -a bins=(
- unison
unison-fsmonitor
)
+ # Unison GUI is a CLI + GTK GUI in one binary, no need to install both,
+ # see bug https://bugs.gentoo.org/941780
if use gui ; then
bins+=( unison-gui )
+ else
+ bins+=( unison )
fi
local binname
for binname in "${bins[@]}" ; do
exeinto /usr/bin
- newexe "${binname}" "${binname}-${SLOT}"
+ newexe "${binname}" "${binname/-gui/}-${SLOT}"
done
cd "${S}" || die