davmail-bin: fixed a stupid error.

4 files changed, 81 insertions, 70 deletions

diff --git a/net-mail/davmail-bin/ChangeLog b/net-mail/davmail-bin/ChangeLog
index 7324092..ddb2570 100644
--- a/net-mail/davmail-bin/ChangeLog
+++ b/net-mail/davmail-bin/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*davmail-bin-3.9.6-r1 (23 Nov 2011)
+
+  23 Nov 2011; Sven Eden <sven.eden@gmx.de> +davmail-3.9.6-r1.ebuild,
+  -davmail-3.9.6.ebuild :
+  Fixed some stupid errors. The old ebuild is obsolete.
+
 *davmail-bin-3.9.6 (21 Nov 2011)
 
   21 Nov 2011; Sven Eden <sven.eden@gmx.de> +davmail-3.9.6.ebuild :
diff --git a/net-mail/davmail-bin/Manifest b/net-mail/davmail-bin/Manifest
index d0d0cdc..28c28e2 100644
--- a/net-mail/davmail-bin/Manifest
+++ b/net-mail/davmail-bin/Manifest
@@ -3,6 +3,7 @@ AUX davmail.png 4218 RMD160 1b271ae8e6f85f1550c5140080fb6b7f64799afc SHA1 44fe30
 AUX initd 737 RMD160 be5914cb8bcd4973b23d169d2b9b1aa2eeb9ba74 SHA1 25e8b0cdd2cbf6c50dfb827957336853f5f3f08d SHA256 9ed1aa645383983e609943886765228daef6505f32484d29af2bc7bf5663ef6a
 DIST davmail-linux-x86-3.9.6-1843.tgz 6387336 RMD160 d159fb72e8564e9692bf9fe2afe6a342d2a7b362 SHA1 6a097ac8f2bd6633a0988ea321054954e0b36940 SHA256 524fabfa45b232effe9c6463a2bccbeb690cf314200bff1312fce8f6cafc2a5d
 DIST davmail-linux-x86_64-3.9.6-1843.tgz 6532833 RMD160 f961b8ffbd97a5ffe83a2d7d9bb742cb374ecd43 SHA1 986857af90c84a90466d1f1f08b6b53a578611a9 SHA256 5acdf58efa254756aa46d65d8b9d2d20e9c4ecb2550ab38151f3e1a8b1e398b7
+EBUILD davmail-bin-3.9.6-r1.ebuild 1778 RMD160 bb0c7b9525fc143f5505bfecdf0b866a8464b9cc SHA1 197f1178c7eba524ddb76795d80d9a711489041b SHA256 cfc3aa57cb504d3a85242936599a9703f10856e58c7af5bbf217757d931f60e3
 EBUILD davmail-bin-3.9.6.ebuild 1686 RMD160 780f8ce0f40b2c0aeb1f92188f2576b8fa978172 SHA1 5280025da6a07cba137e7d3f1986f4fdd38d0eb1 SHA256 571c9f5942890e162ff322686e901c01f8946b42be98bfd9bef3789c066f8593
 MISC ChangeLog 445 RMD160 0779ccf6d76faf674a5ec0c951a2fae35a5c6ef3 SHA1 c58dec57a204e772c46aa2abe3939861f926ec29 SHA256 4ef0e8662c5b9f072dbee528bccc30f8e4f2fab20acc22f586648a4f94ea8ee5
 MISC metadata.xml 512 RMD160 ee2a9786a4bc210bcbd9e3098d3bfb0e18d2f7da SHA1 527b4c0c960efabc803a9721cfe03df3f161529e SHA256 65eeddc3377134a494f194ad22d9212463c65ce9addcd3276781829cdc0abd09
diff --git a/net-mail/davmail-bin/davmail-bin-3.9.6-r1.ebuild b/net-mail/davmail-bin/davmail-bin-3.9.6-r1.ebuild
new file mode 100644
index 0000000..4f58fbf
--- /dev/null
+++ b/net-mail/davmail-bin/davmail-bin-3.9.6-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+inherit eutils
+
+MY_REV="1843"
+MY_PN="davmail"
+MY_P="${MY_PN}-linux-x86"
+SRC_URI="x86? (
+                 mirror://sourceforge/${MY_PN}/${MY_P}-${PV}-${MY_REV}.tgz
+              )
+       amd64? (
+                 mirror://sourceforge/${MY_PN}/${MY_P}_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"
+IUSE="menu server"
+
+DEPEND="|| ( virtual/jre:1.6 virtual/jdk:1.6 )
+  !net-mail/davmail"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+  if use server ; then
+    enewuser davmail -1 -1 /dev/null
+  fi
+}
+
+src_install() {
+  if use x86 ; then
+    S="${S}-${PV}-${MY_REV}"
+  else
+    S="${S}_64-${PV}-${MY_REV}"
+	fi
+  cd "${S}"
+  # Fix the script BASE=
+  sed -i -e "s@BASE=.*@BASE=/opt/davmail@" davmail.sh
+  dodir "/opt/$MY_PN"
+  cp -a * "${D}/opt/$MY_PN"
+  dodir "/opt/bin"
+  dosym "/opt/$MY_PN/davmail.sh" "/opt/bin/davmail.sh"
+
+  if use menu; then
+    domenu "${FILESDIR}"/davmail.desktop
+    doicon "${FILESDIR}"/davmail.png
+  fi
+
+  if use server ; then
+    insinto /etc
+    doins "${FILESDIR}"/davmail.properties
+    newinitd "${FILESDIR}"/davmail.init davmail
+    newconfd "${FILESDIR}"/davmail.confd davmail
+  fi
+}
+
+pkg_postinst() {
+  if use server ; then
+    elog "You have chosen to run davmail as a system service."
+    elog "You will need to modify /etc/davmail.properties"
+    elog "to service your needs. You may find it easier to"
+    elog "run the davmail.sh, configure it via the GUI and"
+    elog "copy the resulting ~/.davmail.properties to /etc."
+  fi
+}
+
diff --git a/net-mail/davmail-bin/davmail-bin-3.9.6.ebuild b/net-mail/davmail-bin/davmail-bin-3.9.6.ebuild
deleted file mode 100644
index 3efc908..0000000
--- a/net-mail/davmail-bin/davmail-bin-3.9.6.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: net-mail/davmail-3.9.1 $
-
-EAPI="3"
-inherit eutils
-
-MY_REV="1843"
-MY_PN="davmail"
-MY_P_A="${MY_PN}-linux-x86"
-MY_P_B="${PV}-${MY_REV}"
-SRC_URI="x86? (
-                 mirror://sourceforge/${MY_PN}/${MY_P_A}-${MY_P_B}.tgz
-              )
-       amd64? (
-                 mirror://sourceforge/${MY_PN}/${MY_P_A}_64-${MY_P_B}.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="menu server"
-
-DEPEND="|| ( virtual/jre:1.6 virtual/jdk:1.6 )
-  !net-mail/davmail"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use server ; then
-		enewuser davmail -1 -1 /dev/null
-	fi
-}
-
-src_install() {
-	cd "${S}"
-	# Fix the script BASE=
-	sed -i -e "s@BASE=.*@BASE=/opt/davmail@" davmail.sh
-	dodir "/opt/$MY_PN"
-	cp -a * "${D}/opt/$MY_PN"
-	dodir "/opt/bin"
-	dosym "/opt/$MY_PN/davmail.sh" "/opt/bin/davmail.sh"
-
-	if use menu; then
-		domenu "${FILESDIR}"/davmail.desktop
-		doicon "${FILESDIR}"/davmail.png
-	fi
-
-	if use server ; then
-		insinto /etc
-		doins "${FILESDIR}"/davmail.properties
-		newinitd "${FILESDIR}"/davmail.init davmail
-		newconfd "${FILESDIR}"/davmail.confd davmail
-	fi
-}
-
-pkg_postinst() {
-	if use server ; then
-		elog "You have chosen to run davmail as a system service."
-		elog "You will need to modify /etc/davmail.properties"
-		elog "to service your needs. You may find it easier to"
-		elog "run the davmail.sh, configure it via the GUI and"
-		elog "copy the resulting ~/.davmail.properties to /etc."
-	fi
-}
-