Add version 6.40.8.

Remove older ebuilds

13 files changed, 41 insertions, 584 deletions

diff --git a/net-mail/zarafa/ChangeLog b/net-mail/zarafa/ChangeLog
index ca9c866..9e71282 100644
--- a/net-mail/zarafa/ChangeLog
+++ b/net-mail/zarafa/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*zarafa-6.40.8 (26 May 2011)
+
+  26 May 2011; Robert Piasek <dagger@gentoo.org> -zarafa-6.40.2.ebuild,
+  -zarafa-6.40.3.ebuild, -zarafa-6.40.3-r1.ebuild, -zarafa-6.40.4-r1.ebuild,
+  -zarafa-6.40.5-r1.ebuild, +zarafa-6.40.8.ebuild:
+  Add version 6.40.8.
+  Remove older ebuilds
+
 *zarafa-6.40.7 (19 Apr 2011)
 
   19 Apr 2011; Robert Piasek <dagger@gentoo.org> +zarafa-6.40.7.ebuild:
diff --git a/net-mail/zarafa/Manifest b/net-mail/zarafa/Manifest
index 685f7ed..272601e 100644
--- a/net-mail/zarafa/Manifest
+++ b/net-mail/zarafa/Manifest
@@ -10,16 +10,9 @@ AUX zarafa-monitor.rc6 705 RMD160 d1e524b7ed48ec5b53594595a35d4fb3c02b1a5a SHA1
 AUX zarafa-server.rc6 732 RMD160 4472d58c669351295191e78ad6a5dfb1942457ed SHA1 ada87c0687dff4060b65e85b1fc00c986ea163f8 SHA256 ccc3d84acb28f9f72960b74506bb82a032e6661c453941952b1fa0fda7b49160
 AUX zarafa-spooler.rc6 705 RMD160 a2981b8e9b60df19d5adce5507ec51ac6d5b12e8 SHA1 09527095beb3891986656cb0e1c53414b7f038bf SHA256 4cf183daf6d86e2bb39073993af8f244bc28ee90feb4cf1ba34e5302894aa2fe
 AUX zarafa.logrotate 1227 RMD160 a0b3e0a50886d04cd28ad2ead2cc8589101f47f9 SHA1 d0f2b3a01641f821d60353ed77935b46abf451fc SHA256 f7276f0ccd48b3c9e71545630ad41cdc2748af45148bf0576f2ca14ee8f9d129
-DIST zarafa-6.40.2.tar.gz 4605538 RMD160 9da243c0d7f5b9e86a5606482a1728b1056dde89 SHA1 3554a6f6cc2f32ee30f628598eb2d5de09fe5f1d SHA256 3ad4598cc6943e7e99d3d8340916dc425db1c54ed76c66a309183cb53b838350
-DIST zarafa-6.40.3.tar.gz 4609906 RMD160 36cf0a26f57335b155483d91177a7450dba86162 SHA1 dc1b5df3fc817d2c382fae9e23b7799f22348e11 SHA256 f9fa001ebc912ec17e1cc68b0eceaa7872f735c65f4a9d11e054d1918bc41433
-DIST zarafa-6.40.4.tar.bz2 3649202 RMD160 98ae3ab7fdcf40d1d3c51b1a0533a213b31c9369 SHA1 fd0cc8e840544b514579d3b6c3ee2a04ba9c7c8a SHA256 9a16f147f405c118c5965a1f76ab911f14818f6d4a9a2c27c104ba339811de47
-DIST zarafa-6.40.5.tar.bz2 3836308 RMD160 1d54409d58491fc8113201d36b7d409f5cd80166 SHA1 1bf50d8d25303d8f937540f94ffe345ec9b8c99f SHA256 630ece18ef899eb9118935d90436c95a40361b54d659a37e67116d969ffc087b
 DIST zcp-6.40.7.tar.gz 5362979 RMD160 d54deed52d6899802321cbd0b6f1ca999b6eaf8d SHA1 4766f0522e32a6149dbbdb015c9d4d5c6ca06b87 SHA256 869d25970485e32a7e5323b7ba305ef3146d74745b7466e13a61d915332ab2ae
-EBUILD zarafa-6.40.2.ebuild 2030 RMD160 4b3eb0aa75e35e8882f3d704e5a73b48714dd1a3 SHA1 6432ab1cfb83daae3f01cdff7bb4d0770c72c838 SHA256 8e419e1ff68bc6d7404daffa731ddd7ea19c5c8e1064c3978fc77af93d7b35a0
-EBUILD zarafa-6.40.3-r1.ebuild 2661 RMD160 35a35154ebc195a9fc6b739f892edebfaef8f5b1 SHA1 03abe849cd6816a28e7d6baeb1da3c8caa001b67 SHA256 8038ca36bac059fc2a5dd06692eec7f3a49f8d68e00c7d9dbc34e974833a494c
-EBUILD zarafa-6.40.3.ebuild 2243 RMD160 abafb253c1505416cb54df85254431f748a98a84 SHA1 3f2f826e699c15f8f51d7a053f2fbd683f5ac3e4 SHA256 d990c6b4e617ce6e6213efe195df0a937c76ef3854f92a77cd81ba8d50e0477d
-EBUILD zarafa-6.40.4-r1.ebuild 2663 RMD160 c6bebc9c87488863033d543bb3c392ae86be355e SHA1 0ebdcbb30e9196f6c20ab2000a9fec53c7eb2d63 SHA256 e7c5104955c502e05a20e8230c7f3f9a46f3090f3df667bc3b42797961e9bc39
-EBUILD zarafa-6.40.5-r1.ebuild 2902 RMD160 8dfdaa1cceec42ad54c0a8f1cf82e80f879b5c00 SHA1 479a550fafffea6d30061a4a3a496d6ef70ce2dc SHA256 d980b1c4a953823f759c675ab6bc3969bf513617d4ba381e91b3eb4099b23432
+DIST zcp-6.40.8.tar.gz 5428506 RMD160 36ce2095a1d0126a43405ac50b289107910feeaf SHA1 6c342a725610fb38dc6a5cef6e0d9bc160252fd4 SHA256 206bb736731f5b3c3fdc0d34c495b8c2af9e3245770d8636bc97d06ff7363023
 EBUILD zarafa-6.40.7.ebuild 2999 RMD160 c816fb06097d65977a56cafda33a5f519a7b2ff0 SHA1 9d28bece7b4b0508ed289409454b2e5e1a82aadb SHA256 accc3728474c3546f23dca7f4f3098e358090daad53730fc2ef85adcba61ea02
-MISC ChangeLog 1326 RMD160 c6532f288cfa854ea2d9345f3a85c560f1ea806e SHA1 0d9b7491f79d1078d891145116c2daa1e2e45ba7 SHA256 aeae4f2699a2d36b274c0ed9db41065e89e309095b2b29b6bfb6f8b351c36e47
+EBUILD zarafa-6.40.8.ebuild 2999 RMD160 03713511dcdb230412679411c3ac3fa89ea2f3b5 SHA1 a1b9250191ec4e7c5441fd057b225ed6c4040ee5 SHA256 ec976c4b6e9c480bf67699cd193d6b09ade6dfdb8538c8a255cc4607a2833e38
+MISC ChangeLog 1726 RMD160 1b2c08f23dd8aacb8e56a58416e826029d9a8a1e SHA1 4aea005f754efbc1ca8607ca1cb52cef3bd87236 SHA256 040a68ad5c64c4b4be4800d75306e82702596e7e52476f723c68f07b44f5aaa0
 MISC metadata.xml 232 RMD160 1003df9706c53108377113d61c9c95bf485cc494 SHA1 fc994415ecad6f285541b567143cb40f2ef5f155 SHA256 1a507fc874f29bab501db0ca4cf1328971a64d415d35c7e050c59747eb0d2d1a
diff --git a/net-mail/zarafa/zarafa-6.40.2.ebuild b/net-mail/zarafa/zarafa-6.40.2.ebuild
deleted file mode 100644
index 07ed98d..0000000
--- a/net-mail/zarafa/zarafa-6.40.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-PHP_EXT_NAME="mapi"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-inherit eutils php-ext-base-r1
-
-ZARAFA_PACKAGE="http://download.zarafa.com/zarafa/drupal/beta/ondemand.php?version=${PV}&src=${P} -> ${P}.tar.gz"
-
-DESCRIPTION="Open Source Groupware Solution"
-HOMEPAGE="http://zarafa.com/"
-SRC_URI="${ZARAFA_PACKAGE}"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="debug ldap +logrotate static"
-
-RDEPEND=">=dev-libs/libical-0.44
-	=dev-cpp/libvmime-0.7.1
-	>=dev-lang/php-5.2.0
-	app-text/catdoc
-	app-text/poppler
-	dev-cpp/clucene
-	dev-db/mysql
-	dev-libs/libxml2
-	dev-libs/openssl
-	net-misc/curl
-	sys-libs/e2fsprogs-libs
-	sys-libs/zlib
-	ldap? ( net-nds/openldap )
-	logrotate? ( app-admin/logrotate )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-devel/gettext"
-
-src_prepare() {
-	# Fixes zarafa-server linking
-	epatch "${FILESDIR}"/"${PN}"-6.40.1-uuid-link.patch
-}
-
-src_configure() {
-	econf \
-		--enable-oss \
-		--disable-perl \
-		--disable-testtools \
-		--with-userscript-prefix=/etc/zarafa/userscripts \
-		--with-quotatemplate-prefix=/etc/zarafa/quotamails \
-		--with-indexerscripts-prefix=/etc/zarafa/indexerscripts \
-		$(use_enable static) \
-		$(use_enable debug)
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	php-ext-base-r1_src_install
-
-	if use logrotate; then
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}"/zarafa.logrotate zarafa || die "Failed to install logrotate"
-	fi
-
-	insinto /etc/zarafa
-	doins "${S}"/installer/linux/*.cfg || die "Failed to install config files"
-
-	dodir /var/log/zarafa
-	keepdir /var/log/zarafa
-
-	newinitd "${FILESDIR}"/zarafa-gateway.rc6 zarafa-gateway
-	newinitd "${FILESDIR}"/zarafa-ical.rc6 zarafa-ical
-	newinitd "${FILESDIR}"/zarafa-indexer.rc6 zarafa-indexer
-	newinitd "${FILESDIR}"/zarafa-monitor.rc6 zarafa-monitor
-	newinitd "${FILESDIR}"/zarafa-server.rc6 zarafa-server
-	newinitd "${FILESDIR}"/zarafa-spooler.rc6 zarafa-spooler
-}
diff --git a/net-mail/zarafa/zarafa-6.40.3-r1.ebuild b/net-mail/zarafa/zarafa-6.40.3-r1.ebuild
deleted file mode 100644
index febd512..0000000
--- a/net-mail/zarafa/zarafa-6.40.3-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-PHP_EXT_NAME="mapi"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-USE_PHP="php5-3"
-
-inherit php-ext-source-r2 eutils
-
-DESCRIPTION="Open Source Groupware Solution"
-HOMEPAGE="http://zarafa.com/"
-SRC_URI="http://dev.gentoo.org/~dagger/files/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="debug ldap +logrotate static"
-
-RDEPEND=">=dev-libs/libical-0.44
-	=dev-cpp/libvmime-0.7.1
-	>=dev-lang/php-5.2.0
-	app-text/catdoc
-	app-text/poppler
-	dev-cpp/clucene
-	dev-db/mysql
-	dev-libs/libxml2
-	dev-libs/openssl
-	net-misc/curl
-	sys-libs/e2fsprogs-libs
-	sys-libs/zlib
-	ldap? ( net-nds/openldap )
-	logrotate? ( app-admin/logrotate )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-devel/gettext"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-}
-
-src_prepare() {
-	# Fixes zarafa-server linking
-	epatch "${FILESDIR}"/"${PN}"-6.40.1-uuid-link.patch
-
-	# Don't install php ini file, as installation doesn't
-	# respect Gentoo way of handling SAPIs
-	epatch "${FILESDIR}"/"${PN}"-6.40.1-no-php-conf.patch
-}
-
-src_configure() {
-	econf \
-		--enable-oss \
-		--disable-perl \
-		--disable-testtools \
-		--with-userscript-prefix=/etc/zarafa/userscripts \
-		--with-quotatemplate-prefix=/etc/zarafa/quotamails \
-		--with-indexerscripts-prefix=/etc/zarafa/indexerscripts \
-		$(use_enable static) \
-		$(use_enable debug)
-}
-
-src_compile() {
-	emake
-}
-
-src_install() {
-
-	emake DESTDIR="${D}" install
-
-	# Use only some parts of PHP eclass
-	php-ext-source-r2_buildinilist php${slot}
-	php-ext-source-r2_addextension "${PHP_EXT_NAME}.so"
-
-	# Symlink the <ext>.ini files from ext/ to ext-active/
-	for inifile in ${PHPINIFILELIST} ; do
-		inidir="${inifile/${PHP_EXT_NAME}.ini/}"
-		inidir="${inidir/ext/ext-active}"
-		dodir "/${inidir}"
-		dosym "/${inifile}" "/${inifile/ext/ext-active}"
-	done
-
-	# Install PHP module
-	php-ext-source-r2_addtoinifiles ";mapi.cache_max_sessions" "128"
-	php-ext-source-r2_addtoinifiles ";mapi.cache_lifetime" "300"
-
-	if use logrotate; then
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}"/zarafa.logrotate zarafa || die "Failed to install logrotate"
-	fi
-
-	insinto /etc/zarafa
-	doins "${S}"/installer/linux/*.cfg || die "Failed to install config files"
-
-	dodir /var/log/zarafa
-	keepdir /var/log/zarafa
-
-	newinitd "${FILESDIR}"/zarafa-gateway.rc6 zarafa-gateway
-	newinitd "${FILESDIR}"/zarafa-ical.rc6 zarafa-ical
-	newinitd "${FILESDIR}"/zarafa-indexer.rc6 zarafa-indexer
-	newinitd "${FILESDIR}"/zarafa-monitor.rc6 zarafa-monitor
-	newinitd "${FILESDIR}"/zarafa-server.rc6 zarafa-server
-	newinitd "${FILESDIR}"/zarafa-spooler.rc6 zarafa-spooler
-
-}
diff --git a/net-mail/zarafa/zarafa-6.40.3.ebuild b/net-mail/zarafa/zarafa-6.40.3.ebuild
deleted file mode 100644
index 50d8ef9..0000000
--- a/net-mail/zarafa/zarafa-6.40.3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-PHP_EXT_NAME="mapi"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-inherit eutils php-ext-base-r1
-
-DESCRIPTION="Open Source Groupware Solution"
-HOMEPAGE="http://zarafa.com/"
-SRC_URI="http://dev.gentoo.org/~dagger/files/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="debug ldap +logrotate static"
-
-RDEPEND=">=dev-libs/libical-0.44
-	=dev-cpp/libvmime-0.7.1
-	>=dev-lang/php-5.2.0
-	app-text/catdoc
-	app-text/poppler
-	dev-cpp/clucene
-	dev-db/mysql
-	dev-libs/libxml2
-	dev-libs/openssl
-	net-misc/curl
-	sys-libs/e2fsprogs-libs
-	sys-libs/zlib
-	ldap? ( net-nds/openldap )
-	logrotate? ( app-admin/logrotate )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-devel/gettext"
-
-src_prepare() {
-	# Fixes zarafa-server linking
-	epatch "${FILESDIR}"/"${PN}"-6.40.1-uuid-link.patch
-
-	# Don't install php ini file, as installation doesn't
-	# respect Gentoo way of handling SAPIs
-	epatch "${FILESDIR}"/"${PN}"-6.40.1-no-php-conf.patch
-}
-
-src_configure() {
-	econf \
-		--enable-oss \
-		--disable-perl \
-		--disable-testtools \
-		--with-userscript-prefix=/etc/zarafa/userscripts \
-		--with-quotatemplate-prefix=/etc/zarafa/quotamails \
-		--with-indexerscripts-prefix=/etc/zarafa/indexerscripts \
-		$(use_enable static) \
-		$(use_enable debug)
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	# Install PHP module
-	php-ext-base-r1_src_install
-	php-ext-base-r1_addtoinifiles ";mapi.cache_max_sessions" "128"
-	php-ext-base-r1_addtoinifiles ";mapi.cache_lifetime" "300"
-
-	if use logrotate; then
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}"/zarafa.logrotate zarafa || die "Failed to install logrotate"
-	fi
-
-	insinto /etc/zarafa
-	doins "${S}"/installer/linux/*.cfg || die "Failed to install config files"
-
-	dodir /var/log/zarafa
-	keepdir /var/log/zarafa
-
-	newinitd "${FILESDIR}"/zarafa-gateway.rc6 zarafa-gateway
-	newinitd "${FILESDIR}"/zarafa-ical.rc6 zarafa-ical
-	newinitd "${FILESDIR}"/zarafa-indexer.rc6 zarafa-indexer
-	newinitd "${FILESDIR}"/zarafa-monitor.rc6 zarafa-monitor
-	newinitd "${FILESDIR}"/zarafa-server.rc6 zarafa-server
-	newinitd "${FILESDIR}"/zarafa-spooler.rc6 zarafa-spooler
-
-}
diff --git a/net-mail/zarafa/zarafa-6.40.4-r1.ebuild b/net-mail/zarafa/zarafa-6.40.4-r1.ebuild
deleted file mode 100644
index c58b347..0000000
--- a/net-mail/zarafa/zarafa-6.40.4-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-PHP_EXT_NAME="mapi"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-USE_PHP="php5-3"
-
-inherit php-ext-source-r2 eutils
-
-DESCRIPTION="Open Source Groupware Solution"
-HOMEPAGE="http://zarafa.com/"
-SRC_URI="http://dev.gentoo.org/~dagger/files/${P}.tar.bz2"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="debug ldap +logrotate static"
-
-RDEPEND=">=dev-libs/libical-0.44
-	=dev-cpp/libvmime-0.7.1
-	>=dev-lang/php-5.2.0
-	app-text/catdoc
-	app-text/poppler
-	dev-cpp/clucene
-	dev-db/mysql
-	dev-libs/libxml2
-	dev-libs/openssl
-	net-misc/curl
-	sys-libs/e2fsprogs-libs
-	sys-libs/zlib
-	ldap? ( net-nds/openldap )
-	logrotate? ( app-admin/logrotate )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-devel/gettext"
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-}
-
-src_prepare() {
-	# Fixes zarafa-server linking
-	epatch "${FILESDIR}"/"${PN}"-6.40.1-uuid-link.patch
-
-	# Don't install php ini file, as installation doesn't
-	# respect Gentoo way of handling SAPIs
-	epatch "${FILESDIR}"/"${PN}"-6.40.1-no-php-conf.patch
-}
-
-src_configure() {
-	econf \
-		--enable-oss \
-		--disable-perl \
-		--disable-testtools \
-		--with-userscript-prefix=/etc/zarafa/userscripts \
-		--with-quotatemplate-prefix=/etc/zarafa/quotamails \
-		--with-indexerscripts-prefix=/etc/zarafa/indexerscripts \
-		$(use_enable static) \
-		$(use_enable debug)
-}
-
-src_compile() {
-	emake
-}
-
-src_install() {
-
-	emake DESTDIR="${D}" install
-
-	# Use only some parts of PHP eclass
-	php-ext-source-r2_buildinilist php${slot}
-	php-ext-source-r2_addextension "${PHP_EXT_NAME}.so"
-
-	# Symlink the <ext>.ini files from ext/ to ext-active/
-	for inifile in ${PHPINIFILELIST} ; do
-		inidir="${inifile/${PHP_EXT_NAME}.ini/}"
-		inidir="${inidir/ext/ext-active}"
-		dodir "/${inidir}"
-		dosym "/${inifile}" "/${inifile/ext/ext-active}"
-	done
-
-	# Install PHP module
-	php-ext-source-r2_addtoinifiles ";mapi.cache_max_sessions" "128"
-	php-ext-source-r2_addtoinifiles ";mapi.cache_lifetime" "300"
-
-	if use logrotate; then
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}"/zarafa.logrotate zarafa || die "Failed to install logrotate"
-	fi
-
-	insinto /etc/zarafa
-	doins "${S}"/installer/linux/*.cfg || die "Failed to install config files"
-
-	dodir /var/log/zarafa
-	keepdir /var/log/zarafa
-
-	newinitd "${FILESDIR}"/zarafa-gateway.rc6 zarafa-gateway
-	newinitd "${FILESDIR}"/zarafa-ical.rc6 zarafa-ical
-	newinitd "${FILESDIR}"/zarafa-indexer.rc6 zarafa-indexer
-	newinitd "${FILESDIR}"/zarafa-monitor.rc6 zarafa-monitor
-	newinitd "${FILESDIR}"/zarafa-server.rc6 zarafa-server
-	newinitd "${FILESDIR}"/zarafa-spooler.rc6 zarafa-spooler
-
-}
diff --git a/net-mail/zarafa/zarafa-6.40.5-r1.ebuild b/net-mail/zarafa/zarafa-6.40.8.ebuild
index d2a948b..4771071 100644
--- a/net-mail/zarafa/zarafa-6.40.5-r1.ebuild
+++ b/net-mail/zarafa/zarafa-6.40.8.ebuild
@@ -9,11 +9,16 @@ PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 USE_PHP="php5-3"
 
-inherit php-ext-source-r2 eutils
+inherit versionator php-ext-source-r2 eutils
+
+ZARAFA_MAJOR=$(get_version_component_range 1 ${PV})
+ZARAFA_MINOR=$(get_version_component_range 2 ${PV})
+ZARAFA_MICRO=$(get_version_component_range 3 ${PV})
+ZARAFA_REV=27223
 
 DESCRIPTION="Open Source Groupware Solution"
 HOMEPAGE="http://zarafa.com/"
-SRC_URI="http://dev.gentoo.org/~dagger/files/${P}.tar.bz2"
+SRC_URI="http://download.zarafa.com/community/final/${ZARAFA_MAJOR}.${ZARAFA_MINOR}/${PV}-${ZARAFA_REV}/sourcecode/zcp-${PV}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
@@ -32,15 +37,16 @@ RDEPEND=">=dev-libs/libical-0.44
 	net-misc/curl
 	sys-libs/e2fsprogs-libs
 	sys-libs/zlib
+	dev-libs/boost
 	ldap? ( net-nds/openldap )
 	logrotate? ( app-admin/logrotate )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	sys-devel/gettext"
 
-src_unpack() {
-	unpack ${P}.tar.bz2
-}
+#src_unpack() {
+#	unpack ${P}.tar.bz2
+#}
 
 src_prepare() {
 	# Fixes zarafa-server linking
@@ -49,12 +55,6 @@ src_prepare() {
 	# Don't install php ini file, as installation doesn't
 	# respect Gentoo way of handling SAPIs
 	epatch "${FILESDIR}"/"${PN}"-6.40.1-no-php-conf.patch
-
-	# Add missing endif
-	epatch "${FILESDIR}"/"${P}"-add-missing-endif.patch
-
-	# Remove missing file from installation
-	epatch "${FILESDIR}"/"${P}"-fix-missing-installation-file.patch
 }
 
 src_configure() {
diff --git a/www-apps/zarafa-webaccess/ChangeLog b/www-apps/zarafa-webaccess/ChangeLog
index a53cc8c..2740430 100644
--- a/www-apps/zarafa-webaccess/ChangeLog
+++ b/www-apps/zarafa-webaccess/ChangeLog
@@ -2,6 +2,15 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*zarafa-webaccess-6.40.8 (26 May 2011)
+
+  26 May 2011; Robert Piasek <dagger@gentoo.org>
+  -zarafa-webaccess-6.40.2.ebuild, -zarafa-webaccess-6.40.3.ebuild,
+  -zarafa-webaccess-6.40.4-r1.ebuild, -zarafa-webaccess-6.40.5.ebuild,
+  +zarafa-webaccess-6.40.8.ebuild:
+  Add version 6.40.8.
+  Remove older ebuilds
+
 *zarafa-webaccess-6.40.5 (25 Jan 2011)
 
   25 Jan 2011; Robert Piasek <dagger@gentoo.org>
diff --git a/www-apps/zarafa-webaccess/Manifest b/www-apps/zarafa-webaccess/Manifest
index 53ea7e6..7aebca6 100644
--- a/www-apps/zarafa-webaccess/Manifest
+++ b/www-apps/zarafa-webaccess/Manifest
@@ -1,12 +1,6 @@
-DIST zarafa-6.40.2.tar.gz 4605538 RMD160 9da243c0d7f5b9e86a5606482a1728b1056dde89 SHA1 3554a6f6cc2f32ee30f628598eb2d5de09fe5f1d SHA256 3ad4598cc6943e7e99d3d8340916dc425db1c54ed76c66a309183cb53b838350
-DIST zarafa-6.40.3.tar.gz 4609906 RMD160 36cf0a26f57335b155483d91177a7450dba86162 SHA1 dc1b5df3fc817d2c382fae9e23b7799f22348e11 SHA256 f9fa001ebc912ec17e1cc68b0eceaa7872f735c65f4a9d11e054d1918bc41433
-DIST zarafa-6.40.4.tar.bz2 3649202 RMD160 98ae3ab7fdcf40d1d3c51b1a0533a213b31c9369 SHA1 fd0cc8e840544b514579d3b6c3ee2a04ba9c7c8a SHA256 9a16f147f405c118c5965a1f76ab911f14818f6d4a9a2c27c104ba339811de47
-DIST zarafa-6.40.5.tar.bz2 3836308 RMD160 1d54409d58491fc8113201d36b7d409f5cd80166 SHA1 1bf50d8d25303d8f937540f94ffe345ec9b8c99f SHA256 630ece18ef899eb9118935d90436c95a40361b54d659a37e67116d969ffc087b
 DIST zcp-6.40.7.tar.gz 5362979 RMD160 d54deed52d6899802321cbd0b6f1ca999b6eaf8d SHA1 4766f0522e32a6149dbbdb015c9d4d5c6ca06b87 SHA256 869d25970485e32a7e5323b7ba305ef3146d74745b7466e13a61d915332ab2ae
-EBUILD zarafa-webaccess-6.40.2.ebuild 1242 RMD160 3fd316b197ad3248d5920f935ed0e580c9bc973a SHA1 f07cb0b8f4f65b4345351f0e62e8f0c3671a9b62 SHA256 064241e0089202067d85295162499044a58911bd853f62677e3dddfbf774b937
-EBUILD zarafa-webaccess-6.40.3.ebuild 1155 RMD160 6259ed669b374fb3ff03545d76fa890334400cf0 SHA1 3a6f50ff2e9aa4cdbd04984e0c65c911b22ea5fa SHA256 0ef0786f84d71c930f4000ba2d2be67c549ba56070a2b1c3fb9c4d309d2852c6
-EBUILD zarafa-webaccess-6.40.4-r1.ebuild 1156 RMD160 3173f1ed2c92d86e2f5dfa4a47a702b03b8b4728 SHA1 827f814bf0c51604db9871636821571e1d2b5b35 SHA256 59c8097fad25992467826300c9f09c49221009a1ec45ca9af14424a8bd957c70
-EBUILD zarafa-webaccess-6.40.5.ebuild 1159 RMD160 7ec9248aa8bac5d82364b79a3920c5fbaeff49d4 SHA1 4f5f85a92b870477d3409c80374c18c2e1038666 SHA256 2836f51b7b1361764ffcca0c0499bbfec320d528d83738301baacc3d7bde7f57
+DIST zcp-6.40.8.tar.gz 5428506 RMD160 36ce2095a1d0126a43405ac50b289107910feeaf SHA1 6c342a725610fb38dc6a5cef6e0d9bc160252fd4 SHA256 206bb736731f5b3c3fdc0d34c495b8c2af9e3245770d8636bc97d06ff7363023
 EBUILD zarafa-webaccess-6.40.7.ebuild 1402 RMD160 a556b04e156dff39b1ffd7c3aaa245c83241903b SHA1 ac09b9a1cabf6a13cc86634b47172288618529f9 SHA256 8385aeac2c0568796463385bf2c6964f73b7b8916d218a24159f03ed20122c1c
-MISC ChangeLog 1022 RMD160 c66734c353b8561028ac449b12ea9261645dfee2 SHA1 af923ee22fe06f45795f4c0338442e034e0b384b SHA256 b5de7b7dae0c5907895e4aeaddcc76f2dc4c2b88366a33e6f46d8101b9968803
+EBUILD zarafa-webaccess-6.40.8.ebuild 1402 RMD160 7f2c4631bcf2b74980773a4d7e78ee56bad96fbd SHA1 2115999c3bb9d1fefc748058d5fe9496c79df037 SHA256 11aec76694f18359609522afe90fbb1421cbbd62a0b4ceaedfdb46dec446914d
+MISC ChangeLog 1331 RMD160 5ae3abb092ed05855668f75f39f429206609150e SHA1 dd909751d488393a2602f3defc29525847a88c15 SHA256 0330cb7d2230f2e17b3a19c9fc4f2b437c2b68559e7cc3ec3e6ae3fa4a812322
 MISC metadata.xml 296 RMD160 d8f057fffd0d6d3c84b2d5481481f8848cc7f5aa SHA1 d3e950b1ca7636e89f44d3182753cb2384dcd11c SHA256 996385c7eb65b2fe398df26ebb0da85233a4f6c135a1256da9c53bd96ad450f4
diff --git a/www-apps/zarafa-webaccess/zarafa-webaccess-6.40.2.ebuild b/www-apps/zarafa-webaccess/zarafa-webaccess-6.40.2.ebuild
deleted file mode 100644
index 5bc32c1..0000000
--- a/www-apps/zarafa-webaccess/zarafa-webaccess-6.40.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-inherit webapp eutils depend.php
-
-MY_P=${P/webaccess-/}
-ZARAFA_PACKAGE="http://download.zarafa.com/zarafa/drupal/beta/ondemand.php?version=${PV}&src=${MY_P} -> ${MY_P}.tar.gz"
-
-DESCRIPTION="Open Source Groupware Solution"
-HOMEPAGE="http://zarafa.com/"
-SRC_URI="${ZARAFA_PACKAGE}"
-
-LICENSE="AGPL-3"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-need_php_httpd
-
-S="${WORKDIR}"/${MY_P}/php-webclient-ajax
-
-RDEPEND=">=dev-libs/libical-0.40"
-DEPEND="${RDEPEND}"
-
-pkg_setup () {
-	webapp_pkg_setup
-	require_php_with_use iconv session xml
-}
-
-src_install() {
-	webapp_src_preinst
-
-	# make .po files
-	for pofile in "${S}"/server/language/*/LC_MESSAGES/zarafa.po; do
-		msgfmt -o ${pofile%%.po}.mo ${pofile}
-		rm ${pofile}
-	done
-
-	dodir /var/lib/zarafa-webaccess/plugins
-	dodir /var/lib/zarafa-webaccess/tmp
-	dosym /var/lib/zarafa-webaccess/plugins "${MY_HTDOCSDIR}"/plugins
-
-	# remove unneeded files
-	rm zarafa-webaccess.conf
-
-	cp "${S}"/config.php.dist "${S}"/config.php
-	insinto "${MY_HTDOCSDIR}"
-	doins -r "${S}"/*
-
-	webapp_configfile "${MY_HTDOCSDIR}"/config.php
-	webapp_serverowned "${MY_HTDOCSDIR}"/config.php
-
-	webapp_src_install
-}
diff --git a/www-apps/zarafa-webaccess/zarafa-webaccess-6.40.3.ebuild b/www-apps/zarafa-webaccess/zarafa-webaccess-6.40.3.ebuild
deleted file mode 100644
index aaa30c5..0000000
--- a/www-apps/zarafa-webaccess/zarafa-webaccess-6.40.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-inherit webapp eutils depend.php
-
-MY_P=${P/webaccess-/}
-
-DESCRIPTION="Open Source Groupware Solution"
-HOMEPAGE="http://zarafa.com/"
-SRC_URI="http://dev.gentoo.org/~dagger/files/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-need_php_httpd
-
-S="${WORKDIR}"/${MY_P}/php-webclient-ajax
-
-RDEPEND=">=dev-libs/libical-0.40"
-DEPEND="${RDEPEND}"
-
-pkg_setup () {
-	webapp_pkg_setup
-	require_php_with_use iconv session xml
-}
-
-src_install() {
-	webapp_src_preinst
-
-	# make .po files
-	for pofile in "${S}"/server/language/*/LC_MESSAGES/zarafa.po; do
-		msgfmt -o ${pofile%%.po}.mo ${pofile}
-		rm ${pofile}
-	done
-
-	dodir /var/lib/zarafa-webaccess/plugins
-	dodir /var/lib/zarafa-webaccess/tmp
-	dosym /var/lib/zarafa-webaccess/plugins "${MY_HTDOCSDIR}"/plugins
-
-	# remove unneeded files
-	rm zarafa-webaccess.conf
-
-	cp "${S}"/config.php.dist "${S}"/config.php
-	insinto "${MY_HTDOCSDIR}"
-	doins -r "${S}"/*
-
-	webapp_configfile "${MY_HTDOCSDIR}"/config.php
-	webapp_serverowned "${MY_HTDOCSDIR}"/config.php
-
-	webapp_src_install
-}
diff --git a/www-apps/zarafa-webaccess/zarafa-webaccess-6.40.4-r1.ebuild b/www-apps/zarafa-webaccess/zarafa-webaccess-6.40.4-r1.ebuild
deleted file mode 100644
index a19d832..0000000
--- a/www-apps/zarafa-webaccess/zarafa-webaccess-6.40.4-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-inherit webapp eutils depend.php
-
-MY_P=${P/webaccess-/}
-
-DESCRIPTION="Open Source Groupware Solution"
-HOMEPAGE="http://zarafa.com/"
-SRC_URI="http://dev.gentoo.org/~dagger/files/${MY_P}.tar.bz2"
-
-LICENSE="AGPL-3"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-need_php_httpd
-
-S="${WORKDIR}"/${MY_P}/php-webclient-ajax
-
-RDEPEND=">=dev-libs/libical-0.40"
-DEPEND="${RDEPEND}"
-
-pkg_setup () {
-	webapp_pkg_setup
-	require_php_with_use iconv session xml
-}
-
-src_install() {
-	webapp_src_preinst
-
-	# make .po files
-	for pofile in "${S}"/server/language/*/LC_MESSAGES/zarafa.po; do
-		msgfmt -o ${pofile%%.po}.mo ${pofile}
-		rm ${pofile}
-	done
-
-	dodir /var/lib/zarafa-webaccess/plugins
-	dodir /var/lib/zarafa-webaccess/tmp
-	dosym /var/lib/zarafa-webaccess/plugins "${MY_HTDOCSDIR}"/plugins
-
-	# remove unneeded files
-	rm zarafa-webaccess.conf
-
-	cp "${S}"/config.php.dist "${S}"/config.php
-	insinto "${MY_HTDOCSDIR}"
-	doins -r "${S}"/*
-
-	webapp_configfile "${MY_HTDOCSDIR}"/config.php
-	webapp_serverowned "${MY_HTDOCSDIR}"/config.php
-
-	webapp_src_install
-}
diff --git a/www-apps/zarafa-webaccess/zarafa-webaccess-6.40.5.ebuild b/www-apps/zarafa-webaccess/zarafa-webaccess-6.40.8.ebuild
index bc841e1..60d22d7 100644
--- a/www-apps/zarafa-webaccess/zarafa-webaccess-6.40.5.ebuild
+++ b/www-apps/zarafa-webaccess/zarafa-webaccess-6.40.8.ebuild
@@ -4,13 +4,16 @@
 
 EAPI=2
 
-inherit webapp eutils depend.php
+inherit versionator webapp eutils depend.php
 
-MY_P=${P/webaccess-/}
+ZARAFA_MAJOR=$(get_version_component_range 1 ${PV})
+ZARAFA_MINOR=$(get_version_component_range 2 ${PV})
+ZARAFA_MICRO=$(get_version_component_range 3 ${PV})
+ZARAFA_REV=27223
 
 DESCRIPTION="Open Source Groupware Solution"
 HOMEPAGE="http://zarafa.com/"
-SRC_URI="http://dev.gentoo.org/~dagger/files/${MY_P}.tar.bz2"
+SRC_URI="http://download.zarafa.com/community/final/${ZARAFA_MAJOR}.${ZARAFA_MINOR}/${PV}-${ZARAFA_REV}/sourcecode/zcp-${PV}.tar.gz"
 
 LICENSE="AGPL-3"
 KEYWORDS="~x86 ~amd64"
@@ -18,7 +21,7 @@ IUSE=""
 
 need_php_httpd
 
-S="${WORKDIR}"/${MY_P}/php-webclient-ajax
+S="${WORKDIR}"/${P/-webaccess/}/php-webclient-ajax
 
 RDEPEND=">=dev-libs/libical-0.40"
 DEPEND="${RDEPEND}"