--- /usr/portage/net-misc/asterisk/asterisk-1.6.2.13-r2.ebuild	2010-10-15 18:30:59.000000000 +0100
+++ asterisk-1.6.2.13-r2.ebuild	2010-11-27 13:01:50.679560287 +0000
@@ -14,7 +14,7 @@
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="alsa +caps dahdi debug doc freetds iconv jabber ldap lua keepsrc logrotate misdn newt +samples oss postgres radius snmp span speex ssl sqlite static vorbis"
+IUSE="alsa +caps dahdi debug doc freetds iconv imap jabber ldap lua keepsrc logrotate misdn newt +samples oss postgres radius snmp span speex ssl sqlite static vorbis"
 
 RDEPEND="sys-libs/ncurses
 	dev-libs/popt
@@ -25,6 +25,7 @@
 		net-misc/dahdi-tools )
 	freetds? ( dev-db/freetds )
 	iconv? ( virtual/libiconv )
+	imap? ( >=net-libs/c-client-2007[ssl=] )
 	jabber? ( dev-libs/iksemel )
 	ldap?	( net-nds/openldap )
 	lua? ( dev-lang/lua )
@@ -63,6 +64,7 @@
 	"${FILESDIR}/1.6.2/${P}-pbxstart-failed-spurious-bye.patch"
 	"${FILESDIR}/1.6.2/${P}-confbridge-menu-invocation.patch"
 	"${FILESDIR}/1.6.2/${P}-alarm-receiver-use-playtones.patch"
+	"${FILESDIR}/1.6.2/${PN}-1.6.2.13-imap-libs.patch"
 )
 
 pkg_setup() {
@@ -76,9 +78,24 @@
 src_prepare() {
 	base_src_prepare
 	AT_M4DIR=autoconf eautoreconf
+
+	# Custom menuselect options are defined in this file (it may remain empty)
+	#
+	>"${S}"/gentoo.makeopts
+
+	# Enable IMAP storage in app_voicemail if requested
+	#
+	use imap && echo "MENUSELECT_OPTS_app_voicemail=IMAP_STORAGE" >> "${S}"/gentoo.makeopts
 }
 
 src_configure() {
+	if use imap; then
+		local imap_libs
+		has_version net-libs/c-client[pam] && imap_libs="-lpam"
+		has_version net-libs/c-client[ssl] && imap_libs="${imap_libs} -lssl"
+		export IMAP_LIBS="${imap_libs}"
+	fi
+
 	econf \
 		--libdir="/usr/$(get_libdir)" \
 		--localstatedir="/var" \
@@ -92,6 +109,7 @@
 		$(use_with dahdi) \
 		$(use_with freetds tds) \
 		$(use_with iconv) \
+		$(use_with imap imap system) \
 		$(use_with jabber iksemel) \
 		$(use_with lua) \
 		$(use_with misdn isdnnet) \
@@ -120,7 +138,7 @@
 }
 
 src_compile() {
-	ASTLDFLAGS="${LDFLAGS}" emake || die "emake failed"
+	ASTLDFLAGS="${LDFLAGS}" emake USER_MAKEOPTS="${S}"/gentoo.makeopts || die "emake failed"
 }
 
 src_install() {