From 1f30b3d872ddc9b335377eb547b1c4f8636c4c10 Mon Sep 17 00:00:00 2001 From: Sam James Date: Mon, 19 Oct 2020 02:54:32 +0000 Subject: 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 --- 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 93297eaf8275..e32810067cdd 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 5fe71cf739a4..8b324830c1e4 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 -- cgit v1.2.3-65-gdbad