From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1216128-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 8CF6A13835A
for <garchives@archives.gentoo.org>; Mon, 19 Oct 2020 02:54:45 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id AF3F9E097A;
Mon, 19 Oct 2020 02:54:44 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 956FCE097A
for <gentoo-commits@lists.gentoo.org>; Mon, 19 Oct 2020 02:54:44 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 5EA91341036
for <gentoo-commits@lists.gentoo.org>; Mon, 19 Oct 2020 02:54:43 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 140E93A8
for <gentoo-commits@lists.gentoo.org>; Mon, 19 Oct 2020 02:54:42 +0000 (UTC)
From: "Sam James" <sam@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, "Sam James" <sam@gentoo.org>
Message-ID: <1603076077.1f30b3d872ddc9b335377eb547b1c4f8636c4c10.sam@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.48.15_p4.ebuild net-misc/unison/unison-2.51.3_rc2.ebuild
X-VCS-Directories: net-misc/unison/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 1f30b3d872ddc9b335377eb547b1c4f8636c4c10
X-VCS-Branch: master
Date: Mon, 19 Oct 2020 02:54:42 +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: 17d7e661-810f-4075-8f4e-f60342ab7c71
X-Archives-Hash: e769c7a60e107d1e09cec96b268d677f
commit: 1f30b3d872ddc9b335377eb547b1c4f8636c4c10
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 19 02:54:32 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct 19 02:54:37 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f30b3d8
net-misc/unison: don't double-name the desktop file
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/unison/unison-2.48.15_p4.ebuild | 7 +++++--
net-misc/unison/unison-2.51.3_rc2.ebuild | 7 +++++--
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/net-misc/unison/unison-2.48.15_p4.ebuild b/net-misc/unison/unison-2.48.15_p4.ebuild
index 93297eaf827..e32810067cd 100644
--- a/net-misc/unison/unison-2.48.15_p4.ebuild
+++ b/net-misc/unison/unison-2.48.15_p4.ebuild
@@ -74,10 +74,12 @@ src_install() {
for binname in unison unison-fsmonitor; do
newbin ${binname} ${binname}-${SLOT}
done
+
if use gtk; then
newicon -s scalable ../icons/U.svg ${PN}-${SLOT}.svg
- make_desktop_entry ${PN}-${SLOT} ${PN}-${SLOT} ${PN}-${SLOT}
+ make_desktop_entry Unison "${PN} (${SLOT})" "${EPREFIX}/usr/share/${PN}/${PN}-${SLOT}.svg"
fi
+
# No manual.pdf or manual.html available for this version
# if use doc; then
# DOCS+=( "${DISTDIR}/${P}-manual.pdf" )
@@ -90,7 +92,8 @@ pkg_postinst() {
elog "Unison now uses SLOTs, so you can specify servercmd=/usr/bin/unison-${SLOT}"
elog "in your profile files to access exactly this version over ssh."
elog "Or you can use 'eselect unison' to set the version."
- eselect unison update
+ eselect unison update || die
+
if use gtk; then
xdg_icon_cache_update
fi
diff --git a/net-misc/unison/unison-2.51.3_rc2.ebuild b/net-misc/unison/unison-2.51.3_rc2.ebuild
index 5fe71cf739a..8b324830c1e 100644
--- a/net-misc/unison/unison-2.51.3_rc2.ebuild
+++ b/net-misc/unison/unison-2.51.3_rc2.ebuild
@@ -66,10 +66,12 @@ src_install() {
for binname in unison unison-fsmonitor; do
newbin ${binname} ${binname}-${SLOT}
done
+
if use gtk; then
newicon -s scalable ../icons/U.svg ${PN}-${SLOT}.svg
- make_desktop_entry ${PN}-${SLOT} ${PN}-${SLOT} ${PN}-${SLOT}
+ make_desktop_entry Unison "${PN} (${SLOT})" "${EPREFIX}/usr/share/${PN}/${PN}-${SLOT}.svg"
fi
+
# No docs for release candidates
#if use doc; then
# DOCS+=( "${DISTDIR}/${P}-manual.pdf" )
@@ -83,7 +85,8 @@ pkg_postinst() {
elog "Unison now uses SLOTs, so you can specify servercmd=/usr/bin/unison-${SLOT}"
elog "in your profile files to access exactly this version over ssh."
elog "Or you can use 'eselect unison' to set the version."
- eselect unison update
+ eselect unison update || die
+
if use gtk; then
xdg_icon_cache_update
fi