Add zarafa 6.40.11

4 files changed, 10 insertions, 120 deletions

diff --git a/net-mail/zarafa/ChangeLog b/net-mail/zarafa/ChangeLog
index ba35a65..c25d4cf 100644
--- a/net-mail/zarafa/ChangeLog
+++ b/net-mail/zarafa/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*zarafa-6.40.11 (20 Sep 2011)
+
+  20 Sep 2011; Robert Piasek <dagger@gentoo.org> -zarafa-6.40.7.ebuild,
+  -zarafa-6.40.8.ebuild, +zarafa-6.40.11.ebuild:
+  Add zarafa 6.4.11
+
 *zarafa-7.0.1 (22 Aug 2011)
 
   22 Aug 2011; Robert Piasek <dagger@gentoo.org> +zarafa-7.0.1.ebuild:
diff --git a/net-mail/zarafa/Manifest b/net-mail/zarafa/Manifest
index fcb3578..8594118 100644
--- a/net-mail/zarafa/Manifest
+++ b/net-mail/zarafa/Manifest
@@ -11,16 +11,14 @@ AUX zarafa-server.rc6 732 RMD160 4472d58c669351295191e78ad6a5dfb1942457ed SHA1 a
 AUX zarafa-spooler.rc6 705 RMD160 a2981b8e9b60df19d5adce5507ec51ac6d5b12e8 SHA1 09527095beb3891986656cb0e1c53414b7f038bf SHA256 4cf183daf6d86e2bb39073993af8f244bc28ee90feb4cf1ba34e5302894aa2fe
 AUX zarafa.logrotate 1227 RMD160 a0b3e0a50886d04cd28ad2ead2cc8589101f47f9 SHA1 d0f2b3a01641f821d60353ed77935b46abf451fc SHA256 f7276f0ccd48b3c9e71545630ad41cdc2748af45148bf0576f2ca14ee8f9d129
 DIST zcp-6.40.10.tar.gz 5452296 RMD160 8ed6388e7ff310edff30a75dc3758eedd7911d1b SHA1 d35502d8ac4dba962c0bf8449c4b9e7cd9fba0f7 SHA256 50eef47cb354b9eca4bd4e2af6e0422aac5db5fdb35486197312f5f96b34abfc
-DIST zcp-6.40.7.tar.gz 5362979 RMD160 d54deed52d6899802321cbd0b6f1ca999b6eaf8d SHA1 4766f0522e32a6149dbbdb015c9d4d5c6ca06b87 SHA256 869d25970485e32a7e5323b7ba305ef3146d74745b7466e13a61d915332ab2ae
-DIST zcp-6.40.8.tar.gz 5428506 RMD160 36ce2095a1d0126a43405ac50b289107910feeaf SHA1 6c342a725610fb38dc6a5cef6e0d9bc160252fd4 SHA256 206bb736731f5b3c3fdc0d34c495b8c2af9e3245770d8636bc97d06ff7363023
+DIST zcp-6.40.11.tar.gz 5493848 RMD160 8a4a91fcc800b79ef2adfe9b10f84dffa56b927c SHA1 a3a1914541906b1f5f025074278097a78ca6d0fe SHA256 d64997301fbe36e1ccadc254d0f892dc45e7250e445f14cf39d638d4274a1e1c
 DIST zcp-6.40.9.tar.gz 5434001 RMD160 6a14d627dfbdf77c17839e1ab8840695af9e3b34 SHA1 7cf5b7d08d521571d00e06c9f97a8498b8fe49eb SHA256 23653649497b0b26322b8152c639eec1087727d2370947050c239dc3d7c1f03d
 DIST zcp-7.0.0.tar.gz 6006829 RMD160 584b5593696f850ae8299806e447e61af389ec46 SHA1 e7463593cee89343b2129b8bd6977f95cc778279 SHA256 b7c3c85c0578eb5ca0c5f5d22bbef315f2f52e22208d6e1193ffa505b05e952e
 DIST zcp-7.0.1.tar.gz 6023258 RMD160 81e06637baae0adb106e40d05f72d9034a2fbf67 SHA1 a15bebafd87afa848e303e5df4b58d7700106569 SHA256 96cfefad6b77593bc5561baf808a9eae2f662a4e6a824af9842cfb4e36f5c82d
 EBUILD zarafa-6.40.10.ebuild 2999 RMD160 d2680f394b856a40dd5cb4f08b23541c2b1cb2b8 SHA1 0765d8a94acd8f90c5ecbe3b0aec932f1c80780e SHA256 777dcf0274c1bc2591078d99660b97f83f6433d0353cd7d53f88960820ec437b
-EBUILD zarafa-6.40.7.ebuild 2999 RMD160 c816fb06097d65977a56cafda33a5f519a7b2ff0 SHA1 9d28bece7b4b0508ed289409454b2e5e1a82aadb SHA256 accc3728474c3546f23dca7f4f3098e358090daad53730fc2ef85adcba61ea02
-EBUILD zarafa-6.40.8.ebuild 2999 RMD160 03713511dcdb230412679411c3ac3fa89ea2f3b5 SHA1 a1b9250191ec4e7c5441fd057b225ed6c4040ee5 SHA256 ec976c4b6e9c480bf67699cd193d6b09ade6dfdb8538c8a255cc4607a2833e38
+EBUILD zarafa-6.40.11.ebuild 2999 RMD160 c57e4ee4d024c1955fe9f20c967c258a34568011 SHA1 ce98479aad4526f01d4ee46699f287725f5777c3 SHA256 8a2bc79b12a81116da9fc59e800dc4b8cc8323d312be16844973fce4164b1d3d
 EBUILD zarafa-6.40.9.ebuild 2999 RMD160 726e91dbca6c1776464ec635f14cead1215cb576 SHA1 e29a005ef553d3bb1ee56f562586638518dcf8c0 SHA256 1d718e2a2e1a7104a51412a516e7d3728a48fee483a162739c57b254ee17b26f
 EBUILD zarafa-7.0.0.ebuild 3402 RMD160 9318ffc2c6cc3e26100192fdb81ba34348dc7ad8 SHA1 db4e78a4b6c94d150ff6769a6da839788c951483 SHA256 1a57ff2a317f1d2a154d179b9b74fb81bd18b3e904b714bbb462f050ec3d5563
 EBUILD zarafa-7.0.1.ebuild 3402 RMD160 d8507732c64c669b72e07205067ef9d55ad5124a SHA1 7191ba4e792c2cfe617bbd057c778b231fc37877 SHA256 81193cc8eeae9922b6c4a568c40dda687b11bf9d8fb1701e7502f4c23d27c0d3
-MISC ChangeLog 2214 RMD160 f147f74382be6c087722deb1e7dba7b2235fca3e SHA1 b7a8eeef735122409a825f18140ba3cfcd3cdc7f SHA256 5f2c85a88555c08c13c1afb54467818ad0b0b78d961f46ae5dd4a20d0defc8db
+MISC ChangeLog 2387 RMD160 29fef8b8036b4d1f659a621eedfdc1ad8838d0c6 SHA1 eb022ce62610f0d87a6bf67778469de8fa1dbb37 SHA256 fd85d68f1b6add2d5ee5f9fe90b6fbe7eaa5cf2de7745abc639327cbfe24f97d
 MISC metadata.xml 232 RMD160 1003df9706c53108377113d61c9c95bf485cc494 SHA1 fc994415ecad6f285541b567143cb40f2ef5f155 SHA256 1a507fc874f29bab501db0ca4cf1328971a64d415d35c7e050c59747eb0d2d1a
diff --git a/net-mail/zarafa/zarafa-6.40.7.ebuild b/net-mail/zarafa/zarafa-6.40.11.ebuild
index 6db2e31..e20769a 100644
--- a/net-mail/zarafa/zarafa-6.40.7.ebuild
+++ b/net-mail/zarafa/zarafa-6.40.11.ebuild
@@ -14,7 +14,7 @@ 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=26119
+ZARAFA_REV=28965
 
 DESCRIPTION="Open Source Groupware Solution"
 HOMEPAGE="http://zarafa.com/"
diff --git a/net-mail/zarafa/zarafa-6.40.8.ebuild b/net-mail/zarafa/zarafa-6.40.8.ebuild
deleted file mode 100644
index 4771071..0000000
--- a/net-mail/zarafa/zarafa-6.40.8.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2011 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 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://download.zarafa.com/community/final/${ZARAFA_MAJOR}.${ZARAFA_MINOR}/${PV}-${ZARAFA_REV}/sourcecode/zcp-${PV}.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
-	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_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 || die "Compilation failed"
-}
-
-src_install() {
-
-	emake DESTDIR="${D}" install || die "Installation failed"
-
-	# 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
-
-}