Add ZCP 6.40.12

7 files changed, 190 insertions, 4 deletions

diff --git a/net-mail/zarafa/ChangeLog b/net-mail/zarafa/ChangeLog
index c25d4cf..373f145 100644
--- a/net-mail/zarafa/ChangeLog
+++ b/net-mail/zarafa/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*zarafa-6.40.12 (02 Nov 2011)
+
+  02 Nov 2011; Robert Piasek <dagger@gentoo.org> +zarafa-6.40.12.ebuild:
+  Add ZCP 6.40.12
+
 *zarafa-6.40.11 (20 Sep 2011)
 
   20 Sep 2011; Robert Piasek <dagger@gentoo.org> -zarafa-6.40.7.ebuild,
diff --git a/net-mail/zarafa/Manifest b/net-mail/zarafa/Manifest
index 8594118..0e2427b 100644
--- a/net-mail/zarafa/Manifest
+++ b/net-mail/zarafa/Manifest
@@ -12,13 +12,15 @@ AUX zarafa-spooler.rc6 705 RMD160 a2981b8e9b60df19d5adce5507ec51ac6d5b12e8 SHA1
 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.11.tar.gz 5493848 RMD160 8a4a91fcc800b79ef2adfe9b10f84dffa56b927c SHA1 a3a1914541906b1f5f025074278097a78ca6d0fe SHA256 d64997301fbe36e1ccadc254d0f892dc45e7250e445f14cf39d638d4274a1e1c
+DIST zcp-6.40.12.tar.gz 5521416 RMD160 e68f608d7da52947f82411c952d60f4d135333ea SHA1 3f036e5837d659086702882b09a8e1f519014d35 SHA256 4fcecd4dfaac335b174b6223f5ca0ad30b45bc1ff3839d9044acc0e887db1297
 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.11.ebuild 2999 RMD160 c57e4ee4d024c1955fe9f20c967c258a34568011 SHA1 ce98479aad4526f01d4ee46699f287725f5777c3 SHA256 8a2bc79b12a81116da9fc59e800dc4b8cc8323d312be16844973fce4164b1d3d
+EBUILD zarafa-6.40.12.ebuild 2999 RMD160 731766332a08f7f168326fc280120cba569ac894 SHA1 83b11e4b30b9ad7c8b313a7b9bbe14b1aaf118e9 SHA256 79c79eb97f5d26b38415fab472c8e3669e60dd9bf8a3d46c950c3b6ad2e943e3
 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 2387 RMD160 29fef8b8036b4d1f659a621eedfdc1ad8838d0c6 SHA1 eb022ce62610f0d87a6bf67778469de8fa1dbb37 SHA256 fd85d68f1b6add2d5ee5f9fe90b6fbe7eaa5cf2de7745abc639327cbfe24f97d
+MISC ChangeLog 2510 RMD160 d49fe623e0d063bfd4ea7f477bfdcdebbfdd4ed1 SHA1 4dc96bf12c093bbaf7b9aec0f3fd0024e21bf058 SHA256 178f123d8de97d29b3b1a0bb44c6cf94d552559e7353fd1731668b489b91ffdd
 MISC metadata.xml 232 RMD160 1003df9706c53108377113d61c9c95bf485cc494 SHA1 fc994415ecad6f285541b567143cb40f2ef5f155 SHA256 1a507fc874f29bab501db0ca4cf1328971a64d415d35c7e050c59747eb0d2d1a
diff --git a/net-mail/zarafa/zarafa-6.40.12.ebuild b/net-mail/zarafa/zarafa-6.40.12.ebuild
new file mode 100644
index 0000000..c206954
--- /dev/null
+++ b/net-mail/zarafa/zarafa-6.40.12.ebuild
@@ -0,0 +1,114 @@
+# 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=29942
+
+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
+
+}
diff --git a/www-apps/zarafa-webaccess/ChangeLog b/www-apps/zarafa-webaccess/ChangeLog
index 225f5e8..e872491 100644
--- a/www-apps/zarafa-webaccess/ChangeLog
+++ b/www-apps/zarafa-webaccess/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*zarafa-webaccess-6.40.12 (02 Nov 2011)
+
+  02 Nov 2011; Robert Piasek <dagger@gentoo.org>
+  +zarafa-webaccess-6.40.12.ebuild:
+  add version 6.40.12
+
 *zarafa-webaccess-6.40.11 (20 Sep 2011)
 
   20 Sep 2011; Robert Piasek <dagger@gentoo.org>
diff --git a/www-apps/zarafa-webaccess/Manifest b/www-apps/zarafa-webaccess/Manifest
index 5a182d0..311f588 100644
--- a/www-apps/zarafa-webaccess/Manifest
+++ b/www-apps/zarafa-webaccess/Manifest
@@ -1,12 +1,14 @@
 DIST zcp-6.40.10.tar.gz 5452296 RMD160 8ed6388e7ff310edff30a75dc3758eedd7911d1b SHA1 d35502d8ac4dba962c0bf8449c4b9e7cd9fba0f7 SHA256 50eef47cb354b9eca4bd4e2af6e0422aac5db5fdb35486197312f5f96b34abfc
 DIST zcp-6.40.11.tar.gz 5493848 RMD160 8a4a91fcc800b79ef2adfe9b10f84dffa56b927c SHA1 a3a1914541906b1f5f025074278097a78ca6d0fe SHA256 d64997301fbe36e1ccadc254d0f892dc45e7250e445f14cf39d638d4274a1e1c
+DIST zcp-6.40.12.tar.gz 5521416 RMD160 e68f608d7da52947f82411c952d60f4d135333ea SHA1 3f036e5837d659086702882b09a8e1f519014d35 SHA256 4fcecd4dfaac335b174b6223f5ca0ad30b45bc1ff3839d9044acc0e887db1297
 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-webaccess-6.40.10.ebuild 1402 RMD160 8633b73a34ef95b19ccab63e5b03eee1d64426ac SHA1 63ce0e3e410abc48e854717149a666c141fbb243 SHA256 648bd8071b75d76ca99a3d74073e1537c38f7721983773bd989b4f332413ef4d
 EBUILD zarafa-webaccess-6.40.11.ebuild 1402 RMD160 17d561b8dab9c936128242beaba0e34fab586da2 SHA1 20828d60e258ebc0e429ce62670ddbebf0144ddd SHA256 5136f71632ac641523c69a9007c303127d858c73c1556f3d3647765c9e10664c
+EBUILD zarafa-webaccess-6.40.12.ebuild 1402 RMD160 2c2d281e293da454d09576baea90bce0256f0285 SHA1 3f096fc79cc0b56767989b9324cf673209b5899a SHA256 d30e29e7e00283fc4ec930dcea387bc78dea8bcdfcf78c8935f1fe1b9426e4e4
 EBUILD zarafa-webaccess-6.40.9.ebuild 1402 RMD160 96a30d8090a8309abeea1ec89ac5c5dbe2f1bd6f SHA1 e75ef7c28cded4cae921b5233fee86f1f8eae9e1 SHA256 1e56d4d175769d0184c57597e47bfa7debec519d4e50cdce8d500fbf1aeaf49e
 EBUILD zarafa-webaccess-7.0.0.ebuild 1402 RMD160 323830d11b4e2eb557650c5b8fa1d4d9471b9471 SHA1 ca92fc06755de8e2656d7d3c840066b8f061fdd1 SHA256 c5e1d80a2bfcf375a317f7f4dd60619d9cd421e4b2609a00f83e841e977d80f8
 EBUILD zarafa-webaccess-7.0.1.ebuild 1402 RMD160 0b06491c524b1fb4ea61b806a1c5cd206a4cefc1 SHA1 15f2703aa8b32a951eea8bc849c127d31f0dac13 SHA256 96a12740f3cd1388bcc59f1629a4fb53fa9e35869ac699e1faf4b650b3cddfd7
-MISC ChangeLog 2156 RMD160 84bc560ba026a8db938552ce6c8c36def4c1ec95 SHA1 4042ad07014801026d297981587a60ce2273790e SHA256 8e761bbe7afabbd5e6327540c80a089ad46c72e70977a9d46cdae46c68bd2908
-MISC metadata.xml 296 RMD160 d8f057fffd0d6d3c84b2d5481481f8848cc7f5aa SHA1 d3e950b1ca7636e89f44d3182753cb2384dcd11c SHA256 996385c7eb65b2fe398df26ebb0da85233a4f6c135a1256da9c53bd96ad450f4
+MISC ChangeLog 2305 RMD160 feebb37ae12cc2c58bf477f499aa3bf35e0cd33d SHA1 cf460a485c17bbb9267e4e42d9bea76cf450b0cc SHA256 573eddc98bb216a2a1aa81a647be782f20cc73e98bacbd93d3a436d0d28259c4
+MISC metadata.xml 274 RMD160 532fba378f39951d9d6e627680cb253b75a60e43 SHA1 b7944797d8ec680531bff86a335a16cecaf4323c SHA256 ba0a999b4d1df887812cf00f170ded3bbe8c21982d0e8b427e04f506f554be56
diff --git a/www-apps/zarafa-webaccess/metadata.xml b/www-apps/zarafa-webaccess/metadata.xml
index bd06873..37bb40d 100644
--- a/www-apps/zarafa-webaccess/metadata.xml
+++ b/www-apps/zarafa-webaccess/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>no-herd</herd>
         <maintainer>
                 <email>dagger@gentoo.org</email>
                 <name>Robert Piasek</name>
diff --git a/www-apps/zarafa-webaccess/zarafa-webaccess-6.40.12.ebuild b/www-apps/zarafa-webaccess/zarafa-webaccess-6.40.12.ebuild
new file mode 100644
index 0000000..b467760
--- /dev/null
+++ b/www-apps/zarafa-webaccess/zarafa-webaccess-6.40.12.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit versionator webapp eutils depend.php
+
+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=29942
+
+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"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+need_php_httpd
+
+S="${WORKDIR}"/${P/-webaccess/}/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 -f -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
+}