net-mail/cyrus-imapd: Drop hardmasked versions

Package-Manager: Portage-2.3.6, Repoman-2.3.2

6 files changed, 0 insertions, 792 deletions

diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 1e280f1d391a..d9f96c0ec774 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,6 +1,3 @@
-DIST cyrus-imapd-2.4.16.tar.gz 2484201 SHA256 beac9d6059680bbf65948db60a30c6e8f59786df4a7821c70dc27b2a225f32c4 SHA512 31931e94ebe869516f10886cee5ab152fb6d6376bf009250718077732c6172a6430f3502370e15e94f6165500e5b4108623bceea7c0dcfb3eb746e9ff0fcffab WHIRLPOOL 1e9916d03448e7f036aa6320af69a7ae57ae37205f98d4cfee8c335d9dcdc1c09ba243f4506036da4ca17f859f5c7eef0cb56443dfe51ad3075f0e4d62874fcb
-DIST cyrus-imapd-2.4.17.tar.gz 2486355 SHA256 b3e30052c764ee7163947ffde27bdd58bd4dd2e5697ad144491941e46300a583 SHA512 86ffe1664ca3c3df164ed8fca21cc08ddae12380e1485deccec7da4ec263d8b953a806e05f0b10f6fb7717a0d40fc05669792b77cc66d7c5067061c8506e59ee WHIRLPOOL 22566578217a5901793b886ff020aa1deecbb81bf85f54a524b58de129029e51b0aa358db902a2139584d05f668404cb98ca2ff3fa33803ce986e07b95c69c45
-DIST cyrus-imapd-2.4.18.tar.gz 2495098 SHA256 166a0a1efbf01f71d9d8449569152b3cda4949cd689f299a5e77a38d7026012c SHA512 3b234c1773fe5d57cae35743985930bc7fed2eedaa0919598da8fb19588f95b3beb8ad166d3b4f0c96faf006ff56ed5027ec516fab6007edbe46c4f45572a1ef WHIRLPOOL 1a243a9b3875105dfc414e1092f328691b6bef7c0d04f8bd91824ca0d01c715ebc2449c37bbca2ab86193e4d2dc426b33cfd31a0cdfdea0bacc081fd9010b1df
 DIST cyrus-imapd-2.5.10.tar.gz 3103914 SHA256 b38f4fd72825a298ac47426dcd2a50c8437c2947864ba50d79a9a53fe9845c5f SHA512 78b85e37c63f1dbb60898da229f70f45810326a01244067d23b1317e2c2ae3326e48b6944787d59024e44c48c441ed2b848d6a83c451c192a3bb95c8f37880fa WHIRLPOOL d2167900596c1b6f8e595de7aec499a7fbd6228537d7a27bec4fe0bda6a74b861303c4e9691ca829994972b099f29c362f9692f266df66d76c05a69629b52dfd
 DIST cyrus-imapd-2.5.11.tar.gz 3109188 SHA256 36a79117b320c78d62bc6842c3024d970d3bec7aa12908f862d92cf1d63397d5 SHA512 bbb0e11f31d91d85037306321165e3608f8d5e2699b971fc4fbdd1630ec0a1485c8f6f17900142dec584ab41b0ec0c65c11cfaf8c5bbf1054b194a8f5f361538 WHIRLPOOL e6aaedb642b634d9fc0c56f7ddd06e15130091bd21f4e089ae46168fb2976c7e1fa281f8c6fc0f3e171e70bbfeb5cec8f6cc613f62d5b769fb8b6af4dede6e67
 DIST cyrus-imapd-3.0.1.tar.gz 10515460 SHA256 24a9886aa6bbe001484a54b29309ff99415c0f355b98325ebb29ad61fff5e257 SHA512 0a2bf13b4793e642f3df53231fd66774e0c5ad753b436a7fb0645db6ee70121d0da245038527cc58cb078255fec3e7b32a6230c196cceea040f74813ef78e337 WHIRLPOOL 830284e3d96b2d34d88350f8e65de2cac28c34c9d302dc7fe4247022c5d96251d72989714062408cfcf08828650a7b67aecfb1672165fed344b2e98c2dc06265
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.4.16.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.4.16.ebuild
deleted file mode 100644
index 514db3fbe226..000000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.4.16.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit db-use eutils multilib pam ssl-cert user
-
-MY_P=${P/_/}
-
-DESCRIPTION="The Cyrus IMAP Server"
-HOMEPAGE="http://www.cyrusimap.org/"
-SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="afs berkdb kerberos mysql nntp pam postgres replication sieve snmp sqlite ssl tcpd"
-
-RDEPEND="sys-libs/zlib
-	>=dev-libs/cyrus-sasl-2.1.13
-	afs? ( net-fs/openafs )
-	berkdb? ( >=sys-libs/db-3.2 )
-	kerberos? ( virtual/krb5 )
-	mysql? ( virtual/mysql )
-	nntp? ( !net-nntp/leafnode )
-	pam? (
-			virtual/pam
-			>=net-mail/mailbase-1
-		)
-	postgres? ( dev-db/postgresql )
-	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
-	sqlite? ( dev-db/sqlite )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )"
-
-DEPEND="$RDEPEND"
-
-# get rid of old style virtual - bug 350792
-# all blockers really needed?
-RDEPEND="${RDEPEND}
-	!mail-mta/courier
-	!net-mail/bincimap
-	!net-mail/courier-imap
-	!net-mail/uw-imap"
-
-REQUIRED_USE="afs? ( kerberos )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewuser cyrus -1 -1 /usr/cyrus mail
-}
-
-src_prepare() {
-	# 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"
-
-	# do not strip
-	sed -i -e '/(INSTALL/s/-s //' "${S}"/imtest/Makefile.in
-
-	# correct afs include and liblwp.a directory
-	sed -i -e '/I${with_afs_incdir/s/\/include//' \
-		-e '/liblwp/s/liblwp/afs\/liblwp/' \
-		"${S}"/configure{,.in} || die
-	# same with lock.h
-	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
-		ptclient/afskrb.c || die
-	# libcom_err.a to libafscom_err.a
-	sed -i -e '/afs\/libcom_err.a/s:libcom_err.a:libafscom_err.a:' \
-		configure{,.in} || die
-}
-
-src_configure() {
-	local myconf
-	if use mysql ; then
-		myconf=$(mysql_config --include)
-		myconf="--with-mysql-incdir=${myconf#-I}"
-	fi
-	if use afs ; then
-		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
-		myconf+=" --with-afs-incdir=/usr/include/afs"
-	fi
-	if use berkdb ; then
-		myconf+=" --with-bdb-incdir=$(db_includedir)"
-	fi
-	econf \
-		--enable-murder \
-		--enable-netscapehack \
-		--enable-idled \
-		--with-service-path=/usr/$(get_libdir)/cyrus \
-		--with-cyrus-user=cyrus \
-		--with-cyrus-group=mail \
-		--with-com_err=yes \
-		--with-sasl \
-		--without-perl \
-		--without-krb \
-		--without-krbdes \
-		--with-zlib \
-		$(use_enable afs) \
-		$(use_enable afs krb5afspts) \
-		$(use_with berkdb bdb) \
-		$(use_enable nntp) \
-		$(use_enable replication) \
-		$(use_enable kerberos gssapi) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with sqlite) \
-		$(use_with ssl openssl) \
-		$(use_enable sieve) \
-		$(use_with snmp) \
-		$(use_with tcpd libwrap) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# file collision - bug #368245
-	if ! use nntp ; then
-		rm "${D}"/usr/share/man/man8/fetchnews.8*
-	fi
-
-	dodoc README*
-	dohtml doc/*.html doc/murder.png
-	docinto text
-	dodoc doc/text/*
-	cp doc/cyrusv2.mc "${D}/usr/share/doc/${PF}/html"
-	cp -r contrib tools "${D}/usr/share/doc/${PF}"
-	rm -f doc/text/Makefile*
-
-	insinto /etc
-	doins "${FILESDIR}/cyrus.conf" "${FILESDIR}/imapd.conf"
-
-	# turn off sieve if not installed
-	if ! use sieve; then
-		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-
-	newinitd "${FILESDIR}/cyrus.rc6" cyrus
-	newconfd "${FILESDIR}/cyrus.confd" cyrus
-	newpamd "${FILESDIR}/cyrus.pam-include" sieve
-
-	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() {
-	# do not install server.{key,pem) if they exist.
-	if use ssl ; then
-		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
-			install_cert /etc/ssl/cyrus/server
-			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
-		fi
-	fi
-
-	elog "For correct logging add the following to /etc/syslog.conf:"
-	elog "    local6.*         /var/log/imapd.log"
-	elog "    auth.debug       /var/log/auth.log"
-	echo
-
-	elog "You have to add user cyrus to the sasldb2. Do this with:"
-	elog "    saslpasswd2 cyrus"
-}
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.4.17-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.4.17-r1.ebuild
deleted file mode 100644
index 786326bd692b..000000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.4.17-r1.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools db-use eutils multilib pam ssl-cert user toolchain-funcs
-
-MY_P=${P/_/}
-
-DESCRIPTION="The Cyrus IMAP Server"
-HOMEPAGE="http://www.cyrusimap.org/"
-SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="afs berkdb kerberos mysql nntp pam postgres replication sieve snmp sqlite ssl tcpd"
-
-# virtual/mysql-5.5 added for the --variable= option below
-RDEPEND="sys-libs/zlib
-	>=dev-libs/cyrus-sasl-2.1.13
-	afs? ( net-fs/openafs )
-	berkdb? ( >=sys-libs/db-3.2 )
-	kerberos? ( virtual/krb5 )
-	mysql? ( >=virtual/mysql-5.5 )
-	nntp? ( !net-nntp/leafnode )
-	pam? (
-			virtual/pam
-			>=net-mail/mailbase-1
-		)
-	postgres? ( dev-db/postgresql )
-	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
-	sqlite? ( dev-db/sqlite )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )"
-
-DEPEND="$RDEPEND"
-
-# get rid of old style virtual - bug 350792
-# all blockers really needed?
-RDEPEND="${RDEPEND}
-	!mail-mta/courier
-	!net-mail/bincimap
-	!net-mail/courier-imap
-	!net-mail/uw-imap"
-
-REQUIRED_USE="afs? ( kerberos )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewuser cyrus -1 -1 /usr/cyrus mail
-}
-
-src_prepare() {
-	# fix squatter segfaults, see:
-	# https://bugzilla.cyrusimap.org/show_bug.cgi?id=3757
-	epatch "${FILESDIR}/${P}-statuscache.diff"
-
-	# 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"
-
-	# do not strip
-	sed -i -e '/(INSTALL/s/-s //' "${S}"/imtest/Makefile.in
-
-	# correct afs include and liblwp.a directory
-	sed -i -e '/I${with_afs_incdir/s/\/include//' \
-		-e '/liblwp/s/liblwp/afs\/liblwp/' \
-		"${S}"/configure{,.in} || die
-	# same with lock.h
-	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
-		ptclient/afskrb.c || die
-	# libcom_err.a to libafscom_err.a
-	sed -i -e '/afs\/libcom_err.a/s:libcom_err.a:libafscom_err.a:' \
-		configure{,.in} || die
-
-	sed -i -e "s/ar cr/$(tc-getAR) cr/" \
-		perl/sieve/lib/Makefile.in \
-		imap/Makefile.in \
-		lib/Makefile.in \
-		installsieve/Makefile.in \
-		com_err/et/Makefile.in \
-		sieve/Makefile.in \
-		syslog/Makefile.in || die
-
-	AT_M4DIR="cmulocal" eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use mysql ; then
-		myconf="--with-mysql-incdir=$(mysql_config --variable=pkgincludedir)"
-		myconf+=" --with-mysql-libdir=$(mysql_config --variable=pkglibdir)"
-	fi
-	if use afs ; then
-		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
-		myconf+=" --with-afs-incdir=/usr/include/afs"
-	fi
-	if use berkdb ; then
-		myconf+=" --with-bdb-incdir=$(db_includedir)"
-	fi
-	econf \
-		--enable-murder \
-		--enable-netscapehack \
-		--enable-idled \
-		--with-service-path=/usr/$(get_libdir)/cyrus \
-		--with-cyrus-user=cyrus \
-		--with-cyrus-group=mail \
-		--with-com_err=yes \
-		--with-sasl \
-		--without-perl \
-		--without-krb \
-		--without-krbdes \
-		--with-zlib \
-		$(use_enable afs) \
-		$(use_enable afs krb5afspts) \
-		$(use_with berkdb bdb) \
-		$(use_enable nntp) \
-		$(use_enable replication) \
-		$(use_enable kerberos gssapi) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with sqlite) \
-		$(use_with ssl openssl) \
-		$(use_enable sieve) \
-		$(use_with snmp) \
-		$(use_with tcpd libwrap) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# file collision - bug #368245
-	if ! use nntp ; then
-		rm "${D}"/usr/share/man/man8/fetchnews.8*
-	fi
-
-	dodoc README*
-	dohtml doc/*.html doc/murder.png
-	docinto text
-	dodoc doc/text/*
-	cp doc/cyrusv2.mc "${D}/usr/share/doc/${PF}/html"
-	cp -r contrib tools "${D}/usr/share/doc/${PF}"
-	rm -f doc/text/Makefile*
-
-	insinto /etc
-	doins "${FILESDIR}/cyrus.conf" "${FILESDIR}/imapd.conf"
-
-	# turn off sieve if not installed
-	if ! use sieve; then
-		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-
-	newinitd "${FILESDIR}/cyrus.rc6" cyrus
-	newconfd "${FILESDIR}/cyrus.confd" cyrus
-	newpamd "${FILESDIR}/cyrus.pam-include" sieve
-
-	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_preinst() {
-	if ! has_version ${CATEGORY}/${PN} ; then
-		elog "For correct logging add the following to /etc/syslog.conf:"
-		elog "    local6.*         /var/log/imapd.log"
-		elog "    auth.debug       /var/log/auth.log"
-		echo
-
-		elog "You have to add user cyrus to the sasldb2. Do this with:"
-		elog "    saslpasswd2 cyrus"
-	fi
-}
-
-pkg_postinst() {
-	# do not install server.{key,pem) if they exist.
-	if use ssl ; then
-		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
-			install_cert /etc/ssl/cyrus/server
-			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
-		fi
-	fi
-}
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.4.17.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.4.17.ebuild
deleted file mode 100644
index 0d555c7617ce..000000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.4.17.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools db-use eutils multilib pam ssl-cert user toolchain-funcs
-
-MY_P=${P/_/}
-
-DESCRIPTION="The Cyrus IMAP Server"
-HOMEPAGE="http://www.cyrusimap.org/"
-SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="afs berkdb kerberos mysql nntp pam postgres replication sieve snmp sqlite ssl tcpd"
-
-RDEPEND="sys-libs/zlib
-	>=dev-libs/cyrus-sasl-2.1.13
-	afs? ( net-fs/openafs )
-	berkdb? ( >=sys-libs/db-3.2 )
-	kerberos? ( virtual/krb5 )
-	mysql? ( virtual/mysql )
-	nntp? ( !net-nntp/leafnode )
-	pam? (
-			virtual/pam
-			>=net-mail/mailbase-1
-		)
-	postgres? ( dev-db/postgresql )
-	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
-	sqlite? ( dev-db/sqlite )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )"
-
-DEPEND="$RDEPEND"
-
-# get rid of old style virtual - bug 350792
-# all blockers really needed?
-RDEPEND="${RDEPEND}
-	!mail-mta/courier
-	!net-mail/bincimap
-	!net-mail/courier-imap
-	!net-mail/uw-imap"
-
-REQUIRED_USE="afs? ( kerberos )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewuser cyrus -1 -1 /usr/cyrus mail
-}
-
-src_prepare() {
-	# 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"
-
-	# do not strip
-	sed -i -e '/(INSTALL/s/-s //' "${S}"/imtest/Makefile.in
-
-	# correct afs include and liblwp.a directory
-	sed -i -e '/I${with_afs_incdir/s/\/include//' \
-		-e '/liblwp/s/liblwp/afs\/liblwp/' \
-		"${S}"/configure{,.in} || die
-	# same with lock.h
-	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
-		ptclient/afskrb.c || die
-	# libcom_err.a to libafscom_err.a
-	sed -i -e '/afs\/libcom_err.a/s:libcom_err.a:libafscom_err.a:' \
-		configure{,.in} || die
-
-	sed -i -e "s/ar cr/$(tc-getAR) cr/" \
-		perl/sieve/lib/Makefile.in \
-		imap/Makefile.in \
-		lib/Makefile.in \
-		installsieve/Makefile.in \
-		com_err/et/Makefile.in \
-		sieve/Makefile.in \
-		syslog/Makefile.in || die
-
-	AT_M4DIR="cmulocal" eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use mysql ; then
-		myconf=$(mysql_config --include)
-		myconf="--with-mysql-incdir=${myconf#-I}"
-	fi
-	if use afs ; then
-		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
-		myconf+=" --with-afs-incdir=/usr/include/afs"
-	fi
-	if use berkdb ; then
-		myconf+=" --with-bdb-incdir=$(db_includedir)"
-	fi
-	econf \
-		--enable-murder \
-		--enable-netscapehack \
-		--enable-idled \
-		--with-service-path=/usr/$(get_libdir)/cyrus \
-		--with-cyrus-user=cyrus \
-		--with-cyrus-group=mail \
-		--with-com_err=yes \
-		--with-sasl \
-		--without-perl \
-		--without-krb \
-		--without-krbdes \
-		--with-zlib \
-		$(use_enable afs) \
-		$(use_enable afs krb5afspts) \
-		$(use_with berkdb bdb) \
-		$(use_enable nntp) \
-		$(use_enable replication) \
-		$(use_enable kerberos gssapi) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with sqlite) \
-		$(use_with ssl openssl) \
-		$(use_enable sieve) \
-		$(use_with snmp) \
-		$(use_with tcpd libwrap) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# file collision - bug #368245
-	if ! use nntp ; then
-		rm "${D}"/usr/share/man/man8/fetchnews.8*
-	fi
-
-	dodoc README*
-	dohtml doc/*.html doc/murder.png
-	docinto text
-	dodoc doc/text/*
-	cp doc/cyrusv2.mc "${D}/usr/share/doc/${PF}/html"
-	cp -r contrib tools "${D}/usr/share/doc/${PF}"
-	rm -f doc/text/Makefile*
-
-	insinto /etc
-	doins "${FILESDIR}/cyrus.conf" "${FILESDIR}/imapd.conf"
-
-	# turn off sieve if not installed
-	if ! use sieve; then
-		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-
-	newinitd "${FILESDIR}/cyrus.rc6" cyrus
-	newconfd "${FILESDIR}/cyrus.confd" cyrus
-	newpamd "${FILESDIR}/cyrus.pam-include" sieve
-
-	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_preinst() {
-	if ! has_version ${CATEGORY}/${PN} ; then
-		elog "For correct logging add the following to /etc/syslog.conf:"
-		elog "    local6.*         /var/log/imapd.log"
-		elog "    auth.debug       /var/log/auth.log"
-		echo
-
-		elog "You have to add user cyrus to the sasldb2. Do this with:"
-		elog "    saslpasswd2 cyrus"
-	fi
-}
-
-pkg_postinst() {
-	# do not install server.{key,pem) if they exist.
-	if use ssl ; then
-		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
-			install_cert /etc/ssl/cyrus/server
-			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
-		fi
-	fi
-}
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.4.18.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.4.18.ebuild
deleted file mode 100644
index 33de32820552..000000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.4.18.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools db-use eutils multilib pam ssl-cert user toolchain-funcs
-
-MY_P=${P/_/}
-
-DESCRIPTION="The Cyrus IMAP Server"
-HOMEPAGE="http://www.cyrusimap.org/"
-SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="afs berkdb kerberos mysql nntp pam postgres replication sieve snmp sqlite ssl tcpd"
-
-# virtual/mysql-5.5 added for the --variable= option below
-RDEPEND="sys-libs/zlib
-	>=dev-libs/cyrus-sasl-2.1.13
-	afs? ( net-fs/openafs )
-	berkdb? ( >=sys-libs/db-3.2:* )
-	kerberos? ( virtual/krb5 )
-	mysql? ( >=virtual/mysql-5.5 )
-	nntp? ( !net-nntp/leafnode )
-	pam? (
-			virtual/pam
-			>=net-mail/mailbase-1
-		)
-	postgres? ( dev-db/postgresql:* )
-	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( >=dev-libs/openssl-0.9.6:* )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )"
-
-DEPEND="$RDEPEND"
-
-# get rid of old style virtual - bug 350792
-# all blockers really needed?
-RDEPEND="${RDEPEND}
-	!mail-mta/courier
-	!net-mail/bincimap
-	!net-mail/courier-imap
-	!net-mail/uw-imap"
-
-REQUIRED_USE="afs? ( kerberos )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewuser cyrus -1 -1 /usr/cyrus mail
-}
-
-src_prepare() {
-	# 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"
-
-	# do not strip
-	sed -i -e '/(INSTALL/s/-s //' "${S}"/imtest/Makefile.in
-
-	# correct afs include and liblwp.a directory
-	sed -i -e '/I${with_afs_incdir/s/\/include//' \
-		-e '/liblwp/s/liblwp/afs\/liblwp/' \
-		"${S}"/configure{,.in} || die
-	# same with lock.h
-	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
-		ptclient/afskrb.c || die
-	# libcom_err.a to libafscom_err.a
-	sed -i -e '/afs\/libcom_err.a/s:libcom_err.a:libafscom_err.a:' \
-		configure{,.in} || die
-
-	sed -i -e "s/ar cr/$(tc-getAR) cr/" \
-		perl/sieve/lib/Makefile.in \
-		imap/Makefile.in \
-		lib/Makefile.in \
-		installsieve/Makefile.in \
-		com_err/et/Makefile.in \
-		sieve/Makefile.in \
-		syslog/Makefile.in || die
-
-	AT_M4DIR="cmulocal" eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use mysql ; then
-		myconf="--with-mysql-incdir=$(mysql_config --variable=pkgincludedir)"
-		myconf+=" --with-mysql-libdir=$(mysql_config --variable=pkglibdir)"
-	fi
-	if use afs ; then
-		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
-		myconf+=" --with-afs-incdir=/usr/include/afs"
-	fi
-	if use berkdb ; then
-		myconf+=" --with-bdb-incdir=$(db_includedir)"
-	fi
-	econf \
-		--enable-murder \
-		--enable-netscapehack \
-		--enable-idled \
-		--with-service-path=/usr/$(get_libdir)/cyrus \
-		--with-cyrus-user=cyrus \
-		--with-cyrus-group=mail \
-		--with-com_err=yes \
-		--with-sasl \
-		--without-perl \
-		--without-krb \
-		--without-krbdes \
-		--with-zlib \
-		$(use_enable afs) \
-		$(use_enable afs krb5afspts) \
-		$(use_with berkdb bdb) \
-		$(use_enable nntp) \
-		$(use_enable replication) \
-		$(use_enable kerberos gssapi) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with sqlite) \
-		$(use_with ssl openssl) \
-		$(use_enable sieve) \
-		$(use_with snmp) \
-		$(use_with tcpd libwrap) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# file collision - bug #368245
-	if ! use nntp ; then
-		rm "${D}"/usr/share/man/man8/fetchnews.8*
-	fi
-
-	dodoc README*
-	dohtml doc/*.html doc/murder.png
-	docinto text
-	dodoc doc/text/*
-	cp doc/cyrusv2.mc "${D}/usr/share/doc/${PF}/html"
-	cp -r contrib tools "${D}/usr/share/doc/${PF}"
-	rm -f doc/text/Makefile*
-
-	insinto /etc
-	doins "${FILESDIR}/cyrus.conf" "${FILESDIR}/imapd.conf"
-
-	# turn off sieve if not installed
-	if ! use sieve; then
-		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-
-	newinitd "${FILESDIR}/cyrus.rc6" cyrus
-	newconfd "${FILESDIR}/cyrus.confd" cyrus
-	newpamd "${FILESDIR}/cyrus.pam-include" sieve
-
-	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_preinst() {
-	if ! has_version ${CATEGORY}/${PN} ; then
-		elog "For correct logging add the following to /etc/syslog.conf:"
-		elog "    local6.*         /var/log/imapd.log"
-		elog "    auth.debug       /var/log/auth.log"
-		echo
-
-		elog "You have to add user cyrus to the sasldb2. Do this with:"
-		elog "    saslpasswd2 cyrus"
-	fi
-}
-
-pkg_postinst() {
-	# do not install server.{key,pem) if they exist.
-	if use ssl ; then
-		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
-			install_cert /etc/ssl/cyrus/server
-			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
-		fi
-	fi
-}
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-2.4.17-statuscache.diff b/net-mail/cyrus-imapd/files/cyrus-imapd-2.4.17-statuscache.diff
deleted file mode 100644
index b939479e4a78..000000000000
--- a/net-mail/cyrus-imapd/files/cyrus-imapd-2.4.17-statuscache.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- imap/statuscache_db.c.orig	2012-12-01 20:57:54.000000000 +0100
-+++ imap/statuscache_db.c	2013-10-18 17:09:42.110915989 +0200
-@@ -152,7 +152,7 @@
-     len = strlcpy(key, mailboxname, sizeof(key));
-     key[len++] = '%';
-     key[len++] = '%';
--    len += strlcpy(key + len, userid, sizeof(key) - len);
-+    if (userid) len += strlcpy(key + len, userid, sizeof(key) - len);
- 
-     *keylen = len;
-