Version bump. Updated patches by Per Pomsel. Add David Heidelberger as proxied maintainer. Fixes bug #389511.

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

8 files changed, 354 insertions, 15 deletions

diff --git a/net-mail/courier-imap/ChangeLog b/net-mail/courier-imap/ChangeLog
index fb1f0692fb09..c04edc92fe23 100644
--- a/net-mail/courier-imap/ChangeLog
+++ b/net-mail/courier-imap/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-mail/courier-imap
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.205 2014/04/09 20:37:13 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.206 2014/04/23 23:04:08 mrueg Exp $
+
+*courier-imap-4.15 (23 Apr 2014)
+
+  23 Apr 2014; Manuel Rüger <mrueg@gentoo.org> +courier-imap-4.15.ebuild,
+  +files/courier-imap-4.15-aclocal-fix.patch,
+  +files/courier-imap-4.15-db4-bdbobj_configure.ac.patch,
+  +files/courier-imap-4.15-db4-configure.ac.patch,
+  +files/courier-imap-4.15-disable-fam-configure.ac.patch, metadata.xml:
+  Version bump. Updated patches by Per Pomsel. Add David Heidelberger as proxied
+  maintainer. Fixes bug #389511.
 
   09 Apr 2014; Pacho Ramos <pacho@gentoo.org> -courier-imap-4.0.6-r3.ebuild,
   -courier-imap-4.5.0.ebuild, -courier-imap-4.6.0.ebuild,
diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index f33fa7a3ddd7..abe81055de93 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX courier-authdaemond.service 376 SHA256 a275d29b61029b92e7ce76c1d16f9ec943a6cd0e2199821811253fabb6801370 SHA512 534f64625c21d65b22d3887c649df94615daaa80cc49800877c93990a1974998099d94585b49a2b5b7f637c106cc72b9caec1b79c8a3f7e7e82be731e9ebb124 WHIRLPOOL b1b68a2d4c9d11ddc18b41e3e3be19dbb121d03997a82e67afa94855a62391aedaee60d70728d14d362296d3097241a2d7786db3c3471e08b17153d8df3c98b6
 AUX courier-imap-4.0.1-disable-fam-configure.in.patch 654 SHA256 775dab159b4e05141e4d8fdfa5df75967dda8a8f60e4e962208f724a497d3f54 SHA512 193e40c5ef0e87c00b09d689433d34ba1a007a246fdb85df646fe66732d1170ed1567aa0b994c86b78635e96f1dc855973ba3330b058deb2633a5a77f414c0c4 WHIRLPOOL cf88477da67885f03d427b192ca22ca5140f7724039f3ac4124a794c4461cf9a0ad161a57aa8004eca61e94b2a3224af0df7c4b8d6e6c167892071b2dc887360
 AUX courier-imap-4.0.6-aclocal-fix.patch 237 SHA256 2bc930268fd9c1565f2dfc341557de4a6e4f867131b279d52d47d285e5f62579 SHA512 b19701037db1777f7c3c94a8da89381dab143fb2608f0bf0e8195dde118715db9586e5dc5fb9ec17910b132dfed1f63c22f6df22a4cffa66daf45a1e72b04ca3 WHIRLPOOL e34fdf1f9f514caaa1cca8bfd59d11ea7071fb919c343566cb0b0f32f90feec4f5f73160b73ab2ad13816f369861278e943a703b86b0e1c2a2c309d508c96ab6
@@ -17,19 +14,18 @@ AUX courier-imap-4.0.6-r1-gentoo-imapd-ssl.rc 984 SHA256 dd79242bddbd46f7eabbd99
 AUX courier-imap-4.0.6-r1-gentoo-imapd.rc 1026 SHA256 a54e674a8bfce99cda974e5c2e9bd818440256130f018f1c3412ea29f4e618f1 SHA512 ce4714adfa0ec24e9f133474b4f691864851e834bc10d12b43d0906ccf7e01ec41ccf0bff7dfd1e570cfc1612a3d33097d585df39470ffc8968d536a8a958707 WHIRLPOOL 83b72511f2c9e97c26a846d78db4263055d2a5d719ee69433d91689270cc6dd025e7c2247001ba9212311e01989d87a41243a256ca09436ebe279c578b233ba3
 AUX courier-imap-4.0.6-r1-gentoo-pop3d-ssl.rc 957 SHA256 977ddb360fe8a4a2baab932895c1d871b992d33d2837d97af23d7a97f66dc6a6 SHA512 450d0edd44a158be81a1ae88faea09f891bc7d08d43ee968357fd8f0045190dbef995e3cbd5f5db83cd3b1803379c93c0e692c1b157d5fce777d09a3f654ad35 WHIRLPOOL a15119734488d154455fc4959a09dd5b4b86dc7c1b814fa2fc8a464fd362a81602d2cec6fe87b0def7d3d79b6adac2f3693a2ac46fe3b774c9a40a38353d58a9
 AUX courier-imap-4.0.6-r1-gentoo-pop3d.rc 999 SHA256 e9ec918c6a9f1ac3ad952d7c15392ab73f0a2e6a27f4f8a1f3fe3902c67ea278 SHA512 b12bc07ffd5dc679343b8cf811aa9fbb66afdfc5a0fd09c6775e27269d00727aa8e1ae4e425610dd502162954625104294da94ec7f4d8a481743781aa449f5a1 WHIRLPOOL 89ca5a0edb56488270680f8186482b85739bbe8c38d2054d1b36465bccb40eba9312b084aebd7898ddffd9b22eb5e004bef7b0dc6578a84a765349a122eb088c
+AUX courier-imap-4.15-aclocal-fix.patch 237 SHA256 d90bdec1e9f515a24e36d479c864b2260b40bb4b0a35d19e07d2e6424b81b955 SHA512 72cbb54c29dda061fabf96d7b415fcb9a3bf0faf527444c9d4f2a211238e54d516e77778efe31ab25476cbe47e554efd8a9175143a4a2a90c31f04631d6cdc29 WHIRLPOOL cb0a80ab615c808fa910c5c1fe4ed9037dda2b1c4922d1672f05d4591c6b68504a98109e5c96ca114b03e7efbe6b736e4a74bb01799006675172445c633b7e6f
+AUX courier-imap-4.15-db4-bdbobj_configure.ac.patch 1495 SHA256 fd2b75c0b0bd4aee48148f01cea55c4cb55b3521a943fba47ec0ea359b227385 SHA512 f4e40ac312d37499fbbe61fc7f1be3602aac2bac17d3da888c8db77b6f17bd2825c90286dd7669f08b0716e1686c42c5af7953eb949c5a9b4e614fc3a53dd37e WHIRLPOOL 722a612b50cdf05dca99a9b46534ade7e300c51c9f454c8a122f030eb6bbca0de7a3d31d6d214cc1d7317529c82974a648693736def4d2d115e70122bfd9e2b2
+AUX courier-imap-4.15-db4-configure.ac.patch 1460 SHA256 d5d5888ce3534740be0e307830bec325746758af80d6ccc8313173b8dceb8b0b SHA512 99897d152f44713adf746996b8d720af65cb8af46e1ade68f4f3336b59b7b8acfba2d2e35b1b818c440e847e8126e8cf683a17fa4e2bf593e42274da6e21ce15 WHIRLPOOL 2501509d58d128c66f63e391933a2ef77a76dd50def0a67a5471336ed6fa31837cd857a4bbd8d53a76e9970f6fcfb310867bdbe1cb98eff5315238dc91756dfb
+AUX courier-imap-4.15-disable-fam-configure.ac.patch 626 SHA256 53f8a4504580c50da590859eb1c2759ef6d8f8751d8243699a5192bde89dbbf7 SHA512 649de2e7137642702b78f4e37808479124b1e71b7a2d9299f450bcae969399f1efdbc8a6076783baf7a8437fd90dfa6cc3a41908eb46e628ca05901e71c43a08 WHIRLPOOL 5bf1af9cbab1e7d6d08266f1377de6ff3c9238aab9737c9cb233f7b1b16e4c71ba97e86a52e17a791f74bd1784c38d11612c8b5c067844cce361870508e10adf
 AUX courier-imap-gentoo.readme 2827 SHA256 fbfe0396d87bcfe2722df94b2c68ef1a1993edcf776c8572604aed0390e4061f SHA512 a677218ed39483dbe07358382f557a877486d5028b890ce25822663a6fff58a4744d245537a5395c7a403a566522753c91f9c0c511b9a7229ac1ea2ba4a9c54c WHIRLPOOL 57e7f12fd054f5c22a4ec37bc7ff661dd07d09c4b95fb55849d7115a154a067ac1ff286445b987f39f83f3889c4dc82daeaa1cb9f72919bdea3486c22bdeab9b
 AUX courier-imapd-ssl.service 277 SHA256 9c1e97c93137a83fc5381d5ba2ba557777a22a7993d977b4cb9a139256330877 SHA512 8aa16239d239af9e344256de351bcd25cce5c92ccdca481d16c9c97bdb4c576bd889bb6bcbea163d5b472d3792a120fc1141e43701db8c631087f90a99076988 WHIRLPOOL 6b410784ee8850afa53cc6472e6945541e01252c584d86c43525721a09833a1a4ed0f34b5bcab67e711e2d26a31874942ec7daf1f7cdc70419a2ea955c20a94c
 AUX courier-imapd.service 265 SHA256 48c43249df0b0a2ff18372fca67d36da290f73bc1f9b453365015554985ca38e SHA512 154101170d1c7f03d3c63693695037027dfc36b086fa47bed4631de478f4a33c839dadc354990be2d0ecde1c27868f0d456565ced3fff79eaddd61199388c23e WHIRLPOOL 9eb2a50e5ce26a27aeeb42c6d91e55aeba3f033f2689777dce8782bb6d21a777ef575351ce41b3c51a0cb6f1475a887254fa1a4646c56bdf5fab01619426135c
 AUX mkimapdcert 996 SHA256 1ebd9ae44e3ca5fb906f5f399abec7d6f117d231db5725be0a1c4e043eaec4f6 SHA512 502eec64d1db7106ca83a38c18bb48ea9fa9d9a2526076fe45fbf54f7313866d9a4cf3bda7b0a8984af88fb8e8f35a24447071d3bc6882c8f158395d55548bf4 WHIRLPOOL de07fbe8ef656223a5fe43c5e8b6df909257e0c171978db30d0c43e3ef56a927dd26b11468545c89e431dceb34f75a44b290192d304c5e32eb29fe54aaf6d111
 AUX mkpop3dcert 996 SHA256 c241ccca359b5d126dc56fc73f21991d8a7bffb5c211d8b0a1e4e88e693eb7cb SHA512 eab113a442dd6b22b5d4eaa6beb755849e2af61dbb3f0bc3eb93c6e9240058c46e5220971504a18587eb2af8f5c8d8c7c44ce24ad898603319a78c1b11dec078 WHIRLPOOL 7b30ab63852376236717eb7cd230b453e2144f56641f506bd47b5fbea645fd7ac53c9147a9e3707a8b0233e74218f69c6b6d8c0f8ff764b3aa13a18d22d966b8
+DIST courier-imap-4.15.tar.bz2 3266353 SHA256 6c34107e7ba9e5396d50b58fb414a495806335cab7135c96ad85a3816785b109 SHA512 7829662282db5e6f414a1d34f06a94c2dd028e263510f01b49ebd3a1a4994055ecc08604568f5a44a30f6411e3a34e0d6c38807c29eaf255752191e885f82e1a WHIRLPOOL 1b5e42bd1f72e3205030b54e9564ce45c4eccb394b31c64a616f225def5a5df05f74ef62c59fbea63b18ce336d77cc2368170a982abb7a6e94d309d0c6ee4dd2
 DIST courier-imap-4.8.0.tar.bz2 3362734 SHA256 ec7511a4398920a04f3bb60cf1208e29a9a5432baeff4d356a4ec142113bfbf2 SHA512 71f5aa44f1ab06bb83f06cffac728fde796f3fc8c00a7acc80e157a9c072876aa0c189781325c39634d14c4bbf8e0ac0b14d05725c7331bda817ea28a85be5a7 WHIRLPOOL 7dadd694348699222a52658cdec971bde7a2a3a4f0385745c32243e234784200a4415840de1e643943f83aa85cc29eb56ae4c5097c6a60c36e65ee2a40aa87f6
+EBUILD courier-imap-4.15.ebuild 7362 SHA256 d99b911c4d5e6612eb170656af211c6a447c09b947cfac6abb1ec976a4fd8b14 SHA512 7c1751e818b7781c47e9ab287b976d44b0fcab04f6b116e4e22de41cfff5661aaf7699f0c821c0cf159f54533d97d0a3f11c3cbfac0d4c3bea8b9f5e5909487f WHIRLPOOL e5c9eb4d6a8eb6be20b3d7b0e9487fa440db48bdb6f45a3944987faf019e234104560ffe492c304f8f7269a92ccb095e9284b3eeacf4fce4f5cd4957c62cb6f0
 EBUILD courier-imap-4.8.0-r1.ebuild 7376 SHA256 ead07c4b93dbe5268413e5ddcb02a2911d34b0cbdb12ed3c4f5b85d53a172cea SHA512 e7f2139875bb946f79fe2945cbffec9e054533494d9b2a0eea6f97c10dd31787b9f0d02f337d23c7e45152ba188180015c033f2b9cf665f6979ad2f3f6c2ded5 WHIRLPOOL 77f3c7f02c62c11877e0a5069374d89fdd260f90be5bf8f972e307831b7b00e870d3ccca81e9907164a709baf859ab4e43e897a4083c6bc31b81ccb4da45d0e5
-MISC ChangeLog 40334 SHA256 aeef18c333e354fbf2d3e229f2e2b2feba14b9de0fd8ec8c475576654acd451c SHA512 c637559a0a10360802831899a353ee5a36c6186937746301b6dd652ad3d2fc5bd0d188b3981d1084e91371cf5a31bac55fe52be47a880ad8911d2f6b921f9db8 WHIRLPOOL cd0f9a82b307138baa71f97b3827c85b8b788ef55792ac11c8c3174e6545173d4007715499e1ee815444ead5478bce56715d0bbfbbf1a3d4bcefae212948c916
-MISC metadata.xml 346 SHA256 4dbd299b62adbf27d940a1107192310f8a437c0bfa1860902e54e15a53e7a2b0 SHA512 b715120d503806819f6f4d82f73b173c3498707347c88471a3c3f06815a2496b4361cb1478c714324470e9ed3288bf1334ba28d2c31e54cc2dbede9edd1631b0 WHIRLPOOL 97e63a7127c8403e23cc8fad7b379c862427252b06b589ed7dc66532ca550ac5441b94b0caa579a4c85f2eac9439013871d7ef37e3e8ecb1eceb9d715f865132
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iEYEAREIAAYFAlNFr3oACgkQCaWpQKGI+9RxagCeLunSr6GpGUFSAy6YHnCe6Sw3
-6KEAn2Ph/Ht25rxAlVmLLGaf8sguFTzG
-=DXXy
------END PGP SIGNATURE-----
+MISC ChangeLog 40786 SHA256 d86d177a5b295b0ac303a6918dc485b43ca7a3bad16b3677d71bc50d0f997eeb SHA512 ab6ed7ffc58a16d8b22e039518b40c20bec729cee2efd530828f683066041c54cee885922c0bee7dcbe328fb62438c3554a28fec3184a95fcd0b2ceb35c7eb9c WHIRLPOOL da47fb83e816ee94e50f698ba526b496ff19c2a90364b7564b92ee359ea3c9f4034d3e2da1b88f6a4f76b0f4d6877a9f59cd827eae2952c882c0a7c16e36103d
+MISC metadata.xml 590 SHA256 1a544bb17adaad2968157550ae691e85a19e00494afe3fc8902539efedff6a38 SHA512 a6d8d2f7397a091c3ba837f82c27768b89fc64b43496e7893f4133f463f5fd993a887b5be010a4e284f927e85bfebb3c6cd9bb3cdb3fbb32f500354342a22bd0 WHIRLPOOL bcef7db2d25ac4d9828ec96087edca56c42772376ef97dd8461f909d55a5a7c093d2152c71e862ecf38feef596e20c3f28727cdd6753bb5c1273954f0ddd6881
diff --git a/net-mail/courier-imap/courier-imap-4.15.ebuild b/net-mail/courier-imap/courier-imap-4.15.ebuild
new file mode 100644
index 000000000000..096808fd29ab
--- /dev/null
+++ b/net-mail/courier-imap/courier-imap-4.15.ebuild
@@ -0,0 +1,225 @@
+# 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.15.ebuild,v 1.1 2014/04/23 23:04:08 mrueg Exp $
+
+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"
+
+DESCRIPTION="An IMAP daemon designed specifically for maildirs."
+HOMEPAGE="http://www.courier-mta.org/"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="berkdb debug fam +gdbm ipv6 selinux gnutls trashquota"
+REQUIRED_USE="|| ( berkdb gdbm )"
+
+RDEPEND="gnutls? ( net-libs/gnutls )
+		!gnutls? ( >=dev-libs/openssl-0.9.6 )
+		>=net-libs/courier-authlib-0.61
+		>=net-mail/mailbase-0.00-r8
+		berkdb? ( sys-libs/db )
+		fam? ( virtual/fam )
+		gdbm? ( >=sys-libs/gdbm-1.8.0 )
+		selinux? ( sec-policy/selinux-courier )"
+DEPEND="${RDEPEND}
+		dev-lang/perl
+		!mail-mta/courier
+		userland_GNU? ( sys-process/procps )"
+
+# get rid of old style virtual - bug 350792
+# all blockers really needed?
+RDEPEND="${RDEPEND}
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/cyrus-imapd
+	!net-mail/uw-imap"
+
+RC_VER="4.0.6-r1"
+INITD_VER="4.0.6-r1"
+
+src_prepare() {
+	# 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}"/${P}-disable-fam-configure.ac.patch
+
+	# Kill unneeded call to AC_PROG_SYSCONFTOOL (bug #168206).
+	epatch "${FILESDIR}"/${P}-aclocal-fix.patch
+
+	# These patches should fix problems detecting BerkeleyDB.
+	# We now can compile with db4 support.
+	if use berkdb ; then
+		epatch "${FILESDIR}"/${P}-db4-bdbobj_configure.ac.patch\
+			"${FILESDIR}"/${P}-db4-configure.ac.patch
+	fi
+
+	MAKEOPTS="-j1" eautoreconf # bug #389511#c13
+}
+
+src_configure() {
+	local myconf=""
+
+	# 19 Aug 2004 langthang@gentoo.org
+	# Default to gdbm if both berkdb and gdbm are present.
+	if use gdbm ; then
+		einfo "Building with GDBM support"
+		myconf="${myconf} --with-db=gdbm"
+	elif use berkdb ; then
+		einfo "Building with BerkeleyDB support"
+		myconf="${myconf} --with-db=db"
+	fi
+
+	# Disabling unicode is no longer supported
+	# By default all available character sets are included
+	# Set ENABLE_UNICODE=iso-8859-1,utf-8,iso-8859-10
+	# to include only specified translation tables.
+	if [[ -z "${ENABLE_UNICODE}" ]] ; then
+		einfo "ENABLE_UNICODE is not set, building with all available character sets"
+		myconf="${myconf} --enable-unicode"
+	else
+		einfo "ENABLE_UNICODE is set, building with unicode=${ENABLE_UNICODE}"
+		myconf="${myconf} --enable-unicode=${ENABLE_UNICODE}"
+	fi
+
+	if use trashquota ; then
+		einfo "Building with Trash Quota Support"
+		myconf="${myconf} --with-trashquota"
+	fi
+
+	use debug && myconf="${myconf} debug=true"
+
+	# Do the actual build now
+	econf \
+		--disable-root-check \
+		--bindir=/usr/sbin \
+		--sysconfdir=/etc/${PN} \
+		--libexecdir=/usr/$(get_libdir)/${PN} \
+		--localstatedir=/var/lib/${PN} \
+		--with-authdaemonvar=/var/lib/${PN}/authdaemon \
+		--enable-workarounds-for-imap-client-bugs \
+		--with-mailuser=mail \
+		--with-mailgroup=mail \
+		$(use_with fam) \
+		$(use_with ipv6) \
+		$(use_with gnutls) \
+		${myconf}
+
+	# Change the pem file location.
+	sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/imapd.pem:" \
+		libs/imap/imapd-ssl.dist || \
+		die "sed failed"
+
+	sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/pop3d.pem:" \
+		libs/imap/pop3d-ssl.dist || \
+		die "sed failed"
+}
+
+src_compile() {
+	# spurious failures with parallel compiles
+	emake -j1
+}
+
+src_install() {
+	dodir /var/lib/${PN} /etc/pam.d
+	emake DESTDIR="${D}" install
+	rm -Rf "${D}/etc/pam.d"
+
+	# Avoid name collisions in /usr/sbin wrt imapd and pop3d
+	cd "${D}/usr/sbin"
+	for name in imapd pop3d ; do
+		mv -f "${name}" "courier-${name}" || die "Failed to mv ${name} to courier-${name}"
+	done
+
+	# Hack /usr/lib/courier-imap/foo.rc to use ${MAILDIR} instead of
+	# 'Maildir', and to use /usr/sbin/courier-foo names.
+	cd "${D}/usr/$(get_libdir)/${PN}"
+	for service in {imapd,pop3d}{,-ssl} ; do
+		sed -i -e 's/Maildir/${MAILDIR}/' "${service}.rc" || die "sed failed"
+		sed -i -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" "${service}.rc" || die "sed failed"
+	done
+
+	# Rename the config files correctly and add a value for ${MAILDIR} to them.
+	cd "${D}/etc/${PN}"
+	for service in {imapd,pop3d}{,-ssl} ; do
+		mv -f "${service}.dist" "${service}" || die "Failed to mv ${service}.dist to ${service}"
+		echo -e '\n# Hardwire a value for ${MAILDIR}' >> "${service}"
+		echo 'MAILDIR=.maildir' >> "${service}"
+		echo 'MAILDIRPATH=.maildir' >> "${service}"
+	done
+	for service in imapd pop3d ; do
+		echo -e '# Put any program for ${PRERUN} here' >> "${service}"
+		echo 'PRERUN=' >> "${service}"
+		echo -e '# Put any program for ${LOGINRUN} here' >> "${service}"
+		echo -e '# this is for relay-ctrl-allow in 4*' >> "${service}"
+		echo 'LOGINRUN=' >> "${service}"
+	done
+
+	cd "${D}/usr/sbin"
+	for x in * ; do
+		if [[ -L "${x}" ]] ; then
+			rm -f "${x}" || die "Failed to rm ${x}"
+		fi
+	done
+
+	cd ../share
+	mv -f * ../sbin
+	mv -f ../sbin/man .
+	cd ..
+
+	for x in mkimapdcert mkpop3dcert ; do
+		mv -f "${D}/usr/sbin/${x}" "${D}/usr/sbin/${x}.orig" || die "Failed to mv /usr/sbin/${x} to /usr/sbin/${x}.orig"
+	done
+
+	exeinto /usr/sbin
+	doexe "${FILESDIR}/mkimapdcert" "${FILESDIR}/mkpop3dcert"
+
+	dosym /usr/sbin/courierlogger /usr/$(get_libdir)/${PN}/courierlogger
+
+	mkdir "${WORKDIR}/tmp" ; cd "${WORKDIR}/tmp"
+
+	for initd in courier-{imapd,pop3d}{,-ssl} ; do
+		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" "${FILESDIR}/${PN}-${INITD_VER}-${initd}.rc6" > "${initd}" || die "initd libdir-sed failed"
+		doinitd "${initd}"
+	done
+
+	systemd_dounit "${FILESDIR}"/courier-authdaemond.service
+	systemd_dounit "${FILESDIR}"/courier-imapd-ssl.service
+	systemd_dounit "${FILESDIR}"/courier-imapd.service
+
+	exeinto /usr/$(get_libdir)/${PN}
+	for exe in gentoo-{imapd,pop3d}{,-ssl}.rc courier-{imapd,pop3d}.indirect ; do
+		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" "${FILESDIR}/${PN}-${RC_VER}-${exe}" > "${exe}" || die "exe libdir-sed failed"
+		doexe "${exe}"
+	done
+
+	dodir /usr/bin
+	mv -f "${D}/usr/sbin/maildirmake" "${D}/usr/bin/maildirmake" || die "Failed to mv /usr/sbin/maildirmake to /usr/bin/maildirmake"
+
+	# Bug #45953, more docs.
+	cd "${S}"
+	dohtml -r "${S}"/*
+	dodoc "${S}"/{AUTHORS,INSTALL,NEWS,README,ChangeLog} "${FILESDIR}"/${PN}-gentoo.readme
+	docinto imap
+	dodoc "${S}"/libs/imap/{ChangeLog,BUGS,BUGS.html,README}
+	docinto maildir
+	dodoc "${S}"/libs/maildir/{AUTHORS,INSTALL,README.maildirquota.txt,README.sharedfolders.txt}
+	docinto tcpd
+	dodoc "${S}"/libs/tcpd/README.couriertls
+}
+
+pkg_postinst() {
+	elog "Authdaemond is no longer provided by this package."
+	elog "Authentication libraries are now in courier-authlib."
+	elog "For a quick-start howto please refer to"
+	elog "${PN}-gentoo.readme in /usr/share/doc/${PF}"
+	# Some users have been reporting that permissions on this directory were
+	# getting scrambled, so let's ensure that they are sane.
+	chmod 0755 "${ROOT}/usr/$(get_libdir)/${PN}" || die "Failed to ensure sane permissions on ${ROOT}/usr/$(get_libdir)/${PN}"
+}
+
+src_test() {
+	ewarn "make check is not supported by this package due to the"
+	ewarn "--enable-workarounds-for-imap-client-bugs option."
+}
diff --git a/net-mail/courier-imap/files/courier-imap-4.15-aclocal-fix.patch b/net-mail/courier-imap/files/courier-imap-4.15-aclocal-fix.patch
new file mode 100644
index 000000000000..bc68698ea247
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-4.15-aclocal-fix.patch
@@ -0,0 +1,10 @@
+--- configure.ac.orig	2006-12-30 09:28:52.000000000 -0500
++++ configure.ac	2007-02-27 12:13:38.000000000 -0500
+@@ -15,7 +15,6 @@
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
+-AC_PROG_SYSCONFTOOL
+ AC_LIBTOOL_DLOPEN
+ AM_PROG_LIBTOOL
+ 
diff --git a/net-mail/courier-imap/files/courier-imap-4.15-db4-bdbobj_configure.ac.patch b/net-mail/courier-imap/files/courier-imap-4.15-db4-bdbobj_configure.ac.patch
new file mode 100644
index 000000000000..ba75db9ff5dd
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-4.15-db4-bdbobj_configure.ac.patch
@@ -0,0 +1,33 @@
+--- libs/bdbobj/configure.ac.orig	2013-08-25 20:52:10.000000000 +0200
++++ libs/bdbobj/configure.ac	2013-11-22 10:39:25.787861774 +0100
+@@ -23,15 +23,22 @@
+ dnl Checks for libraries.
+ 
+ saveLIBS="$LIBS"
+-AC_CHECK_LIB(db, dbopen, [ LIBDB=-ldb ; LIBS="-ldb $LIBS" ],
+-	AC_CHECK_LIB(db, db_open, [ LIBDB=-ldb ; LIBS="-ldb $LIBS"],
+-	AC_CHECK_LIB(db, db_env_create, [ LIBDB=-ldb; LIBS="-ldb $LIBS"])
+-	))
+-
++for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
++	do
++		AC_CHECK_LIB($dbname, db_create_4004, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++		AC_CHECK_LIB($dbname, db_create_4003, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++		AC_CHECK_LIB($dbname, db_create_4002, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++		AC_CHECK_LIB($dbname, db_create_4001, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++		AC_CHECK_LIB($dbname, db_create_4000, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++		AC_CHECK_LIB($dbname, db_create, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ]))))))
++	done
+ FOUND_DB=0
+-AC_CHECK_FUNC(dbopen, FOUND_DB=1)
+-AC_CHECK_FUNC(db_open, FOUND_DB=1)
+-AC_CHECK_FUNC(db_env_create, FOUND_DB=1)
++AC_CHECK_FUNC(db_create_4004, FOUND_DB=1)
++AC_CHECK_FUNC(db_create_4003, FOUND_DB=1)
++AC_CHECK_FUNC(db_create_4002, FOUND_DB=1)
++AC_CHECK_FUNC(db_create_4001, FOUND_DB=1)
++AC_CHECK_FUNC(db_create_4000, FOUND_DB=1)
++AC_CHECK_FUNC(db_create, FOUND_DB=1)
+ 
+ LIBS="$saveLIBS"
+ 
diff --git a/net-mail/courier-imap/files/courier-imap-4.15-db4-configure.ac.patch b/net-mail/courier-imap/files/courier-imap-4.15-db4-configure.ac.patch
new file mode 100644
index 000000000000..19fe77e28f69
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-4.15-db4-configure.ac.patch
@@ -0,0 +1,33 @@
+--- configure.ac.orig	2013-09-28 19:44:24.000000000 +0200
++++ configure.ac	2013-11-22 10:46:34.910990069 +0100
+@@ -180,15 +180,21 @@
+ if test "$db" != "gdbm"
+ then
+ 
+-	AC_CHECK_LIB(db, dbopen, [ LIBDB=-ldb ; LIBS="-ldb $LIBS" ],
+-		AC_CHECK_LIB(db, db_open, [ LIBDB=-ldb ; LIBS="-ldb $LIBS"],
+-		AC_CHECK_LIB(db, db_env_create,
+-				[ LIBDB=-ldb; LIBS="-ldb $LIBS"])
+-	))
+-
+-	AC_CHECK_FUNC(dbopen, HAVE_BDB=1)
+-	AC_CHECK_FUNC(db_open, HAVE_BDB=1)
+-	AC_CHECK_FUNC(db_env_create, HAVE_BDB=1)
++for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
++	do
++		AC_CHECK_LIB($dbname, db_create_4004, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++		AC_CHECK_LIB($dbname, db_create_4003, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++		AC_CHECK_LIB($dbname, db_create_4002, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++		AC_CHECK_LIB($dbname, db_create_4001, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++		AC_CHECK_LIB($dbname, db_create_4000, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++		AC_CHECK_LIB($dbname, db_create, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ]))))))
++	done
++AC_CHECK_FUNC(db_create_4004, HAVE_BDB=1)
++AC_CHECK_FUNC(db_create_4003, HAVE_BDB=1)
++AC_CHECK_FUNC(db_create_4002, HAVE_BDB=1)
++AC_CHECK_FUNC(db_create_4001, HAVE_BDB=1)
++AC_CHECK_FUNC(db_create_4000, HAVE_BDB=1)
++AC_CHECK_FUNC(db_create, HAVE_BDB=1)
+ fi
+ 
+ LIBS="$saveLIBS"
diff --git a/net-mail/courier-imap/files/courier-imap-4.15-disable-fam-configure.ac.patch b/net-mail/courier-imap/files/courier-imap-4.15-disable-fam-configure.ac.patch
new file mode 100644
index 000000000000..940703d1b6ca
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-4.15-disable-fam-configure.ac.patch
@@ -0,0 +1,23 @@
+--- libs/maildir/configure.ac.orig	2004-06-08 15:44:23.000000000 -0700
++++ libs/maildir/configure.ac	2004-08-14 15:28:20.525714876 -0700
+@@ -73,6 +73,12 @@
+ dnl Checks for library functions.
+ AC_CHECK_HEADER(fam.h, :, :)
+ AC_CHECK_FUNCS(symlink readlink strcasecmp utime utimes)
++AC_ARG_WITH(fam, [  --with-fam              Compile with FAM support],
++       fam="$withval",
++       fam="no")
++
++if test "$fam" != "no"
++then
+ AC_CHECK_LIB(fam, FAMOpen,  [
+ 			LIBFAM=-lfam
+ 			AC_DEFINE_UNQUOTED(HAVE_FAM,1,
+@@ -87,6 +93,7 @@
+ AC_MSG_ERROR([[FAM development libraries not found.]]) ]
+ 					)
+ 		  ])
++fi
+ 
+ AC_SUBST(LIBFAM)
+ 
diff --git a/net-mail/courier-imap/metadata.xml b/net-mail/courier-imap/metadata.xml
index 8f5fef928998..22cb444b18af 100644
--- a/net-mail/courier-imap/metadata.xml
+++ b/net-mail/courier-imap/metadata.xml
@@ -1,8 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
-	<use>
+<herd>proxy-maintainers</herd>
+<maintainer>
+	<email>david.heidelberger@ixit.cz</email>
+	<name>David Heidelberger</name>
+	<description>Assign bugs to him.</description>
+</maintainer>
+<maintainer>
+	<email>mrueg@gentoo.org</email>
+	<name>Manuel Rüger</name>
+	<description>CC him on bugs.</description>
+</maintainer>	<use>
 		<flag name="trashquota">include deleted messages, and the Trash folder, in the estimated quota usage for maildirs</flag>
 	</use>
 </pkgmetadata>