Remove old

Package-Manager: portage-2.2.0_alpha124/cvs/Linux x86_64

4 files changed, 19 insertions, 568 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index ada81aac78ac..6e1002f6f8be 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/dovecot
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.372 2012/08/03 06:33:48 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.373 2012/09/03 15:58:59 eras Exp $
+
+  03 Sep 2012; Eray Aslan <eras@gentoo.org> -dovecot-2.1.6-r1.ebuild,
+  -dovecot-2.1.7.ebuild:
+  Remove old
 
   03 Aug 2012; Eray Aslan <eras@gentoo.org> dovecot-2.1.9.ebuild:
   Fix building with -sieve - bug #429582
@@ -1733,4 +1737,3 @@
   10 Apr 2004; Grant Goodyear <g2boojum@hotmail.com> :
   Long overdue new package.  Thanks to Zach Bagnell, Andreas Simon, Lars 
   Trieloff, Andrew Cooks, Tony Vroon, and tseng.
-
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 577426e0cc2a..65af765bc8ce 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -15,8 +15,6 @@ DIST dovecot-2.0.19.tar.gz 3357056 SHA256 50e49e181acea7f2c08008c5a61500c01803dc
 DIST dovecot-2.0.20.tar.gz 3360751 SHA256 fa630159127e710dcd623b99bc655d1f5f85891fd1615f194ea72d4fe3cf82c0
 DIST dovecot-2.0.21.tar.gz 3372011 SHA256 540ec583703a29c95eaec82f0162b8e5a86ccca4c470e9309ede82b40e8e8145
 DIST dovecot-2.1-pigeonhole-0.3.1.tar.gz 1084148 SHA256 e95d86c5cd912c9a7e180414ffd5eee52e1b5dc8abef3d5762b950d1de86b5c7 SHA512 9df0a428f43287606522120a368c07513b39852325c436bc9c523e52f82a4c97232991ca832630baaa8c704adc2234ed18c2c0a63f8211f7f412dbe285436240 WHIRLPOOL 72e346e338a3e0149cc978ccc9c54943efad165d82d54cade1d954688f1806b30b3509c7f90c6589673c2808f9d85497af28aec63e2e060ca5934ea4ef101e9a
-DIST dovecot-2.1.6.tar.gz 3773967 SHA256 4b81b2cdf624344c6c2ff91be1b794911b51c98dffa24095a6dcbc7eb6bc1e89 SHA512 a82e0728ac08532d8afd1ec8cbf1830a0e73f3a538a91ed7550220de71c552b9c3c2f1d4e8a42f37680bce047809959fe738bcdd27d3e25358b0d79067c74b45 WHIRLPOOL 87e0d99e0454dfed97852de2deb836d476e5c1bac65779b043a15ebc8b5cd9f2a19713fdf6017c59dde48179caca86e768ff63136e7f3082181a5f008d036384
-DIST dovecot-2.1.7.tar.gz 3778791 SHA256 d5b7bc61fff947722aebe12ebb25e92c38ce3e27e14ebc54cfc66f0b346cf452
 DIST dovecot-2.1.8.tar.gz 3807008 SHA256 48807384f815072cf5a9c8a94726b4179433d4a3dd35f33cbe8db3a7880b000d SHA512 587e7112e357dd87c32d8d20a756da9db54574e2ec50723667281749727afb5a3810acb1e679f482119a94c57d6fbec65ba23b857496ed17e7edf7c19fd8c679 WHIRLPOOL 7d63f68fc97b527796e8474622c4814d6b281d90182509492a07ef64850c01eb24faccffbce5c80bbc991b792f5881a09b237cbe2a7cab6dae391bb464ea25fd
 DIST dovecot-2.1.9.tar.gz 3829755 SHA256 77d11112bced9e2bbb1410ce5e6464af477775315ec67c7f3ab4d0da64e3c512 SHA512 da16bce6fdb535dd8eb48b4626444296e78808613f5a0d3d28dd7a509a82a276ee4f34d3ed8c339a98bd6aaee10ddf1c2df62060748b4c603a06ab165086d8de WHIRLPOOL f5bfe022687f36fcb06aa46165d6ffe8323bd13e990b7acecaed6af91226c5b06bc1e479f242dd6f963ff6039f633d790221559af42c4debf39ca252715a81f3
 EBUILD dovecot-1.2.17.ebuild 8779 SHA256 d98318a83549c639f579d039653a97ac1c41cd0da98f0d5524baa6a82593865d SHA512 9fb7646f6bf4ae7aad6b6cbac317e47d6c31c38a8aab6a96e74dc5ac5962fe5fa28970836644394424c5a2a5a66c2072d4ff559746ba14025933c3accb2cbb32 WHIRLPOOL b7232c4ce1ec437cf26b3b2ff6d55d619175c2efa5c163bcb82a888fc35499f1f64fd3ab28d7ec7d46f5c685a485b1c29c2875467911a7c1c58a684bf5dafc9e
@@ -24,26 +22,24 @@ EBUILD dovecot-2.0.17.ebuild 8809 SHA256 0536b6064792e582c83e3933278d592591d549d
 EBUILD dovecot-2.0.19.ebuild 8811 SHA256 ead198ebc3666606552b825060813506d3f0d711484117e1149458d93b70eb8e SHA512 5821c2c9421d1c59b45a77ffa89086fa5db86c547d9e7840ada4f54e3c605bde1965ec452ae88af22c388dd384f383d0409da1561a69ec35f4ef9201bd7b0efa WHIRLPOOL c662019512a8d6f245df34a79bb8939d93f09fc200acca4243ad17e81c2e4f175b1d34291205aea1498c018e0db00d6a255f17ab04f2ffce73665fdde3af7a65
 EBUILD dovecot-2.0.20.ebuild 8819 SHA256 dda778e127884503bba4630eb7686e26ebcdfde951736df8305e71f052d8a76b SHA512 9e0a14667c16e58766ce27ab9f4a1de21c3f412ccc0a08cd6e55fa62859cd3e992a28ba7ddaf2c506645cc7f49ea5e657c15c101fe9a6a5c2a6d2f5f698a54d1 WHIRLPOOL 2f2850e0bc541d4be47d6343eb1807078b3485733e5065cae7eff221ce753f3a637f3ffd6aabaf18c017788e86f4874042817ee389b7daaf4e689af9e6328a94
 EBUILD dovecot-2.0.21.ebuild 8796 SHA256 b17fab06af210c8d38249c4faf2d8f05f96f5a226370cab10c9876004af61d90 SHA512 f5fe87477ba1fefa3de83b2bedf73239a95133294cb1b775d8ca543daca685410f3806a86ed0b0383f9d2aba799e9b09b90582b43f78e428a22ad5c63bc194e3 WHIRLPOOL 61e20bd5691e4fbbdf061528f4d91a324954262f5e7e82035de26d9f7bdd9a5827d0b4f999e759de6725ebb47296cfc739f43a7f29bc64a3770eb35d1db8cc9b
-EBUILD dovecot-2.1.6-r1.ebuild 8455 SHA256 6fab9f2394585026955486cc926ed8a55a940872e09c4bc9be231856ecb97399 SHA512 fd1dd231144aa45d45e0fed91690560245f6fa98765e37c03bee29ffd2f586f31acc49c45f44b930605ae935d130753b2bc37007fa3ec4a838c881dd2d388550 WHIRLPOOL 44c6dfe6c777f1bc0d45ad21ac37c51fae2fc07dee40e3502bc31f9c2cbc87dd252bc3a2c5fde477e7c596acaf049151bad8c438a8e295382760dbc9a239ad80
-EBUILD dovecot-2.1.7.ebuild 8462 SHA256 d7eeee8433411e4d643049d426af81320c97e68bc0e83db95459cc200b3cff59 SHA512 408a631a61a25323a146905101f7b1c8e57c2a93e06d6dcf0c3c0c731fbb47c4e0cbf475fba239cfa0a16697ebf7273afa0728f1d773e4b4ccfe5c5015900024 WHIRLPOOL ed6f72adca6161a4724d3d53130fa7c004a84260037d2aa9b52d1fbb8b1d681eca4478a1f6b81f0a6e59d4dc92fb6d26a294e68ee5079a1147834e50a2bce9d5
 EBUILD dovecot-2.1.8.ebuild 8462 SHA256 a999f4214288de01c099c3a0abbeaad0a5d9a4567846f5974343e7eb9e1ec03a SHA512 624d731f001d06d9ace2b465bbfb020f169f268aa2d34a798f164fb975bb86ce691acb88bbe6dc843266f4872047641323349894411aac05897698e3b9fb0c1d WHIRLPOOL 49638f47ac4570dc48a32a940e76c7fb807ad0ff7a0738e1c2a8c8d58cf2f40bf81734868ad166a38654a818f179c7d4d9145b6fafdbb00f93a1f075e41a1218
 EBUILD dovecot-2.1.9.ebuild 8645 SHA256 965051a5a16ea74ad1815558f7e72edb785ce449ba8bbea8a36025e1360f4abf SHA512 04a69925dcaaa7ece441ad5c7b9313fc2f425bc28b8c458919f260ed193d70ec1898c8f6c1ab5a412eefe3012bc82d4b89e5761d34e34d35ebd174184af9a0bb WHIRLPOOL 0ad99ba31cbad1a22c3f525727cedbb1ff3112e4361b3fa947f2359410fe2b1c30a20b9c00dd0aaf472edfca326cd1f17f3d46b6539cfac2abf4e2889138e306
-MISC ChangeLog 57206 SHA256 6f3b627db02a6f3bee6c33ce17c497185b46e89bde1a9bfea852cfee85305f66 SHA512 7f8a393535043cb3b9be278cf96de18530227cb3bc5b19638239dea252ec1c79ea2b294014122d9ce59381c73c91f22c66132c692fa873560dfe57b85689d5bd WHIRLPOOL 740e32bd2f37d0980df04aa2bb3889e13e92283741f25cf7ec9585b9aac1ec7a66c501fe0e43c1528984c90a2aa7192018790bc75ff382cdea06e104ec3918b9
+MISC ChangeLog 57314 SHA256 2d0585ca2c2c3eec6c6673df9d1cb3c7b56fae1d7771077843b68d4532244e5f SHA512 7814eaf615643ddda3ee857a020ce0c1229d2d2ebf9fead0c21a1f8300f966a63cebf6bda935a22084ef7f50cb1b38cbf8d1c4cdee10b14b1fd5007942d57b07 WHIRLPOOL 9bd7f5a0e65b6b149e093a8686407fe947d31ae81984920b13c2677b206af159f4bc0275d55eae84e21c8895958ca21537dbcc31f4535e22c0aa5968d95e2acc
 MISC metadata.xml 871 SHA256 64805284b8602318ba8b8902d58adc8b4edacba0468037a9c8abae4aac46ddb8 SHA512 651ab1dc7f14e5a9749ee2b249fd1c135da045a51861dee59adce119e1943259d9d69cedb68a45ebd2084b16d8baee13ac78130c7c58044700fe285826943a4f WHIRLPOOL 9aa300af8a4d0a0f59c06337081cd14f3d7be9197bdffc6db9f144f5eba739c6a2fb0e6dc3a465df6af030091073262c4c277b6b758c8ebd27be397c3d4c14d4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQG3DaAAoJEHfx8XVYajsfs/8P/1hbj1Fg2k7aliB3dyeeUHr0
-xRXc7Luj2R5k4BJAhT+sa142QntTTx5GqbiqeOzIsKSeokvRgsuoFrYUAKcQrpao
-2m8csnKBvBJCQpVMq+gp6oq8keeUS6bGEkMwXdtMcvCbnQjs4I4CtEZOuwHBNYYZ
-+Xf4eVRVSjiDHi2Vx+Y7QYE1cDgMSOIIVccpb+RHPDbN5+J0g+Yjd/JtFr81P42O
-iR+/1XM/mxv/1ZI+yEPyHXVd3AGzhqw5CsALUz4sTOqWXEsRPIeRvli7gi2T9XST
-XbOot/oM2efMvepfcOPxI01mKFKOyO19Su4xVX43o6oTEuRY5V9qQ7SPCnZvknCD
-sXP6VJSBJ3UQM3dYoaT3QqEty9zcoDNgKqZqcoJLjtZjAEOeckxXPGJHMfSTXvV0
-QGTPB0+z5w4znO7ETBdlREzK0msR+TNFMwwBQt5yEVencjWZK4H7/HhqcpoPd56f
-Knz3VmrclU9i6+W4AlntxJebpDG583qPdmgxoeHc5pDnSTb7sJpkGsxIMkMfsdu1
-qsP69q26yUFvAphKHMAkFhkdgkvEwz7Ff03HIKgno2Fum6jedTe4hqLptb+IfopN
-xMAn8wQsnJBT3QLWk+6lsPoncV1ECkVjYfPiCn8A7vTOm2eLGIqvbejjDZ51bfWS
-rG3oTvkkfzgUg+5MTTFh
-=WShN
+iQIcBAEBCAAGBQJQRNPIAAoJEHfx8XVYajsfCfAP/jNRzoKvsg/EMD8V69ZD9Svf
+RHJYw6JB2qb6NFjuQCjHpwtu8N6TnA4UClAMJdvypy+aTJkAEHJrB2evi5+nUI8a
+jmfjvPmq2M2nrG27k4VpuSnN41yx8FoElRPWJ5APKChQ5/blQVbGFgUvZBayR40c
+0D8dgoaA0Jsykog90/89UQuT/ZC9oDIXdTTvIW2qRP0zeQRw/BCZkhZyyrNTfMO1
+gNMEYrMVch7XudPOIDDH6w7bMCoIIGwJyiU7NjL7T30GV8EvvfrCSZxFh9GtZOkQ
+zagQADpul3Bf9Q090HvfuTfwQkvpHCTCg6jG78TOF/fuE0ps6gZu+7NawnZ2TEno
+x/XzAhomnbp/1qSMb4RV64+RzxGwo4tjmHnuOaeIaZDuTscLRotsBbp5ZQmn5bj7
+QyhUbEpE+DIwJCv3zSAHbt1ortSfTAuJgUKDMUDXJpjDfe/P7G7tl4EgPZ7FrCBe
+cwQ4trq8XRyT6dSI46QkX1+ke1gsu6XkkNZUnHszu2EXLCa4negsz4XAw3H7z6bb
+u+7LZ8LvVXB+zgAdVPfjn1FmrNrUrxCzSG2x/3QD3bhs1EXV3RriJ9cZHf/Y5QqP
+5AHw8wwI0rWi8uYQpg+mvczFyVz8ZXjvs0Qr0B/qyn/zSgI9wllFPNbjHWTB8f9k
+IxkThkCikdmWWmxqeHEo
+=oVTo
 -----END PGP SIGNATURE-----
diff --git a/net-mail/dovecot/dovecot-2.1.6-r1.ebuild b/net-mail/dovecot/dovecot-2.1.6-r1.ebuild
deleted file mode 100644
index 2ae1cdc8dd62..000000000000
--- a/net-mail/dovecot/dovecot-2.1.6-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.6-r1.ebuild,v 1.1 2012/05/26 11:39:35 eras Exp $
-
-EAPI=4
-inherit eutils versionator ssl-cert systemd
-
-MY_P="${P/_/.}"
-major_minor="$( get_version_component_range 1-2 )"
-sieve_version="0.3.1"
-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 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-IUSE="bzip2 caps cydir sdbox doc ipv6 imapc kerberos ldap lucene +maildir managesieve mbox
-mdbox mysql pam postgres sieve sqlite +ssl static-libs suid vpopmail zlib"
-
-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] )
-	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
-
-	# Add user and group for login process (same as for fedora/redhat)
-	# default internal user
-	enewgroup dovecot 97
-	enewuser dovecot 97 -1 /dev/null dovecot
-	# add "mail" group for suid'ing. Better security isolation.
-	if use suid; then
-		enewgroup mail
-	fi
-	# default login user
-	enewuser dovenull -1 -1 /dev/null
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	local storages=""
-	for storage in cydir sdbox mdbox maildir mbox imapc; 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" \
-		$( use_with bzip2 bzlib ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with ldap ) \
-		$( use_with lucene ) \
-		--without-stemmer \
-		$( 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 ) \
-		--with-storages="${storages}" \
-		--disable-rpath \
-		$(systemd_with_unitdir) \
-		${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() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-
-	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_src_test
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		default_src_test
-	fi
-}
-
-src_install () {
-	emake DESTDIR="${ED}" install
-
-	# 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-r3 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 sdbox ; then
-			mail_location="sdbox:~/.sdbox"
-		elif use mdbox ; then
-			mail_location="mdbox:~/.mdbox"
-		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 "Upgrade notes can be found at:"
-	elog "\thttp://wiki2.dovecot.org/Upgrading"
-}
diff --git a/net-mail/dovecot/dovecot-2.1.7.ebuild b/net-mail/dovecot/dovecot-2.1.7.ebuild
deleted file mode 100644
index b476af3d2683..000000000000
--- a/net-mail/dovecot/dovecot-2.1.7.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.7.ebuild,v 1.2 2012/07/07 12:28:07 blueness Exp $
-
-EAPI=4
-inherit eutils versionator ssl-cert systemd
-
-MY_P="${P/_/.}"
-major_minor="$( get_version_component_range 1-2 )"
-sieve_version="0.3.1"
-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 ~sparc ~x86 ~x86-fbsd"
-
-IUSE="bzip2 caps cydir sdbox doc ipv6 imapc kerberos ldap lucene +maildir managesieve mbox
-mdbox mysql pam postgres sieve sqlite +ssl static-libs suid vpopmail zlib"
-
-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] )
-	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
-
-	# Add user and group for login process (same as for fedora/redhat)
-	# default internal user
-	enewgroup dovecot 97
-	enewuser dovecot 97 -1 /dev/null dovecot
-	# add "mail" group for suid'ing. Better security isolation.
-	if use suid; then
-		enewgroup mail
-	fi
-	# default login user
-	enewuser dovenull -1 -1 /dev/null
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	local storages=""
-	for storage in cydir sdbox mdbox maildir mbox imapc; 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" \
-		$( use_with bzip2 bzlib ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with ldap ) \
-		$( use_with lucene ) \
-		--without-stemmer \
-		$( 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 ) \
-		--with-storages="${storages}" \
-		--disable-rpath \
-		$(systemd_with_unitdir) \
-		${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() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-
-	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_src_test
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		default_src_test
-	fi
-}
-
-src_install () {
-	emake DESTDIR="${ED}" install
-
-	# 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-r3 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 sdbox ; then
-			mail_location="sdbox:~/.sdbox"
-		elif use mdbox ; then
-			mail_location="mdbox:~/.mdbox"
-		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 "Upgrade notes can be found at:"
-	elog "\thttp://wiki2.dovecot.org/Upgrading"
-}