diff --git a/net-mail/zarafa/ChangeLog b/net-mail/zarafa/ChangeLog
index d6d3a0c..11431fe 100644
--- a/net-mail/zarafa/ChangeLog
+++ b/net-mail/zarafa/ChangeLog
@@ -2,6 +2,22 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*zarafa-6.40.8.27223 (26 May 2011)
+*zarafa-6.40.7.26119 (26 May 2011)
+
+  26 May 2011; Mario Fetka <mario.fetka@gmail.com>
+  -files/6.40.7.1.26050/zarafa-6.40.1-no-php-conf.patch,
+  -files/6.40.7.1.26050/fix-pthread.patch,
+  -files/6.40.7.1.26050/zarafa-6.40.2-libtcmalloc_shared-1.patch,
+  -files/6.40.7.1.26050/zarafa-6.40.6-force_latin1.patch,
+  +zarafa-6.40.8.27223.ebuild,
+  -files/6.40.7.1.26050/fix-zarafaserver-uuid-linkage.patch,
+  -files/6.40.7.1.26050/fix-zarafastats-uuid-linkage.patch,
+  -files/6.40.7.1.26050/zarafa-6.40.2-sysconfig2confd-1.patch,
+  -files/6.40.7.1.26050/zarafa-6.40.6-package.patch,
+  -zarafa-6.40.7.1.26050.ebuild, +zarafa-6.40.7.26119.ebuild:
+  Bump
+
 *zarafa-6.40.7.1.26050 (28 Mar 2011)
 
   28 Mar 2011; Mario Fetka <mario.fetka@gmail.com>
diff --git a/net-mail/zarafa/Manifest b/net-mail/zarafa/Manifest
index 4f6028d..8476e7f 100644
--- a/net-mail/zarafa/Manifest
+++ b/net-mail/zarafa/Manifest
@@ -17,14 +17,22 @@ AUX 6.40.6.25584/zarafa-6.40.2-libtcmalloc_shared-1.patch 857 RMD160 7112bfd1b5c
 AUX 6.40.6.25584/zarafa-6.40.2-sysconfig2confd-1.patch 8497 RMD160 1838567e668a32833d22e286defa73877cb515d2 SHA1 4ce13564cfc80598636b1c94028db3613feeb98c SHA256 cd1128ec66f18c887b6b304648e3a94b9aea782e363a303fc636b8f66b43fc5f
 AUX 6.40.6.25584/zarafa-6.40.6-force_latin1.patch 618 RMD160 8fc093050c3368c770d11326cf2402511f8d7c14 SHA1 5a7a6669308166ffb8117090411c3df9827408aa SHA256 e8caa41fb4a285e59ab8b3a2a6c0b5733423f70dbc55798d6c1472202deab496
 AUX 6.40.6.25584/zarafa-6.40.6-package.patch 2135 RMD160 30804eb455510967a5cfc2f9fe9bd699f906a9df SHA1 725f55210166e3453eae6bb58d1a417c6b0021ad SHA256 e441b08807753388e561653adcb9e3de8def54e3c343105dc25d95c1a1e0997d
-AUX 6.40.7.1.26050/fix-pthread.patch 2101 RMD160 aafbca78c32dc5c248ff044b9fd35ae3e5882649 SHA1 44f7ac8d8e36209c811b0e1cde5dbfdcc1cdab0d SHA256 f3e8324db43fb626aadb0bf334852d7a1b194333b120c7de643a89a37a1cc99c
-AUX 6.40.7.1.26050/fix-zarafaserver-uuid-linkage.patch 1394 RMD160 f88c3d41e5af48713d5ba5a4f9a9add75724bb45 SHA1 59aadb0eb993c7a552018c37e715bee7caaa1a12 SHA256 c452efb1f6b4deec5f32471b3998d6b9a40a2eacba959b76b3abae7d82e80e22
-AUX 6.40.7.1.26050/fix-zarafastats-uuid-linkage.patch 1051 RMD160 9713fa23bd16cb69111ecb39f840f8b7026d8f21 SHA1 ca04f80dce737ad10821c2e1bb84cd8f4ea5b9c5 SHA256 a1c0febb372dba9241cd87eded9d0e5940748cf01285a8eee0e43fa38a63fc03
-AUX 6.40.7.1.26050/zarafa-6.40.1-no-php-conf.patch 1634 RMD160 1bb4d4357aeeec0b005cd090beb96cb73905f58d SHA1 3da975c330bf09eca894db87aa1888536ee1e206 SHA256 ec79e127c30aeb93fe455bbebbd426645d4d8aa3e1031005ff9177d7f7b9685f
-AUX 6.40.7.1.26050/zarafa-6.40.2-libtcmalloc_shared-1.patch 857 RMD160 7112bfd1b5c1bf628f33521138d76ebdc9e8fa84 SHA1 638f39aa252c644362952becd5eb28fe06db8743 SHA256 c66f888d89a07c2c962f60aae81dee5b97cc2f0c0d4b5f725309f9f7509bea55
-AUX 6.40.7.1.26050/zarafa-6.40.2-sysconfig2confd-1.patch 8497 RMD160 1838567e668a32833d22e286defa73877cb515d2 SHA1 4ce13564cfc80598636b1c94028db3613feeb98c SHA256 cd1128ec66f18c887b6b304648e3a94b9aea782e363a303fc636b8f66b43fc5f
-AUX 6.40.7.1.26050/zarafa-6.40.6-force_latin1.patch 618 RMD160 8fc093050c3368c770d11326cf2402511f8d7c14 SHA1 5a7a6669308166ffb8117090411c3df9827408aa SHA256 e8caa41fb4a285e59ab8b3a2a6c0b5733423f70dbc55798d6c1472202deab496
-AUX 6.40.7.1.26050/zarafa-6.40.6-package.patch 2135 RMD160 30804eb455510967a5cfc2f9fe9bd699f906a9df SHA1 725f55210166e3453eae6bb58d1a417c6b0021ad SHA256 e441b08807753388e561653adcb9e3de8def54e3c343105dc25d95c1a1e0997d
+AUX 6.40.7.26119/fix-pthread.patch 2101 RMD160 aafbca78c32dc5c248ff044b9fd35ae3e5882649 SHA1 44f7ac8d8e36209c811b0e1cde5dbfdcc1cdab0d SHA256 f3e8324db43fb626aadb0bf334852d7a1b194333b120c7de643a89a37a1cc99c
+AUX 6.40.7.26119/fix-zarafaserver-uuid-linkage.patch 1394 RMD160 f88c3d41e5af48713d5ba5a4f9a9add75724bb45 SHA1 59aadb0eb993c7a552018c37e715bee7caaa1a12 SHA256 c452efb1f6b4deec5f32471b3998d6b9a40a2eacba959b76b3abae7d82e80e22
+AUX 6.40.7.26119/fix-zarafastats-uuid-linkage.patch 1051 RMD160 9713fa23bd16cb69111ecb39f840f8b7026d8f21 SHA1 ca04f80dce737ad10821c2e1bb84cd8f4ea5b9c5 SHA256 a1c0febb372dba9241cd87eded9d0e5940748cf01285a8eee0e43fa38a63fc03
+AUX 6.40.7.26119/zarafa-6.40.1-no-php-conf.patch 1634 RMD160 1bb4d4357aeeec0b005cd090beb96cb73905f58d SHA1 3da975c330bf09eca894db87aa1888536ee1e206 SHA256 ec79e127c30aeb93fe455bbebbd426645d4d8aa3e1031005ff9177d7f7b9685f
+AUX 6.40.7.26119/zarafa-6.40.2-libtcmalloc_shared-1.patch 857 RMD160 7112bfd1b5c1bf628f33521138d76ebdc9e8fa84 SHA1 638f39aa252c644362952becd5eb28fe06db8743 SHA256 c66f888d89a07c2c962f60aae81dee5b97cc2f0c0d4b5f725309f9f7509bea55
+AUX 6.40.7.26119/zarafa-6.40.2-sysconfig2confd-1.patch 8497 RMD160 1838567e668a32833d22e286defa73877cb515d2 SHA1 4ce13564cfc80598636b1c94028db3613feeb98c SHA256 cd1128ec66f18c887b6b304648e3a94b9aea782e363a303fc636b8f66b43fc5f
+AUX 6.40.7.26119/zarafa-6.40.6-force_latin1.patch 618 RMD160 8fc093050c3368c770d11326cf2402511f8d7c14 SHA1 5a7a6669308166ffb8117090411c3df9827408aa SHA256 e8caa41fb4a285e59ab8b3a2a6c0b5733423f70dbc55798d6c1472202deab496
+AUX 6.40.7.26119/zarafa-6.40.6-package.patch 2135 RMD160 30804eb455510967a5cfc2f9fe9bd699f906a9df SHA1 725f55210166e3453eae6bb58d1a417c6b0021ad SHA256 e441b08807753388e561653adcb9e3de8def54e3c343105dc25d95c1a1e0997d
+AUX 6.40.8.27223/fix-pthread.patch 2101 RMD160 aafbca78c32dc5c248ff044b9fd35ae3e5882649 SHA1 44f7ac8d8e36209c811b0e1cde5dbfdcc1cdab0d SHA256 f3e8324db43fb626aadb0bf334852d7a1b194333b120c7de643a89a37a1cc99c
+AUX 6.40.8.27223/fix-zarafaserver-uuid-linkage.patch 1394 RMD160 f88c3d41e5af48713d5ba5a4f9a9add75724bb45 SHA1 59aadb0eb993c7a552018c37e715bee7caaa1a12 SHA256 c452efb1f6b4deec5f32471b3998d6b9a40a2eacba959b76b3abae7d82e80e22
+AUX 6.40.8.27223/fix-zarafastats-uuid-linkage.patch 1051 RMD160 9713fa23bd16cb69111ecb39f840f8b7026d8f21 SHA1 ca04f80dce737ad10821c2e1bb84cd8f4ea5b9c5 SHA256 a1c0febb372dba9241cd87eded9d0e5940748cf01285a8eee0e43fa38a63fc03
+AUX 6.40.8.27223/zarafa-6.40.1-no-php-conf.patch 1634 RMD160 1bb4d4357aeeec0b005cd090beb96cb73905f58d SHA1 3da975c330bf09eca894db87aa1888536ee1e206 SHA256 ec79e127c30aeb93fe455bbebbd426645d4d8aa3e1031005ff9177d7f7b9685f
+AUX 6.40.8.27223/zarafa-6.40.2-libtcmalloc_shared-1.patch 857 RMD160 7112bfd1b5c1bf628f33521138d76ebdc9e8fa84 SHA1 638f39aa252c644362952becd5eb28fe06db8743 SHA256 c66f888d89a07c2c962f60aae81dee5b97cc2f0c0d4b5f725309f9f7509bea55
+AUX 6.40.8.27223/zarafa-6.40.2-sysconfig2confd-1.patch 8497 RMD160 1838567e668a32833d22e286defa73877cb515d2 SHA1 4ce13564cfc80598636b1c94028db3613feeb98c SHA256 cd1128ec66f18c887b6b304648e3a94b9aea782e363a303fc636b8f66b43fc5f
+AUX 6.40.8.27223/zarafa-6.40.6-force_latin1.patch 618 RMD160 8fc093050c3368c770d11326cf2402511f8d7c14 SHA1 5a7a6669308166ffb8117090411c3df9827408aa SHA256 e8caa41fb4a285e59ab8b3a2a6c0b5733423f70dbc55798d6c1472202deab496
+AUX 6.40.8.27223/zarafa-6.40.6-package.patch 2135 RMD160 30804eb455510967a5cfc2f9fe9bd699f906a9df SHA1 725f55210166e3453eae6bb58d1a417c6b0021ad SHA256 e441b08807753388e561653adcb9e3de8def54e3c343105dc25d95c1a1e0997d
 AUX 7.0.0.3.25734/fix-pthread.patch 2257 RMD160 742d533a64090b865e62dae0ab170c4a66c11896 SHA1 b9a360f9e822bed5547308e96b3635c69012ec26 SHA256 f2ac2d45a8bc7fd91e3df1a8096f0f779cad34a75a205cc98a8faab814243c7a
 AUX 7.0.0.3.25734/fix-zarafaserver-uuid-linkage.patch 707 RMD160 18b4c44f603b215e5b01262356c45e30a02dc57b SHA1 a0f6569a25e538f2a8b529fd46bc0e9fe0993590 SHA256 93eb0bfb9e539fe96b6cc936e2096b53e327e7f7c904e91eabedafe6070e18cf
 AUX 7.0.0.3.25734/fix-zarafastats-uuid-linkage.patch 542 RMD160 bc73d6373502e2fcff435369a34df87c8dbbd8e9 SHA1 5e4634de179ff03e6527e219066ea1be0711f2c7 SHA256 c9e3a60291c4268635064099856baea58c8340cb37fd7302446a225ed0b45141
@@ -45,16 +53,20 @@ DIST zcp-6.40.5-24860-sles-11-x86_64-free.tgz 23195063 RMD160 8633a69b08f21003bc
 DIST zcp-6.40.6-25584-sles-11-i586-free.tar.gz 23940552 RMD160 4525c28ee575c9751350f1fee9f5a7c279d46af6 SHA1 6323b440f8eb8f44f4705b25d6b40f53b628577d SHA256 8b8405e2fcd8ab3ea947fb39ff8833f7d6a665dd1183b24d75d447c743002253
 DIST zcp-6.40.6-25584-sles-11-x86_64-free.tar.gz 23897316 RMD160 6b51e08bec4e10403c01b7a3edbbdf41db35d006 SHA1 b694de1727709adaa04266440c703f153567888f SHA256 75a1e5956844b87e8de331d0bad6f0fcbbe442348a12b63a200f618de5c7766a
 DIST zcp-6.40.6.tar.gz 5355842 RMD160 32e46041df4efcc1a4943b1af79a6347a99dda97 SHA1 4d7553e73b22934f8a2dde747fc79a2175cf1885 SHA256 b5297458ed98e2d07f138ac99c386900c2df4d6367ffc1923c4ff1de4da68799
+DIST zcp-6.40.7-26119-sles-11-i586-free.tar.gz 27335866 RMD160 bf13b3a79e80c2956d3429de1116ecd49134c7fb SHA1 946d9895e5d2c6242ccf9af8e6c9b45b58f72499 SHA256 8452f7cf43b0be57e27884150109d2aacd44b9b322690da6770e538d07bfc517
+DIST zcp-6.40.7-26119-sles-11-x86_64-free.tar.gz 27283509 RMD160 49116b30536b7013d7715a556acfd84f7fa441ea SHA1 12aa88615d9a74ba3fb245f5e1ac8cd7a0690b63 SHA256 cfc13f80c390930e2aa9c831b1281afdff4f3924f628ebb1c033d9a1e22959ac
 DIST zcp-6.40.7.tar.gz 5362891 RMD160 dbdee3cbca76f6a3f3427aef3d4bca3d52615d1e SHA1 7f04962bb57c620afcbc76663f3556247a4de5ef SHA256 2b729bc90d8def0e223ff14103ce55ea4c2f60d0101a76ba4bbfb74f8749c9fc
-DIST zcp-6.40.7beta1-26050-sles-11-i586-free.tar.gz 27337784 RMD160 71b35e3d1fbba796a717fcb129c9a077023220fa SHA1 70f58cb7cc5885f7571514fba72ed0f5c52d210f SHA256 889655c62b80ea8dfc3b84f95b16e80feb9708cde9d14f2177599e925bf30fb5
-DIST zcp-6.40.7beta1-26050-sles-11-x86_64-free.tar.gz 27286140 RMD160 271ad1775cf743ff057f54f8f7e6ebd59ed358b0 SHA1 189edd86dadbf4f3b4f0ed4594d39ffb04ee971f SHA256 a8c68f7b9086588797ae3e35664c06b0718d69a9bcaa270e22246fb65f7d9ca2
+DIST zcp-6.40.8-27223-sles-11-i586-free.tar.gz 24048189 RMD160 442e433cb7a0da8081a5def4c8c6ac6770a24b10 SHA1 dec7d3e8fa8ad4bf5fd162ebb3b1fd2e2d3d71b4 SHA256 99a010e216e7d49d2d6b07fd33f265a08829f01d7ed85f2dd832e8809c1c72a1
+DIST zcp-6.40.8-27223-sles-11-x86_64-free.tar.gz 24001656 RMD160 d4f8474b47378b28e8e8374141c03eedff9b3666 SHA1 775f53bb7d5c35cfb596f87e99b5278ef77420eb SHA256 ba5fed41d6fee39dc969e711a7edbf76e7640ca5c77e28c9be6d11f026a99b30
+DIST zcp-6.40.8.tar.gz 5428506 RMD160 36ce2095a1d0126a43405ac50b289107910feeaf SHA1 6c342a725610fb38dc6a5cef6e0d9bc160252fd4 SHA256 206bb736731f5b3c3fdc0d34c495b8c2af9e3245770d8636bc97d06ff7363023
 DIST zcp-7.0.0.tar.gz 5898702 RMD160 dfc0958b69ebe4931e07de50f63c236b38f08aaf SHA1 fefc92f21a609bdfcab8de635076476045141c4c SHA256 3f48614df5faf151cd8eb32adce8fd23253a22d3c52b10a4bcb003968da3a900
 DIST zcp-7.0.0beta3-25734-sles-11-i586-free.tar.gz 25242652 RMD160 8f3710fc09b0b2ca80e80ae4f3c3a041d2808b19 SHA1 d601974e823700623c0d8b3e3496b43f3dbca115 SHA256 1648c3200d9249baa50ed8d43e46f78535a643d9042a3a5d7e8bfff27aa0fc2a
 DIST zcp-7.0.0beta3-25734-sles-11-x86_64-free.tar.gz 25165278 RMD160 8925b89c1107d4530397275bfd14bf14e7ae55d9 SHA1 f4e5877ab6b47c6e2e57a805d308720842b2e24e SHA256 6d9db4530621cffc40797511fb4757f3c259a48c9f9d4a3515aefd0ec7437e4d
 DIST zcp-source-6.40.5-24860.tgz 7075378 RMD160 1d350cb5dd0df326f3c96ace088f8a40783193aa SHA1 b7c00fae3e49af8e733cb76dfb5a6ba57867a14f SHA256 dbc69d9261bd19479f81024d0482b641b4b6a65089e67076d29eec116edcb546
 EBUILD zarafa-6.40.5.24860.ebuild 6477 RMD160 8eaabfabf480dc46d5eac5e237951c1bc75bff9f SHA1 cc05fa3a7ac388c250f5f7935c08ab51a1597961 SHA256 b296f4d589b2b0d8ae64aff1bfe37a98d316d2d659af802d9b316a2c0986028b
 EBUILD zarafa-6.40.6.25584.ebuild 6723 RMD160 72550113d78f6864caa8122ffeb08bb3c79412b3 SHA1 76ffb4521e5465ad31af130d1d332212f4835cae SHA256 42dcf7aa4750b6bf7e8574f7894441bac4595371462c57371be9c0800083bba9
-EBUILD zarafa-6.40.7.1.26050.ebuild 6779 RMD160 b75b914cbd48bf6933bd17fc1be40b705f160c20 SHA1 70f089a66a8c821435ca82e4a502a8d6d143aab8 SHA256 57b0045af1509e7785cc82fcef6fe79d4a77fcea9679386b583a9bfaf4141493
+EBUILD zarafa-6.40.7.26119.ebuild 6777 RMD160 fe359cd63aca023aa83fad9a95abe0239b732a82 SHA1 6f343990be1fba33e2e06fa08f52ff57a4f47f7c SHA256 03b75c59a78e6afdbac9e8be7ef683cb42b7346e3879756057951c2f8ad38fdc
+EBUILD zarafa-6.40.8.27223.ebuild 6793 RMD160 e6dab0607401ac1a78415b275b845aaf660eeecc SHA1 792d09cc253baaa11e2afefdbaf16df84e002b5e SHA256 6f795926064e99b7698509e3c3cfa2f4f351acfb302c17fe2ac13e820e308439
 EBUILD zarafa-7.0.0.3.25734.ebuild 6767 RMD160 7cfdab79030913daa2f8c64114a25db32dbda881 SHA1 b159c7d13e2b7f50a8aa9e5e0f7b730b25b422f8 SHA256 a51e0f2b582e03f2f3d755cbf0ae3aded472edacd614fbfbedb758e34f8e1ec7
-MISC ChangeLog 3270 RMD160 d84f151a6a1e37047fb16912798a79b69663c4cd SHA1 dad94ae230d4a4c96a53c74e998a289b788a5fa5 SHA256 08bf19a90446b57ccfad77db0d01db73afd86fbef75ff58f5db7bfaf34e177f9
+MISC ChangeLog 3954 RMD160 af8cca7035ff30826d307c372dbb3de5078afbcd SHA1 ede72513c87bc260ff4083bb5da34116d8503d1f SHA256 e478096d8daa2eba1c49cc51e89f81ef2061ca4009e2792f73f63833a9871f9a
 MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5
diff --git a/net-mail/zarafa/files/6.40.7.1.26050/fix-pthread.patch b/net-mail/zarafa/files/6.40.7.26119/fix-pthread.patch
similarity index 100%
rename from net-mail/zarafa/files/6.40.7.1.26050/fix-pthread.patch
rename to net-mail/zarafa/files/6.40.7.26119/fix-pthread.patch
diff --git a/net-mail/zarafa/files/6.40.7.1.26050/fix-zarafaserver-uuid-linkage.patch b/net-mail/zarafa/files/6.40.7.26119/fix-zarafaserver-uuid-linkage.patch
similarity index 100%
rename from net-mail/zarafa/files/6.40.7.1.26050/fix-zarafaserver-uuid-linkage.patch
rename to net-mail/zarafa/files/6.40.7.26119/fix-zarafaserver-uuid-linkage.patch
diff --git a/net-mail/zarafa/files/6.40.7.1.26050/fix-zarafastats-uuid-linkage.patch b/net-mail/zarafa/files/6.40.7.26119/fix-zarafastats-uuid-linkage.patch
similarity index 100%
rename from net-mail/zarafa/files/6.40.7.1.26050/fix-zarafastats-uuid-linkage.patch
rename to net-mail/zarafa/files/6.40.7.26119/fix-zarafastats-uuid-linkage.patch
diff --git a/net-mail/zarafa/files/6.40.7.1.26050/zarafa-6.40.1-no-php-conf.patch b/net-mail/zarafa/files/6.40.7.26119/zarafa-6.40.1-no-php-conf.patch
similarity index 100%
rename from net-mail/zarafa/files/6.40.7.1.26050/zarafa-6.40.1-no-php-conf.patch
rename to net-mail/zarafa/files/6.40.7.26119/zarafa-6.40.1-no-php-conf.patch
diff --git a/net-mail/zarafa/files/6.40.7.1.26050/zarafa-6.40.2-libtcmalloc_shared-1.patch b/net-mail/zarafa/files/6.40.7.26119/zarafa-6.40.2-libtcmalloc_shared-1.patch
similarity index 100%
rename from net-mail/zarafa/files/6.40.7.1.26050/zarafa-6.40.2-libtcmalloc_shared-1.patch
rename to net-mail/zarafa/files/6.40.7.26119/zarafa-6.40.2-libtcmalloc_shared-1.patch
diff --git a/net-mail/zarafa/files/6.40.7.1.26050/zarafa-6.40.2-sysconfig2confd-1.patch b/net-mail/zarafa/files/6.40.7.26119/zarafa-6.40.2-sysconfig2confd-1.patch
similarity index 100%
rename from net-mail/zarafa/files/6.40.7.1.26050/zarafa-6.40.2-sysconfig2confd-1.patch
rename to net-mail/zarafa/files/6.40.7.26119/zarafa-6.40.2-sysconfig2confd-1.patch
diff --git a/net-mail/zarafa/files/6.40.7.1.26050/zarafa-6.40.6-force_latin1.patch b/net-mail/zarafa/files/6.40.7.26119/zarafa-6.40.6-force_latin1.patch
similarity index 100%
rename from net-mail/zarafa/files/6.40.7.1.26050/zarafa-6.40.6-force_latin1.patch
rename to net-mail/zarafa/files/6.40.7.26119/zarafa-6.40.6-force_latin1.patch
diff --git a/net-mail/zarafa/files/6.40.7.1.26050/zarafa-6.40.6-package.patch b/net-mail/zarafa/files/6.40.7.26119/zarafa-6.40.6-package.patch
similarity index 100%
rename from net-mail/zarafa/files/6.40.7.1.26050/zarafa-6.40.6-package.patch
rename to net-mail/zarafa/files/6.40.7.26119/zarafa-6.40.6-package.patch
diff --git a/net-mail/zarafa/files/6.40.8.27223/fix-pthread.patch b/net-mail/zarafa/files/6.40.8.27223/fix-pthread.patch
new file mode 100644
index 0000000..b374366
--- /dev/null
+++ b/net-mail/zarafa/files/6.40.8.27223/fix-pthread.patch
@@ -0,0 +1,51 @@
+diff -uNr zarafa-6.40.6.orig//autoconf/ltmain.sh zarafa-6.40.6/autoconf/ltmain.sh
+--- zarafa-6.40.6.orig//autoconf/ltmain.sh	2011-03-20 08:23:21.000000000 +0100
++++ zarafa-6.40.6/autoconf/ltmain.sh	2011-03-20 08:24:23.000000000 +0100
+@@ -1628,7 +1628,7 @@
+ 	elif test "X$arg" = "X-lc_r"; then
+ 	 case $host in
+ 	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+-	   # Do not include libc_r directly, use -pthread flag.
++	   # Do not include libc_r directly, use -lpthread flag.
+ 	   continue
+ 	   ;;
+ 	 esac
+@@ -1647,7 +1647,7 @@
+ 	continue
+ 	;;
+ 
+-     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
++     -mt|-mthreads|-kthread|-Kthread|-lpthread|-pthreads|--thread-safe|-threads)
+ 	compiler_flags="$compiler_flags $arg"
+ 	compile_command="$compile_command $arg"
+ 	finalize_command="$finalize_command $arg"
+@@ -2150,7 +2150,7 @@
+ 	lib=
+ 	found=no
+ 	case $deplib in
+-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
++	-mt|-mthreads|-kthread|-Kthread|-lpthread|-pthreads|--thread-safe|-threads)
+ 	  if test "$linkmode,$pass" = "prog,link"; then
+ 	    compile_deplibs="$deplib $compile_deplibs"
+ 	    finalize_deplibs="$deplib $finalize_deplibs"
+diff -uNr zarafa-6.40.6.orig//configure.ac zarafa-6.40.6/configure.ac
+--- zarafa-6.40.6.orig//configure.ac	2011-03-20 08:23:20.000000000 +0100
++++ zarafa-6.40.6/configure.ac	2011-03-20 08:23:44.000000000 +0100
+@@ -407,7 +407,7 @@
+    CPPFLAGS="$CPPFLAGS -I$CLUCENE_INCLUDE_PREFIX"
+ fi
+ # force add pthread in lucene test
+-CXXFLAGS="$CXXFLAGS -pthread"
++CXXFLAGS="$CXXFLAGS -lpthread"
+ if test -e "${CLUCENE_LIB_PREFIX}/libclucene.a"; then
+ AC_CHECK_LIB(clucene, [open],
+   [ CLUCENE_LIBS="${CLUCENE_LIB_PREFIX}/libclucene.a"
+@@ -561,7 +561,7 @@
+ AC_CHECK_LIB([pthread], [pthread_create],, AC_MSG_ERROR([required library libpthread missing or unusable]))
+ LIBS=$libs_keep
+ # because it seems this is better... (gnu c/c++ only?)
+-CXXFLAGS="$CXXFLAGS -pthread"
++CXXFLAGS="$CXXFLAGS -lpthread"
+ 
+ # Only specific links with uuid and dl, clients only with crypto and ssl for ssl connections
+ libs_keep=$LIBS
diff --git a/net-mail/zarafa/files/6.40.8.27223/fix-zarafaserver-uuid-linkage.patch b/net-mail/zarafa/files/6.40.8.27223/fix-zarafaserver-uuid-linkage.patch
new file mode 100644
index 0000000..610b74d
--- /dev/null
+++ b/net-mail/zarafa/files/6.40.8.27223/fix-zarafaserver-uuid-linkage.patch
@@ -0,0 +1,26 @@
+Index: zarafa-6.40.0/provider/server/Makefile.in
+===================================================================
+--- zarafa-6.40.0.orig/provider/server/Makefile.in
++++ zarafa-6.40.0/provider/server/Makefile.in
+@@ -274,7 +274,7 @@ zarafa_server_LDADD = $(UUID_LIBS) $(INT
+ 	${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) $(UUID_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
+ 
+ zarafa_server_SOURCES = ECServer.cpp  \
+ 						ECSoapServerConnection.h ECSoapServerConnection.cpp \
+Index: zarafa-6.40.0/provider/server/Makefile.am
+===================================================================
+--- zarafa-6.40.0.orig/provider/server/Makefile.am
++++ zarafa-6.40.0/provider/server/Makefile.am
+@@ -18,7 +18,7 @@ zarafa_server_LDADD = $(UUID_LIBS) $(INT
+ 	${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) $(UUID_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
+ 
+ zarafa_server_SOURCES = ECServer.cpp  \
+ 						ECSoapServerConnection.h ECSoapServerConnection.cpp \
diff --git a/net-mail/zarafa/files/6.40.8.27223/fix-zarafastats-uuid-linkage.patch b/net-mail/zarafa/files/6.40.8.27223/fix-zarafastats-uuid-linkage.patch
new file mode 100644
index 0000000..05e1406
--- /dev/null
+++ b/net-mail/zarafa/files/6.40.8.27223/fix-zarafastats-uuid-linkage.patch
@@ -0,0 +1,24 @@
+diff -Nuar zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.am zarafa-6.40.0/ECtools/zarafa-stats/Makefile.am
+--- zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.am	2010-04-26 11:37:49.561680215 +0300
++++ zarafa-6.40.0/ECtools/zarafa-stats/Makefile.am	2010-04-26 11:38:31.435806562 +0300
+@@ -13,7 +13,7 @@
+ 	${top_builddir}/mapi4linux/src/libmapi.la \
+ 	${top_builddir}/common/libcommon_mapi.la \
+ 	${top_builddir}/common/libcommon_util.la \
+-	-lncurses
++	-lncurses -luuid
+ 
+ zarafa_stats_SOURCES = zarafa-stats.cpp
+ 
+diff -Nuar zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.in zarafa-6.40.0/ECtools/zarafa-stats/Makefile.in
+--- zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.in	2010-04-26 11:37:49.561680215 +0300
++++ zarafa-6.40.0/ECtools/zarafa-stats/Makefile.in	2010-04-26 11:38:22.475687815 +0300
+@@ -250,7 +250,7 @@
+ 	${top_builddir}/mapi4linux/src/libmapi.la \
+ 	${top_builddir}/common/libcommon_mapi.la \
+ 	${top_builddir}/common/libcommon_util.la \
+-	-lncurses
++	-lncurses -luuid
+ 
+ zarafa_stats_SOURCES = zarafa-stats.cpp
+ all: all-am
diff --git a/net-mail/zarafa/files/6.40.8.27223/zarafa-6.40.1-no-php-conf.patch b/net-mail/zarafa/files/6.40.8.27223/zarafa-6.40.1-no-php-conf.patch
new file mode 100644
index 0000000..9e51f09
--- /dev/null
+++ b/net-mail/zarafa/files/6.40.8.27223/zarafa-6.40.1-no-php-conf.patch
@@ -0,0 +1,44 @@
+--- 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/6.40.8.27223/zarafa-6.40.2-libtcmalloc_shared-1.patch b/net-mail/zarafa/files/6.40.8.27223/zarafa-6.40.2-libtcmalloc_shared-1.patch
new file mode 100644
index 0000000..28dcc78
--- /dev/null
+++ b/net-mail/zarafa/files/6.40.8.27223/zarafa-6.40.2-libtcmalloc_shared-1.patch
@@ -0,0 +1,19 @@
+Submitted By: Your Name (your at email dot address)
+Date: 2010-10-11
+Initial Package Version: 6.40.2
+Origin: me
+Upstream Status: unknown
+Description: on gentoo libtcmalloc_minimal is only provided as shared lib
+ 
+diff -Naur zarafa-6.40.2.orig/configure.ac zarafa-6.40.2/configure.ac
+--- zarafa-6.40.2.orig/configure.ac	2010-10-11 18:39:35.000000000 +0000
++++ zarafa-6.40.2/configure.ac	2010-10-11 18:40:03.000000000 +0000
+@@ -441,7 +441,7 @@
+       AC_HELP_STRING([--with-tcmalloc-prefix=PATH],[path to tcmalloc lib, e.g. /usr/lib/]),
+       [TCMALLOC_PREFIX=${withval}],[TCMALLOC_PREFIX=/usr/lib])
+     AC_CHECK_LIB(tcmalloc_minimal, [open],
+-      [ TCMALLOC_LIBS="${TCMALLOC_PREFIX}/libtcmalloc_minimal.a" ],
++      [ TCMALLOC_LIBS="${TCMALLOC_PREFIX}/libtcmalloc_minimal.so" ],
+       [ WITH_TCMALLOC=no ])
+     AC_SUBST(TCMALLOC_LIBS)
+     AC_LANG_POP
diff --git a/net-mail/zarafa/files/6.40.8.27223/zarafa-6.40.2-sysconfig2confd-1.patch b/net-mail/zarafa/files/6.40.8.27223/zarafa-6.40.2-sysconfig2confd-1.patch
new file mode 100644
index 0000000..93e4d0f
--- /dev/null
+++ b/net-mail/zarafa/files/6.40.8.27223/zarafa-6.40.2-sysconfig2confd-1.patch
@@ -0,0 +1,187 @@
+Submitted By: Your Name (your at email dot address)
+Date: 2010-10-13
+Initial Package Version: 6.40.2
+Origin: me
+Upstream Status: gentoo specific
+Description: this patch correct the install dir for the default install target from /etc/sysconfig to the gentoo equivalent /etc/conf.d
+ 
+diff -Naur zarafa-6.40.2.orig/installer/linux/Makefile.am zarafa-6.40.2/installer/linux/Makefile.am
+--- zarafa-6.40.2.orig/installer/linux/Makefile.am	2010-10-13 08:26:21.000000000 +0000
++++ zarafa-6.40.2/installer/linux/Makefile.am	2010-10-13 08:28:26.000000000 +0000
+@@ -26,7 +26,7 @@
+ sysconf_initdir=${sysconfdir}/init.d
+ sysconf_init_SCRIPTS = ${@DISTRO@_initscript_files}
+ 
+-rhel_sysconfig_path = ${sysconfdir}/sysconfig
++rhel_sysconfig_path = ${sysconfdir}/conf.d
+ suse_sysconfig_path = ${localstatedir}/adm/fillup-templates
+ sles_sysconfig_path = ${localstatedir}/adm/fillup-templates
+ sysconf_sysconfigdir = ${@DISTRO@_sysconfig_path}
+diff -Naur zarafa-6.40.2.orig/installer/userscripts/createcompany zarafa-6.40.2/installer/userscripts/createcompany
+--- zarafa-6.40.2.orig/installer/userscripts/createcompany	2010-10-13 08:26:21.000000000 +0000
++++ zarafa-6.40.2/installer/userscripts/createcompany	2010-10-13 08:26:53.000000000 +0000
+@@ -9,8 +9,8 @@
+ # beware that this string can contain any characters, so take heed to
+ # correct quoting.
+ 
+-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
+-  . ${prefix}/etc/sysconfig/zarafa
++if [ -f ${prefix}/etc/conf.d/zarafa ]; then
++  . ${prefix}/etc/conf.d/zarafa
+ fi
+ 
+ ZARAFA_COMPANY_SCRIPTS=/etc/zarafa/userscripts/createcompany.d
+diff -Naur zarafa-6.40.2.orig/installer/userscripts/createcompany.in zarafa-6.40.2/installer/userscripts/createcompany.in
+--- zarafa-6.40.2.orig/installer/userscripts/createcompany.in	2010-10-13 08:26:21.000000000 +0000
++++ zarafa-6.40.2/installer/userscripts/createcompany.in	2010-10-13 08:27:00.000000000 +0000
+@@ -9,8 +9,8 @@
+ # beware that this string can contain any characters, so take heed to
+ # correct quoting.
+ 
+-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
+-  . @sysconfdir@/sysconfig/zarafa
++if [ -f @sysconfdir@/conf.d/zarafa ]; then
++  . @sysconfdir@/conf.d/zarafa
+ fi
+ 
+ ZARAFA_COMPANY_SCRIPTS=@USERSCRIPTDIR@/createcompany.d
+diff -Naur zarafa-6.40.2.orig/installer/userscripts/creategroup zarafa-6.40.2/installer/userscripts/creategroup
+--- zarafa-6.40.2.orig/installer/userscripts/creategroup	2010-10-13 08:26:21.000000000 +0000
++++ zarafa-6.40.2/installer/userscripts/creategroup	2010-10-13 08:27:04.000000000 +0000
+@@ -9,8 +9,8 @@
+ # beware that this string can contain any characters, so take heed to
+ # correct quoting.
+ 
+-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
+-  . ${prefix}/etc/sysconfig/zarafa
++if [ -f ${prefix}/etc/conf.d/zarafa ]; then
++  . ${prefix}/etc/conf.d/zarafa
+ fi
+ 
+ ZARAFA_GROUP_SCRIPTS=/etc/zarafa/userscripts/creategroup.d
+diff -Naur zarafa-6.40.2.orig/installer/userscripts/creategroup.in zarafa-6.40.2/installer/userscripts/creategroup.in
+--- zarafa-6.40.2.orig/installer/userscripts/creategroup.in	2010-10-13 08:26:21.000000000 +0000
++++ zarafa-6.40.2/installer/userscripts/creategroup.in	2010-10-13 08:27:08.000000000 +0000
+@@ -9,8 +9,8 @@
+ # beware that this string can contain any characters, so take heed to
+ # correct quoting.
+ 
+-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
+-  . @sysconfdir@/sysconfig/zarafa
++if [ -f @sysconfdir@/conf.d/zarafa ]; then
++  . @sysconfdir@/conf.d/zarafa
+ fi
+ 
+ ZARAFA_GROUP_SCRIPTS=@USERSCRIPTDIR@/creategroup.d
+diff -Naur zarafa-6.40.2.orig/installer/userscripts/createuser zarafa-6.40.2/installer/userscripts/createuser
+--- zarafa-6.40.2.orig/installer/userscripts/createuser	2010-10-13 08:26:21.000000000 +0000
++++ zarafa-6.40.2/installer/userscripts/createuser	2010-10-13 08:27:12.000000000 +0000
+@@ -9,8 +9,8 @@
+ # beware that this string can contain any characters, so take heed to
+ # correct quoting.
+ 
+-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
+-  . ${prefix}/etc/sysconfig/zarafa
++if [ -f ${prefix}/etc/conf.d/zarafa ]; then
++  . ${prefix}/etc/conf.d/zarafa
+ fi
+ 
+ ZARAFA_USER_SCRIPTS=/etc/zarafa/userscripts/createuser.d
+diff -Naur zarafa-6.40.2.orig/installer/userscripts/createuser.in zarafa-6.40.2/installer/userscripts/createuser.in
+--- zarafa-6.40.2.orig/installer/userscripts/createuser.in	2010-10-13 08:26:21.000000000 +0000
++++ zarafa-6.40.2/installer/userscripts/createuser.in	2010-10-13 08:27:17.000000000 +0000
+@@ -9,8 +9,8 @@
+ # beware that this string can contain any characters, so take heed to
+ # correct quoting.
+ 
+-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
+-  . @sysconfdir@/sysconfig/zarafa
++if [ -f @sysconfdir@/conf.d/zarafa ]; then
++  . @sysconfdir@/conf.d/zarafa
+ fi
+ 
+ ZARAFA_USER_SCRIPTS=@USERSCRIPTDIR@/createuser.d
+diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletecompany zarafa-6.40.2/installer/userscripts/deletecompany
+--- zarafa-6.40.2.orig/installer/userscripts/deletecompany	2010-10-13 08:26:21.000000000 +0000
++++ zarafa-6.40.2/installer/userscripts/deletecompany	2010-10-13 08:27:22.000000000 +0000
+@@ -9,8 +9,8 @@
+ # beware that this string can contain any characters, so take heed to
+ # correct quoting.
+ 
+-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
+-  . ${prefix}/etc/sysconfig/zarafa
++if [ -f ${prefix}/etc/conf.d/zarafa ]; then
++  . ${prefix}/etc/conf.d/zarafa
+ fi
+ 
+ ZARAFA_COMPANY_SCRIPTS=/etc/zarafa/userscripts/deletecompany.d
+diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletecompany.in zarafa-6.40.2/installer/userscripts/deletecompany.in
+--- zarafa-6.40.2.orig/installer/userscripts/deletecompany.in	2010-10-13 08:26:21.000000000 +0000
++++ zarafa-6.40.2/installer/userscripts/deletecompany.in	2010-10-13 08:27:26.000000000 +0000
+@@ -9,8 +9,8 @@
+ # beware that this string can contain any characters, so take heed to
+ # correct quoting.
+ 
+-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
+-  . @sysconfdir@/sysconfig/zarafa
++if [ -f @sysconfdir@/conf.d/zarafa ]; then
++  . @sysconfdir@/conf.d/zarafa
+ fi
+ 
+ ZARAFA_COMPANY_SCRIPTS=@USERSCRIPTDIR@/deletecompany.d
+diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletegroup zarafa-6.40.2/installer/userscripts/deletegroup
+--- zarafa-6.40.2.orig/installer/userscripts/deletegroup	2010-10-13 08:26:21.000000000 +0000
++++ zarafa-6.40.2/installer/userscripts/deletegroup	2010-10-13 08:27:30.000000000 +0000
+@@ -9,8 +9,8 @@
+ # beware that this string can contain any characters, so take heed to
+ # correct quoting.
+ 
+-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
+-  . ${prefix}/etc/sysconfig/zarafa
++if [ -f ${prefix}/etc/conf.d/zarafa ]; then
++  . ${prefix}/etc/conf.d/zarafa
+ fi
+ 
+ ZARAFA_GROUP_SCRIPTS=/etc/zarafa/userscripts/deletegroup.d
+diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletegroup.in zarafa-6.40.2/installer/userscripts/deletegroup.in
+--- zarafa-6.40.2.orig/installer/userscripts/deletegroup.in	2010-10-13 08:26:21.000000000 +0000
++++ zarafa-6.40.2/installer/userscripts/deletegroup.in	2010-10-13 08:27:35.000000000 +0000
+@@ -9,8 +9,8 @@
+ # beware that this string can contain any characters, so take heed to
+ # correct quoting.
+ 
+-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
+-  . @sysconfdir@/sysconfig/zarafa
++if [ -f @sysconfdir@/conf.d/zarafa ]; then
++  . @sysconfdir@/conf.d/zarafa
+ fi
+ 
+ ZARAFA_GROUP_SCRIPTS=@USERSCRIPTDIR@/deletegroup.d
+diff -Naur zarafa-6.40.2.orig/installer/userscripts/deleteuser zarafa-6.40.2/installer/userscripts/deleteuser
+--- zarafa-6.40.2.orig/installer/userscripts/deleteuser	2010-10-13 08:26:21.000000000 +0000
++++ zarafa-6.40.2/installer/userscripts/deleteuser	2010-10-13 08:27:39.000000000 +0000
+@@ -9,8 +9,8 @@
+ # that this string can contain any characters, so take heed to correct
+ # quoting.
+ 
+-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
+-  . ${prefix}/etc/sysconfig/zarafa
++if [ -f ${prefix}/etc/conf.d/zarafa ]; then
++  . ${prefix}/etc/conf.d/zarafa
+ fi
+ 
+ ZARAFA_USER_SCRIPTS=/etc/zarafa/userscripts/deleteuser.d
+diff -Naur zarafa-6.40.2.orig/installer/userscripts/deleteuser.in zarafa-6.40.2/installer/userscripts/deleteuser.in
+--- zarafa-6.40.2.orig/installer/userscripts/deleteuser.in	2010-10-13 08:26:21.000000000 +0000
++++ zarafa-6.40.2/installer/userscripts/deleteuser.in	2010-10-13 08:27:43.000000000 +0000
+@@ -9,8 +9,8 @@
+ # that this string can contain any characters, so take heed to correct
+ # quoting.
+ 
+-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
+-  . @sysconfdir@/sysconfig/zarafa
++if [ -f @sysconfdir@/conf.d/zarafa ]; then
++  . @sysconfdir@/conf.d/zarafa
+ fi
+ 
+ ZARAFA_USER_SCRIPTS=@USERSCRIPTDIR@/deleteuser.d
diff --git a/net-mail/zarafa/files/6.40.8.27223/zarafa-6.40.6-force_latin1.patch b/net-mail/zarafa/files/6.40.8.27223/zarafa-6.40.6-force_latin1.patch
new file mode 100644
index 0000000..82ada47
--- /dev/null
+++ b/net-mail/zarafa/files/6.40.8.27223/zarafa-6.40.6-force_latin1.patch
@@ -0,0 +1,14 @@
+diff -uNr zarafa-6.40.6.orig//provider/libserver/ECDatabaseMySQL.cpp zarafa-6.40.6/provider/libserver/ECDatabaseMySQL.cpp
+--- zarafa-6.40.6.orig//provider/libserver/ECDatabaseMySQL.cpp	2011-03-20 23:50:06.000000000 +0100
++++ zarafa-6.40.6/provider/libserver/ECDatabaseMySQL.cpp	2011-03-21 00:00:45.000000000 +0100
+@@ -343,6 +343,10 @@
+ 		// this option was introduced in mysql 5.0, so let's not even try on 4.1 servers
+ 		strQuery = "SET SESSION sql_mode = 'STRICT_ALL_TABLES'";
+ 		Query(strQuery); // ignore error
++
++		// Latin1 is default charset
++		strQuery = "SET NAMES 'latin1'";
++		Query(strQuery);
+ 	}
+ 
+ exit:
diff --git a/net-mail/zarafa/files/6.40.8.27223/zarafa-6.40.6-package.patch b/net-mail/zarafa/files/6.40.8.27223/zarafa-6.40.6-package.patch
new file mode 100644
index 0000000..e311bb2
--- /dev/null
+++ b/net-mail/zarafa/files/6.40.8.27223/zarafa-6.40.6-package.patch
@@ -0,0 +1,65 @@
+Patch by Robert Scheck <robert@fedoraproject.org> for zarafa >= 6.40.0, which only
+removes the paths from autoconf/automake related files, that don't exist in the OSS
+version of Zarafa. Having these paths not removed causes autoreconf to fail, but a
+re-run of autoreconf is needed in order to get the rpaths completely out of all the
+libraries and binaries built during the make process.
+
+forward patch by Mario Fetka <mario.fetka@gmail.com>
+
+diff -uNr zarafa-6.40.6,orig//ECtools/Makefile.am zarafa-6.40.6/ECtools/Makefile.am
+--- zarafa-6.40.6,orig//ECtools/Makefile.am	2011-03-20 08:34:03.000000000 +0100
++++ zarafa-6.40.6/ECtools/Makefile.am	2011-03-20 08:36:31.000000000 +0100
+@@ -1,7 +1,3 @@
+-if ! OSS_ONLY
+-PROSUBS = zarafa-backup zarafa-report
+-endif
+-
+ if WITH_TESTTOOLS
+ TESTSUBS = ECTestTools
+ endif
+diff -uNr zarafa-6.40.6,orig//Makefile.am zarafa-6.40.6/Makefile.am
+--- zarafa-6.40.6,orig//Makefile.am	2011-03-20 08:34:03.000000000 +0100
++++ zarafa-6.40.6/Makefile.am	2011-03-20 08:35:57.000000000 +0100
+@@ -1,10 +1,6 @@
+ AUTOMAKE_OPTIONS = 1.9 foreign
+ ACLOCAL_AMFLAGS = -Iautoconf
+ 
+-if ! OSS_ONLY
+-PROSUBS = liblicense licensed
+-endif
+-
+ SUBDIRS = common libfreebusy zarafa-libsync mapi4linux $(PROSUBS) provider libicalmapi inetmapi php-ext spooler gateway caldav ECtools installer po doc
+ 
+ if WITH_SWIG
+@@ -26,10 +22,6 @@
+ common/ecversion.h: versionheader.sh
+ 	sh ${top_srcdir}/versionheader.sh > common/ecversion.h
+ 
+-if ! OSS_ONLY
+-CLEANFILES=common/ecversion.h
+-endif
+-
+ dist-hook:
+ 	find $(distdir) -type d -name .svn -exec rm -rf {} \; 2>/dev/null || true
+ if OSS_ONLY
+diff -uNr zarafa-6.40.6,orig//configure.ac zarafa-6.40.6/configure.ac
+--- zarafa-6.40.6,orig//configure.ac	2011-03-20 08:34:03.000000000 +0100
++++ zarafa-6.40.6/configure.ac	2011-03-20 08:35:16.000000000 +0100
+@@ -808,17 +808,6 @@
+ 		version
+ 		specialbuild
+ ])
+-dnl non-oss files
+-if test -d `dirname $0`/licensed; then
+-AC_CONFIG_FILES([
+-		liblicense/Makefile
+-		licensed/Makefile
+-		ECtools/zarafa-backup/Makefile
+-		ECtools/zarafa-backup/helpers/Makefile
+-		ECtools/zarafa-report/Makefile
+-		debian/zarafa.install
+-])
+-fi
+ 
+ AC_OUTPUT
+ 
diff --git a/net-mail/zarafa/zarafa-6.40.7.1.26050.ebuild b/net-mail/zarafa/zarafa-6.40.7.26119.ebuild
similarity index 94%
rename from net-mail/zarafa/zarafa-6.40.7.1.26050.ebuild
rename to net-mail/zarafa/zarafa-6.40.7.26119.ebuild
index 8cfd314..5fe4d32 100644
--- a/net-mail/zarafa/zarafa-6.40.7.1.26050.ebuild
+++ b/net-mail/zarafa/zarafa-6.40.7.26119.ebuild
@@ -11,17 +11,17 @@ USE_PHP="php5-3"
 
 inherit php-ext-source-r2 eutils autotools rpm5 versionator
 
-MY_PV=$(replace_version_separator 4 '-'  )
+MY_PV=$(replace_version_separator 3 '-'  )
 MY_PVV=$(replace_version_separator 3 'beta' $MY_PV )
 MY_PVM=$(get_version_component_range 1-2 )
 MY_PVR=$(get_version_component_range 1-3 )
 
 DESCRIPTION="Open Source Groupware Solution"
 HOMEPAGE="http://zarafa.com/"
-SRC_URI="http://download.zarafa.com/community/beta/${MY_PVM}/${MY_PVV}/sourcecode/zcp-${MY_PVR}.tar.gz
+SRC_URI="http://download.zarafa.com/community/final/${MY_PVM}/${MY_PV}/sourcecode/zcp-${MY_PVR}.tar.gz
 	!arm? ( licensed? (
-	amd64? ( http://download.zarafa.com/community/beta/${MY_PVM}/${MY_PVV}/zcp-${MY_PVV}-sles-11-x86_64-free.tar.gz )
-	x86? ( http://download.zarafa.com/community/beta/${MY_PVM}/${MY_PVV}/zcp-${MY_PVV}-sles-11-i586-free.tar.gz ) ) )"
+	amd64? ( http://download.zarafa.com/community/final/${MY_PVM}/${MY_PV}/zcp-${MY_PV}-sles-11-x86_64-free.tar.gz )
+	x86? ( http://download.zarafa.com/community/final/${MY_PVM}/${MY_PV}/zcp-${MY_PV}-sles-11-i586-free.tar.gz ) ) )"
 
 LICENSE="AGPL-3"
 SLOT="0"
diff --git a/net-mail/zarafa/zarafa-6.40.8.27223.ebuild b/net-mail/zarafa/zarafa-6.40.8.27223.ebuild
new file mode 100644
index 0000000..84f1593
--- /dev/null
+++ b/net-mail/zarafa/zarafa-6.40.8.27223.ebuild
@@ -0,0 +1,202 @@
+# 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 php-ext-source-r2 eutils autotools rpm5 versionator
+
+MY_PV=$(replace_version_separator 3 '-'  )
+MY_PVV=$(replace_version_separator 3 'beta' $MY_PV )
+MY_PVM=$(get_version_component_range 1-2 )
+MY_PVR=$(get_version_component_range 1-3 )
+
+DESCRIPTION="Open Source Groupware Solution"
+HOMEPAGE="http://zarafa.com/"
+SRC_URI="http://download.zarafa.com/community/final/${MY_PVM}/${MY_PV}/sourcecode/zcp-${MY_PVR}.tar.gz
+	!arm? ( licensed? (
+	amd64? ( http://download.zarafa.com/community/final/${MY_PVM}/${MY_PV}/zcp-${MY_PV}-sles-11-x86_64-free.tar.gz )
+	x86? ( http://download.zarafa.com/community/final/${MY_PVM}/${MY_PV}/zcp-${MY_PV}-sles-11-i586-free.tar.gz ) ) )"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+RESTRICT=""
+IUSE="debug epoll ldap logrotate licensed static swig tcmalloc testtools perl pic profiling python kerberos sparsehash"
+
+RDEPEND=">=dev-libs/libical-0.44
+	dev-cpp/libvmime:0.7
+	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
+	sys-libs/ncurses
+	sys-libs/pam
+	dev-libs/boost
+	kerberos? ( || ( app-crypt/mit-krb5 app-crypt/heimdal ) )
+	ldap? ( net-nds/openldap )
+	logrotate? ( app-admin/logrotate )
+	tcmalloc? ( dev-util/google-perftools )
+	sparsehash? ( dev-cpp/sparsehash )
+	perl? ( dev-lang/perl )
+	python? ( dev-lang/python )
+	swig? ( dev-lang/swig )
+	testtools? ( dev-python/testtools )
+	!arm? ( licensed? (
+	dev-libs/openssl:0.9.8
+	>=sys-libs/zlib-1.2.4
+	) )"
+
+S="${WORKDIR}"/zarafa-${MY_PVR}/
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	sys-devel/gettext
+	dev-lang/php"
+
+QA_PRESTRIPPED="
+	usr/bin/zarafa-restore
+	usr/bin/zarafa-report
+	usr/bin/zarafa-backup
+	usr/bin/zarafa-licensed
+	usr/lib/zarafa/ldapmsplugin.so
+	usr/lib64/zarafa/ldapmsplugin.so"
+
+QA_DT_HASH="
+	usr/bin/zarafa-restore
+	usr/bin/zarafa-report
+	usr/bin/zarafa-backup
+	usr/bin/zarafa-licensed
+	usr/lib/zarafa/ldapmsplugin.so
+	usr/lib64/zarafa/ldapmsplugin.so"
+
+src_unpack() {
+	unpack ${A}
+	if ! use arm; then
+		if use licensed; then
+			cd "${WORKDIR}"
+			mkdir licensed
+			cd licensed
+			if use x86; then
+				rpm5_unpack $(find ./../ -name "zarafa-licensed*")
+#				rpm5_unpack $(find ./../ -name "zarafa-webaccess-muc*")
+			fi
+			if use amd64; then
+				rpm5_unpack $(find ./../ -name "zarafa-licensed*")
+#				rpm5_unpack $(find ./../ -name "zarafa-webaccess-muc*")
+			fi
+			cd "${S}"
+		fi
+	fi
+}
+
+src_prepare() {
+	EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" epatch
+	edos2unix php-webclient-ajax/config.php.dist
+	AT_M4DIR="autoconf" eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-oss \
+		--disable-testtools \
+		--enable-release \
+		--with-userscript-prefix=/etc/zarafa/userscripts \
+		--with-quotatemplate-prefix=/etc/zarafa/quotamails \
+		--with-indexerscripts-prefix=/etc/zarafa/indexerscripts \
+		$(use_with pic) \
+		$(use_enable perl) \
+		$(use_enable python) \
+		$(use_enable profiling) \
+		$(use_enable static) \
+		$(use_enable swig) \
+		$(use_enable sparsehash) \
+		$(use_enable tcmalloc) \
+		$(use_enable testtools) \
+		$(use_enable debug)
+}
+
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	make DESTDIR="${D}" install-ajax-webaccess || die "make install-ajax-webaccess failed"
+	make DESTDIR="${D}" install-mobile-webaccess || die "make install-mobile-webaccess failed"
+
+	insinto /etc/apache2/modules.d
+	newins "${FILESDIR}/50_zarafa-webaccess-mobile.conf" 50_zarafa-webaccess-mobile.conf || die "Failed to install apache config files"
+	newins "${FILESDIR}/50_zarafa-webaccess.conf" 50_zarafa-webaccess.conf || die "Failed to install apache config files"
+
+	rm "${D}"/usr/share/zarafa-webaccess/*.conf || die "Failed to remove apache config files"
+	rm "${D}"/usr/share/zarafa-webaccess-mobile/*.conf || die "Failed to remove apache config files"
+
+	# 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
+
+	# install ldap files
+	if use ldap; then
+		insinto /etc/openldap/schema
+		doins installer/ldap/zarafa.* || die "Failed to install ldap schema files"
+	fi
+
+	insinto /etc/zarafa
+	doins installer/linux/*.cfg || die "Failed to install config files"
+
+	dodir /var/log/zarafa
+	keepdir /var/log/zarafa
+
+	if ! use arm; then
+		if use licensed; then
+			dobin "${WORKDIR}"/licensed/usr/bin/* || die "Failed to install licensed binaries"
+			exeinto /usr/$(get_libdir)/zarafa/
+			doexe "${WORKDIR}"/licensed/usr/$(get_libdir)/zarafa/*.so || die "Failed to install licensed lib"
+			doman "${WORKDIR}"/licensed/usr/share/man/*/*.gz || die "Failed to install man files"
+			exeinto /usr/share/zarafa/zarafa-backup-helpers/
+			doexe "${WORKDIR}"/licensed/usr/share/zarafa/zarafa-backup-helpers/* || die "Failed to install helper scripts"
+			dodoc "${WORKDIR}"/licensed/usr/share/doc/packages/zarafa-licensed/* || die "Failed to install docs"
+			insinto /etc/zarafa
+			doins -r "${WORKDIR}"/licensed/etc/zarafa/* || die "Failed to install config files"
+			insinto /etc/cron.d
+			doins "${WORKDIR}"/licensed/etc/cron.d/* || die "Failed to install cron files"
+#			insinto /usr/share/zarafa-webaccess/
+#			doins -r "${WORKDIR}"/licensed/usr/share/zarafa-webaccess/* || die "Failed to install webapp files"
+			newinitd "${FILESDIR}"/zarafa-licensed.rc6 zarafa-licensed || die "Failed to install init.d files"
+		fi
+	fi
+
+	newinitd "${FILESDIR}"/zarafa-gateway.rc6 zarafa-gateway || die "Failed to install init.d files"
+	newinitd "${FILESDIR}"/zarafa-ical.rc6 zarafa-ical || die "Failed to install init.d files"
+	newinitd "${FILESDIR}"/zarafa-indexer.rc6 zarafa-indexer || die "Failed to install init.d files"
+	newinitd "${FILESDIR}"/zarafa-monitor.rc6 zarafa-monitor || die "Failed to install init.d files"
+	newinitd "${FILESDIR}"/zarafa-server.rc6 zarafa-server || die "Failed to install init.d files"
+	newinitd "${FILESDIR}"/zarafa-spooler.rc6 zarafa-spooler || die "Failed to install init.d files"
+	newinitd "${FILESDIR}"/zarafa-dagent.rc6 zarafa-dagent || die "Failed to install init.d files"
+}