gcc-4.0.x patch. Thanks to steveb <steeeeeveee@gmx.net>. Bug #118449.

(Portage version: 2.1_pre4-r1)

5 files changed, 406 insertions, 11 deletions

diff --git a/net-mail/cyrus-imapd/ChangeLog b/net-mail/cyrus-imapd/ChangeLog
index bd8a7434687c..9ab777f9a9ae 100644
--- a/net-mail/cyrus-imapd/ChangeLog
+++ b/net-mail/cyrus-imapd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/cyrus-imapd
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.77 2006/01/10 20:32:55 langthang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.78 2006/01/30 18:22:03 langthang Exp $
+
+*cyrus-imapd-2.2.12-r4 (30 Jan 2006)
+
+  30 Jan 2006; Tuấn Văn <langthang@gentoo.org>
+  +files/cyrus-imapd-2.2.12-gcc4.patch, +cyrus-imapd-2.2.12-r4.ebuild:
+  gcc-4.0.x patch. Thanks to steveb <steeeeeveee@gmx.net>. Bug #118449.
 
 *cyrus-imapd-2.3.1 (10 Jan 2006)
 
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 7d460d5d9685..ad9d3f5225c4 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,38 +1,93 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 2744da33da384b50b422a17ecea49c8e ChangeLog 15007
+RMD160 e4efbb9c46fd8543fdbf7ae0f9296e6d1139c39f ChangeLog 15007
+SHA256 d8fb2c997c6ebc0225b83840d4b3e5565a99f6cce3a038f27ddf3bb1e2afb9f7 ChangeLog 15007
 MD5 94b7b5a9e866775b5f76d1c0d672a414 cyrus-imapd-2.2.10-r1.ebuild 9134
+RMD160 0eb7e23e08620e626986a9a1aa75552dea819961 cyrus-imapd-2.2.10-r1.ebuild 9134
+SHA256 0316d58f4201e5061b18871053ed3ff09729e785eec9de70a8beef04854b04c2 cyrus-imapd-2.2.10-r1.ebuild 9134
 MD5 ced6ee910436e03f72d9d0bc72ea1b9b cyrus-imapd-2.2.10.ebuild 8735
+RMD160 63baa1474a79fc2129c14cfc7a837e560897974c cyrus-imapd-2.2.10.ebuild 8735
+SHA256 8a10f3e351653c34b2576bcd3d3975ea0aaeffc0debdaabd5831bd7b9a48fcca cyrus-imapd-2.2.10.ebuild 8735
 MD5 e0323e25f3fcda3dcc9a991e394db445 cyrus-imapd-2.2.12-r1.ebuild 9369
+RMD160 7716489b559e95cd9e87485e2186da6a89b6875d cyrus-imapd-2.2.12-r1.ebuild 9369
+SHA256 73f79e7bc3f7d0ee9fbfb7ab36e1da45c3d54503ad21d0736cd364055ebb514d cyrus-imapd-2.2.12-r1.ebuild 9369
 MD5 1b657d8264a75acd8c920b267c8857f6 cyrus-imapd-2.2.12-r2.ebuild 9168
+RMD160 a25f9675280aa4cabadb1d767e10429c593c0cfd cyrus-imapd-2.2.12-r2.ebuild 9168
+SHA256 fe2716933b575f7021c26e97334065e44cd80bcf8dfd8722424a7cd933811ace cyrus-imapd-2.2.12-r2.ebuild 9168
 MD5 4c88b12181bd8de5b359192607a922e9 cyrus-imapd-2.2.12-r3.ebuild 9246
+RMD160 a5c2752cb627c9f8396dd23f3b53d550cb4fae7d cyrus-imapd-2.2.12-r3.ebuild 9246
+SHA256 6569e0b7b60297e32baeb9d683bdbf14d2026c825c27fcf1966fa6503ca31446 cyrus-imapd-2.2.12-r3.ebuild 9246
+MD5 1cb8370aedce965b58185a0a916f6c35 cyrus-imapd-2.2.12-r4.ebuild 9312
+RMD160 216dcd76d36c0bfcba4a16baafcaa1c17ed76a98 cyrus-imapd-2.2.12-r4.ebuild 9312
+SHA256 9958dac66203ff465b2925c6f7167e0e29ca395a101634a3fedef75da59b8200 cyrus-imapd-2.2.12-r4.ebuild 9312
 MD5 4c0f69e2d9c9b56f51069f98544000e2 cyrus-imapd-2.2.12.ebuild 9132
+RMD160 d71e869328d98aadc3c763242119cb72568e8f15 cyrus-imapd-2.2.12.ebuild 9132
+SHA256 b795231c668b2f8155be9f367b232aece305f3ebacc14f7d87bf3494049d1ef5 cyrus-imapd-2.2.12.ebuild 9132
 MD5 78a820e64339e6861538bc5ba97274d5 cyrus-imapd-2.3.1.ebuild 8255
+RMD160 8c42b90cda5459c96add6c20fc6b05e8da875f84 cyrus-imapd-2.3.1.ebuild 8255
+SHA256 ce2f25c19f1fd235d0cc847e0d7e8ab48065c2f3b68b004fb3da2fc65a3301ef cyrus-imapd-2.3.1.ebuild 8255
 MD5 945aad1ac6ce2e72b6dede038c37c934 files/cyrus-imapd-2.2.10-drac.patch 926
+RMD160 7a587e2f756e6058262348d19c80fd27ad169a52 files/cyrus-imapd-2.2.10-drac.patch 926
+SHA256 9c9b297767ef787bc76fa134b178848695199b662860515f0157f59f726b5b84 files/cyrus-imapd-2.2.10-drac.patch 926
 MD5 88f50354abbcae1950a2d11c74db5fe5 files/cyrus-imapd-2.2.10-libwrap.patch 390
+RMD160 4ed2b14f549ccfab487cff66e5f2cb8ebdd39427 files/cyrus-imapd-2.2.10-libwrap.patch 390
+SHA256 2bddad2045130090ea23f5ad65d797cfa1f6083446bd00411cb1540cb56d4e0e files/cyrus-imapd-2.2.10-libwrap.patch 390
 MD5 945aad1ac6ce2e72b6dede038c37c934 files/cyrus-imapd-2.2.12-drac.patch 926
+RMD160 7a587e2f756e6058262348d19c80fd27ad169a52 files/cyrus-imapd-2.2.12-drac.patch 926
+SHA256 9c9b297767ef787bc76fa134b178848695199b662860515f0157f59f726b5b84 files/cyrus-imapd-2.2.12-drac.patch 926
+MD5 77413f5bcf777e10908f9a755e6ff55e files/cyrus-imapd-2.2.12-gcc4.patch 396
+RMD160 b01f76386facd436cd9db247a7a4c31129ae55b8 files/cyrus-imapd-2.2.12-gcc4.patch 396
+SHA256 f5c8e11355df0ac41ede1fa18381241097e143669ba5903c90ff4b20aeed273c files/cyrus-imapd-2.2.12-gcc4.patch 396
 MD5 88f50354abbcae1950a2d11c74db5fe5 files/cyrus-imapd-2.2.12-libwrap.patch 390
+RMD160 4ed2b14f549ccfab487cff66e5f2cb8ebdd39427 files/cyrus-imapd-2.2.12-libwrap.patch 390
+SHA256 2bddad2045130090ea23f5ad65d797cfa1f6083446bd00411cb1540cb56d4e0e files/cyrus-imapd-2.2.12-libwrap.patch 390
 MD5 0e81f80785347aff06cecae136fda4e5 files/cyrus-imapd-2.3.1-drac.patch 896
+RMD160 8f66ae7ca569964e45f4691cee04e5a078da27e0 files/cyrus-imapd-2.3.1-drac.patch 896
+SHA256 d8f086c99750e0045215bcc96bf4abbbd1ad48b89b6767de17e3145df170dec0 files/cyrus-imapd-2.3.1-drac.patch 896
 MD5 e76f31d728a283bf2dd2fb5b5a853af8 files/cyrus-imapd-unsupported-8bit.patch 3342
+RMD160 b175b6799723c54110880ad93a4ee2795b40f69e files/cyrus-imapd-unsupported-8bit.patch 3342
+SHA256 e44ad27b5acf20a9bce95815d5fa25f040eb06870feb87cddf59204f1d8a2867 files/cyrus-imapd-unsupported-8bit.patch 3342
 MD5 d91b5eaa87ced6cb7efc8c716fc7476a files/cyrus.conf 1354
+RMD160 b2d6f470b7097036a5c64bc59f147f78fdbc16d5 files/cyrus.conf 1354
+SHA256 23189674bb5c2f021f35027cfe22cfe56e022ce5e03da67f5c4913473bec1292 files/cyrus.conf 1354
 MD5 08017debe8d02c695ec456e1165d920d files/cyrus.confd 279
+RMD160 da79ff4128869a045b432abc9cea6667b65ee69a files/cyrus.confd 279
+SHA256 3e786c28ffc44a222214b22d8849728360edc37f4b3f7d7c1473a23ab58c28a9 files/cyrus.confd 279
 MD5 b8da82b13f99b84321a976a8f41d2a49 files/cyrus.pam-include 109
+RMD160 24f82d0496f0ff94f9c1ee4cef14124909d361e5 files/cyrus.pam-include 109
+SHA256 d4ef9ed9c7c9add97df75f0e19a833bee872d3863a2b3cb1d0674fefba54e3d8 files/cyrus.pam-include 109
 MD5 756c504a8b0b90aaa0630c089ae42f50 files/cyrus.rc6 573
+RMD160 1ca59773442962d47cf1c9899730410e168b563f files/cyrus.rc6 573
+SHA256 c5534ef121f1c509f0005846b10df12f32e11c282656bf48699c2b457a40e187 files/cyrus.rc6 573
 MD5 5a1c49cf6018aa400e8836ee03238140 files/digest-cyrus-imapd-2.2.10 71
+RMD160 e7f87504cf2587b42ddde07e835bcf2f237a0a16 files/digest-cyrus-imapd-2.2.10 71
+SHA256 74c37507adf78f57b3dd433e2be38e7d71c5664be6b868be2756400a6902226e files/digest-cyrus-imapd-2.2.10 71
 MD5 5a1c49cf6018aa400e8836ee03238140 files/digest-cyrus-imapd-2.2.10-r1 71
+RMD160 e7f87504cf2587b42ddde07e835bcf2f237a0a16 files/digest-cyrus-imapd-2.2.10-r1 71
+SHA256 74c37507adf78f57b3dd433e2be38e7d71c5664be6b868be2756400a6902226e files/digest-cyrus-imapd-2.2.10-r1 71
 MD5 28d9bdef56c61af75a28f8ae2ea2b5c7 files/digest-cyrus-imapd-2.2.12 71
+RMD160 0b5fcc75e58ca8cfc21069205bb6e63381622ba8 files/digest-cyrus-imapd-2.2.12 71
+SHA256 a662da942213a1f3444e9d11a0853a7bb500d7a211a915ad0cf460185e87b328 files/digest-cyrus-imapd-2.2.12 71
 MD5 28d9bdef56c61af75a28f8ae2ea2b5c7 files/digest-cyrus-imapd-2.2.12-r1 71
+RMD160 0b5fcc75e58ca8cfc21069205bb6e63381622ba8 files/digest-cyrus-imapd-2.2.12-r1 71
+SHA256 a662da942213a1f3444e9d11a0853a7bb500d7a211a915ad0cf460185e87b328 files/digest-cyrus-imapd-2.2.12-r1 71
 MD5 28d9bdef56c61af75a28f8ae2ea2b5c7 files/digest-cyrus-imapd-2.2.12-r2 71
+RMD160 0b5fcc75e58ca8cfc21069205bb6e63381622ba8 files/digest-cyrus-imapd-2.2.12-r2 71
+SHA256 a662da942213a1f3444e9d11a0853a7bb500d7a211a915ad0cf460185e87b328 files/digest-cyrus-imapd-2.2.12-r2 71
 MD5 28d9bdef56c61af75a28f8ae2ea2b5c7 files/digest-cyrus-imapd-2.2.12-r3 71
+RMD160 0b5fcc75e58ca8cfc21069205bb6e63381622ba8 files/digest-cyrus-imapd-2.2.12-r3 71
+SHA256 a662da942213a1f3444e9d11a0853a7bb500d7a211a915ad0cf460185e87b328 files/digest-cyrus-imapd-2.2.12-r3 71
+MD5 8c219986e0c374c302460c7204eb96fe files/digest-cyrus-imapd-2.2.12-r4 259
+RMD160 c3b34254e2030756e02decdb2593e4ebb3604994 files/digest-cyrus-imapd-2.2.12-r4 259
+SHA256 ad62d41892313174ffa09db9b0f48fdbc5a1feb33e2ba0bf6d9f1b7e06ce62d5 files/digest-cyrus-imapd-2.2.12-r4 259
 MD5 0b3de6cdb50c6422f35588a9f8a5c5dc files/digest-cyrus-imapd-2.3.1 70
+RMD160 3de6653d436856d1046fbf66f549d8d8b8e9f165 files/digest-cyrus-imapd-2.3.1 70
+SHA256 3e653ad62d023a08d3810d757c0f171ca024969d9e8553b8ff050c2568ebddc8 files/digest-cyrus-imapd-2.3.1 70
 MD5 ef68faa77664a88f939cee2f12019507 files/imap.pam 195
+RMD160 18585b20cc2568a000ecb381f3299dedcc737d27 files/imap.pam 195
+SHA256 e8068af6f4141fe2b7d7afbaf241be779ad6edb7e03d4dfdcf7ca8e991a8a5e0 files/imap.pam 195
 MD5 66137eb399ec7760afc24491a10d8bd7 files/imapd.conf 1587
+RMD160 74e02af5daa7648ce7e366478c1b89b112750e6b files/imapd.conf 1587
+SHA256 69eacd9fffad55f20990fcf3b117fe4e2ac55233515ed70698c65a6deb42503f files/imapd.conf 1587
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDxBoL5FrxP71izLARAtZqAKC5KLek+mt31fjtCkPYBJ9mUQ/QOgCfessm
-xzLZnQJVNY9fso+MG2H6DrA=
-=IkEE
------END PGP SIGNATURE-----
+RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161
+SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 metadata.xml 161
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.2.12-r4.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.2.12-r4.ebuild
new file mode 100644
index 000000000000..f886b6fdda15
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.2.12-r4.ebuild
@@ -0,0 +1,313 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.2.12-r4.ebuild,v 1.1 2006/01/30 18:22:03 langthang Exp $
+
+inherit eutils ssl-cert gnuconfig fixheadtails
+
+DESCRIPTION="The Cyrus IMAP Server."
+HOMEPAGE="http://asg.web.cmu.edu/cyrus/imapd/"
+SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~amd64 ~ppc ~hppa ~ppc64"
+IUSE="afs drac idled kerberos pam snmp ssl tcpd unsupported_8bit"
+
+PROVIDE="virtual/imapd"
+RDEPEND=">=sys-libs/db-3.2
+	>=dev-libs/cyrus-sasl-2.1.13
+	afs? ( >=net-fs/openafs-1.2.2 )
+	pam? (
+			virtual/pam
+			>=net-mail/mailbase-1
+		)
+	kerberos? ( virtual/krb5 )
+	snmp? ( net-analyzer/net-snmp )
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	drac? ( >=mail-client/drac-1.12-r1 )"
+
+DEPEND="$RDEPEND
+	sys-devel/libtool
+	>=sys-devel/autoconf-2.58
+	sys-devel/automake"
+
+# "borrow" this from eldad in bug 60495 util portage can handle dep USE flags.
+check_useflag() {
+	local my_pkg=$(best_version ${1})
+	local my_flag=${2}
+
+	if [[ $(grep -wo ${my_flag} /var/db/pkg/${my_pkg}/USE) ]]; then
+		return 0
+	fi
+
+	return 1
+}
+
+tcpd_flag_check() {
+	local tcpd_flag
+	local cyrus_imapd_has_tcpd_flag
+	local my_pkg=${1}
+	einfo "${my_pkg} found"
+	check_useflag ${my_pkg} tcpd
+	tcpd_flag="$?"
+
+	if [ "${tcpd_flag}" == "0" ]; then
+		einfo "\"${my_pkg}\" has been emerged with \"tcpd\" USE flag"
+	else
+		einfo "\"${my_pkg}\" has been emerged without \"tcpd\" USE flag"
+	fi
+
+	if use tcpd; then
+		cyrus_imapd_has_tcpd_flag="0"
+	else
+		cyrus_imapd_has_tcpd_flag="1"
+	fi
+
+	if [ "${tcpd_flag}" != "${cyrus_imapd_has_tcpd_flag}" ]; then
+		eerror "both \"net-mail/cyrus-imapd\" and \"${my_pkg}\" have to be emerged"
+		eerror "with or without \"tcpd\" USE flag if you want to emerge"
+		eerror "this package with \"snmp\" USE flag. Bug #68254"
+		die "see above error message."
+	fi
+}
+
+net-snmp_check() {
+	if has_version net-analyzer/ucd-snmp; then
+		tcpd_flag_check net-analyzer/ucd-snmp
+	fi
+
+	if has_version net-analyzer/net-snmp; then
+		tcpd_flag_check net-analyzer/net-snmp
+		# check for minimal USE flag.
+		local has_minimal
+		check_useflag net-analyzer/net-snmp minimal
+		has_minimal="$?"
+		if [ "${has_minimal}" == "0" ]; then
+			eerror "If you want to emerge this package with \"snmp\" USE flag"
+			eerror "reemerge \"net-snmp\" without \"minimal\" USE flag"
+			die "see error message above"
+		fi
+
+		# check for tcpd USE flag in sync for both packages.
+
+		if [ "${net_snmp_has_tcpd_flag}" != "${cyrus_imapd_has_tcpd_flag}" ]; then
+			eerror "both \"cyrus-imapd\" and \"net-snmp\" have to be emerged"
+			eerror "with or without \"tcpd\" USE flag if you want to emerge"
+			eerror "this package with \"snmp\" USE flag. Bug #68254"
+			die "see above error message."
+		fi
+
+		# an atemptto solve bug #67411. Is there a better solution?
+		# check for net-snmp-config exit and executable.
+		if [ -x "$(type -p net-snmp-config)" ]; then
+			einfo "$(type -p net-snmp-config) is found and executable."
+			NSC_AGENTLIBS="$(net-snmp-config --agent-libs)"
+			einfo "NSC_AGENTLIBS=\""${NSC_AGENTLIBS}"\""
+			if [ -z "$NSC_AGENTLIBS" ]; then
+				eerror "NSC_AGENTLIBS is null"
+				einfo "please report this to bugs.gentoo.org"
+			fi
+			for i in ${NSC_AGENTLIBS}; do
+				# check for the DynaLoader path.
+				if [ "$(expr "$i" : '.*\(DynaLoader\)')" == "DynaLoader" ] ; then
+					DYNALOADER_PATH="$i"
+					einfo "DYNALOADER_PATH=\""${DYNALOADER_PATH}"\""
+					if [[ ! -f "${DYNALOADER_PATH}" ]]; then
+						eerror "\""${DYNALOADER_PATH}"\" is not found."
+						einfo "Have you upgraded \"perl\" after"
+						einfo "you emerged \"net-snmp\". Please re-emerge"
+						einfo "\"net-snmp\" then try again. Bug #67411."
+						die "\""${DYNALOADER_PATH}"\" is not found."
+					fi
+				fi
+			done
+		else
+			eerror "\"net-snmp-config\" not found or not executable!"
+			die "You have \"net-snmp\" installed but \"net-snmp-config\" is not found or not executable. Please re-emerge \"net-snmp\" and try again!"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if use snmp; then
+		net-snmp_check
+	fi
+
+	enewuser cyrus -1 -1 /usr/cyrus mail
+}
+
+
+src_unpack() {
+	unpack ${A} && cd "${S}"
+
+	ht_fix_file ${S}/imap/xversion.sh
+
+	# gcc4 patch. Bug #118449
+	epatch "${FILESDIR}/${P}-gcc4.patch"
+
+	# Add unsupported patch wrt #18706 and #80630
+	use unsupported_8bit && epatch "${FILESDIR}/${PN}-unsupported-8bit.patch"
+
+	# Add drac database support.
+	if use drac ; then
+		# better check for drac. Bug #79442.
+		epatch "${FILESDIR}/${P}-drac.patch" || die "epatch failed"
+		epatch "${S}/contrib/drac_auth.patch" || die "epatch failed"
+	fi
+
+	# Add libwrap defines as we don't have a dynamicly linked library.
+	if use tcpd ; then
+		epatch "${FILESDIR}/${P}-libwrap.patch" || die "epatch failed"
+	fi
+
+	# DB4 detection and versioned symbols.
+	# The new cyrus-imapd has a new DB detection.
+	# Hopefully we don't need this patch anymore.
+	# epatch "${FILESDIR}/${P}-db4.patch" || die "epatch failed"
+
+	# Fix master(8)->cyrusmaster(8) manpage.
+	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
+		sed -i -e 's:master\.8:cyrusmaster.8:g' \
+			-e 's:master(8):cyrusmaster(8):g' \
+			"${i}" || die "sed failed" || die "sed failed"
+	done
+	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
+	sed -i -e "s:MASTER:CYRUSMASTER:g" \
+		-e "s:Master:Cyrusmaster:g" \
+		-e "s:master:cyrusmaster:g" \
+		man/cyrusmaster.8 || die "sed failed"
+
+	# Recreate configure.
+	export WANT_AUTOCONF="2.5"
+	gnuconfig_update
+	rm -rf configure config.h.in autom4te.cache || die
+	ebegin "Recreating configure"
+	sh SMakefile &>/dev/null || die "SMakefile failed"
+	eend $?
+
+	# When linking with rpm, you need to link with more libraries.
+	sed -i -e "s:lrpm:lrpm -lrpmio -lrpmdb:" configure || die "sed failed"
+}
+
+src_compile() {
+	local myconf
+	myconf="${myconf} $(use_with afs)"
+	myconf="${myconf} $(use_with drac)"
+	myconf="${myconf} $(use_with ssl openssl)"
+	myconf="${myconf} $(use_with snmp ucdsnmp)"
+	myconf="${myconf} $(use_with tcpd libwrap)"
+	myconf="${myconf} $(use_enable kerberos gssapi)"
+
+	if use idled; then
+		myconf="${myconf} --with-idle=idled"
+	else
+		myconf="${myconf} --with-idle=poll"
+	fi
+
+	econf \
+		--enable-murder \
+		--enable-listext \
+		--enable-netscapehack \
+		--with-extraident=Gentoo \
+		--with-service-path=/usr/lib/cyrus \
+		--with-cyrus-user=cyrus \
+		--with-cyrus-group=mail \
+		--with-com_err=yes \
+		--with-auth=unix \
+		--without-perl \
+		--disable-cyradm \
+		${myconf} || die "econf failed"
+
+	# needed for parallel make. Bug #72352.
+	cd ${S}/imap
+	emake xversion.h || die "emake xversion.h failed"
+
+	cd ${S}
+	emake || die "compile problem"
+}
+
+src_install() {
+	dodir /usr/bin /usr/lib
+	for subdir in master imap imtest timsieved notifyd sieve; do
+		make -C "${subdir}" DESTDIR="${D}" install || die "make install failed"
+	done
+
+	# Link master to cyrusmaster (postfix has a master too)
+	dosym /usr/lib/cyrus/master /usr/lib/cyrus/cyrusmaster
+
+	doman man/*.[0-8]
+	dodoc COPYRIGHT README*
+	dohtml doc/*.html doc/murder.png
+	cp doc/cyrusv2.mc "${D}/usr/share/doc/${PF}/html"
+	cp -r contrib tools "${D}/usr/share/doc/${PF}"
+	find "${D}/usr/share/doc" -name CVS -print0 | xargs -0 rm -rf
+
+	insinto /etc
+	doins "${FILESDIR}/cyrus.conf" "${FILESDIR}/imapd.conf"
+
+	newinitd "${FILESDIR}/cyrus.rc6" cyrus
+	newconfd "${FILESDIR}/cyrus.confd" cyrus
+	newpamd "${FILESDIR}/cyrus.pam-include" sieve
+
+	if use ssl ; then
+		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Cyrus IMAP Server}"
+		insinto /etc/ssl/cyrus
+		docert server
+		fowners cyrus:mail /etc/ssl/cyrus/server.{key,pem}
+	fi
+
+	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
+		keepdir "/var/${subdir}"
+		fowners cyrus:mail "/var/${subdir}"
+		fperms 0750 "/var/${subdir}"
+	done
+	for subdir in imap/{user,quota,sieve} spool/imap ; do
+		for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do
+			keepdir "/var/${subdir}/${i}"
+			fowners cyrus:mail "/var/${subdir}/${i}"
+			fperms 0750 "/var/${subdir}/${i}"
+		done
+	done
+}
+
+pkg_postinst() {
+	ewarn "*****NOTE*****"
+	ewarn "If you're upgrading from versions prior to 2.2.2_BETA"
+	ewarn "be sure to read the following thoroughly:"
+	ewarn "http://asg.web.cmu.edu/cyrus/download/imapd/install-upgrade.html"
+	ewarn "*****NOTE*****"
+	echo
+
+	ewarn "If you change the fs-type of /var/imap or"
+	ewarn "/var/spool/imap you should read step 9 of"
+	ewarn "/usr/share/doc/${P}/html/install-configure.html."
+	echo
+
+	enewuser cyrus -1 -1 /usr/cyrus mail
+
+	if df -T /var/imap | grep -q ' ext[23] ' ; then
+		ebegin "Making /var/imap/user/* and /var/imap/quota/* synchronous."
+		chattr +S /var/imap/{user,quota}{,/*}
+		eend $?
+	fi
+
+	if df -T /var/spool/imap | grep -q ' ext[23] ' ; then
+		ebegin "Making /var/spool/imap/* synchronous."
+		chattr +S /var/spool/imap{,/*}
+		eend $?
+	fi
+
+	ewarn "If the queue directory of the mail daemon resides on an ext2"
+	ewarn "or ext3 filesystem you need to set it manually to update"
+	ewarn "synchronously. E.g. 'chattr +S /var/spool/mqueue'."
+	echo
+
+	einfo "For correct logging add the following to /etc/syslog.conf:"
+	einfo "    local6.*         /var/log/imapd.log"
+	einfo "    auth.debug       /var/log/auth.log"
+	echo
+
+	ewarn "You have to add user cyrus to the sasldb2. Do this with:"
+	ewarn "    saslpasswd2 cyrus"
+}
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.12-gcc4.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.12-gcc4.patch
new file mode 100644
index 000000000000..4a0f89ab0100
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.12-gcc4.patch
@@ -0,0 +1,18 @@
+--- tools/config2header.orig	2006-01-30 09:30:16.000000000 -0800
++++ tools/config2header	2006-01-30 09:31:05.000000000 -0800
+@@ -214,7 +214,6 @@
+ print HFILE <<EOF
+   IMAPOPT_LAST
+ };
+-extern struct imapopt_s imapopts[];
+ 
+ enum enum_value {
+   IMAP_ENUM_ZERO = 0,
+@@ -260,6 +259,7 @@
+ 
+ print HFILE <<EOF
+ };
++extern struct imapopt_s imapopts[];
+ #endif /* INCLUDED_IMAPOPTIONS_H */
+ EOF
+     ;
diff --git a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.2.12-r4 b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.2.12-r4
new file mode 100644
index 000000000000..9892eb1bb989
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.2.12-r4
@@ -0,0 +1,3 @@
+MD5 70b3bba526a8d36d3bb23a87d37e9188 cyrus-imapd-2.2.12.tar.gz 1961161
+RMD160 ff4a95e519ea066ed9b21b515b18bdacaf0d1852 cyrus-imapd-2.2.12.tar.gz 1961161
+SHA256 3c6f41255ba15d8b2ea78320dd5e0c98e07fe0b5c3c4b84bc20f503427bd1b7b cyrus-imapd-2.2.12.tar.gz 1961161