remove vulnerable versions

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

6 files changed, 21 insertions, 719 deletions

diff --git a/net-mail/cyrus-imapd/ChangeLog b/net-mail/cyrus-imapd/ChangeLog
index 3145df753900..09a50b210b9d 100644
--- a/net-mail/cyrus-imapd/ChangeLog
+++ b/net-mail/cyrus-imapd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/cyrus-imapd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.189 2011/10/11 19:04:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.190 2011/10/24 14:12:40 eras Exp $
+
+  24 Oct 2011; Eray Aslan <eras@gentoo.org> -cyrus-imapd-2.4.8.ebuild,
+  -cyrus-imapd-2.4.9.ebuild, -cyrus-imapd-2.4.10.ebuild,
+  -cyrus-imapd-2.4.11.ebuild:
+  remove vulnerable versions
 
   11 Oct 2011; Jeroen Roovers <jer@gentoo.org> cyrus-imapd-2.4.12.ebuild:
   Stable for HPPA (bug #385729).
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index b3b02f07b438..748b22b04157 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,27 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX cyrus.conf 1354 RMD160 b2d6f470b7097036a5c64bc59f147f78fdbc16d5 SHA1 efc4d14807391be53018a81c4f4277cd8d6ce5f8 SHA256 23189674bb5c2f021f35027cfe22cfe56e022ce5e03da67f5c4913473bec1292
 AUX cyrus.confd 279 RMD160 da79ff4128869a045b432abc9cea6667b65ee69a SHA1 6d2d3417b678c77336a4b89db3507314302fe4eb SHA256 3e786c28ffc44a222214b22d8849728360edc37f4b3f7d7c1473a23ab58c28a9
 AUX cyrus.pam-include 109 RMD160 24f82d0496f0ff94f9c1ee4cef14124909d361e5 SHA1 1a13c82008b6d59bb9236a8162c75f8d24d6c4ba SHA256 d4ef9ed9c7c9add97df75f0e19a833bee872d3863a2b3cb1d0674fefba54e3d8
 AUX cyrus.rc6 568 RMD160 0494dc278b3c93f49018392694a809f1ec395459 SHA1 22e6f03d9365d0fef4af9236d9cd01ae0b94a67f SHA256 f2f796f1ab208bcd5641a1610b07673f92069e6f5b2370f453e3a24014ab2c6c
 AUX imapd.conf 1587 RMD160 74e02af5daa7648ce7e366478c1b89b112750e6b SHA1 e4f189cb59fe499a42adffe3ffe382dcb9d7c546 SHA256 69eacd9fffad55f20990fcf3b117fe4e2ac55233515ed70698c65a6deb42503f
-DIST cyrus-imapd-2.4.10.tar.gz 2430196 RMD160 d7ffe3ad56b9e565dc7e1b764d4bb0a597ce9696 SHA1 b6cb51d67f2b49536ba92daae471d7817929c482 SHA256 2f5b5c6e524df9005df4a700c958bb99a21c4450485374e38a3d18010bc87317
-DIST cyrus-imapd-2.4.11.tar.gz 2446611 RMD160 0bb30f7d8c655a03366a8ce59f5a708c30d34ec1 SHA1 24fdaf0e57d5c3bdb63b7dcca29fe6df535c6102 SHA256 fe6bbcfd7abe459a0aa88922ef81e41a98dc93b0cf2408b7086356b3ee4c7f70
 DIST cyrus-imapd-2.4.12.tar.gz 2450099 RMD160 5c481d5ce295667eed1c90bc1d0572946caaae29 SHA1 c7a1e1dee9f32891c64499945915e8c4e99ce183 SHA256 b33c348d4d8c0b4d7dd4cd114d2cc53dde6c49be359e9dfd6ce0069cc536366f
-DIST cyrus-imapd-2.4.8.tar.gz 2424151 RMD160 72f9afbf7893b3449a1a76b7050ea6d7c9b003c9 SHA1 4dfc328aff482c9ebb4efdce4b140f69564880e8 SHA256 7a1ff733928276d0e42dccfb85f17e6d6d63cdc11c03e93aea19e7de798da030
-DIST cyrus-imapd-2.4.9.tar.gz 2425065 RMD160 37727502f8b080a1e3205360c048abd47e76e878 SHA1 3cc8cf54d43baeda6822f84efec6ab95f3d1c49f SHA256 d757bc95ca891acad3768a888a5022ab96ba72d49445aa12e26b5929822e4156
-EBUILD cyrus-imapd-2.4.10.ebuild 4791 RMD160 91c6db22c3d52122888bdaf5f6f65160b2296d79 SHA1 b3ba3ad270941747e0c0c078565c4df08c53e55a SHA256 f61b1e88f4674a460ea56412743ac3abc6b54b2652cff6ff994c7ddb1d0a13b8
-EBUILD cyrus-imapd-2.4.11.ebuild 4779 RMD160 80e78566243ff261970708eea37b9f8c0444b7ec SHA1 bc5bcddcfbe154659a540e1008ff422be5867c8e SHA256 6d67814d852d1af82f9c9e11b77d8c424c8ff3f108655f4c176851993d4a33ed
 EBUILD cyrus-imapd-2.4.12.ebuild 4902 RMD160 4c0d95615593bf1ec70195ee82e3ce4641f3d167 SHA1 331a35a10de631e2dfc55932bc3553ad6bbaeff6 SHA256 cfd874f29771199c015ee851f025301495e29a35ba72deb7959c54f6381d4fb7
-EBUILD cyrus-imapd-2.4.8.ebuild 4519 RMD160 d9b2a7936145628977ee23061b6d0ea7d591358f SHA1 6b64b524b15913bd9a2b46111e839a543383ec7a SHA256 a8d7bb8e0a3da6249f1f5856fdbfaac0d3ccc88d13031edd44618c977ffc9143
-EBUILD cyrus-imapd-2.4.9.ebuild 4790 RMD160 d8910f5165bc5fe8d756526e96985334076964d9 SHA1 45245e0fdd6db18a56b4c5f39a605b297d401334 SHA256 415e0bf765a1e786d5330829b27f6ef80e245706978b3d8d5dd36d75c3c9b34e
-MISC ChangeLog 34923 RMD160 0ca934b07478b197ff4fea29a79fa83b94991d4a SHA1 abd37368aae4f61fdae17378a128f80783e56f6c SHA256 2024cd53625214fa899f0855dfcf2f622821854f0dbe92e5cecea3a97c84684a
+MISC ChangeLog 35112 RMD160 639e5f2915cda87452ff959b03e474b7fc7e2613 SHA1 4071714b054af3c5f1da16e2dbb4bceaac3468f3 SHA256 cf39b94544c7724871b3e2c36c53cf68276b803646411409da76465950487f8c
 MISC metadata.xml 313 RMD160 7fb6badef50f7b7a65a3336f742a748d7f9265d0 SHA1 d2eebc6334f742a084829659803295d444e47c35 SHA256 4fc55c30d8af0d3b7555b4c0d5fa85ccc60232dc786d56a25c5482079a367ecd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk6UkzYACgkQVWmRsqeSphMfugCeMG/xUwPUB7zRpWfIK+wVce5g
-kwEAn2Npg+04k8C8N1ihQiHznJsZJDCJ
-=6+BE
+iQIcBAEBCAAGBQJOpXJeAAoJEHfx8XVYajsfe9cP/2OIWK18p9cWZ4XhcfdQNQI1
+uUZw94xgnBHG0ML4kc+ClfkGpckN7IWK9fghTjHnsSqOfHsyK7+QgdzdseeAedPU
+AfVYIXmqkgq/Qw4+P0ENXU+pYKc/M36zpN7VyabCu9byzTKk25D+fKj9/7WNmrXq
+kJYpHPYlBIYiq1vZcb0tjowATvKwk7IJUS5MziK4iM/5dAjztQHI52hDPlZj0xmN
+sq7Zfoe4bI2/6diQXYJ0HOV2ZkTQq+utlsZFEtELKzGztJtjS7pvcA6UN270uw/5
+B/7L/1QagHG2nv8mOxcwmrwWFzUKLHyMZa4xnzLeKZbre/WV1vz1SeQWN5unBNBi
+vhBnFsFtgQ5I8hTglkZOYI0jakU8rmYGFob3V/bViYGP81F12QIW7oio3RNAYgFu
+sVws11GmaTWYdYSkiL9uZawTjQ/bF+yEphx9Bk/OTz6A1yOVyyXViDfTQuGmvbBw
+GOl2ESo5osHYDhu8tWuf+itke8vVtTOnSIS6QcYbYsEQnOa+BiV4QqeQRxPw1llo
+yKtAHhtpK3K8J5GwpJhKWUkx8eHI3p8FighcOofcPDVg8GyyzFt4PfOZ92pyqHoB
+8HFCXKTGxClp5S8vR6VRuJyuXvs3G3jc5oJp0CaF4FFgsKgejm2thgy2P5+lSyfR
+d5+905edloeyjtNl8BNo
+=wdFQ
 -----END PGP SIGNATURE-----
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.4.10.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.4.10.ebuild
deleted file mode 100644
index 6776d3a64cdf..000000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.4.10.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.4.10.ebuild,v 1.1 2011/07/06 14:39:36 eras Exp $
-
-EAPI=4
-
-inherit db-use eutils ssl-cert pam multilib
-
-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="as-is"
-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-base )
-	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_enable sieve) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with sqlite) \
-		$(use_with ssl openssl) \
-		$(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"
-
-	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.11.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.4.11.ebuild
deleted file mode 100644
index 8e0845493175..000000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.4.11.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.4.11.ebuild,v 1.6 2011/09/27 18:09:57 xarthisius Exp $
-
-EAPI=4
-
-inherit db-use eutils ssl-cert pam multilib
-
-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="as-is"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="afs berkdb kerberos mysql nntp pam postgres replication 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-base )
-	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 \
-		--enable-sieve \
-		--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_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"
-
-	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.8.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.4.8.ebuild
deleted file mode 100644
index 42a43ac54c0f..000000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.4.8.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.4.8.ebuild,v 1.12 2011/05/29 20:10:18 eras Exp $
-
-EAPI=4
-
-inherit db-use eutils ssl-cert pam multilib
-
-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"
-LIBWRAP_PATCH_VER="2.2"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="afs kerberos mysql nntp pam postgres replication +sieve snmp sqlite ssl tcpd"
-
-RDEPEND=">=sys-libs/db-3.2
-	sys-libs/zlib
-	>=dev-libs/cyrus-sasl-2.1.13
-	afs? ( net-fs/openafs )
-	kerberos? ( virtual/krb5 )
-	mysql? ( virtual/mysql )
-	nntp? ( !net-nntp/leafnode )
-	pam? (
-			virtual/pam
-			>=net-mail/mailbase-1
-		)
-	postgres? ( dev-db/postgresql-base )
-	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}
-}
-
-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
-	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-bdb \
-		--with-bdb-incdir=$(db_includedir) \
-		--with-zlib \
-		$(use_enable afs) \
-		$(use_enable afs krb5afspts) \
-		$(use_enable nntp) \
-		$(use_enable replication) \
-		$(use_enable kerberos gssapi) \
-		$(use_enable sieve) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with sqlite) \
-		$(use_with ssl openssl) \
-		$(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"
-
-	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.9.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.4.9.ebuild
deleted file mode 100644
index 3a31e8c40534..000000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.4.9.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.4.9.ebuild,v 1.2 2011/06/24 15:37:40 eras Exp $
-
-EAPI=4
-
-inherit db-use eutils ssl-cert pam multilib
-
-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="as-is"
-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-base )
-	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_enable sieve) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with sqlite) \
-		$(use_with ssl openssl) \
-		$(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"
-
-	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"
-}