--- /usr/portage/net-mail/courier-imap/courier-imap-4.8.0-r1.ebuild	2013-09-26 19:31:26.000000000 +0200
+++ /var/lib/layman/ixit/net-mail/courier-imap/courier-imap-4.15.ebuild	2014-01-13 18:11:44.649873407 +0100
@@ -1,11 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-4.8.0-r1.ebuild,v 1.11 2013/09/26 17:30:39 ago Exp $
+# $Header: $
 
 EAPI=5
 inherit autotools eutils multilib libtool systemd
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 
 DESCRIPTION="An IMAP daemon designed specifically for maildirs."
 HOMEPAGE="http://www.courier-mta.org/"
@@ -43,19 +43,19 @@
 	# Bug #48838. Patch to enable/disable FAM support.
 	# 20 Aug 2004 langthang@gentoo.org
 	# This patch should fix bug #51540. fam USE flag is not needed for shared folder support.
-	epatch "${FILESDIR}"/${PN}-4.0.1-disable-fam-configure.in.patch
+	epatch "${FILESDIR}"/${PN}-4.15-disable-fam-configure.ac.patch
 
 	# Kill unneeded call to AC_PROG_SYSCONFTOOL (bug #168206).
-	epatch "${FILESDIR}"/${PN}-4.0.6-aclocal-fix.patch
+	epatch "${FILESDIR}"/${PN}-4.15-aclocal-fix.patch
 
 	# These patches should fix problems detecting BerkeleyDB.
 	# We now can compile with db4 support.
 	if use berkdb ; then
-		epatch "${FILESDIR}"/${PN}-4.0.6-db4-bdbobj_configure.in.patch
-		epatch "${FILESDIR}"/${PN}-4.0.6-db4-configure.in.patch
+		epatch "${FILESDIR}"/${PN}-4.15-db4-bdbobj_configure.ac.patch
+		epatch "${FILESDIR}"/${PN}-4.15-db4-configure.ac.patch
 	fi
 
-	eautoreconf
+	MAKEOPTS="-j1" eautoreconf # bug 389511#c13
 }
 
 src_configure() {
@@ -108,11 +108,11 @@
 
 	# Change the pem file location.
 	sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/imapd.pem:" \
-		imap/imapd-ssl.dist || \
+		libs/imap/imapd-ssl.dist || \
 		die "sed failed"
 
 	sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/pop3d.pem:" \
-		imap/pop3d-ssl.dist || \
+		libs/imap/pop3d-ssl.dist || \
 		die "sed failed"
 }
 
@@ -200,13 +200,13 @@
 	# Bug #45953, more docs.
 	cd "${S}"
 	dohtml -r "${S}"/*
-	dodoc "${S}"/{00README.NOW.OR.SUFFER,AUTHORS,INSTALL,NEWS,README,ChangeLog} "${FILESDIR}"/${PN}-gentoo.readme
+	dodoc "${S}"/{AUTHORS,INSTALL,NEWS,README,ChangeLog} "${FILESDIR}"/${PN}-gentoo.readme
 	docinto imap
-	dodoc "${S}"/imap/{ChangeLog,BUGS,BUGS.html,README}
+	dodoc "${S}"/libs/imap/{ChangeLog,BUGS,BUGS.html,README}
 	docinto maildir
-	dodoc "${S}"/maildir/{AUTHORS,INSTALL,README.maildirquota.txt,README.sharedfolders.txt}
+	dodoc "${S}"/libs/maildir/{AUTHORS,INSTALL,README.maildirquota.txt,README.sharedfolders.txt}
 	docinto tcpd
-	dodoc "${S}"/tcpd/README.couriertls
+	dodoc "${S}"/libs/tcpd/README.couriertls
 }
 
 pkg_postinst() {