Move zarafa + libvmime to betagarden overlay

22 files changed, 0 insertions, 1274 deletions

diff --git a/net-mail/zarafa/ChangeLog b/net-mail/zarafa/ChangeLog
deleted file mode 100644
index 4694086..0000000
--- a/net-mail/zarafa/ChangeLog
+++ /dev/null
@@ -1,125 +0,0 @@
-# ChangeLog for net-mail/zarafa
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*zarafa-7.0.6 (20 Mar 2012)
-
-  20 Mar 2012; Robert Piasek <dagger@gentoo.org> -zarafa-7.0.2.ebuild,
-  -zarafa-7.0.3.ebuild, -zarafa-7.0.4.ebuild, +zarafa-7.0.6.ebuild:
-  Add zarafa 7.0.6. Remove older 7.0.x versions
-
-*zarafa-7.0.5 (14 Feb 2012)
-
-  14 Feb 2012; Robert Piasek <dagger@gentoo.org> +zarafa-7.0.5.ebuild:
-  Add zarafa 7.0.5
-
-*zarafa-6.40.14 (23 Jan 2012)
-
-  23 Jan 2012; Robert Piasek <dagger@gentoo.org> -zarafa-6.40.13.ebuild,
-  +zarafa-6.40.14.ebuild, +files/zarafa-fix-8842.patch:
-  Add ZCP 6.40.14. Include fix for bug ZCP-8842
-
-*zarafa-7.0.4 (29 Dec 2011)
-
-  29 Dec 2011; Robert Piasek <dagger@gentoo.org> -zarafa-7.0.1.ebuild,
-  +zarafa-7.0.4.ebuild:
-  Add ZCP 7.0.4
-
-*zarafa-6.40.13 (13 Dec 2011)
-
-  13 Dec 2011; Robert Piasek <dagger@gentoo.org> -zarafa-6.40.10.ebuild,
-  +zarafa-6.40.13.ebuild:
-  Add ZCP 6.40.13
-
-*zarafa-7.0.3 (17 Nov 2011)
-
-  17 Nov 2011; Robert Piasek <dagger@gentoo.org> +zarafa-7.0.3.ebuild:
-  Add ZCP 7.0.3
-
-*zarafa-7.0.2 (03 Nov 2011)
-
-  03 Nov 2011; Robert Piasek <dagger@gentoo.org> -zarafa-7.0.0.ebuild,
-  +zarafa-7.0.2.ebuild:
-  Add ZCP 7.0.2
-
-*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,
-  -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:
-  Add zarafa 7.0.1
-
-*zarafa-6.40.10 (26 Jul 2011)
-
-  26 Jul 2011; Robert Piasek <dagger@gentoo.org> +zarafa-6.40.10.ebuild:
-  Add version 6.40.10
-
-*zarafa-7.0.0 (08 Jul 2011)
-
-  08 Jul 2011; Robert Piasek <dagger@gentoo.org> +zarafa-7.0.0.ebuild:
-  Add zcp-7.0.0
-
-*zarafa-6.40.9 (20 Jun 2011)
-
-  20 Jun 2011; Robert Piasek <dagger@gentoo.org> +zarafa-6.40.9.ebuild:
-  Add version 6.40.9
-
-*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:
-  Add version 6.40.7
-
-*zarafa-6.40.5-r1 (25 Jan 2011)
-
-  25 Jan 2011; Robert Piasek <dagger@gentoo.org> -zarafa-6.40.5.ebuild,
-  +zarafa-6.40.5-r1.ebuild, +files/zarafa-6.40.5-add-missing-endif.patch,
-  +files/zarafa-6.40.5-fix-missing-installation-file.patch:
-  Fix compilation and installation issues with 6.40.5 release
-
-*zarafa-6.40.5 (25 Jan 2011)
-
-  25 Jan 2011; Robert Piasek <dagger@gentoo.org> +zarafa-6.40.5.ebuild:
-  Add version 6.40.5
-
-*zarafa-6.40.4-r1 (09 Dec 2010)
-
-  09 Dec 2010; Robert Piasek <dagger@gentoo.org> -zarafa-6.40.4.ebuild,
-  +zarafa-6.40.4-r1.ebuild:
-  Updated version to 6.40.4 final (previous was pulled out)
-
-*zarafa-6.40.4 (03 Dec 2010)
-
-  03 Dec 2010; Robert Piasek <dagger@gentoo.org> +zarafa-6.40.4.ebuild:
-  Added version 6.40.4
-
-*zarafa-6.40.3-r1 (24 Nov 2010)
-
-  24 Nov 2010; Robert Piasek <dagger@gentoo.org> +zarafa-6.40.3-r1.ebuild:
-  Make it work with current PHP ecalss
-
-*zarafa-6.40.3 (28 Oct 2010)
-
-  28 Oct 2010; Robert Piasek <dagger@gentoo.org>
-  +files/zarafa-6.40.1-no-php-conf.patch, +zarafa-6.40.3.ebuild:
-  Added version 6.40.3.
-
-  11 Aug 2010; Robert Piasek <dagger@gentoo.org> zarafa-6.40.1.ebuild:
-  Updated libical dependency. It seems 0.44 is required to make it work ok
-
diff --git a/net-mail/zarafa/Manifest b/net-mail/zarafa/Manifest
deleted file mode 100644
index 90a873d..0000000
--- a/net-mail/zarafa/Manifest
+++ /dev/null
@@ -1,27 +0,0 @@
-AUX zarafa-6.40.1-no-php-conf.patch 1634 RMD160 1bb4d4357aeeec0b005cd090beb96cb73905f58d SHA1 3da975c330bf09eca894db87aa1888536ee1e206 SHA256 ec79e127c30aeb93fe455bbebbd426645d4d8aa3e1031005ff9177d7f7b9685f
-AUX zarafa-6.40.1-uuid-link.patch 1416 RMD160 da5e90e883e1331a5ac1bf9891ece199b61b422d SHA1 f5277c620f78693b05500189fdd869569a1c1fd1 SHA256 ead0383bc69c3c2fce4f69e8dce19161d123dc5fb91b2abbefcf3a83299f855c
-AUX zarafa-6.40.5-add-missing-endif.patch 249 RMD160 ed06c81f50d6a4359ccaa001540a29b4c105e468 SHA1 b6a38c5af35fae2f79bd70846f057873109e9b90 SHA256 e4bb216f1eacebbaa628fad164bcc4f045e9d5b28a17566f2f6a076695a48ba4
-AUX zarafa-6.40.5-fix-missing-installation-file.patch 1221 RMD160 cdc3c85558de3fd35453a174b8af0a5631ea1922 SHA1 2b490e2fb5a27243a77cdbf97a82a859d5a51979 SHA256 41a73e36d939aa9e162ca6df175673329246610dc0e52d998c86d2581b0c5457
-AUX zarafa-fix-8842.patch 1150 RMD160 4467e6cf23bb6d9ce81bc13a359b2bb7de0b8ba5 SHA1 dde9c366ebea897e45b381c33209daf3e93e10b8 SHA256 af7481bd404d11622a057df0b38c06f398e44fa4ca0882bac97e925fa77763b9
-AUX zarafa-gateway.rc6 706 RMD160 341b4a029972290fdac747d65cf324a22d3ee8b0 SHA1 646f1aca42f5457b3beec2a60b0e70b2af17ef93 SHA256 c8d6f0a86338f7a7a68847abcb27c5f254bc837b63ce76d9541f02be70e4a699
-AUX zarafa-ical.rc6 663 RMD160 db306a10e7777889e9460488575cbdd1ddc9037e SHA1 8fa807d0da22ab4fc1f3156c3a7dc0fe3cdab1ad SHA256 1eec0c538a0264eb2757b5687c8285394f899740bc4cba913115f82ccab703e2
-AUX zarafa-indexer.rc6 720 RMD160 7ac4e46479cf7d1469df6a388aa6231cf1e2c5a5 SHA1 7b9e0e90bcdaee3f84fdeeb1214ee52c36d8c396 SHA256 ff10705b5b109b22448fdc01c45046f8984131f57094685af467e96f85a872a2
-AUX zarafa-licensed.rc6 719 RMD160 8a21e42750cff10a81fbb7808944bca7d9eb9aec SHA1 5f5e3863ac7aea1c1f3218f97cb08612b83bfff8 SHA256 acb3a77842078fb7416a7ad2856d200737a8311433958640ac95776583ff52d6
-AUX zarafa-monitor.rc6 705 RMD160 d1e524b7ed48ec5b53594595a35d4fb3c02b1a5a SHA1 d9cbd4df039ae95048bc53edcd4c1968166fdde4 SHA256 6d7cc1b2f0c7049f28dccf0d65530f1075e932898ab9b7d68cd73ffc2e4dd6e9
-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 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.14.tar.gz 5563665 RMD160 8b145f96b36ed7df275f0df75c42c0315f685516 SHA1 4b78112c7bf960621e2e3adb9ef1b055f6b31315 SHA256 871ac04d4f87e1868ff103edddfcfc6f91a1c9e6e0caeeb0f0c20dbc4424521a
-DIST zcp-6.40.9.tar.gz 5434001 RMD160 6a14d627dfbdf77c17839e1ab8840695af9e3b34 SHA1 7cf5b7d08d521571d00e06c9f97a8498b8fe49eb SHA256 23653649497b0b26322b8152c639eec1087727d2370947050c239dc3d7c1f03d
-DIST zcp-7.0.5.tar.gz 6165679 RMD160 6da612d83413d6194798b72cfab4bd14231375fc SHA1 11018d3f42bfe5310dc94c45c248c29059c4df1d SHA256 235a2bfa452f3c013d9b58127cb557690dfcb65bc6510d9d68e4d53f01c21df0
-DIST zcp-7.0.6.tar.gz 6248757 RMD160 63aeba06f8ceb1ded9a6cee6431fd22e854aca01 SHA1 ffe7ed56edc5515cc3b516e025059507602fa5fa SHA256 4bc417d3ede1da7f5ec677f7727404228d1e0663fe1c52c82d6d3e449f4e5c58
-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.14.ebuild 3069 RMD160 eabd5f313aba1b1c75ab8b060d799351b5d3106a SHA1 ba3a6bda32f335752dcb5fbbac8ab42fbf2feda1 SHA256 b93f775c2ceefc6c433941e1c4e0438072ef880570522e6a34e20d32482c7ff3
-EBUILD zarafa-6.40.9.ebuild 2999 RMD160 726e91dbca6c1776464ec635f14cead1215cb576 SHA1 e29a005ef553d3bb1ee56f562586638518dcf8c0 SHA256 1d718e2a2e1a7104a51412a516e7d3728a48fee483a162739c57b254ee17b26f
-EBUILD zarafa-7.0.5.ebuild 3423 RMD160 eddd4143b42ed9aceb70a9d4944e690585591ee5 SHA1 ce7d301881b7659d38fc82eaa689944cf64f0009 SHA256 6f19ae78d827fe0ff54d85f67951bf2b2fb70fa0dec00680f4d424bbfef10060
-EBUILD zarafa-7.0.6.ebuild 3423 RMD160 85842c6bc7f02ace9950aa19888784377a0efd33 SHA1 5490843ed68fa96cbf424c192de6a4bfc472f34a SHA256 ab565a667c7b20da731ac8c4884dca56c2d72350065ec5a27d415de8a0865a32
-MISC ChangeLog 3604 RMD160 b74f958f11d8529324f9b68680bbaa48f65c1712 SHA1 87a1b061de5d03ddfef16e79e95e35cb667fa7f4 SHA256 ad4d4ad4a19019032e75c57a3b97f5d5cb6bf0aa71f7959605a3cb16f9b07e3f
-MISC metadata.xml 232 RMD160 1003df9706c53108377113d61c9c95bf485cc494 SHA1 fc994415ecad6f285541b567143cb40f2ef5f155 SHA256 1a507fc874f29bab501db0ca4cf1328971a64d415d35c7e050c59747eb0d2d1a
diff --git a/net-mail/zarafa/files/zarafa-6.40.1-no-php-conf.patch b/net-mail/zarafa/files/zarafa-6.40.1-no-php-conf.patch
deleted file mode 100644
index 9e51f09..0000000
--- a/net-mail/zarafa/files/zarafa-6.40.1-no-php-conf.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- php-ext/Makefile.in~	2010-10-20 12:26:22.000000000 +0100
-+++ php-ext/Makefile.in	2010-10-28 13:40:48.830318647 +0100
-@@ -34,7 +34,7 @@
- build_triplet = @build@
- host_triplet = @host@
- subdir = php-ext
--DIST_COMMON = $(dist_data_DATA) $(dist_sysconf_DATA) \
-+DIST_COMMON = $(dist_data_DATA) \
- 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-@@ -86,7 +86,7 @@
- DIST_SOURCES = $(mapi_la_SOURCES)
- dist_dataDATA_INSTALL = $(INSTALL_DATA)
- dist_sysconfDATA_INSTALL = $(INSTALL_DATA)
--DATA = $(dist_data_DATA) $(dist_sysconf_DATA)
-+DATA = $(dist_data_DATA)
- ETAGS = etags
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-@@ -406,23 +406,6 @@
- 	  echo " rm -f '$(DESTDIR)$(datadir)/$$f'"; \
- 	  rm -f "$(DESTDIR)$(datadir)/$$f"; \
- 	done
--install-dist_sysconfDATA: $(dist_sysconf_DATA)
--	@$(NORMAL_INSTALL)
--	test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
--	@list='$(dist_sysconf_DATA)'; for p in $$list; do \
--	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
--	  f=$(am__strip_dir) \
--	  echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
--	  $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
--	done
--
--uninstall-dist_sysconfDATA:
--	@$(NORMAL_UNINSTALL)
--	@list='$(dist_sysconf_DATA)'; for p in $$list; do \
--	  f=$(am__strip_dir) \
--	  echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f'"; \
--	  rm -f "$(DESTDIR)$(sysconfdir)/$$f"; \
--	done
- 
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
diff --git a/net-mail/zarafa/files/zarafa-6.40.1-uuid-link.patch b/net-mail/zarafa/files/zarafa-6.40.1-uuid-link.patch
deleted file mode 100644
index d434dd9..0000000
--- a/net-mail/zarafa/files/zarafa-6.40.1-uuid-link.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- provider/server/Makefile.in~	2010-08-03 10:42:59.000000000 +0100
-+++ provider/server/Makefile.in	2010-08-06 10:17:15.391932752 +0100
-@@ -265,7 +265,7 @@
- 	$(MYSQL_INCLUDES) $(GSOAP_CFLAGS) $(SSL_CFLAGS) $(SSL_HAS_EVP_PKEY_CMP) $(EPOLL_CFLAGS)
- 
- zarafa_server_LDFLAGS = ${DL_LIBS} -Wl,-E
--zarafa_server_LDADD = $(UUID_LIBS) $(INTL_LIBS) $(ICONV_LIBS)	\
-+zarafa_server_LDADD = $(INTL_LIBS) $(ICONV_LIBS)	\
- 	${top_builddir}/provider/libserver/libserver.la							\
- 	${top_builddir}/provider/soap/libgsoap.la								\
- 	${top_builddir}/provider/soap/libsoapserver.la							\
-@@ -273,7 +273,7 @@
- 	${top_builddir}/common/libcommon_util.la								\
- 	${top_builddir}/common/libcommon_mapi.la								\
- 	${top_builddir}/common/libcommon_ssl.la									\
--	$(MYSQL_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
-+	$(MYSQL_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) $(UUID_LIBS) -lrt
- 
- zarafa_server_SOURCES = ECServer.cpp  \
- 						ECSoapServerConnection.h ECSoapServerConnection.cpp \
---- ECtools/zarafa-stats/Makefile.in~	2010-08-03 10:42:54.000000000 +0100
-+++ ECtools/zarafa-stats/Makefile.in	2010-08-06 10:23:27.988995191 +0100
-@@ -249,7 +249,7 @@
- 	${top_builddir}/mapi4linux/src/libmapi.la \
- 	${top_builddir}/common/libcommon_mapi.la \
- 	${top_builddir}/common/libcommon_util.la \
--	-lncurses
-+	-lncurses $(UUID_LIBS)
- 
- zarafa_stats_SOURCES = zarafa-stats.cpp
- all: all-am
diff --git a/net-mail/zarafa/files/zarafa-6.40.5-add-missing-endif.patch b/net-mail/zarafa/files/zarafa-6.40.5-add-missing-endif.patch
deleted file mode 100644
index 755ad79..0000000
--- a/net-mail/zarafa/files/zarafa-6.40.5-add-missing-endif.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- provider/libserver/ECIndexer.h~	2011-01-24 15:55:05.000000000 +0000
-+++ provider/libserver/ECIndexer.h	2011-01-25 09:56:36.786592403 +0000
-@@ -49,6 +49,7 @@
- 
- #ifndef ECINDEXER_H
- #define ECINDEXER_H
-+#endif
- 
- class ECConfig;
- class ECLogger;
diff --git a/net-mail/zarafa/files/zarafa-6.40.5-fix-missing-installation-file.patch b/net-mail/zarafa/files/zarafa-6.40.5-fix-missing-installation-file.patch
deleted file mode 100644
index ef79757..0000000
--- a/net-mail/zarafa/files/zarafa-6.40.5-fix-missing-installation-file.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- installer/linux/Makefile.in~	2011-01-24 12:06:15.000000000 +0000
-+++ installer/linux/Makefile.in	2011-01-25 10:36:31.784330713 +0000
-@@ -693,8 +693,6 @@
- 	fi
- 	install -d -m 755 ${DESTDIR}/${datarootdir}/doc/zarafa-indexer/example-config
- 	mv ${DESTDIR}/${data_configdir}/indexer.cfg ${DESTDIR}/${datarootdir}/doc/zarafa-indexer/example-config
--	install -d -m 755 ${DESTDIR}/${datarootdir}/doc/zarafa-archiver/example-config
--	mv ${DESTDIR}/${data_configdir}/archiver.cfg ${DESTDIR}/${datarootdir}/doc/zarafa-archiver/example-config
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
---- installer/linux/Makefile.am~	2011-01-24 11:03:45.000000000 +0000
-+++ installer/linux/Makefile.am	2011-01-25 10:36:27.234524257 +0000
-@@ -108,5 +108,3 @@
- 	fi
- 	install -d -m 755 ${DESTDIR}/${datarootdir}/doc/zarafa-indexer/example-config
- 	mv ${DESTDIR}/${data_configdir}/indexer.cfg ${DESTDIR}/${datarootdir}/doc/zarafa-indexer/example-config
--	install -d -m 755 ${DESTDIR}/${datarootdir}/doc/zarafa-archiver/example-config
--	mv ${DESTDIR}/${data_configdir}/archiver.cfg ${DESTDIR}/${datarootdir}/doc/zarafa-archiver/example-config
diff --git a/net-mail/zarafa/files/zarafa-fix-8842.patch b/net-mail/zarafa/files/zarafa-fix-8842.patch
deleted file mode 100644
index 5f79f22..0000000
--- a/net-mail/zarafa/files/zarafa-fix-8842.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: trunk/zcp/provider/libserver/ZarafaCmd.cpp
-===================================================================
-diff -u -N -r31009 -r31058
---- trunk/zcp/provider/libserver/ZarafaCmd.cpp	(.../ZarafaCmd.cpp)	(revision 31009)
-+++ trunk/zcp/provider/libserver/ZarafaCmd.cpp	(.../ZarafaCmd.cpp)	(revision 31058)
-@@ -824,13 +824,15 @@
- 	ECRESULT	er = erSuccess;
- 	ECSession 	*lpecSession = NULL;
- 
--	er = g_lpSessionManager->ValidateSession(soap, ulSessionId, &lpecSession, false);
-+	er = g_lpSessionManager->ValidateSession(soap, ulSessionId, &lpecSession, true);
- 	if(er != erSuccess)
- 		goto exit;
- 
-     if(lpecSession->GetAuthMethod() == ECSession::METHOD_USERPASSWORD || lpecSession->GetAuthMethod() == ECSession::METHOD_SSO)
-         SaveLogonTime(lpecSession, false);
- 
-+	lpecSession->Unlock();
-+
-     // lpecSession is discarded. It is not locked, so we can do that. We only did the 'validatesession'
-     // call to see if the session id existed in the first place, and the request is coming from the correct
-     // IP address. Another logoff() call called at the same time may remove the session *here*, in which case the following call
-
diff --git a/net-mail/zarafa/files/zarafa-gateway.rc6 b/net-mail/zarafa/files/zarafa-gateway.rc6
deleted file mode 100644
index d9e7f7a..0000000
--- a/net-mail/zarafa/files/zarafa-gateway.rc6
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-GATEWAYCONFIG=/etc/zarafa/gateway.cfg
-GATEWAYPROGRAM=/usr/bin/zarafa-gateway
-
-[ -x $GATEWAYPROGRAM ] || exit 0
-
-GATEWAYCONFIG_OPT=""
-[ ! -z $GATEWAYCONFIG -a -f $GATEWAYCONFIG ] && GATEWAYCONFIG_OPT="-c $GATEWAYCONFIG"
-
-PIDFILE=/var/run/"${SVCNAME}".pid
-
-start() {
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start \
-		--pidfile ${PIDFILE} \
-		--exec ${GATEWAYPROGRAM} -- ${GATEWAYCONFIG_OPT}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-		start-stop-daemon --stop \
-		--pidfile ${PIDFILE} \
-		--exec ${GATEWAYPROGRAM} -- ${GATEWAYCONFIG_OPT}
-	eend $?
-}
diff --git a/net-mail/zarafa/files/zarafa-ical.rc6 b/net-mail/zarafa/files/zarafa-ical.rc6
deleted file mode 100644
index fec3b5c..0000000
--- a/net-mail/zarafa/files/zarafa-ical.rc6
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-ICALCONFIG=/etc/zarafa/ical.cfg
-ICALPROGRAM=/usr/bin/zarafa-ical
-
-[ -x $ICALPROGRAM ] || exit 0
-
-ICALCONFIG_OPT=""
-[ ! -z $ICALCONFIG -a -f $ICALCONFIG ] && ICALCONFIG_OPT="-c $ICALCONFIG"
-
-PIDFILE=/var/run/"${SVCNAME}".pid
-
-start() {
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start \
-		--pidfile ${PIDFILE} \
-		--exec ${ICALPROGRAM} -- ${ICALCONFIG_OPT}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop \
-		--pidfile ${PIDFILE} \
-		--exec ${ICALPROGRAM} -- ${ICALCONFIG_OPT}
-	eend $?
-}
diff --git a/net-mail/zarafa/files/zarafa-indexer.rc6 b/net-mail/zarafa/files/zarafa-indexer.rc6
deleted file mode 100644
index 789f3b6..0000000
--- a/net-mail/zarafa/files/zarafa-indexer.rc6
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-INDEXERCONFIG=/etc/zarafa/indexer.cfg
-INDEXERPROGRAM=/usr/bin/zarafa-indexer
-
-[ -x $INDEXERPROGRAM ] || exit 0
-
-INDEXERCONFIG_OPT=""
-[ ! -z $INDEXERCONFIG -a -f $INDEXERCONFIG ] && INDEXERCONFIG_OPT="-c
-$INDEXERCONFIG"
-
-PIDFILE=/var/run/"${SVCNAME}".pid
-
-start() {
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start \
-		--pidfile ${PIDFILE} \
-		--exec ${INDEXERPROGRAM} -- ${INDEXERCONFIG_OPT}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop \
-		--pidfile ${PIDFILE} \
-		--retry 65 \
-		--exec ${INDEXERPROGRAM} -- ${INDEXERCONFIG_OPT}
-	eend $?
-}
diff --git a/net-mail/zarafa/files/zarafa-licensed.rc6 b/net-mail/zarafa/files/zarafa-licensed.rc6
deleted file mode 100644
index 73d7e44..0000000
--- a/net-mail/zarafa/files/zarafa-licensed.rc6
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-LICENSEDCONFIG=/etc/zarafa/licensed.cfg
-LICENSEDPROGRAM=/usr/bin/zarafa-licensed
-
-[ -x $LICENSEDPROGRAM ] || exit 0
-
-LICENSEDCONFIG_OPT=""
-[ ! -z $LICENSEDCONFIG -a -f $LICENSEDCONFIG ] && LICENSEDCONFIG_OPT="-c
-$LICENSEDCONFIG"
-
-PIDFILE=/var/run/"${SVCNAME}".pid
-
-start() {
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start \
-		--pidfile ${PIDFILE} \
-		--exec ${LICENSEDPROGRAM} -- ${LICENSEDCONFIG_OPT}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop \
-		--pidfile ${PIDFILE} \
-		--exec ${LICENSEDPROGRAM} -- ${LICENSEDCONFIG_OPT}
-	eend $?
-}
diff --git a/net-mail/zarafa/files/zarafa-monitor.rc6 b/net-mail/zarafa/files/zarafa-monitor.rc6
deleted file mode 100644
index 0b9b790..0000000
--- a/net-mail/zarafa/files/zarafa-monitor.rc6
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-MONITORCONFIG=/etc/zarafa/monitor.cfg
-MONITORPROGRAM=/usr/bin/zarafa-monitor
-
-[ -x $MONITORPROGRAM ] || exit 0
-
-MONITORCONFIG_OPT=""
-[ ! -z $MONITORCONFIG -a -f $MONITORCONFIG ] && MONITORCONFIG_OPT="-c $MONITORCONFIG"
-
-PIDFILE=/var/run/"${SVCNAME}".pid
-
-start() {
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start \
-		--pidfile ${PIDFILE} \
-		--exec ${MONITORPROGRAM} -- ${MONITORCONFIG_OPT}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop \
-		--pidfile ${PIDFILE} \
-		--exec ${MONITORPROGRAM} -- ${MONITORCONFIG_OPT}
-	eend $?
-}
diff --git a/net-mail/zarafa/files/zarafa-server.rc6 b/net-mail/zarafa/files/zarafa-server.rc6
deleted file mode 100644
index 41d3a20..0000000
--- a/net-mail/zarafa/files/zarafa-server.rc6
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-SERVERCONFIG=/etc/zarafa/server.cfg
-SERVERPROGRAM=/usr/bin/zarafa-server
-
-[ -x $SERVERPROGRAM ] || exit 0
-
-SERVERCONFIG_OPT=""
-[ ! -z $SERVERCONFIG -a -f $SERVERCONFIG ] && SERVERCONFIG_OPT="-c $SERVERCONFIG"
-
-PIDFILE=/var/run/"${SVCNAME}".pid
-
-depend() {
-	need mysql
-}
-
-start() {
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start \
-		--pidfile ${PIDFILE} \
-		--exec ${SERVERPROGRAM} -- ${SERVERCONFIG_OPT}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop \
-		--pidfile ${PIDFILE} \
-		--retry 65 \
-		--exec ${SERVERPROGRAM} -- ${SERVERCONFIG_OPT}
-	eend $?
-}
diff --git a/net-mail/zarafa/files/zarafa-spooler.rc6 b/net-mail/zarafa/files/zarafa-spooler.rc6
deleted file mode 100644
index 0a24b9c..0000000
--- a/net-mail/zarafa/files/zarafa-spooler.rc6
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-SPOOLERCONFIG=/etc/zarafa/spooler.cfg
-SPOOLERPROGRAM=/usr/bin/zarafa-spooler
-
-[ -x $SPOOLERPROGRAM ] || exit 0
-
-SPOOLERCONFIG_OPT=""
-[ ! -z $SPOOLERCONFIG -a -f $SPOOLERCONFIG ] && SPOOLERCONFIG_OPT="-c $SPOOLERCONFIG"
-
-PIDFILE=/var/run/"${SVCNAME}".pid
-
-start() {
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start \
-		--pidfile ${PIDFILE} \
-		--exec ${SPOOLERPROGRAM} -- ${SPOOLERCONFIG_OPT}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop \
-		--pidfile ${PIDFILE} \
-		--exec ${SPOOLERPROGRAM} -- ${SPOOLERCONFIG_OPT}
-	eend $?
-}
diff --git a/net-mail/zarafa/files/zarafa.logrotate b/net-mail/zarafa/files/zarafa.logrotate
deleted file mode 100644
index e964bc4..0000000
--- a/net-mail/zarafa/files/zarafa.logrotate
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-# This is an example for the common logrotate system.
-# Copy this file to /etc/logrotate.d/zarafa to activate it.
-# Also, check the location of the logfiles, and replace if needed.
-#
-
-/var/log/zarafa/server.log {
-        weekly
-        missingok
-        rotate 52
-        compress
-        delaycompress
-        notifempty
-        postrotate
-			killall -HUP zarafa-server
-        endscript
-}
-
-/var/log/zarafa/spooler.log {
-        weekly
-        missingok
-        rotate 52
-        compress
-        delaycompress
-        notifempty
-        postrotate
-			killall -HUP zarafa-spooler
-        endscript
-}
-
-/var/log/zarafa/monitor.log {
-        weekly
-        missingok
-        rotate 52
-        compress
-        delaycompress
-        notifempty
-        postrotate
-			killall -HUP zarafa-monitor
-        endscript
-}
-
-/var/log/zarafa/gateway.log {
-        weekly
-        missingok
-        rotate 52
-        compress
-        delaycompress
-        notifempty
-        postrotate
-			killall -HUP zarafa-gateway
-        endscript
-}
-
-/var/log/zarafa/ical.log {
-        weekly
-        missingok
-        rotate 52
-        compress
-        delaycompress
-        notifempty
-        postrotate
-			killall -HUP zarafa-ical
-        endscript
-}
diff --git a/net-mail/zarafa/metadata.xml b/net-mail/zarafa/metadata.xml
deleted file mode 100644
index 618053e..0000000
--- a/net-mail/zarafa/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<use>
-	<flag name="logrotate">Adds support for <pkg>app-admin/logrotate</pkg></flag>
-</use>
-</pkgmetadata>
-
diff --git a/net-mail/zarafa/zarafa-6.40.11.ebuild b/net-mail/zarafa/zarafa-6.40.11.ebuild
deleted file mode 100644
index e20769a..0000000
--- a/net-mail/zarafa/zarafa-6.40.11.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=28965
-
-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/net-mail/zarafa/zarafa-6.40.12.ebuild b/net-mail/zarafa/zarafa-6.40.12.ebuild
deleted file mode 100644
index c206954..0000000
--- a/net-mail/zarafa/zarafa-6.40.12.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=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/net-mail/zarafa/zarafa-6.40.14.ebuild b/net-mail/zarafa/zarafa-6.40.14.ebuild
deleted file mode 100644
index 8b96c7a..0000000
--- a/net-mail/zarafa/zarafa-6.40.14.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2012 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=31537
-
-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() {
-	# 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
-
-	# Fix for zarafa-server crash - bug ID 8842
-	# https://jira.zarafa.com/browse/ZCP-8842
-	epatch "${FILESDIR}"/"${PN}"-fix-8842.patch
-}
-
-src_configure() {
-	econf \
-		--enable-oss \
-		--enable-release \
-		--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/net-mail/zarafa/zarafa-6.40.9.ebuild b/net-mail/zarafa/zarafa-6.40.9.ebuild
deleted file mode 100644
index 9b8a036..0000000
--- a/net-mail/zarafa/zarafa-6.40.9.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=27553
-
-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/net-mail/zarafa/zarafa-7.0.5.ebuild b/net-mail/zarafa/zarafa-7.0.5.ebuild
deleted file mode 100644
index b7705e7..0000000
--- a/net-mail/zarafa/zarafa-7.0.5.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2012 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=31880
-
-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.9.2_pre20120110
-	>=dev-lang/php-5.3.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() {
-
-	# 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 \
-		--enable-release \
-		--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
-
-}
-
-pkg_postinst() {
-	ewarn "Zarafa 7 has full UTF-8 support. Currently en_US.UTF-8"
-	ewarn "is hardcoded inside the sources. Please add en_US.UTF-8 UTF-8"
-	ewarn "to your /etc/locale.gen and run"
-	ewarn "'localedef -i en_US -f UTF-8 en_US.UTF-8' and 'locale-gen'"
-	elog "If you are upgrading from zcp-6.x please use upgrade script"
-	elog "located at /usr/share/doc/zarafa/zarafa7-upgrade. The script"
-	elog "requires dev-python/mysql-python to be installed in order to work"
-}
diff --git a/net-mail/zarafa/zarafa-7.0.6.ebuild b/net-mail/zarafa/zarafa-7.0.6.ebuild
deleted file mode 100644
index 7b603cc..0000000
--- a/net-mail/zarafa/zarafa-7.0.6.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2012 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=32752
-
-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.9.2_pre20120110
-	>=dev-lang/php-5.3.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() {
-
-	# 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 \
-		--enable-release \
-		--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
-
-}
-
-pkg_postinst() {
-	ewarn "Zarafa 7 has full UTF-8 support. Currently en_US.UTF-8"
-	ewarn "is hardcoded inside the sources. Please add en_US.UTF-8 UTF-8"
-	ewarn "to your /etc/locale.gen and run"
-	ewarn "'localedef -i en_US -f UTF-8 en_US.UTF-8' and 'locale-gen'"
-	elog "If you are upgrading from zcp-6.x please use upgrade script"
-	elog "located at /usr/share/doc/zarafa/zarafa7-upgrade. The script"
-	elog "requires dev-python/mysql-python to be installed in order to work"
-}