commit:     dfcfaa586a6aee2b81100c59995480f632f669dc
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 20 03:08:18 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Oct 20 03:09:22 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfcfaa58

net-misc/unison: fix .desktop and GUI build

Closes: https://bugs.gentoo.org/360161
Closes: https://bugs.gentoo.org/750125
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../unison/{unison-2.48.15_p4.ebuild => unison-2.48.15_p4-r1.ebuild}  | 4 ++--
 net-misc/unison/unison-2.51.3_rc3.ebuild                              | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-misc/unison/unison-2.48.15_p4.ebuild 
b/net-misc/unison/unison-2.48.15_p4-r1.ebuild
similarity index 95%
rename from net-misc/unison/unison-2.48.15_p4.ebuild
rename to net-misc/unison/unison-2.48.15_p4-r1.ebuild
index e32810067cd..d8102533b70 100644
--- a/net-misc/unison/unison-2.48.15_p4.ebuild
+++ b/net-misc/unison/unison-2.48.15_p4-r1.ebuild
@@ -41,7 +41,7 @@ PATCHES=(
 DOCS=( BUGS.txt CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt )
 
 src_compile() {
-       local myconf
+       local myconf="all"
 
        if use threads; then
                myconf="$myconf THREADS=true"
@@ -77,7 +77,7 @@ src_install() {
 
        if use gtk; then
                newicon -s scalable ../icons/U.svg ${PN}-${SLOT}.svg
-               make_desktop_entry Unison "${PN} (${SLOT})" 
"${EPREFIX}/usr/share/${PN}/${PN}-${SLOT}.svg"
+               make_desktop_entry unison-${SLOT} "${PN} (${SLOT})" 
"${EPREFIX}/usr/share/${PN}/${PN}-${SLOT}.svg"
        fi
 
 # No manual.pdf or manual.html available for this version

diff --git a/net-misc/unison/unison-2.51.3_rc3.ebuild 
b/net-misc/unison/unison-2.51.3_rc3.ebuild
index 8b324830c1e..314ce0d4d1c 100644
--- a/net-misc/unison/unison-2.51.3_rc3.ebuild
+++ b/net-misc/unison/unison-2.51.3_rc3.ebuild
@@ -32,7 +32,7 @@ RDEPEND="
 DOCS=( BUGS.txt CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt )
 
 src_compile() {
-       local myconf
+       local myconf="all"
 
        if use threads; then
                myconf="$myconf THREADS=true"
@@ -69,7 +69,7 @@ src_install() {
 
        if use gtk; then
                newicon -s scalable ../icons/U.svg ${PN}-${SLOT}.svg
-               make_desktop_entry Unison "${PN} (${SLOT})" 
"${EPREFIX}/usr/share/${PN}/${PN}-${SLOT}.svg"
+               make_desktop_entry unison-${SLOT} "${PN} (${SLOT})" 
"${EPREFIX}/usr/share/${PN}/${PN}-${SLOT}.svg"
        fi
 
        # No docs for release candidates

Reply via email to