Fix compilation and installation issues with 6.40.5 release

5 files changed, 44 insertions, 1 deletions

diff --git a/net-mail/zarafa/ChangeLog b/net-mail/zarafa/ChangeLog
index b1297cd..2c63aba 100644
--- a/net-mail/zarafa/ChangeLog
+++ b/net-mail/zarafa/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*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:
diff --git a/net-mail/zarafa/Manifest b/net-mail/zarafa/Manifest
index 0d45911..489c264 100644
--- a/net-mail/zarafa/Manifest
+++ b/net-mail/zarafa/Manifest
@@ -1,5 +1,6 @@
 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-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
@@ -16,6 +17,6 @@ EBUILD zarafa-6.40.2.ebuild 2030 RMD160 4b3eb0aa75e35e8882f3d704e5a73b48714dd1a3
 EBUILD zarafa-6.40.3-r1.ebuild 2661 RMD160 35a35154ebc195a9fc6b739f892edebfaef8f5b1 SHA1 03abe849cd6816a28e7d6baeb1da3c8caa001b67 SHA256 8038ca36bac059fc2a5dd06692eec7f3a49f8d68e00c7d9dbc34e974833a494c
 EBUILD zarafa-6.40.3.ebuild 2243 RMD160 abafb253c1505416cb54df85254431f748a98a84 SHA1 3f2f826e699c15f8f51d7a053f2fbd683f5ac3e4 SHA256 d990c6b4e617ce6e6213efe195df0a937c76ef3854f92a77cd81ba8d50e0477d
 EBUILD zarafa-6.40.4-r1.ebuild 2663 RMD160 c6bebc9c87488863033d543bb3c392ae86be355e SHA1 0ebdcbb30e9196f6c20ab2000a9fec53c7eb2d63 SHA256 e7c5104955c502e05a20e8230c7f3f9a46f3090f3df667bc3b42797961e9bc39
-EBUILD zarafa-6.40.5.ebuild 2720 RMD160 ca90b5fe9fcfc43872b9fc1a885df8fc4ec9ffab SHA1 2e4845143a8132ce9a4739be30b67612a39c6cdd SHA256 6233fbd0e7ccc0cde097520517210d9fb27f8b502ada06339aac34d5c7f4677b
+EBUILD zarafa-6.40.5.ebuild 2795 RMD160 5ca9a615d84cfcc47053fa06885f117c53e374ee SHA1 f92e0208e585d9218bf8063ab6bbaf0198d6a362 SHA256 96a6ce23225511755a5844f61ee8f30e7d635074014515f1a3f73b99385f7e5b
 MISC ChangeLog 1024 RMD160 498ed05cefc3b8c264574728f883761ad5a7c8d8 SHA1 aeeb4d603ca628ac9b71872c677de40014132a61 SHA256 82974bc16cf252133ee07f3a0965a6c5af40e9f168a38d6918ae5efd47cdcf10
 MISC metadata.xml 232 RMD160 1003df9706c53108377113d61c9c95bf485cc494 SHA1 fc994415ecad6f285541b567143cb40f2ef5f155 SHA256 1a507fc874f29bab501db0ca4cf1328971a64d415d35c7e050c59747eb0d2d1a
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
new file mode 100644
index 0000000..755ad79
--- /dev/null
+++ b/net-mail/zarafa/files/zarafa-6.40.5-add-missing-endif.patch
@@ -0,0 +1,10 @@
+--- 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
new file mode 100644
index 0000000..ef79757
--- /dev/null
+++ b/net-mail/zarafa/files/zarafa-6.40.5-fix-missing-installation-file.patch
@@ -0,0 +1,19 @@
+--- 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/zarafa-6.40.5.ebuild b/net-mail/zarafa/zarafa-6.40.5-r1.ebuild
index ec0f9c8..d2a948b 100644
--- a/net-mail/zarafa/zarafa-6.40.5.ebuild
+++ b/net-mail/zarafa/zarafa-6.40.5-r1.ebuild
@@ -49,6 +49,12 @@ src_prepare() {
 	# Don't install php ini file, as installation doesn't
 	# respect Gentoo way of handling SAPIs
 	epatch "${FILESDIR}"/"${PN}"-6.40.1-no-php-conf.patch
+
+	# Add missing endif
+	epatch "${FILESDIR}"/"${P}"-add-missing-endif.patch
+
+	# Remove missing file from installation
+	epatch "${FILESDIR}"/"${P}"-fix-missing-installation-file.patch
 }
 
 src_configure() {