version bump

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

4 files changed, 36 insertions, 334 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index 175cf4b98908..135a9f3e4fb4 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,12 @@
 # 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.342 2012/02/16 13:25:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.343 2012/02/17 15:24:23 eras Exp $
+
+*dovecot-2.1.0 (17 Feb 2012)
+
+  17 Feb 2012; Eray Aslan <eras@gentoo.org> -dovecot-2.1_rc5.ebuild,
+  -dovecot-2.1_rc7.ebuild, +dovecot-2.1.0.ebuild:
+  version bump
 
   16 Feb 2012; Agostino Sarubbo <ago@gentoo.org> dovecot-2.0.17.ebuild:
   Stable for amd64, wrt bug #403849
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index e782ee11d629..cb3e34f91364 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX dovecot-1.2.init 1701 RMD160 89cdc58d6ad9ac41f8946fabf3c80e0b9f4b61ea SHA1 9cbf10e9d1997ad3703ee1ae37edbcfad6f16b79 SHA256 44b308537454362b00f8ab87257c4a0d8eb5a183452ca2e3487f74b642fac8e0
 AUX dovecot.init-r3 1609 RMD160 971a603d1507f40c5377aeedf5fd99485944c525 SHA1 329cf561d55a6dceb7bddd3fd09fb83522a9b548 SHA256 b4fb8ffb9aa7fd270d45512a657dcb5597ae5fe516b1f8e0078aa1892de8ecaa
@@ -14,27 +14,31 @@ DIST dovecot-2.0.15.tar.gz 3303717 RMD160 2c315bbce2d7173b1e62c96d3a4bda0910a59d
 DIST dovecot-2.0.16.tar.gz 3317662 RMD160 dfe0cf2bbd211a07bb492c2f0d944a6a9f1c5f79 SHA1 0df6e84233339ee308deaecd8f1a7ffddcaeca16 SHA256 a9652ce1f0767b9a4d4f613dd4d41bbe7b55c25728be6f1283dacf0aff62f057
 DIST dovecot-2.0.17.tar.gz 3329794 RMD160 108399bdaf0e03e013b78b79e39c5c8a5dd2f62d SHA1 4c12f1a074c52b17cb64fcc73c41f0a2820a88fe SHA256 3f0d4289067d2355b4ce4a00265bf2b4bf6540bca8fdcecfc6ad20611da145d2
 DIST dovecot-2.0.18.tar.gz 3353149 RMD160 e6260b009e3b0f5b58113dd71a2755edee665e0e SHA1 117e90053be3d51ab3cf2674f2c04536729474d7 SHA256 92fc68af6ef0309990c749fcab39eeebce56ea8888c3d73ba812b65a74d1fa1b
-DIST dovecot-2.1-pigeonhole-bc5acd9e957e.tar.bz2 563885 RMD160 e0edf882d407a7a41e6a4b17100c456ea5fc7f35 SHA1 d9a1b2009a1cf6b3846f3915f05db1b1b7e5fbfd SHA256 72cf56f8bc9952231b33b1ff8f9951598129783086f11e6c315017fd05dec55f
-DIST dovecot-2.1.rc5.tar.gz 3619884 RMD160 3f1ff58eaf7129cbe21401f867bd95fb87ea3c56 SHA1 7861c9b40d398437b6eb114412ed64ff3d48e440 SHA256 c81e2e80b3cebba2443f7e8865899a6db062bfa476ede7d28a76c11a7125505c
-DIST dovecot-2.1.rc7.tar.gz 3662514 RMD160 11446a66db005596846e7e10dc4ae6d6a5007f30 SHA1 832e65f811f9e1fdcf58fc277dce2a0aca8244b0 SHA256 d4685e79d8d094a190b35d83a37c2c6524faa012f3faf7fb2a3a53e2731573e7
+DIST dovecot-2.1-pigeonhole-0.3.0.tar.gz 1277277 RMD160 64692b03b60079b9ed22b069de947da7f4a32114 SHA1 e465536ce14690804665b4eea0916969562dc926 SHA256 2aeee8aa6dc700483b0a5a3d31f535abce71698ed1d467f11e931aeace2b0ada
+DIST dovecot-2.1.0.tar.gz 3662969 RMD160 302b6628cbcb14c1334d4bb14293f8ebc4216451 SHA1 1434746a230b0ab554036c00d11ae16aed2746bc SHA256 61d1a776bf02c72272f2401ee4b7b4f1ce530dd2695a774c1ebedb61a228238b
 EBUILD dovecot-1.2.17.ebuild 8779 RMD160 e7e72abbabba9b996c5c22b696064a9ea6be6e23 SHA1 abc5692a012d84b17efee7706fd53257106c9b37 SHA256 d98318a83549c639f579d039653a97ac1c41cd0da98f0d5524baa6a82593865d
 EBUILD dovecot-2.0.15.ebuild 8888 RMD160 cc5172a57be6bd944c3320ff46d305df49c85ac2 SHA1 6ccb2632f814a9a7c6e1b4db016fba99288915b8 SHA256 1ac5143e0384c8a4bdfa617aa5b59c66eef3104ca7818843836f073cebbcd69b
 EBUILD dovecot-2.0.16-r1.ebuild 8822 RMD160 c2ce983c76a557f04515118bcee8d716e5379dbb SHA1 36b29dc68f57fec8a314ffbfd82bacc0bd480fa3 SHA256 c542c8906b7f9f7baf7e13bbe1691b20b971b5a600898b0bf48319681ff271a2
 EBUILD dovecot-2.0.16.ebuild 8809 RMD160 be475bd89f87cf2bab857febd4d2de968069548d SHA1 de0d53be4f702a07b488dbf83f2a54d38d231f06 SHA256 fe0b1de7f5c9c274e55094365b1988596379120500b2862f2d5de9922af4ddd9
 EBUILD dovecot-2.0.17.ebuild 8816 RMD160 b5fe57ac9b5074334c13ace8d385235235a87946 SHA1 04fd2da8f693e0c61dc7f08c30b916d32381a033 SHA256 f6fda196d2d06d18894dbcff6894e490e38f9d21f6f6acc8d6264f050c901a0d
 EBUILD dovecot-2.0.18.ebuild 8819 RMD160 0ccf90a6a18847c61f5e04364309173330a08e17 SHA1 68c2817db52f3d182543821ec4c67e25b745da5c SHA256 ecbafef7e5093bc36ed6e0741b7ec3ddf4bd315ea8a3e8319ec0012a3417f733
-EBUILD dovecot-2.1_rc5.ebuild 9324 RMD160 3abffc57e1ca4112ee8aa37f55de2fb1e41104c2 SHA1 b9421611ea12d39b13410550a93468205431bf27 SHA256 f721c99d2d3d8be520d94a53b193e7fdf6f630714c2ec0c5e9890d052d728cf7
-EBUILD dovecot-2.1_rc7.ebuild 9324 RMD160 d5b7e344e58bf935736da895228b338b1342970d SHA1 7c59950a607b603c995d31bd1fd600856da8a5a9 SHA256 a858e3cabde3abd69daa6bbac593ff04aa78460351e93396757cebdfcd26edf0
-MISC ChangeLog 53088 RMD160 8d5638d5713acb535a435b5d2d2b0f45cf3089e9 SHA1 bf9305ad87d36bcca347d97c4982df474cafcfb1 SHA256 756bea901d196b41fa2a55f1099a2e2bd9618b879f01f9ba7b5d3a98e274f33e
+EBUILD dovecot-2.1.0.ebuild 8913 RMD160 3ecbe1a1d667471221c823959dd9485f339e8687 SHA1 766e5c3fe3b07f8b73a0519e0de024894eed56c6 SHA256 cd00b621eaec3618cac9d19586b2278cb3445c0f37213702134bfe46180e6bd4
+MISC ChangeLog 53254 RMD160 4606c8eba4e940b524701e74d753686a1a43997e SHA1 2e1ebef8d320ddecfedec0a1f401f8f9dcb57663 SHA256 e9b8c385838e10831e06e54c1573c36af4f2a1f3b851caf0d66c69e20607978e
 MISC metadata.xml 871 RMD160 8e53e66f2ad0b595ef424cf855c108d103a87f49 SHA1 ea5616a16a1cb3394600ad17a1422383acb100f5 SHA256 64805284b8602318ba8b8902d58adc8b4edacba0468037a9c8abae4aac46ddb8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPPQPOAAoJEOTDgjZ80txdX14H/RD6u0cdHmp/DvUdKMNexnxE
-6V4tXO369NYKEH0klZ7ZD0vq+w+DnPN/+/A9NxVJl3Jr3731h68WcGrbLlu6NOqU
-vwakgvE74Kj/oUq0cslqsZhBFlLaIQUu9lvmCXa+YQ+CGIOgNOU7Ng2cbzr/Beza
-smI4y8Cktf0mNAM8IpHgACnKrvzCegCAkKL3bjMSfV7mkqA9jTLyYsMiwa0CN6tA
-k1NeihYANIhKFmaKBlHd+0oKpdnOIYIv5VQpyPdO64AWoCrjLLxqqi9/D7eTH+Ea
-yoyaiy/8RY7n5+GlPML+LpHK5hS8NIHQnOyxb5UzfRxl4lUWdzIfg4HssozyPOQ=
-=GQKe
+iQIcBAEBCAAGBQJPPnE2AAoJEHfx8XVYajsfVssP/2HRfbYvmAVS7wyviL9qbX6D
+BP7TYq4fcEV+KLZD+lUWFwzEXXi5s5CMWizRBjzilDgEqSiOPV0SQ2zfdhudZutP
+aEAqlHKu/ApPxmqE9iOyrW7wXEjG7qq0oyULCjrHvI5Q8zPvzFX0avm7RuzLxD5Z
+F5PIsMWk82kgTkcpTK2jaEIyHC+Ts7MinG3WERyoCIBV+mhE7CWlpBH874VoykyO
+SWA2UFs9BHUB8iDRzpcH/uy7UFuVy9XpgOg0z5pUZ4MXplZgaFql3GAkVFgTAZ0I
+UvuUCOEGSJs7ecZYz1svqk6Xr2yHUVh3CCiAXFvjFDYeNueZsJqQcrgJ5YggvxCV
+tjT/oFN03aVB2yCijzx561ygukH3rvWG0qBdf+F6iMKYPXZsl/pPPkrpo5qohA8e
+iPj+FKe/PM2Nvx/MLIXnAFpW6mtzahz0skmxDaYkFo4MThI24Rix6iT/kH/ly9Uc
+1Qe59pSnK/LRD8BGA2sWnAmN9lxdI/KX24en0yDhXdoaxTUoPhpm1eWh5YgEiuTH
+pK4TUYdoLLOTmLMWuSq/gIo0pxqqVU6aFUn21hRjRqfI5jguI/f2h6qSjFm0gk72
+jTB0B53RQ5Aqb7YingThd5HZk28ZCspT1OS4MIpnAHela0TSaEUxheyPdlMLXuqS
+kVxLGI2vGXOQ9JKdMxiZ
+=JOmZ
 -----END PGP SIGNATURE-----
diff --git a/net-mail/dovecot/dovecot-2.1_rc5.ebuild b/net-mail/dovecot/dovecot-2.1.0.ebuild
index f4b59ce21758..4783b7ace03e 100644
--- a/net-mail/dovecot/dovecot-2.1_rc5.ebuild
+++ b/net-mail/dovecot/dovecot-2.1.0.ebuild
@@ -1,31 +1,27 @@
 # 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_rc5.ebuild,v 1.1 2012/01/26 13:21:27 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.1.0.ebuild,v 1.1 2012/02/17 15:24:23 eras Exp $
 
 EAPI=4
 
-inherit eutils versionator ssl-cert autotools
+inherit eutils versionator ssl-cert
 
 MY_P="${P/_/.}"
 major_minor="$( get_version_component_range 1-2 )"
-major_dash_minor="$( replace_version_separator 1 - ${major_minor} )"
 sieve_version="0.3.0"
-sieve_snapshot="bc5acd9e957e"
-SRC_URI="http://www.dovecot.org/releases/${major_minor}/rc/${MY_P}.tar.gz
+SRC_URI="http://www.dovecot.org/releases/${major_minor}/${MY_P}.tar.gz
 	sieve? (
-	http://hg.rename-it.nl/${PN}-${major_minor}-pigeonhole/archive/${sieve_snapshot}.tar.bz2 \
-	-> ${PN}-${major_minor}-pigeonhole-${sieve_snapshot}.tar.bz2
+	http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${major_minor}-pigeonhole-${sieve_version}.tar.gz
 	)
 	managesieve? (
-	http://hg.rename-it.nl/${PN}-${major_minor}-pigeonhole/archive/${sieve_snapshot}.tar.bz2 \
-	-> ${PN}-${major_minor}-pigeonhole-${sieve_snapshot}.tar.bz2
+	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 ~sh ~s390 ~sparc ~x86 ~x86-fbsd"
+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"
@@ -65,14 +61,6 @@ pkg_setup() {
 	enewuser dovenull -1 -1 /dev/null
 }
 
-src_prepare() {
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_dash_minor}-pigeonhole-${sieve_snapshot}" \
-		|| die "cd failed"
-		eautoreconf
-	fi
-}
-
 src_configure() {
 	local conf=""
 
@@ -113,7 +101,7 @@ src_configure() {
 		# 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 || die "emake dovecot-config failed"
-		cd "../dovecot-${major_dash_minor}-pigeonhole-${sieve_snapshot}" || die "cd failed"
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
 		econf \
 			$( use_enable static-libs static ) \
 			--localstatedir="${EPREFIX}/var" \
@@ -127,7 +115,7 @@ src_compile() {
 	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
 
 	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_dash_minor}-pigeonhole-${sieve_snapshot}" || die "cd failed"
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
 		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
 	fi
 }
@@ -135,7 +123,7 @@ src_compile() {
 src_test() {
 	default_src_test
 	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_dash_minor}-pigeonhole-${sieve_snapshot}" || die "cd failed"
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
 		default_src_test
 	fi
 }
@@ -249,7 +237,7 @@ src_install () {
 	fi
 
 	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_dash_minor}-pigeonhole-${sieve_snapshot}" || die "cd failed"
+		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" \
diff --git a/net-mail/dovecot/dovecot-2.1_rc7.ebuild b/net-mail/dovecot/dovecot-2.1_rc7.ebuild
deleted file mode 100644
index eb83d19a1296..000000000000
--- a/net-mail/dovecot/dovecot-2.1_rc7.ebuild
+++ /dev/null
@@ -1,296 +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_rc7.ebuild,v 1.1 2012/02/15 08:49:50 eras Exp $
-
-EAPI=4
-
-inherit eutils versionator ssl-cert autotools
-
-MY_P="${P/_/.}"
-major_minor="$( get_version_component_range 1-2 )"
-major_dash_minor="$( replace_version_separator 1 - ${major_minor} )"
-sieve_version="0.3.0"
-sieve_snapshot="bc5acd9e957e"
-SRC_URI="http://www.dovecot.org/releases/${major_minor}/rc/${MY_P}.tar.gz
-	sieve? (
-	http://hg.rename-it.nl/${PN}-${major_minor}-pigeonhole/archive/${sieve_snapshot}.tar.bz2 \
-	-> ${PN}-${major_minor}-pigeonhole-${sieve_snapshot}.tar.bz2
-	)
-	managesieve? (
-	http://hg.rename-it.nl/${PN}-${major_minor}-pigeonhole/archive/${sieve_snapshot}.tar.bz2 \
-	-> ${PN}-${major_minor}-pigeonhole-${sieve_snapshot}.tar.bz2
-	) "
-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 ~sh ~s390 ~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_prepare() {
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_dash_minor}-pigeonhole-${sieve_snapshot}" \
-		|| die "cd failed"
-		eautoreconf
-	fi
-}
-
-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 \
-		--without-systemdsystemunitdir \
-		${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 || die "emake dovecot-config failed"
-		cd "../dovecot-${major_dash_minor}-pigeonhole-${sieve_snapshot}" || 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_dash_minor}-pigeonhole-${sieve_snapshot}" || die "cd failed"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-	fi
-}
-
-src_test() {
-	default_src_test
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_dash_minor}-pigeonhole-${sieve_snapshot}" || 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_dash_minor}-pigeonhole-${sieve_snapshot}" || 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_preinst() {
-	if has_version "<${CATEGORY}/${PN}-2" ; then
-		elog "There are a lot of changes in configuration files in dovecot-2.0."
-		elog "Please read http://wiki.dovecot.org/Upgrading and"
-		elog "check the conf files in ${ROOT}etc/dovecot."
-		elog "You can also run doveconf -n before running etc-update or"
-		elog "dispatch-conf to get an idea about what needs to be changed."
-		ewarn "\nDo NOT {re}start dovecot without checking your conf files"
-		ewarn "and making the necessary changes.\n"
-	fi
-}
-
-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
-}