Include experimental patch from upstream for linking with gold - masked for now

Package-Manager: portage-2.1.11.5/cvs/Linux x86_64

4 files changed, 356 insertions, 19 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index 4461328d32e0..0601fc6dabd8 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/dovecot
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.369 2012/07/07 12:28:07 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.370 2012/07/13 14:02:22 eras Exp $
+
+*dovecot-2.1.8-r1 (13 Jul 2012)
+
+  13 Jul 2012; Eray Aslan <eras@gentoo.org> +dovecot-2.1.8-r1.ebuild,
+  +files/dovecot-2.1.8_managesieve_gold.patch:
+  Include experimental patch from upstream for linking with gold - masked for
+  now
 
   07 Jul 2012; Anthony G. Basile <blueness@gentoo.org> dovecot-2.1.7.ebuild,
   dovecot-2.1.8.ebuild:
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index b73067851f89..ceb53b063d56 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -2,21 +2,22 @@
 Hash: SHA256
 
 AUX dovecot-1.2.init 1701 SHA256 44b308537454362b00f8ab87257c4a0d8eb5a183452ca2e3487f74b642fac8e0 SHA512 e9ddd72d31a1628b3cde146836cfbdbee8340d3bf0b73783dc1266f73e05e81f62da248aab981fa42b2931b6e3dce4444034fc88ed6121cedef42e80db4bb44d WHIRLPOOL 55113c8f8fc717cb1aecc693ba155495a131850c1cc4c4a7c09829e9dfb12b249f1c674524f3d7dd7cce214737728e3078142fce8d9414d8ccb09a1a21d16dfd
+AUX dovecot-2.1.8_managesieve_gold.patch 1137 SHA256 979076c9c53d7c758a102046e7a82f9e9d0edf750918f3e286cca8605658207b SHA512 4585acacacadab1a0fe5c4a6b65eff5b4b392c8f25237c5b9d471ccac2d9d1dd2c43a76dd0aa9bee46ee88f15c1638c06f6a3045efb7121917af6104adfccd92 WHIRLPOOL 0c041e39540030d787a5ea0afa3d9054546df2d7c77e04a6b1c7c2b53ebf374128e001282420a6941e9e8d8609117c52380dd7c57189005ab51c1f2a26f189d5
 AUX dovecot.init-r3 1609 SHA256 b4fb8ffb9aa7fd270d45512a657dcb5597ae5fe516b1f8e0078aa1892de8ecaa SHA512 957801c0e65153b0e0f394de8e6f6e66ae56427d64823e9937deaf98fda18ce82b2da6c4a0f42a2a46f8492923cf079b41c437b6b3558eeec0a81faa61c3c761 WHIRLPOOL 552a8333f7093727c6e67cce28abf730bb1bf3ed676895797e617308d1da133fd88636e34e080bebe81d8cadce2b9f0aa99f9e6d49ff2d69f7014a5fc6c3a499
-DIST dovecot-1.2-managesieve-0.11.13.tar.gz 405999 RMD160 9deed0637f1b5942a1b4996a343fed1b23301023 SHA1 cd5d2149250072aa8079f9db967cfeffc1b57c53 SHA256 2a9b0d6e048fa9294890ca1bee72fe3f41431aa806d0916bb1b6bbe2a8d2c976
-DIST dovecot-1.2-sieve-0.1.19.tar.gz 1048324 RMD160 49808f393d002567f086168b6a3aae042529ad43 SHA1 9b5a8a1c89bb3af5f70a031a560d9833ff5d4101 SHA256 399335d28fe8d45b85d4d0b994739af941fe1bd77a8b46d6f1d07af7c7c95115
-DIST dovecot-1.2.17-managesieve-0.11.13.diff.gz 6461 RMD160 f03842bc846395b55d99c657123d9d82a3c855f4 SHA1 ace323fcbdb4ecb524068ecede3cc704c7637c93 SHA256 6b3a3b5263adc5d30275201fcc8c8ed0b2a659f85eb5b9be65c8000884343b3e
-DIST dovecot-1.2.17.tar.gz 2983431 RMD160 59f619dba2aadef3cccd6ceb045a2e75a11700a2 SHA1 457b16791a15e739c6bc8b02bc9c78f9ad794e39 SHA256 6f39f86a06ddbaa8e264d03046c2fc8870f97ea27c1e52eb5bc96c3b754f0bed
-DIST dovecot-2.0-pigeonhole-0.2.5.tar.gz 1232117 RMD160 6d8e98fccfa7c6c0eca66fd3b7c70854f9fd2950 SHA1 a67388b739172134ae0d5f43cf45b773da1eff37 SHA256 2793eec5384b9136774e1b3929864aa15edc5f057b97cfbee809ec0dfc292b9c
-DIST dovecot-2.0-pigeonhole-0.2.6.tar.gz 1234253 RMD160 1ee35aac91365be585f19bf21a3b12c2c81de0c8 SHA1 108bfefe6503dcf910c97207538d10f541d04a99 SHA256 49829e4aed763848b63b2bf9e288d4bc94020c924ce0621bc850e0a4bf4821ab
-DIST dovecot-2.0.17.tar.gz 3329794 RMD160 108399bdaf0e03e013b78b79e39c5c8a5dd2f62d SHA1 4c12f1a074c52b17cb64fcc73c41f0a2820a88fe SHA256 3f0d4289067d2355b4ce4a00265bf2b4bf6540bca8fdcecfc6ad20611da145d2
-DIST dovecot-2.0.19.tar.gz 3357056 RMD160 8f0fda1393133a98f76eacdb9ef84d226d0b43be SHA1 54adccd4297e0a63af2a17ff676aadeac7009cce SHA256 50e49e181acea7f2c08008c5a61500c01803dc36b5ae1e6ffe24c1c56e3c69b4
-DIST dovecot-2.0.20.tar.gz 3360751 RMD160 4fb3efe6cea1cda473601280835573e8db4634c7 SHA1 c421e9acb6fb4e509a6c9bbd82970209543cfff0 SHA256 fa630159127e710dcd623b99bc655d1f5f85891fd1615f194ea72d4fe3cf82c0
-DIST dovecot-2.0.21.tar.gz 3372011 RMD160 2d816f49a9680a4486cfa1023557774a5c127163 SHA1 7cf39b7ea1ff1791e49391867387e8f0fc6efb0b SHA256 540ec583703a29c95eaec82f0162b8e5a86ccca4c470e9309ede82b40e8e8145
-DIST dovecot-2.1-pigeonhole-0.3.1.tar.gz 1084148 RMD160 f6b3c25edcd20c042310b4c54533ed1251efeb3f SHA1 a9d895c64e4f6d188f98aefe7cbd83013c4bd5ca SHA256 e95d86c5cd912c9a7e180414ffd5eee52e1b5dc8abef3d5762b950d1de86b5c7
-DIST dovecot-2.1.6.tar.gz 3773967 RMD160 807ddcc41402b0ea6c8bfd33ec8df9ed1ff75d95 SHA1 88bde8a8110646ef1a5b594337a21964e5b35850 SHA256 4b81b2cdf624344c6c2ff91be1b794911b51c98dffa24095a6dcbc7eb6bc1e89
-DIST dovecot-2.1.7.tar.gz 3778791 RMD160 72275ef2f1408f1c361f94d37a14d33545706b44 SHA1 68fc6c80b71946d88f492b3182cb73b43b921bbe SHA256 d5b7bc61fff947722aebe12ebb25e92c38ce3e27e14ebc54cfc66f0b346cf452
-DIST dovecot-2.1.8.tar.gz 3807008 RMD160 772cec080a8fe69bdd7f434235aee36a3dc294e6 SHA1 02a82b620b56d24894653cace6f80b6b662fd634 SHA256 48807384f815072cf5a9c8a94726b4179433d4a3dd35f33cbe8db3a7880b000d
+DIST dovecot-1.2-managesieve-0.11.13.tar.gz 405999 SHA256 2a9b0d6e048fa9294890ca1bee72fe3f41431aa806d0916bb1b6bbe2a8d2c976
+DIST dovecot-1.2-sieve-0.1.19.tar.gz 1048324 SHA256 399335d28fe8d45b85d4d0b994739af941fe1bd77a8b46d6f1d07af7c7c95115
+DIST dovecot-1.2.17-managesieve-0.11.13.diff.gz 6461 SHA256 6b3a3b5263adc5d30275201fcc8c8ed0b2a659f85eb5b9be65c8000884343b3e
+DIST dovecot-1.2.17.tar.gz 2983431 SHA256 6f39f86a06ddbaa8e264d03046c2fc8870f97ea27c1e52eb5bc96c3b754f0bed
+DIST dovecot-2.0-pigeonhole-0.2.5.tar.gz 1232117 SHA256 2793eec5384b9136774e1b3929864aa15edc5f057b97cfbee809ec0dfc292b9c SHA512 620f30de538b1bf83e0cb53f04b20410c8ab75accf91b88b66cde6ba58fc9418a021805fa67ad0a6d1a5cf42f3764ff38ee40457cffb74f61bce78b3de71ba25 WHIRLPOOL 06d1bd69f147de542a56050b9fe04bc854c0fd1bee0a2a451bf9f577d516e64180937c1d7492a1b2234f09ff743181605f2b53c94a1e94cd6d39a01d21e80425
+DIST dovecot-2.0-pigeonhole-0.2.6.tar.gz 1234253 SHA256 49829e4aed763848b63b2bf9e288d4bc94020c924ce0621bc850e0a4bf4821ab
+DIST dovecot-2.0.17.tar.gz 3329794 SHA256 3f0d4289067d2355b4ce4a00265bf2b4bf6540bca8fdcecfc6ad20611da145d2 SHA512 396132b9714acde27e7221bdc1413b1045c90d1d8cc2c6236331a4aaa3329edfd47b2776428f2e8bb5fe63e9aefc9b6919408c323f91a7466f32545addfb3f30 WHIRLPOOL b0e2e69c39722b6b3357517c50e9b8d18dd7895e8c31d3f304d7419ae7b30a28935c179828001d1a63e3909f72b4d722862462e6982536efb6ad2281ef0b3e0f
+DIST dovecot-2.0.19.tar.gz 3357056 SHA256 50e49e181acea7f2c08008c5a61500c01803dc36b5ae1e6ffe24c1c56e3c69b4
+DIST dovecot-2.0.20.tar.gz 3360751 SHA256 fa630159127e710dcd623b99bc655d1f5f85891fd1615f194ea72d4fe3cf82c0
+DIST dovecot-2.0.21.tar.gz 3372011 SHA256 540ec583703a29c95eaec82f0162b8e5a86ccca4c470e9309ede82b40e8e8145
+DIST dovecot-2.1-pigeonhole-0.3.1.tar.gz 1084148 SHA256 e95d86c5cd912c9a7e180414ffd5eee52e1b5dc8abef3d5762b950d1de86b5c7 SHA512 9df0a428f43287606522120a368c07513b39852325c436bc9c523e52f82a4c97232991ca832630baaa8c704adc2234ed18c2c0a63f8211f7f412dbe285436240 WHIRLPOOL 72e346e338a3e0149cc978ccc9c54943efad165d82d54cade1d954688f1806b30b3509c7f90c6589673c2808f9d85497af28aec63e2e060ca5934ea4ef101e9a
+DIST dovecot-2.1.6.tar.gz 3773967 SHA256 4b81b2cdf624344c6c2ff91be1b794911b51c98dffa24095a6dcbc7eb6bc1e89 SHA512 a82e0728ac08532d8afd1ec8cbf1830a0e73f3a538a91ed7550220de71c552b9c3c2f1d4e8a42f37680bce047809959fe738bcdd27d3e25358b0d79067c74b45 WHIRLPOOL 87e0d99e0454dfed97852de2deb836d476e5c1bac65779b043a15ebc8b5cd9f2a19713fdf6017c59dde48179caca86e768ff63136e7f3082181a5f008d036384
+DIST dovecot-2.1.7.tar.gz 3778791 SHA256 d5b7bc61fff947722aebe12ebb25e92c38ce3e27e14ebc54cfc66f0b346cf452
+DIST dovecot-2.1.8.tar.gz 3807008 SHA256 48807384f815072cf5a9c8a94726b4179433d4a3dd35f33cbe8db3a7880b000d SHA512 587e7112e357dd87c32d8d20a756da9db54574e2ec50723667281749727afb5a3810acb1e679f482119a94c57d6fbec65ba23b857496ed17e7edf7c19fd8c679 WHIRLPOOL 7d63f68fc97b527796e8474622c4814d6b281d90182509492a07ef64850c01eb24faccffbce5c80bbc991b792f5881a09b237cbe2a7cab6dae391bb464ea25fd
 EBUILD dovecot-1.2.17.ebuild 8779 SHA256 d98318a83549c639f579d039653a97ac1c41cd0da98f0d5524baa6a82593865d SHA512 9fb7646f6bf4ae7aad6b6cbac317e47d6c31c38a8aab6a96e74dc5ac5962fe5fa28970836644394424c5a2a5a66c2072d4ff559746ba14025933c3accb2cbb32 WHIRLPOOL b7232c4ce1ec437cf26b3b2ff6d55d619175c2efa5c163bcb82a888fc35499f1f64fd3ab28d7ec7d46f5c685a485b1c29c2875467911a7c1c58a684bf5dafc9e
 EBUILD dovecot-2.0.17.ebuild 8809 SHA256 0536b6064792e582c83e3933278d592591d549d5a8bb089ceda749e884bce942 SHA512 d91d140d4df481be8592b27b9a6672a44f1089a196dd29b63337a7db12e9cea8994fe31c815f9e284d0bc2c701061f873202ad43f513c0f7246242100d3d1f36 WHIRLPOOL b693ae8f68e185b7c47e264f5e82899b6bf4463d3990d9764ff14813dfc7301463b3c3cbb3b7420efb183a625e43f5745eb239364cdbeee0716273db5a51f0d4
 EBUILD dovecot-2.0.19.ebuild 8811 SHA256 ead198ebc3666606552b825060813506d3f0d711484117e1149458d93b70eb8e SHA512 5821c2c9421d1c59b45a77ffa89086fa5db86c547d9e7840ada4f54e3c605bde1965ec452ae88af22c388dd384f383d0409da1561a69ec35f4ef9201bd7b0efa WHIRLPOOL c662019512a8d6f245df34a79bb8939d93f09fc200acca4243ad17e81c2e4f175b1d34291205aea1498c018e0db00d6a255f17ab04f2ffce73665fdde3af7a65
@@ -24,13 +25,24 @@ EBUILD dovecot-2.0.20.ebuild 8819 SHA256 dda778e127884503bba4630eb7686e26ebcdfde
 EBUILD dovecot-2.0.21.ebuild 8796 SHA256 b17fab06af210c8d38249c4faf2d8f05f96f5a226370cab10c9876004af61d90 SHA512 f5fe87477ba1fefa3de83b2bedf73239a95133294cb1b775d8ca543daca685410f3806a86ed0b0383f9d2aba799e9b09b90582b43f78e428a22ad5c63bc194e3 WHIRLPOOL 61e20bd5691e4fbbdf061528f4d91a324954262f5e7e82035de26d9f7bdd9a5827d0b4f999e759de6725ebb47296cfc739f43a7f29bc64a3770eb35d1db8cc9b
 EBUILD dovecot-2.1.6-r1.ebuild 8455 SHA256 6fab9f2394585026955486cc926ed8a55a940872e09c4bc9be231856ecb97399 SHA512 fd1dd231144aa45d45e0fed91690560245f6fa98765e37c03bee29ffd2f586f31acc49c45f44b930605ae935d130753b2bc37007fa3ec4a838c881dd2d388550 WHIRLPOOL 44c6dfe6c777f1bc0d45ad21ac37c51fae2fc07dee40e3502bc31f9c2cbc87dd252bc3a2c5fde477e7c596acaf049151bad8c438a8e295382760dbc9a239ad80
 EBUILD dovecot-2.1.7.ebuild 8462 SHA256 d7eeee8433411e4d643049d426af81320c97e68bc0e83db95459cc200b3cff59 SHA512 408a631a61a25323a146905101f7b1c8e57c2a93e06d6dcf0c3c0c731fbb47c4e0cbf475fba239cfa0a16697ebf7273afa0728f1d773e4b4ccfe5c5015900024 WHIRLPOOL ed6f72adca6161a4724d3d53130fa7c004a84260037d2aa9b52d1fbb8b1d681eca4478a1f6b81f0a6e59d4dc92fb6d26a294e68ee5079a1147834e50a2bce9d5
+EBUILD dovecot-2.1.8-r1.ebuild 8578 SHA256 0739dc95fecdd8d8767db87fcd75259e5fe30be4b6880f85e3607eae6c7bdfb2 SHA512 6799ba9cd96d56ae8a5ce506f8cbb55fd27158a901977000edbddf3eca7ac0ecc65888f9ad72f11a680668104663244a0d73867c3f1be345d82c5d8eeb6493a9 WHIRLPOOL 17e2f6eb22578ef840d00e1040fc68705eac827f2e1d5befc9eb05d832dafa326e44067ab7df02305d301b006c8329b7ae41600893efd0749b3105a84f8eb081
 EBUILD dovecot-2.1.8.ebuild 8462 SHA256 a999f4214288de01c099c3a0abbeaad0a5d9a4567846f5974343e7eb9e1ec03a SHA512 624d731f001d06d9ace2b465bbfb020f169f268aa2d34a798f164fb975bb86ce691acb88bbe6dc843266f4872047641323349894411aac05897698e3b9fb0c1d WHIRLPOOL 49638f47ac4570dc48a32a940e76c7fb807ad0ff7a0738e1c2a8c8d58cf2f40bf81734868ad166a38654a818f179c7d4d9145b6fafdbb00f93a1f075e41a1218
-MISC ChangeLog 56569 SHA256 7b7b6d1ff8c18618cc5488fc3cfb8b75b21f48cfe4b93537dfb5370d07de652e SHA512 1f8e08c9591aa750aa7b4dbba67874f8a51e89bc9a9afe876af31d1ca0792db3f79f4ab0f5f5f42d702f0348c0e47db0c79eac17c299ab9912213cd0f49c5e95 WHIRLPOOL 88e31ef1ac703d8c827181ddb704faf176c718122c143df854dc59d56c8f75fca8b0992f9af1e8ac19b8b88de316479f167e4b8fe526a3d7f02d7a6b5fec5670
+MISC ChangeLog 56800 SHA256 e4f1e25db6fd89464a30463ba7a0616d7f0f16b0cce8568ac9affcb51cbe02db SHA512 3ef1d1de238a3b44762a6623a2763618ae26791e6cb9bb452bb7aa67c0391d5429bbb334f817ccfe9399fd95bd235183132eaea588266724174f1fafe989a1b8 WHIRLPOOL 04ddb40ac4c3f7e39fcf33ea75c32c25673eb2e0f54654e15c22494f14dd2458737256556022f03897ebc636a208771e05b92ecea446d3ed10814965f0f13750
 MISC metadata.xml 871 SHA256 64805284b8602318ba8b8902d58adc8b4edacba0468037a9c8abae4aac46ddb8 SHA512 651ab1dc7f14e5a9749ee2b249fd1c135da045a51861dee59adce119e1943259d9d69cedb68a45ebd2084b16d8baee13ac78130c7c58044700fe285826943a4f WHIRLPOOL 9aa300af8a4d0a0f59c06337081cd14f3d7be9197bdffc6db9f144f5eba739c6a2fb0e6dc3a465df6af030091073262c4c277b6b758c8ebd27be397c3d4c14d4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAk/4K2MACgkQl5yvQNBFVTUJnwCgilEjIK6lNvPv4LObdO1X4uhY
-hFcAoJPTOTUN6Pv1tZyD8f7uW9PIbRJR
-=VDId
+iQIcBAEBCAAGBQJQACp7AAoJEHfx8XVYajsfaCMP/1qTGpA9PMHrhRQj5YXqadpo
+b15WZ/7KRkHPJJi7lcI24j+xoXrEn0/OleyBow6QdK2uYCIYdiGCmsus8YtAIBbB
+WenvQfjewHLjOKGBK2nRBnS7XKOOYp7O7YZShKLUp7zB58q811phlV5k89SUG39+
+H2WGH7NJq4c02VSzU0WebGNg08BvHeTWWBwAuJKJF6uCNJXl+/3rjx/ee29zR8nO
+218kcvN6rFsZ4FHIRGMryetPDfQoT7hWFC6NyyNgN5sbcYRHODPANHozJ6haxS8/
+Hcr6Nu6c6W5umJrVN9n9TcrxCtJsDkeZfV4wfUS3W27oQXtZJGKBAydFdMlfO9gH
+bFZq6Ayc/kIuXNfh4oSLPHt/MvFOQutegLvvlDrIuGKO4Md4lPIG4ORHoOfvaqwL
+UifrS+wvS9ikc0xcb4GIlOdveG+gqJFQbKn8o1gEST+4KK3cL7q0yIW/KUjU2tyP
+cuZhd2790VK+VIuS51HIuUvKxkaX+UWl3JLswO201iDFktdjHVuF/EHdwULG5kYR
+wacfT3isX638TXHA3/SLylFgRhujFJ27NChNCY4+yYDlWT83sKWJQKJ2vxX9yEoG
+fL2EnSwCSMfGRPJNk42eiLVbKjNyPw+/05vetppRf0yPbnmSD7515l+KfufE7ptC
+bduzTiNzXLtrpyTjP4CM
+=dIme
 -----END PGP SIGNATURE-----
diff --git a/net-mail/dovecot/dovecot-2.1.8-r1.ebuild b/net-mail/dovecot/dovecot-2.1.8-r1.ebuild
new file mode 100644
index 000000000000..737d83fd4138
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.1.8-r1.ebuild
@@ -0,0 +1,279 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.1.8-r1.ebuild,v 1.1 2012/07/13 14:02:22 eras Exp $
+
+EAPI=4
+inherit eutils versionator ssl-cert systemd
+
+MY_P="${P/_/.}"
+major_minor="$( get_version_component_range 1-2 )"
+sieve_version="0.3.1"
+SRC_URI="http://www.dovecot.org/releases/${major_minor}/${MY_P}.tar.gz
+	sieve? (
+	http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+	)
+	managesieve? (
+	http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+	) "
+DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
+HOMEPAGE="http://www.dovecot.org/"
+
+SLOT="0"
+LICENSE="LGPL-2.1 MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+IUSE="bzip2 caps cydir sdbox doc ipv6 imapc kerberos ldap lucene +maildir managesieve mbox
+mdbox mysql pam postgres sieve sqlite +ssl static-libs suid vpopmail zlib"
+
+DEPEND="caps? ( sys-libs/libcap )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	lucene? ( >=dev-cpp/clucene-2.3 )
+	mysql? ( virtual/mysql )
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql-base !dev-db/postgresql-base[ldap,threads] )
+	sqlite? ( dev-db/sqlite )
+	ssl? ( dev-libs/openssl )
+	vpopmail? ( net-mail/vpopmail )
+	virtual/libiconv"
+
+RDEPEND="${DEPEND}
+	>=net-mail/mailbase-0.00-r8"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	if use managesieve && ! use sieve; then
+		ewarn "managesieve USE flag selected but sieve USE flag unselected"
+		ewarn "sieve USE flag will be turned on"
+	fi
+
+	# Add user and group for login process (same as for fedora/redhat)
+	# default internal user
+	enewgroup dovecot 97
+	enewuser dovecot 97 -1 /dev/null dovecot
+	# add "mail" group for suid'ing. Better security isolation.
+	if use suid; then
+		enewgroup mail
+	fi
+	# default login user
+	enewuser dovenull -1 -1 /dev/null
+}
+
+src_prepare() {
+	cd "${WORKDIR}"/dovecot-2.1-pigeonhole* || die
+	epatch "${FILESDIR}/${P}_managesieve_gold.patch"
+}
+
+src_configure() {
+	local conf=""
+
+	if use postgres || use mysql || use sqlite; then
+		conf="${conf} --with-sql"
+	fi
+
+	local storages=""
+	for storage in cydir sdbox mdbox maildir mbox imapc; do
+		use ${storage} && storages="${storage} ${storages}"
+	done
+	[ "${storages}" ] || storages="maildir"
+
+	# turn valgrind tests off. Bug #340791
+	VALGRIND=no econf \
+		--localstatedir="${EPREFIX}/var" \
+		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
+		$( use_with bzip2 bzlib ) \
+		$( use_with caps libcap ) \
+		$( use_with kerberos gssapi ) \
+		$( use_with ldap ) \
+		$( use_with lucene ) \
+		--without-stemmer \
+		$( use_with mysql ) \
+		$( use_with pam ) \
+		$( use_with postgres pgsql ) \
+		$( use_with sqlite ) \
+		$( use_with ssl ) \
+		$( use_with vpopmail ) \
+		$( use_with zlib ) \
+		$( use_enable static-libs static ) \
+		--with-storages="${storages}" \
+		--disable-rpath \
+		$(systemd_with_unitdir) \
+		${conf}
+
+	if use sieve || use managesieve ; then
+		# The sieve plugin needs this file to be build to determine the plugin
+		# directory and the list of libraries to link to.
+		emake dovecot-config
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		econf \
+			$( use_enable static-libs static ) \
+			--localstatedir="${EPREFIX}/var" \
+			--enable-shared \
+			--with-dovecot="../${MY_P}" \
+			$( use_with managesieve )
+	fi
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+	fi
+}
+
+src_test() {
+	default_src_test
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		default_src_test
+	fi
+}
+
+src_install () {
+	emake DESTDIR="${ED}" install
+
+	# insecure:
+	# use suid && fperms u+s /usr/libexec/dovecot/deliver
+	# better:
+	if use suid;then
+		einfo "Changing perms to allow deliver to be suided"
+		fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
+		fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
+	fi
+
+	newinitd "${FILESDIR}"/dovecot.init-r3 dovecot
+
+	rm -rf "${ED}"/usr/share/doc/dovecot
+
+	dodoc AUTHORS NEWS README TODO
+	dodoc doc/*.{txt,cnf,xml,sh}
+	docinto example-config
+	dodoc doc/example-config/*.{conf,ext}
+	docinto example-config/conf.d
+	dodoc doc/example-config/conf.d/*.{conf,ext}
+	docinto wiki
+	dodoc doc/wiki/*
+	doman doc/man/*.{1,7}
+
+	# Create the dovecot.conf file from the dovecot-example.conf file that
+	# the dovecot folks nicely left for us....
+	local conf="${ED}/etc/dovecot/dovecot.conf"
+	local confd="${ED}/etc/dovecot/conf.d"
+
+	insinto /etc/dovecot
+	doins doc/example-config/*.{conf,ext}
+	insinto /etc/dovecot/conf.d
+	doins doc/example-config/conf.d/*.{conf,ext}
+	fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
+	rm -f "${confd}/../README"
+
+	# .maildir is the Gentoo default
+	local mail_location="maildir:~/.maildir"
+	if ! use maildir; then
+		if use mbox; then
+			mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
+			keepdir /var/dovecot
+			sed -i -e 's|#mail_privileged_group =|mail_privileged_group = mail|' \
+			"${confd}/10-mail.conf" || die "sed failed"
+		elif use sdbox ; then
+			mail_location="sdbox:~/.sdbox"
+		elif use mdbox ; then
+			mail_location="mdbox:~/.mdbox"
+		fi
+	fi
+	sed -i -e \
+		"s|#mail_location =|mail_location = ${mail_location}|" \
+		"${confd}/10-mail.conf" \
+		|| die "failed to update mail location settings in 10-mail.conf"
+
+	# We're using pam files (imap and pop3) provided by mailbase
+	if use pam; then
+		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
+			"${confd}/auth-system.conf.ext" \
+			|| die "failed to update PAM settings in auth-system.conf.ext"
+		# mailbase does not provide a sieve pam file
+		use managesieve && dosym imap /etc/pam.d/sieve
+		sed -i -e \
+			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update PAM settings in 10-auth.conf"
+	fi
+
+	# Disable ipv6 if necessary
+	if ! use ipv6; then
+		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
+			|| die "failed to update listen settings in dovecot.conf"
+	fi
+
+	# Update ssl cert locations
+	if use ssl; then
+		sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
+		|| die "ssl conf failed"
+		sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
+			-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
+			"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
+	fi
+
+	# Install SQL configuration
+	if use mysql || use postgres; then
+		sed -i -e \
+			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
+			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
+			10-auth.conf"
+	fi
+
+	# Install LDAP configuration
+	if use ldap; then
+		sed -i -e \
+			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update ldap settings in 10-auth.conf"
+	fi
+
+	if use vpopmail; then
+		sed -i -e \
+			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update vpopmail settings in 10-auth.conf"
+	fi
+
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		emake DESTDIR="${ED}" install
+		sed -i -e \
+			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
+			|| die "failed to update sieve settings in 15-lda.conf"
+		rm -rf "${ED}"/usr/share/doc/dovecot
+		dodoc doc/*.txt
+		docinto example-config/conf.d
+		dodoc doc/example-config/conf.d/*.conf
+		insinto /etc/dovecot/conf.d
+		doins doc/example-config/conf.d/90-sieve.conf
+		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
+		docinto sieve/rfc
+		dodoc doc/rfc/*.txt
+		docinto sieve/devel
+		dodoc doc/devel/DESIGN
+		doman doc/man/*.{1,7}
+	fi
+
+	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
+}
+
+pkg_postinst() {
+	if use ssl; then
+	# Let's not make a new certificate if we already have one
+		if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
+		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
+			einfo "Creating SSL	certificate"
+			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
+			install_cert /etc/ssl/dovecot/server
+		fi
+	fi
+
+	elog "Upgrade notes can be found at:"
+	elog "\thttp://wiki2.dovecot.org/Upgrading"
+}
diff --git a/net-mail/dovecot/files/dovecot-2.1.8_managesieve_gold.patch b/net-mail/dovecot/files/dovecot-2.1.8_managesieve_gold.patch
new file mode 100644
index 000000000000..97d12b5a6a50
--- /dev/null
+++ b/net-mail/dovecot/files/dovecot-2.1.8_managesieve_gold.patch
@@ -0,0 +1,39 @@
+
+# HG changeset patch
+# User Stephan Bosch <stephan@rename-it.nl>
+# Date 1342130270 -7200
+# Node ID 6ceeb642123117ed8377f3b0d7d28171f790e911
+# Parent  602d93069d3a1c93866178308bd4d03f20a15f73
+ManageSieve: fixed segfault bug triggered by CHECKSCRIPT command.
+
+diff -r 602d93069d3a -r 6ceeb6421231 src/lib-sievestorage/sieve-storage-save.c
+--- a/src/lib-sievestorage/sieve-storage-save.c	Sat May 26 00:16:35 2012 +0200
++++ b/src/lib-sievestorage/sieve-storage-save.c	Thu Jul 12 23:57:50 2012 +0200
+@@ -318,19 +318,20 @@
+ bool sieve_storage_save_will_activate
+ (struct sieve_save_context *ctx)
+ {
+-	const char *scriptname;
+-	int ret = 0;
++	bool result = FALSE;
+ 
+-	T_BEGIN {
++	if ( ctx->scriptname != NULL ) T_BEGIN {
++		const char *scriptname;
++		int ret;
++
+ 		ret = sieve_storage_get_active_scriptfile(ctx->storage, &scriptname);
+-	
+ 		if ( ret > 0 ) {
+ 		 	/* Is the requested script active? */
+-			ret = ( strcmp(ctx->scriptname, scriptname) == 0 ? 1 : 0 );
++			result = ( strcmp(ctx->scriptname, scriptname) == 0 );
+ 		}
+ 	} T_END;
+ 
+-	return ret;
++	return result;
+ }
+ 
+ int sieve_storage_save_commit(struct sieve_save_context **ctx)
+