net-mail/davmail-bin : Upgraded to EAPI=6

3 files changed, 8 insertions, 97 deletions

diff --git a/net-mail/davmail-bin/Manifest b/net-mail/davmail-bin/Manifest
index f474ad0..a1e5d74 100644
--- a/net-mail/davmail-bin/Manifest
+++ b/net-mail/davmail-bin/Manifest
@@ -2,9 +2,8 @@ AUX davmail.conf 99 SHA256 2a622cba80470e2288dc99a99b357c18f8df8ac60bcee1625aaed
 AUX davmail.init 611 SHA256 ac25bb25a8d5e6848db13ddd968156da7a2f260b1fe6e9bcd56b4138e2643a59 SHA512 0743eb5256f6545023218af63736eb5f857ae8c64551c64f41eff947f1d94246f05e68c2fa97aa903899f0a1434f31c8d3a635b91cac3f24e15afe431f78967f WHIRLPOOL 364faa2c3ce5730806605f85a112ee15ffc9dda904fb74a7227d7623b58242e45627eeb1c2b0a54d56ddda885f6bcac23fe220b4e12ed5c96a33632e43883675
 AUX davmail.png 4218 SHA256 b50a1e8d9ac3e20acf88f77d9524f986041282e9f6ae120c78ee64cf6a20df7e SHA512 da600b141df1144c17ae0362f20ff06019986aa73cabeae088da2ae8c917f2e043b127799abc7587011358bcc366fbd2257115e64e02fc0669aefdd05c6581be WHIRLPOOL 1c2e4d8d8f5b318878eedbb7676ee5622429fe0a08d2598fc2cba75daa08b3844afabc87360b9f8d6e00aa419f5d5268e738f598b7793efc992cb22144014550
 AUX davmail.properties 1290 SHA256 2929fc3fbdc32de64ebb0b5f59623d6f12272764dff95dc6673e4276d313530e SHA512 af7403a99a5014b35163801a818c141ab7d0427f660900e15e16724ab1d05b4f346389584ff4537692d9f48f31a191a77f4b55d2960e694cfc00f2d00ba8ded6 WHIRLPOOL f5aa54f5570c63cd2fbcf6537fe5c3cf9f6f69800cc4a642c9a7ea6068e38f281c1eb5b85362807cd13d2fe318fe0463a1dc06b34a49ee774d8c38a6e91f1734
-DIST davmail-linux-x86_64-4.7.1-2416.tgz 6696289 SHA256 c3bf1a3a94f35586a3a8d2d28cdaf8c9514a8cf904a51fd74961e93909c9d2a4 SHA512 bfcc5a1e245918042a8f39be55bfb7babc530371a0dfa7f7f9a2d0d384c71a9eac4543d6f986a020b326f23ba2d941dd94d9041453f670a1db23cce9bd90958e WHIRLPOOL 64f1ba3596d8a0e65abf7186b05925f07dc89693f1f2d86de1a45008b767bf677aec0bfe268d64fed1c222e7023d386a58c691d1081adf1b882b714b475f23f5
+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
-EBUILD davmail-bin-4.7.1.ebuild 1850 SHA256 a9287129cc3feaa5eef3d41e4fb33344c9bb68f3918c78eb9fc4b46713cfb1c3 SHA512 e9bab290ae18d7ffa8807533fb8de22ac9c44e8f2158ee7822917fae1f9c57ac84197ccbbdd53b4d392fed2559bc8e0fefbc0f0156c9e0c1e361094aab47ac92 WHIRLPOOL 01fca6654294d19559801c4e0a861f7e51210d6086a2055d2c0ba764f6a4d2eae015b2d6221589262092512506e58f49f26fcebefd170af5438002783c40446b
-EBUILD davmail-bin-4.7.2.ebuild 1850 SHA256 71b986bdc8f563f259d02f1ac004ba043f7e530740f968887184c0e6a81077c9 SHA512 b5f3ce54b78d256781231460e30366abdaac12f78a168e0999e07262752260625893236f22965adf09f5824bdb2b8ba8886a5c32809c1bad0f4d7b8d4e7d2270 WHIRLPOOL c373ff416283f054c2b3fde76a87a8dedfdf8a9fb4bf1ba9d86170b9b848d37e5e7c7eb6f1ea18ba519f92da601d5c89697095d65f65c20501e20eb97c9040dd
+EBUILD davmail-bin-4.7.2.ebuild 1931 SHA256 090bf254fd78943319c1b3de635dbe6011b4aec6591ac1c5cf0f784a0cd88220 SHA512 6291364885af94793ad9c1e70b696d77518a3f0f8a674dd073cde2906bea8f2c7a71d374d0651a476d5865b4ac63a7dc01397754895f0cd53dd416462d50a8ae WHIRLPOOL b490327e435e19907c1dff759e94db01ef64c69759a5db7146cad7d424e7d1429a708b3f012336fd3236561a8a83b2161b02f7b81c285f1aa08431cb19f554ab
 MISC ChangeLog 5759 SHA256 149fcc4851f90f9fa591b0fc7150046cfb7d6e628aeee7dd8124c87f39c1e6bf SHA512 e5d1050712a62b24b35ff7f67256104b7e80638b22e6f066356571635939a06637c74c02d860396c66e7f2c31ea9b3453f3b6c89e7b35c8021c4bf58f0bd1828 WHIRLPOOL 2e204804e5b0c9b7798bba3cab7e93067d55ccc4e72d9ce0a46624cd0789001d281c29d05a0bab897ca6e657d227cc3cc6c720a30b49c8a9476916838cf938f2
 MISC metadata.xml 514 SHA256 c2376a8b3d9ee6521a5ff9e7fff4acd17f8911f8b80159c5a248f371e5e94941 SHA512 c54f102ce05fa31116ad558b4d03c859a44c69ebd0cc2afea8048ff4adea1535800333ba8f88f3fa4716dd46617150a212c58289affeaef5d5b6b8bd878f1ee8 WHIRLPOOL 27775efd6742a86d3f7968673aa1a6d4b6cb2e701f3ca11e88ed3611117decf47e06950e2fffa9c394f31da6855e2a3d22c8cd18c6f49cceee04b5453b3103f5
diff --git a/net-mail/davmail-bin/davmail-bin-4.7.1.ebuild b/net-mail/davmail-bin/davmail-bin-4.7.1.ebuild
deleted file mode 100644
index aadf4ce..0000000
--- a/net-mail/davmail-bin/davmail-bin-4.7.1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-inherit eutils java-pkg-2 user
-
-MY_REV="2416"
-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
-}
-
-src_install() {
-	cd "${S}"
-
-	# 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
-}
diff --git a/net-mail/davmail-bin/davmail-bin-4.7.2.ebuild b/net-mail/davmail-bin/davmail-bin-4.7.2-r1.ebuild
index ba8529d..061dcbf 100644
--- a/net-mail/davmail-bin/davmail-bin-4.7.2.ebuild
+++ b/net-mail/davmail-bin/davmail-bin-4.7.2-r1.ebuild
@@ -2,20 +2,16 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="3"
+EAPI=6
 
 inherit eutils java-pkg-2 user
 
 MY_REV="2427"
 MY_PN="davmail"
+MY_P="${MY_PN}-linux-x86"
 
-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="amd64? ( mirror://sourceforge/${MY_PN}/${MY_P}_64-${PV}-${MY_REV}.tgz )
+	x86? ( 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"
@@ -32,7 +28,8 @@ DEPEND="|| (
   !net-mail/davmail"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MY_P}-${PV}-${MY_REV}"
+S="amd64? ( ${WORKDIR}/${MY_P}_64-${PV}-${MY_REV} )
+	x86? ( ${WORKDIR}/${MY_P}-${PV}-${MY_REV} )"
 
 pkg_setup() {
   if use server ; then