From 242312e9741de1c478edfc4372da54e86cf4cd0f Mon Sep 17 00:00:00 2001 From: blshkv Date: Wed, 23 Sep 2020 08:13:52 +0800 Subject: [PATCH] davmail-bin: fix https://github.com/pentoo/pentoo-overlay/issues/677 --- ...299.ebuild => davmail-bin-5.5.1.3299-r1.ebuild} | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) rename net-mail/davmail-bin/{davmail-bin-5.5.1.3299.ebuild => davmail-bin-5.5.1.3299-r1.ebuild} (89%) diff --git a/net-mail/davmail-bin/davmail-bin-5.5.1.3299.ebuild b/net-mail/davmail-bin/davmail-bin-5.5.1.3299-r1.ebuild similarity index 89% rename from net-mail/davmail-bin/davmail-bin-5.5.1.3299.ebuild rename to net-mail/davmail-bin/davmail-bin-5.5.1.3299-r1.ebuild index b13f39661..6eed0f99f 100644 --- a/net-mail/davmail-bin/davmail-bin-5.5.1.3299.ebuild +++ b/net-mail/davmail-bin/davmail-bin-5.5.1.3299-r1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit eutils java-pkg-2 +inherit eutils java-pkg-2 desktop #https://sourceforge.net/projects/davmail/files/davmail/ MY_PN="davmail" @@ -34,16 +34,9 @@ src_install() { # libraries java-pkg_dojar lib/*.jar java-pkg_dojar ${MY_PN}.jar - - # icon - doicon "${FILESDIR}"/${MY_PN}.png - # create wrapper script for the client java-pkg_dolauncher ${MY_PN} --main ${MY_PN}.DavGateway --java_args "" - # desktop entry - make_desktop_entry ${MY_PN} "DavMail" /usr/share/pixmaps/${MY_PN}.png "Network" - if use server ; then # log file touch ${MY_PN}.log @@ -56,6 +49,11 @@ src_install() { doins "${FILESDIR}"/${MY_PN}.properties newinitd "${FILESDIR}"/${MY_PN}.init ${MY_PN} newconfd "${FILESDIR}"/${MY_PN}.conf ${MY_PN} + else + # icon + doicon "${FILESDIR}"/${MY_PN}.png + # desktop entry + make_desktop_entry ${MY_PN} "DavMail" /usr/share/pixmaps/${MY_PN}.png "Network" fi }