Remove old

Package-Manager: portage-2.2.0_alpha169/cvs/Linux x86_64
Manifest-Sign-Key: 0x77F1F175586A3B1F

4 files changed, 19 insertions, 567 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index 25e20da6bd3f..a676012bbb19 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/dovecot
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.416 2013/03/22 09:57:06 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.417 2013/03/22 12:45:15 eras Exp $
+
+  22 Mar 2013; Eray Aslan <eras@gentoo.org> -dovecot-2.1.12-r1.ebuild,
+  -dovecot-2.1.13.ebuild:
+  Remove old
 
 *dovecot-2.2_rc3 (22 Mar 2013)
 
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 6c4a8427594d..29b0b786b746 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -8,34 +8,30 @@ DIST dovecot-2.0-pigeonhole-0.2.6.tar.gz 1234253 SHA256 49829e4aed763848b63b2bf9
 DIST dovecot-2.0.19.tar.gz 3357056 SHA256 50e49e181acea7f2c08008c5a61500c01803dc36b5ae1e6ffe24c1c56e3c69b4 SHA512 a6a54675c3f991a9c86a285d3fcbd388ba92f902e032362a6fc846522090daf05b8e2d4bae623a1568120384c981105c8b80c1ab0f365fdb1c22da1a84e025f9 WHIRLPOOL aad7772edf993c364cc53b36425c2a34b1170215a6f54cb22ea34cbf5b5b587602e393e38ca98e583129f2673d6f467e466f554eb5277e49ad5126305ca93ae4
 DIST dovecot-2.1-pigeonhole-0.3.1.tar.gz 1084148 SHA256 e95d86c5cd912c9a7e180414ffd5eee52e1b5dc8abef3d5762b950d1de86b5c7 SHA512 9df0a428f43287606522120a368c07513b39852325c436bc9c523e52f82a4c97232991ca832630baaa8c704adc2234ed18c2c0a63f8211f7f412dbe285436240 WHIRLPOOL 72e346e338a3e0149cc978ccc9c54943efad165d82d54cade1d954688f1806b30b3509c7f90c6589673c2808f9d85497af28aec63e2e060ca5934ea4ef101e9a
 DIST dovecot-2.1-pigeonhole-0.3.3.tar.gz 1078559 SHA256 1d581f6292c6e760b26a06193a0af266ba3b6f3a0431e6617fcf6e1c84f7dd0e SHA512 1e9b611fce25860e3c1663bb98ba14d823cd7903ca9889194da157180e296c5a38de368bef0ff152620644963b51f2a0648673a0136f304d677e88ba2ee4e9be WHIRLPOOL f83c77559e1bf98e4f8b29652d5a66720fe9f1264af3ec943fd4c184071e2c0495cca4b86d541eee91fd34f3cd6cf902e8e347cb2dab55b8ecb51d4db2c50a98
-DIST dovecot-2.1.12.tar.gz 3839088 SHA256 d76ae15146452d053c423d883b2cbc24f62a55cf2f1f547577f42bc7d8d20840 SHA512 269beb56be927c33415fe0c0a94c73331b32a4d0104f28e98e9a24ea27475450abb18c8fea1aa134ac8f9747a0fe2fe92049c7318929dee7ef6126a0d7a0f6dd WHIRLPOOL 9b3f615b17d88ed67829960220fd27ae2a9b64cc31d2395a7dff9a349c217b7505454d2f3c0aeac5d1e6dc42602a42b715ab6b9620e3e4128c4a6cdc19acc333
-DIST dovecot-2.1.13.tar.gz 3843407 SHA256 d0982b1a3b4cefe06d8d5e9e90372dc7569b9cc35bcb4d8087f09362b2632278 SHA512 8be152d10b3d29c9067c4fc46eb5ddbb0b6c3cabf70fc3c88ce7add89fc2730a28b33fb8a129dced2aa314e9abadc095731eb66a96904d6b45fd2187cf5f1e74 WHIRLPOOL fab53e2f56c33dc60dc38106155598754e02de92150c2b5a7d4de7472d1f1f60c78a06bbc27b48514dfe244123c654580575a7d92eb52ef746be8b3ce692b9a0
 DIST dovecot-2.1.15.tar.gz 3862058 SHA256 706a69cede44551401dc5f49225b97b4b7b7e30ddbdc5cc11176a23a0fa72ded SHA512 e97f12ba5fbf2608c377730467efd0bd6773aab2f31dd886c25e8966ca084599498da1c092fc52e46456da3fd7fc4ca410623b1077838a3561ed164ca0acd9d3 WHIRLPOOL 5bdcad2f1c5833d2142c1282c4321c3488f3c4e75ea8a95561d57ba41f733ec08633f2d69b8cdee5cb0a233f8088d89fc61ec816f0ed3eb7769b331e3c865b75
 DIST dovecot-2.1.9.tar.gz 3829755 SHA256 77d11112bced9e2bbb1410ce5e6464af477775315ec67c7f3ab4d0da64e3c512 SHA512 da16bce6fdb535dd8eb48b4626444296e78808613f5a0d3d28dd7a509a82a276ee4f34d3ed8c339a98bd6aaee10ddf1c2df62060748b4c603a06ab165086d8de WHIRLPOOL f5bfe022687f36fcb06aa46165d6ffe8323bd13e990b7acecaed6af91226c5b06bc1e479f242dd6f963ff6039f633d790221559af42c4debf39ca252715a81f3
 DIST dovecot-2.2-pigeonhole-b75b00760b86.tar.bz2 579987 SHA256 a55c514b91f4c43dbdb656785bde813fd64ad5f5df66e5dc071212d420c3c003 SHA512 2005a080d8a97dca62b0fd4d444ec875f3f0e8bc1a0d0f56a0a03e812dcd9d366ee387b7fdb1e53dc49052391032fcbc4b1eefd817035d9356812c5c42320617 WHIRLPOOL 823dcabad94917dfa4ae6e21a885255ba989fadeb03e140e7337b13fc366ff00f05b88c50e2d3d1b5df842c8d871d5bc9e4f113335d1468f5713f6f47bcead50
 DIST dovecot-2.2.rc3.tar.gz 4222611 SHA256 71f9e19925b5e713be06a019084ddbb3dd2e0452c31fe07466f7613d39f8ee67 SHA512 3af9ba7f33c9c4062d2242d75635237481f1c97a9947fd889d01f369cfeca2bff790653da00a427cd2e25fe4f392117b9a8e6bfa81ceccd146959a2b74b16aa7 WHIRLPOOL c7fdb7d6ae09654742baf447e762fda30757ee434efbaabcf14db57d8cc73ea9c70844a7d7684ae8a66e72cc307ed96a5a0990d115d667f3d9f3b59403b15093
 EBUILD dovecot-2.0.19.ebuild 8872 SHA256 672190f8898d8587dad95872745bb65af195a77e2894527091e9032d4259a366 SHA512 52ef08b376d6bf6a443e9c4aea0db3b6a1a80e3cc0a899558e6dbdac6f36fbee5a1a84eb96f1d396a114ec74bafcb8ffada4a64a05a976fdbdc88c800dd0ccc3 WHIRLPOOL d4debf95e6404d908ccfbc1b01315902f77364c998488e1edd13b4a1008c308a3ba51479d228df4969e00efc29bab849216453d847d602f058674fb742aae6a2
-EBUILD dovecot-2.1.12-r1.ebuild 8493 SHA256 3e8f612462c3fb31fc62ff5e60a544287cbad07d2e17ead11d03a43b3d2495c5 SHA512 1c82b20e29ade1ab739466e52ce0cab1085403ead2798ae68bbdf4bd9b49c38354285e3d17de1147a4440f790df78836140927f3b0cd489fcb7eeba26ef935bd WHIRLPOOL 3ce5546193a5989941fcfef8d61bc0831702c9f9721f9bcd387ee740f4b4aa4597dbf3786448eaec114029c48a93c7638b35e06f875eb3be1274d96cddf1e8f7
-EBUILD dovecot-2.1.13.ebuild 8498 SHA256 d29492cd4bfb583ec6aaad2bea6b3f4fb8108cdaad0a11b5462490b345bbf31a SHA512 3a6d063ecf2cc9155f171a25d51902c7b3fe82c9db7a65e21ce4ac46c0c5e885ea0e30c2bb428a5f94661e79813782ee25d94a9ce95fc22d9e62c90c264acc2c WHIRLPOOL 651e9397b6ebbdf535d23c9edbc429ac7430301db7f23075157130aec8911162af1440bdc9d68271b55a633d825af3ba45024d28cf9a29a1dea2a027a2adcb86
 EBUILD dovecot-2.1.15.ebuild 8487 SHA256 93da1e5635449886882835c47e75614e539ee1bab86bb2fcb5a71f77a51fc132 SHA512 ea3f45e424cd1aed63691d643d79f30b1d306d1c78583420ffce4eb209e8b9e82b6c6e8291935d9f8ce49eb9fa96deeabfb985f23877993eb659e0e84e44a371 WHIRLPOOL f3a8f3ae06c8d34c1e14839010114f23cdc8ce4b6cc3b092488a7250a5770c8ffc009c100571fba0f44f970474c241df31b5dcdd99c20d86c44b86ead817204f
 EBUILD dovecot-2.1.9.ebuild 8711 SHA256 7d1dcd87630cd6ea0692aeb1b3e5a323692935948634610fac6ecadc6a0c4e2b SHA512 15d6ec32508190d166eeeb5ba195e9228d58da7834cc0f670f68d43357b8dd8c3b82fbab909ea7d232ca0d8676820af4946d66acefc836526d598f61d249df33 WHIRLPOOL 73ce697ed35a319b87e2e9b4bc6286c848a847b0c72c14cc18f31e381d3815952567ef02b4c23fe280e473983ebbf078101539234ccc532810a5f73c601a5d36
 EBUILD dovecot-2.2_rc3.ebuild 8568 SHA256 9900469b919358b86e7d1ee196912af484c9f5e662bb3ee1a5e055f887643e8f SHA512 fe7e36dad1ebcb822c139d9fa13f51b5389981f36411392eeef34cfea35575a722c65e840fd377e1b03a586e945664b0afd9ace601baffc33c530db882ab96c2 WHIRLPOOL bcc4fde1b64d8d47dfc0ba347b0e7c709d2cb06383ac22d505f4e40c0d6072d86e279fb055365abb470f67b3955ed29cb6410b331c540c7335cfa416b3b13aff
-MISC ChangeLog 62599 SHA256 5b3ffbe5fab68d5c1eca7c4872a656e9673f4070190cfd3622e4c1c680a784e6 SHA512 fa642e73079b40a372b8fa47d7d4d1bb55ee705c9da015de0312431153a469598d5ec2158d04f8dc1625c32f2797a99595258c1ab239eaed7591e52ecb3275a8 WHIRLPOOL 8e3f75a558efc403964d2041a31ef6d0e0f549e28b1bd8076815558a24b576deae189c2d3c93f41946b95a2e57c9118c6e925f46cefcbe3fd3c410adee36f0e7
+MISC ChangeLog 62710 SHA256 b9acbfcada80da3949fcaedaad68ef330fbdbd8045cad5fbab9e2c628233f260 SHA512 6980e62704bac5439c8270e6c856a4f294d5c1573c0a13a6101e29f78ff0ccdab39abc5f90009c2ab2c2a2edb6e7bd6eeca1fb21610ecce9dffe0b656fd0f0c7 WHIRLPOOL 366e590dc9b557f7536e2ac48b382c6ab0f40380cb5235fe6e0de8f184bc082dff485134e964edb303706768929bb11981d021eae3203756a5d01a027b193897
 MISC metadata.xml 879 SHA256 40171ddac84b6d47c050e61ec8158085dc11c1da24c3c85b0375632868da55f6 SHA512 0f0dbfc71c087fd1c6f0b673ff83b837ea8e203f74cdbd159dd66943fbccb39fdd30bc38ba19b74403a369110c205218e397dec35db72ae53bd1431bfa61b702 WHIRLPOOL 25c2f71d1e7f8987155b7c7fa08f45ff2e1f647bb390ef19e4f84dbb319ede24bf1bbce9482a823e487eab08948368b74898f57ca182f8904c501a7bc4f70755
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRTCsBAAoJEHfx8XVYajsfxicQAK2nrlbQN9TA/AsGoNXpyB8k
-WFxRT3GN/MtGQeLE+9YsjLX5EiEawPi4Zr7Iw1WlxRxH/R8/6ZCdo9h1ARkGLOQl
-o3ha9AoXg2f33zYel4Rlt0vad/4KuOG6QWh79osZAD3ZdhtJJCW8DReD/z0hGOA7
-wuAUILy7OIgFk1JHUTpZh6K9b9ltYauzXaxrM1ukPvAqorYf7G5YRbiNkAM8rH6R
-8rBuPznpLgJ/TZGp38GK3kn6CshTXBxRLJdmUdlJ6eiPTpi10Z8leq5RdP1fKUY4
-sfpv13WmwNPOgkaghTHGfQS8wzI7G/yLiW6UMD/k7gdoZSGwCPRK4ju6gQH+LJ+g
-fOLUg/+2/W+CrsiRe/QTBfiPIqrHoUYPMx6spngad+TGOiv8meJAMsMHV1r1+mcU
-BhUxH/NFdOjdNCdi4SjdsKXh9OIuHybu4w1eVq/n0MszuzFsxA4ePR3l6sMNCD90
-DtFSzhKLqcW0ju591OQrCC434lauL2tcnRFemy8QrOO8WSYV5/ArwsoVkHDrBRXQ
-+RxUItLWZ/tHrvNzVrngMLpblM63PhX6DYVuqA1MgNJ6sfW4aaUmTLAu2w8zlu/F
-6GC+WGJQxTftsxyKcpzCzNHhfO+lIGNC/gSXEk9EaT5OP3aPaf1BoytoxtXVyXCW
-9WJ1+7LiEfyyZWnKAXRf
-=enIw
+iQIcBAEBCAAGBQJRTFJlAAoJEHfx8XVYajsfAVcP/RrmCXFDFKTo5VbkTp16Oxcu
+EkUGtEGp5dDHR0RmTHsbRi0juCjybD0Zp0uaCwV3sSU3d8lsBe1+2bpEEVMoL5wt
+DoASLoRbqyOSAHgTtELJ8MkdKO6uSEQrn44yrVSobth389wM1XR3uI7usRzMnzFe
+lELp1DSgcSpVLs1MgzEnvuSnROjlQMGZS5MOaDQM1vWMEQZtzfyaiC3NGHgT0r0c
+Idz6iUkFhATw630AHte9YTUbB46JAjm6NQ4IU/vC897UwhZoUcpepJYq5nPUYfoS
+0NhfpprVOIhOhtLjo99jmXPG0d4ZWOFxvdEMRK49UGVaqpPK5YU/RmEkUPPI0fgy
+HDSQ8L/XO/Xi2+bkpcc66HuXoBTbz54IG5aut0+rBhTYS5yOby3j5dHu/S78X2At
+5AZyvqZtcXHsXnlZPW7GGIa/y0d9mTtOT3xl1OrdJzG9sIF0H1RC776pEKcgYQ9a
+2jW0rFh2JpBH0x9KeHSjWmCLw9R3NS2VhD9yjkxagUDqEw+Gv/y1XKui+khl5xIV
+NhBzSSsQ/D0rM15dGDTVZFQowfFiDz66F5NFYnVp3dY0myd3kRW9RDUdG1ZbaHRB
+Fn+McybFGWJjwikqryukADjQzcs8MtZcsk9Du0trUi3hqKXFPf0QcFYJI60sp8mJ
+HnEAc0kgwVcfcJ1PTrk6
+=jfIH
 -----END PGP SIGNATURE-----
diff --git a/net-mail/dovecot/dovecot-2.1.12-r1.ebuild b/net-mail/dovecot/dovecot-2.1.12-r1.ebuild
deleted file mode 100644
index e478d9dc744b..000000000000
--- a/net-mail/dovecot/dovecot-2.1.12-r1.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.1.12-r1.ebuild,v 1.8 2012/12/15 17:53:00 armin76 Exp $
-
-EAPI=4
-inherit eutils versionator ssl-cert systemd user multilib
-
-MY_P="${P/_/.}"
-major_minor="$(get_version_component_range 1-2)"
-sieve_version="0.3.3"
-SRC_URI="http://www.dovecot.org/releases/${major_minor}/${MY_P}.tar.gz
-	sieve? (
-	http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	)
-	managesieve? (
-	http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="http://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-
-IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
-IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox"
-IUSE_DOVECOT_OTHER="bzip2 caps doc ipv6 lucene managesieve selinux sieve +ssl static-libs suid zlib"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_OTHER}"
-
-DEPEND="caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	lucene? ( >=dev-cpp/clucene-2.3 )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base !dev-db/postgresql-base[ldap,threads] )
-	selinux? ( sec-policy/selinux-dovecot )
-	sqlite? ( dev-db/sqlite )
-	ssl? ( dev-libs/openssl )
-	vpopmail? ( net-mail/vpopmail )
-	virtual/libiconv"
-
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00-r8"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if use managesieve && ! use sieve; then
-		ewarn "managesieve USE flag selected but sieve USE flag unselected"
-		ewarn "sieve USE flag will be turned on"
-	fi
-	# default internal user
-	enewgroup dovecot 97
-	enewuser dovecot 97 -1 /dev/null dovecot
-	# default login user
-	enewuser dovenull -1 -1 /dev/null
-	# add "mail" group for suid'ing. Better security isolation.
-	if use suid; then
-		enewgroup mail
-	fi
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	local storages=""
-	for storage in ${IUSE_DOVECOT_STORAGE//+/}; do
-		use ${storage} && storages="${storage} ${storages}"
-	done
-	[ "${storages}" ] || storages="maildir"
-
-	# turn valgrind tests off. Bug #340791
-	VALGRIND=no econf \
-		--localstatedir="${EPREFIX}/var" \
-		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-		--without-stemmer \
-		--with-storages="${storages}" \
-		--disable-rpath \
-		$( systemd_with_unitdir ) \
-		$( use_with bzip2 bzlib ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with ldap ) \
-		$( use_with lucene ) \
-		$( use_with mysql ) \
-		$( use_with pam ) \
-		$( use_with postgres pgsql ) \
-		$( use_with sqlite ) \
-		$( use_with ssl ) \
-		$( use_with vpopmail ) \
-		$( use_with zlib ) \
-		$( use_enable static-libs static ) \
-		${conf}
-
-	if use sieve || use managesieve ; then
-		# The sieve plugin needs this file to be build to determine the plugin
-		# directory and the list of libraries to link to.
-		emake dovecot-config
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		econf \
-			$( use_enable static-libs static ) \
-			--localstatedir="${EPREFIX}/var" \
-			--enable-shared \
-			--with-dovecot="../${MY_P}" \
-			$( use_with managesieve )
-	fi
-}
-
-src_compile() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-	fi
-}
-
-src_test() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		default
-	fi
-}
-
-src_install () {
-	default
-
-	# insecure:
-	# use suid && fperms u+s /usr/libexec/dovecot/deliver
-	# better:
-	if use suid;then
-		einfo "Changing perms to allow deliver to be suided"
-		fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-		fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-	fi
-
-	newinitd "${FILESDIR}"/dovecot.init-r4 dovecot
-
-	rm -rf "${ED}"/usr/share/doc/dovecot
-
-	dodoc AUTHORS NEWS README TODO
-	dodoc doc/*.{txt,cnf,xml,sh}
-	docinto example-config
-	dodoc doc/example-config/*.{conf,ext}
-	docinto example-config/conf.d
-	dodoc doc/example-config/conf.d/*.{conf,ext}
-	docinto wiki
-	dodoc doc/wiki/*
-	doman doc/man/*.{1,7}
-
-	# Create the dovecot.conf file from the dovecot-example.conf file that
-	# the dovecot folks nicely left for us....
-	local conf="${ED}/etc/dovecot/dovecot.conf"
-	local confd="${ED}/etc/dovecot/conf.d"
-
-	insinto /etc/dovecot
-	doins doc/example-config/*.{conf,ext}
-	insinto /etc/dovecot/conf.d
-	doins doc/example-config/conf.d/*.{conf,ext}
-	fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
-	rm -f "${confd}/../README"
-
-	# .maildir is the Gentoo default
-	local mail_location="maildir:~/.maildir"
-	if ! use maildir; then
-		if use mbox; then
-			mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
-			keepdir /var/dovecot
-			sed -i -e 's|#mail_privileged_group =|mail_privileged_group = mail|' \
-			"${confd}/10-mail.conf" || die "sed failed"
-		elif use mdbox ; then
-			mail_location="mdbox:~/.mdbox"
-		elif use sdbox ; then
-			mail_location="sdbox:~/.sdbox"
-		fi
-	fi
-	sed -i -e \
-		"s|#mail_location =|mail_location = ${mail_location}|" \
-		"${confd}/10-mail.conf" \
-		|| die "failed to update mail location settings in 10-mail.conf"
-
-	# We're using pam files (imap and pop3) provided by mailbase
-	if use pam; then
-		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
-			"${confd}/auth-system.conf.ext" \
-			|| die "failed to update PAM settings in auth-system.conf.ext"
-		# mailbase does not provide a sieve pam file
-		use managesieve && dosym imap /etc/pam.d/sieve
-		sed -i -e \
-			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update PAM settings in 10-auth.conf"
-	fi
-
-	# Disable ipv6 if necessary
-	if ! use ipv6; then
-		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
-			|| die "failed to update listen settings in dovecot.conf"
-	fi
-
-	# Update ssl cert locations
-	if use ssl; then
-		sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
-		|| die "ssl conf failed"
-		sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
-			-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
-			"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
-	fi
-
-	# Install SQL configuration
-	if use mysql || use postgres; then
-		sed -i -e \
-			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
-			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
-			10-auth.conf"
-	fi
-
-	# Install LDAP configuration
-	if use ldap; then
-		sed -i -e \
-			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update ldap settings in 10-auth.conf"
-	fi
-
-	if use vpopmail; then
-		sed -i -e \
-			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update vpopmail settings in 10-auth.conf"
-	fi
-
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake DESTDIR="${ED}" install
-		sed -i -e \
-			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
-			|| die "failed to update sieve settings in 15-lda.conf"
-		rm -rf "${ED}"/usr/share/doc/dovecot
-		dodoc doc/*.txt
-		docinto example-config/conf.d
-		dodoc doc/example-config/conf.d/*.conf
-		insinto /etc/dovecot/conf.d
-		doins doc/example-config/conf.d/90-sieve.conf
-		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
-		docinto sieve/rfc
-		dodoc doc/rfc/*.txt
-		docinto sieve/devel
-		dodoc doc/devel/DESIGN
-		doman doc/man/*.{1,7}
-	fi
-
-	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
-}
-
-pkg_postinst() {
-	if use ssl; then
-	# Let's not make a new certificate if we already have one
-		if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
-			einfo "Creating SSL	certificate"
-			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-			install_cert /etc/ssl/dovecot/server
-		fi
-	fi
-
-	elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
-}
diff --git a/net-mail/dovecot/dovecot-2.1.13.ebuild b/net-mail/dovecot/dovecot-2.1.13.ebuild
deleted file mode 100644
index 4935ae0d8d56..000000000000
--- a/net-mail/dovecot/dovecot-2.1.13.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.1.13.ebuild,v 1.1 2013/01/07 13:43:00 eras Exp $
-
-EAPI=4
-inherit eutils versionator ssl-cert systemd user multilib
-
-MY_P="${P/_/.}"
-major_minor="$(get_version_component_range 1-2)"
-sieve_version="0.3.3"
-SRC_URI="http://www.dovecot.org/releases/${major_minor}/${MY_P}.tar.gz
-	sieve? (
-	http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	)
-	managesieve? (
-	http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="http://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
-IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox"
-IUSE_DOVECOT_OTHER="bzip2 caps doc ipv6 lucene managesieve selinux sieve +ssl static-libs suid zlib"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_OTHER}"
-
-DEPEND="caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	lucene? ( >=dev-cpp/clucene-2.3 )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base !dev-db/postgresql-base[ldap,threads] )
-	selinux? ( sec-policy/selinux-dovecot )
-	sqlite? ( dev-db/sqlite )
-	ssl? ( dev-libs/openssl )
-	vpopmail? ( net-mail/vpopmail )
-	virtual/libiconv"
-
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00-r8"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if use managesieve && ! use sieve; then
-		ewarn "managesieve USE flag selected but sieve USE flag unselected"
-		ewarn "sieve USE flag will be turned on"
-	fi
-	# default internal user
-	enewgroup dovecot 97
-	enewuser dovecot 97 -1 /dev/null dovecot
-	# default login user
-	enewuser dovenull -1 -1 /dev/null
-	# add "mail" group for suid'ing. Better security isolation.
-	if use suid; then
-		enewgroup mail
-	fi
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	local storages=""
-	for storage in ${IUSE_DOVECOT_STORAGE//+/}; do
-		use ${storage} && storages="${storage} ${storages}"
-	done
-	[ "${storages}" ] || storages="maildir"
-
-	# turn valgrind tests off. Bug #340791
-	VALGRIND=no econf \
-		--localstatedir="${EPREFIX}/var" \
-		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-		--without-stemmer \
-		--with-storages="${storages}" \
-		--disable-rpath \
-		$( systemd_with_unitdir ) \
-		$( use_with bzip2 bzlib ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with ldap ) \
-		$( use_with lucene ) \
-		$( use_with mysql ) \
-		$( use_with pam ) \
-		$( use_with postgres pgsql ) \
-		$( use_with sqlite ) \
-		$( use_with ssl ) \
-		$( use_with vpopmail ) \
-		$( use_with zlib ) \
-		$( use_enable static-libs static ) \
-		${conf}
-
-	if use sieve || use managesieve ; then
-		# The sieve plugin needs this file to be build to determine the plugin
-		# directory and the list of libraries to link to.
-		emake dovecot-config
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		econf \
-			$( use_enable static-libs static ) \
-			--localstatedir="${EPREFIX}/var" \
-			--enable-shared \
-			--with-dovecot="../${MY_P}" \
-			$( use_with managesieve )
-	fi
-}
-
-src_compile() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-	fi
-}
-
-src_test() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		default
-	fi
-}
-
-src_install () {
-	default
-
-	# insecure:
-	# use suid && fperms u+s /usr/libexec/dovecot/deliver
-	# better:
-	if use suid;then
-		einfo "Changing perms to allow deliver to be suided"
-		fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-		fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-	fi
-
-	newinitd "${FILESDIR}"/dovecot.init-r4 dovecot
-
-	rm -rf "${ED}"/usr/share/doc/dovecot
-
-	dodoc AUTHORS NEWS README TODO
-	dodoc doc/*.{txt,cnf,xml,sh}
-	docinto example-config
-	dodoc doc/example-config/*.{conf,ext}
-	docinto example-config/conf.d
-	dodoc doc/example-config/conf.d/*.{conf,ext}
-	docinto wiki
-	dodoc doc/wiki/*
-	doman doc/man/*.{1,7}
-
-	# Create the dovecot.conf file from the dovecot-example.conf file that
-	# the dovecot folks nicely left for us....
-	local conf="${ED}/etc/dovecot/dovecot.conf"
-	local confd="${ED}/etc/dovecot/conf.d"
-
-	insinto /etc/dovecot
-	doins doc/example-config/*.{conf,ext}
-	insinto /etc/dovecot/conf.d
-	doins doc/example-config/conf.d/*.{conf,ext}
-	fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
-	rm -f "${confd}/../README"
-
-	# .maildir is the Gentoo default
-	local mail_location="maildir:~/.maildir"
-	if ! use maildir; then
-		if use mbox; then
-			mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
-			keepdir /var/dovecot
-			sed -i -e 's|#mail_privileged_group =|mail_privileged_group = mail|' \
-			"${confd}/10-mail.conf" || die "sed failed"
-		elif use mdbox ; then
-			mail_location="mdbox:~/.mdbox"
-		elif use sdbox ; then
-			mail_location="sdbox:~/.sdbox"
-		fi
-	fi
-	sed -i -e \
-		"s|#mail_location =|mail_location = ${mail_location}|" \
-		"${confd}/10-mail.conf" \
-		|| die "failed to update mail location settings in 10-mail.conf"
-
-	# We're using pam files (imap and pop3) provided by mailbase
-	if use pam; then
-		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
-			"${confd}/auth-system.conf.ext" \
-			|| die "failed to update PAM settings in auth-system.conf.ext"
-		# mailbase does not provide a sieve pam file
-		use managesieve && dosym imap /etc/pam.d/sieve
-		sed -i -e \
-			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update PAM settings in 10-auth.conf"
-	fi
-
-	# Disable ipv6 if necessary
-	if ! use ipv6; then
-		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
-			|| die "failed to update listen settings in dovecot.conf"
-	fi
-
-	# Update ssl cert locations
-	if use ssl; then
-		sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
-		|| die "ssl conf failed"
-		sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
-			-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
-			"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
-	fi
-
-	# Install SQL configuration
-	if use mysql || use postgres; then
-		sed -i -e \
-			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
-			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
-			10-auth.conf"
-	fi
-
-	# Install LDAP configuration
-	if use ldap; then
-		sed -i -e \
-			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update ldap settings in 10-auth.conf"
-	fi
-
-	if use vpopmail; then
-		sed -i -e \
-			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update vpopmail settings in 10-auth.conf"
-	fi
-
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake DESTDIR="${ED}" install
-		sed -i -e \
-			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
-			|| die "failed to update sieve settings in 15-lda.conf"
-		rm -rf "${ED}"/usr/share/doc/dovecot
-		dodoc doc/*.txt
-		docinto example-config/conf.d
-		dodoc doc/example-config/conf.d/*.conf
-		insinto /etc/dovecot/conf.d
-		doins doc/example-config/conf.d/90-sieve.conf
-		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
-		docinto sieve/rfc
-		dodoc doc/rfc/*.txt
-		docinto sieve/devel
-		dodoc doc/devel/DESIGN
-		doman doc/man/*.{1,7}
-	fi
-
-	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
-}
-
-pkg_postinst() {
-	if use ssl; then
-	# Let's not make a new certificate if we already have one
-		if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
-			einfo "Creating SSL	certificate"
-			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-			install_cert /etc/ssl/dovecot/server
-		fi
-	fi
-
-	elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
-}