3 files changed, 3 insertions, 227 deletions
diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index 0de48ae0a967..d43310824815 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -23,11 +23,9 @@ AUX courier-imapd-ssl-r1.service 310 BLAKE2B 3894d582ace57379929712aabdfb243b28c
 AUX mkimapdcert 996 BLAKE2B 76a8bbe16f182a32fc47acc5410c20e545c117cda1af40b94d71f53b4ac668044dc3b5ba415fe3e0f8842a03757d9caf206846dc1c6f6dd589a3adafd0af226e SHA512 502eec64d1db7106ca83a38c18bb48ea9fa9d9a2526076fe45fbf54f7313866d9a4cf3bda7b0a8984af88fb8e8f35a24447071d3bc6882c8f158395d55548bf4
 AUX mkpop3dcert 996 BLAKE2B 1016d041092c51afabce0bb6993fbfefd233e5aac7e8079d191168c58336206099e0eb3aafd3e50238d83391478bdede627156718bd613741efc34b1dc978984 SHA512 eab113a442dd6b22b5d4eaa6beb755849e2af61dbb3f0bc3eb93c6e9240058c46e5220971504a18587eb2af8f5c8d8c7c44ce24ad898603319a78c1b11dec078
 DIST courier-imap-4.15.tar.bz2 3266353 BLAKE2B 08b44e9a58f13ead65174b913e9caca3305aff5155adf4fc495c79b31f51326fa4917a6c3335d9ab956b7895f98d66b6c65501faa3dcf1a13527cae8c7c137de SHA512 7829662282db5e6f414a1d34f06a94c2dd028e263510f01b49ebd3a1a4994055ecc08604568f5a44a30f6411e3a34e0d6c38807c29eaf255752191e885f82e1a
-DIST courier-imap-4.16.2.tar.bz2 3028445 BLAKE2B 91e1c376d6d760208aab078628aa798ae5a2019319e27fe7a0590399087f74267effc56a5b342cf8bd8b04800ecf79883d07aaf23e46db4d4ae0fc554d137630 SHA512 42a685324b630835fe0c8735a67879e099f96eadf091c803368a9dd478a80b4ab47225fda6142942569c96b21355b5dac5e174ff434bcdc78784a810d2088609
 DIST courier-imap-4.17.3.tar.bz2 3202534 BLAKE2B c42eb369bdcb65e7f904b3bd7b018e2785e48fddcc1690374ba254ce17a76b3191c301a81626f0fe44587f4f4b9e4f34edc06e8e8098c509b2c76e3830db2563 SHA512 3166cc703cdc09a71d33257671a662d95cfdb8977bc3b19e0218a4d25eb99a1a108d2868a6eb593106e6538aadf684f11ff0426cd58d522e3ca4b2988f0a88f1
 DIST courier-imap-4.18.0.tar.bz2 3202389 BLAKE2B 3889d8db1bca082b1a8a1f1c8f04996ddcdf30b46e2aa3d16b45c46987426f75721223fc63810884a8fa2d8f8daf60d85c2909321abf0ef27e77cfcd0dc3c531 SHA512 16dedefe8a43ef48f76388c65ee7f100aaf12c30d9610f4c85f9adbd1adab374f9a0978930e70c221b551a60ed3d804f6b5e87a979b549f5c8249c34af1a3a64
 EBUILD courier-imap-4.15-r2.ebuild 7361 BLAKE2B eb1e02b3d11649d73ae21cce91fbc0bab28ab3a2f24c1920038d8429e356c7768d7f80bd706120bcc3c7dc9bd1d795cfc99e516c7a7db5f776e488c083a62086 SHA512 9cf45e7d0c150b7256632d50282bf625f24d1e1dba377736a499073e7626abdb20749cb36685c6e959c1cbaa7b9a55f6f953720caff2d2d3ae34aaecf895cbe9
-EBUILD courier-imap-4.16.2-r1.ebuild 6953 BLAKE2B 4ec8ce85cc82a1d6f239562722f46db2ca3ba059693a4e8fbcb276d7cb442ba3d30a1f653c938e99f829ebbf05ca8576ba4aedcbd291f96e8e3a386dfebeec01 SHA512 54e1948fec6d477a1c55649cf0658afba54a61e4b77fb2b64e4738cbb95e603bfc0fa6f029e6cbdc807b048800b4625efae620c838efd8d7f82e0170aadc52e6
-EBUILD courier-imap-4.17.3.ebuild 6788 BLAKE2B 0d76c92bda46847ee8bbb4698b8d1421312af9fea43941cfab938f20033617ddd16a48afdf0478c0dfa6ee28180959f13ceb9e5fe935de278bd91c4c4cccd1f7 SHA512 22c42a1bf60270d9e2755cd67a4766d7b5629446c0938fc810bf10ce7450fef5dc002bbc5f9e2268c8fb4a13275cf3b0cbf36649feb0aa15bbc0d72cb8edf684
+EBUILD courier-imap-4.17.3.ebuild 6787 BLAKE2B 4f560cbb7538ff3c61ecc73705db27e46b3bd95673747c4322c7bf9043cc3c06f576b44d727048388542aa3c5473ee59c9f5461dea8df1e4b65136da46bfb79a SHA512 c8e3b52940b45fb492b2af63a1912eebd8ba48e996228953f1c59896f1630c16f2c9f448b369c033d2e2d183a1f1626c8d3556606ad3de97ec0cf26b23e5d8b5
 EBUILD courier-imap-4.18.0.ebuild 6764 BLAKE2B 10986db94919f747aee195359295f83aa4b632eaf0305fb2bd429baf1a0265619e68c5504a0fa024bb7e7a242875c32cb015f77c2246314daba440eccd193d32 SHA512 04b7b67a0cce4f9a29782e4de0c831c9103fb21e0b7cca0f8a1cbac4ea4c743d4c90431829a4f1f406a1b7398762d7f9938778e7d9ff0b2fa78fe4b5a48d77f5
 MISC metadata.xml 382 BLAKE2B e8299d24ed437cceeb508779d1915b7d2e54ed50a12e9959ff7ba6aca31a226817a01e9b0c778dd72047c345e5ce359f97e6baa443893357e0155c9dca9eca96 SHA512 2422c2a28ee3049a7b8da4b27f0dfca5699cb62ac77d39c89de4b9287f32f78167fc4b3eabf20e890c5c5dc1e00ccdce8a745501d3423846e42224f60e8ed110
diff --git a/net-mail/courier-imap/courier-imap-4.16.2-r1.ebuild b/net-mail/courier-imap/courier-imap-4.16.2-r1.ebuild
deleted file mode 100644
index 88952967ff8e..000000000000
--- a/net-mail/courier-imap/courier-imap-4.16.2-r1.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils multilib libtool systemd
-
-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"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="berkdb debug fam +gdbm gnutls ipv6 libressl selinux trashquota"
-
-REQUIRED_USE="|| ( berkdb gdbm )"
-
-CDEPEND="
-	gnutls? ( net-libs/gnutls )
-	!gnutls? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	>=net-libs/courier-authlib-0.61
-	<=net-libs/courier-unicode-2
-	>=net-libs/courier-unicode-1.3
-	>=net-mail/mailbase-0.00-r8
-	berkdb? ( sys-libs/db:= )
-	fam? ( virtual/fam )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )"
-DEPEND="${CDEPEND}
-	dev-lang/perl
-	!mail-mta/courier
-	userland_GNU? ( sys-process/procps )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-courier )"
-
-# 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}"/${PN}-4.15-disable-fam-configure.ac.patch
-
-	# Kill unneeded call to AC_PROG_SYSCONFTOOL (bug #168206).
-	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.15-db4-bdbobj_configure.ac.patch \
-			"${FILESDIR}"/${PN}-4.15-db4-configure.ac.patch
-	fi
-
-	eautoreconf
-}
-
-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
-
-	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
-	default
-	rm -Rf "${D}/etc/pam.d" || die
-
-	# Avoid name collisions in /usr/sbin wrt imapd and pop3d
-	cd "${D}/usr/sbin" || die
-	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}" || die
-	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}" || die
-	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
-
-	dosbin "${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_newunit "${FILESDIR}"/courier-authdaemond-r1.service courier-authdaemond.service
-	systemd_newunit "${FILESDIR}"/courier-imapd-ssl-r1.service courier-imapd-ssl.service
-	systemd_newunit "${FILESDIR}"/courier-imapd-r1.service 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}" || die
-	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 "Please read http://www.courier-mta.org/imap/INSTALL.html#upgrading"
-	elog "and remove TLS_DHPARAMS from configuration files or run mkdhparams"
-
-	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/courier-imap-4.17.3.ebuild b/net-mail/courier-imap/courier-imap-4.17.3.ebuild
index cd99c5cbdda5..400faa8125bc 100644
--- a/net-mail/courier-imap/courier-imap-4.17.3.ebuild
+++ b/net-mail/courier-imap/courier-imap-4.17.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="berkdb debug fam +gdbm gnutls ipv6 libressl selinux trashquota"
 
 REQUIRED_USE="|| ( berkdb gdbm )"