davmail-bin: fix invalid use calls from global scope

This commit is contained in:
Rick Farina (Zero_Chaos) 2016-07-02 17:02:31 -04:00
parent d518bab8e3
commit 46fc5e1735
No known key found for this signature in database
GPG key ID: A5DD1427DD11F94A
3 changed files with 9 additions and 99 deletions

View file

@ -1,2 +1,2 @@
DIST davmail-linux-x86_64-4.6.2-2377.tgz 6691933 SHA256 4c6c3ca0baa95e03a25d9efa8dcf08ef01092f8f46f207bb185199cb63e1c448 SHA512 93852601df0ee826314cf27bfb96e8c84695e879a3c57bcb1669edc0efb8239989d51c7a3797a1684597a0b7ac94e68e3b624dde5b7410377b0ea61c02f7bff2 WHIRLPOOL 3212b0263f8728b9c90fff106947635608b98f78fc0a7da69f719d78f170deed24d3e5651da0676c4b9c4dbccdabe56a953478d98ec0436d290651727c2ef240
DIST davmail-linux-x86-4.7.2-2427.tgz 6551827 SHA256 38cc827dbd6214cda6483c51366c304dbb544f3b84d6bc4a4c7c5839f0980adc SHA512 5a7fac73681abb78a59a990305bca6b17d8fa832fbb896e2366b78842ce643599c8a28bd76e994e3dc4b29cb0eb49de01eee09057f9569854cd4cbbb3387bdcd WHIRLPOOL 2e7cc93f040f585f12ed606b44cdfd54e6caf890aeb9d6535bc7a33acc985554df101f53e18cad44273d88b6e0752152850906b78c844b6d705a41bcef366aa6
DIST davmail-linux-x86_64-4.7.2-2427.tgz 6697660 SHA256 02be79170b4b64021ea598c841f44a4506fb496bada3ff23eb7a413a41da5641 SHA512 db1b8d8280b422771332953aff0e3849882bd82b16c3c810a7f5d5f40e862406e263c61af2c744ae37745e53eee3c02bd27944fe60f5c7b9ecae786299ec91e2 WHIRLPOOL ab39dac8cd4521bc898adc7b491e977c7a88da35210af1fa7675b70d67255bb20a6dc021178201f467b515acbb9805fbf1414f83fd80ad596721edd99a536e3a

View file

@ -1,87 +0,0 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="5"
inherit eutils java-pkg-2 user
MY_REV="2377"
MY_PN="davmail"
if use x86 ; then
MY_P="${MY_PN}-linux-x86"
else
MY_P="${MY_PN}-linux-x86_64"
fi
SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}-${PV}-${MY_REV}.tgz"
DESCRIPTION="POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange Gateway"
HOMEPAGE="http://davmail.sourceforge.net/"
RESTRICT="mirror"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="server"
DEPEND="|| (
>=virtual/jre-1.6
>=virtual/jdk-1.6
)
!net-mail/davmail"
RDEPEND="${DEPEND}"
S="${WORKDIR}/${MY_P}-${PV}-${MY_REV}"
pkg_setup() {
if use server ; then
enewuser davmail -1 -1 /dev/null
fi
}
java-pkg-2_src_compile() {
einfo ""
}
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
insinto /var/log
doins ${MY_PN}.log
fowners ${MY_PN} /var/log/${MY_PN}.log
# config files
insinto /etc
doins "${FILESDIR}"/${MY_PN}.properties
newinitd "${FILESDIR}"/${MY_PN}.init ${MY_PN}
newconfd "${FILESDIR}"/${MY_PN}.conf ${MY_PN}
fi
}
pkg_postinst() {
if use server ; then
elog
elog "You have chosen to run ${MY_PN} as a system service. You will need to"
elog "modify /etc/${MY_PN}.properties to serve your needs."
elog
elog "You may find it easier to run the ${MY_PN}, configure it via the GUI"
elog "and copy the resulting ~/.${MY_PN}.properties to /etc. Make sure you"
elog "set ${MY_PN}.server=true and ${MY_PN}.allowRemote=true."
elog
fi
}

View file

@ -10,30 +10,25 @@ inherit eutils java-pkg-2 user
MY_REV="2427"
MY_PN="davmail"
if use x86 ; then
MY_P="${MY_PN}-linux-x86"
else
MY_P="${MY_PN}-linux-x86_64"
fi
SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}-${PV}-${MY_REV}.tgz"
SRC_URI="x86? ( mirror://sourceforge/${MY_PN}/${MY_PN}-linux-x86-${PV}-${MY_REV}.tgz )
amd64? ( mirror://sourceforge/${MY_PN}/${MY_PN}-linux-x86_64-${PV}-${MY_REV}.tgz )"
DESCRIPTION="POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange Gateway"
HOMEPAGE="http://davmail.sourceforge.net/"
RESTRICT="mirror"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
KEYWORDS="~amd64 ~x86 -*"
IUSE="server"
DEPEND="|| (
>=virtual/jre-1.6
>=virtual/jdk-1.6
>=virtual/jre-1.6:*
>=virtual/jdk-1.6:*
)
!net-mail/davmail"
RDEPEND="${DEPEND}"
S="${WORKDIR}/${MY_P}-${PV}-${MY_REV}"
S="${WORKDIR}"
pkg_setup() {
if use server ; then
@ -46,6 +41,8 @@ java-pkg-2_src_compile() {
}
src_install() {
use x86 && cd "${S}/${MY_PN}-linux-x86-${PV}-${MY_REV}"
use amd64 && cd "${S}/${MY_PN}-linux-x86_64-${PV}-${MY_REV}"
# libraries
java-pkg_dojar lib/*.jar
java-pkg_dojar ${MY_PN}.jar