Add ~x86-fbsd based on Dmitri Bogomolov's report in bug 341123. Remove old versions

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

5 files changed, 10 insertions, 542 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index 75049b5a6517..658d6c1987c6 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/dovecot
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.285 2011/01/30 18:41:30 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.286 2011/02/21 16:30:13 darkside Exp $
+
+  21 Feb 2011; Jeremy Olexa <darkside@gentoo.org> -dovecot-1.1.19.ebuild,
+  -dovecot-1.2.15.ebuild, dovecot-2.0.9.ebuild:
+  Add ~x86-fbsd based on Dmitri Bogomolov's report in bug 341123. Remove old
+  versions
 
   30 Jan 2011; Raúl Porcel <armin76@gentoo.org> dovecot-1.2.16.ebuild:
   alpha/sparc stable wrt #348978
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 7785ceb7b4ce..3beace0a9f75 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,12 +1,7 @@
 AUX dovecot-1.2.init 1720 RMD160 0f641929fd2c58878f6d69e6ba454b9110603031 SHA1 c498c5208f0504f2eadc460d515f563f907d05ef SHA256 9c7ef516324cd5a17c5f28f6af272d8d06106420c747ff5c4da6fa14a3ac316c
 AUX dovecot.init-r2 1618 RMD160 5b5c88847c096282f5ab94b82db7fab5c9e42aa3 SHA1 d9f61ac897a6e377dc8cf2c6da4952a4ff7918e9 SHA256 6ad0d1fc09c41ba390e717667e4dad3838f669ef7b227e3cbdb60c499758a901
-DIST dovecot-1.1-managesieve-0.10.7.tar.gz 358166 RMD160 a8ca467e4a61b916a68a8252e6c3e8adc211472c SHA1 88d7b88dfc1cb4cc4dfac4de6aa3601a5272d345 SHA256 122deb67237714601223112846604942fe70c4d52edc8142851de0be502d8c23
-DIST dovecot-1.1.19-managesieve-0.10.7.diff.gz 6317 RMD160 b739bf737c38cda7744f8de609550f6c94a8e021 SHA1 f0e8726e8b1bc57362089fa07e5bb1c44961f5ac SHA256 63d9c896a5d6e2c52a41fd533e50ef24847392fc37fc47c0bc4322eefa2e47bb
-DIST dovecot-1.1.19.tar.gz 2389194 RMD160 8fe25b5a5347792e7aa919cc285c1b8c99bab36e SHA1 ce8f8a135a2c8ef1bd0cd1ceff04018402f3cb58 SHA256 33df1d97b9241b25dfcbc78c86ba6114f16ddf14763879432a6afe4acd1bc95a
 DIST dovecot-1.2-managesieve-0.11.12.tar.gz 406261 RMD160 f91a1fd059cebcb3c934192f1db57eb75ea4baa6 SHA1 c632c74bfc5e0c0c0a00c1445a65cb012423ceba SHA256 c43d2d2ab4abf7aba5061984f01dd4880118504c101b6451bd530a7edb8e3f6a
 DIST dovecot-1.2-sieve-0.1.18.tar.gz 1052057 RMD160 f61b1ec03d861b964666a374a8c42a7b98c1fba1 SHA1 e661a6ab79b2987dedec1ed84cbd957755882ade SHA256 4a39bdf60d530cc27a1bc113fd3cb1f7adb6cc857578ada3720e40385c2cc7fe
-DIST dovecot-1.2.15-managesieve-0.11.12.diff.gz 6469 RMD160 82e7ce791d232f0312dbae6a7f3bde7378d685e6 SHA1 e2bb15d2847ea25e64c34abc670788f201039527 SHA256 140aa353a26c5ba0c74f0df1b33bdfca55ef9c65fb096d9646272aa9d5b5c77e
-DIST dovecot-1.2.15.tar.gz 2948856 RMD160 4b4def7a959729b9e01184565db90f0a7ee41f9e SHA1 828a4bd8822c2d1c53ee56247201b96b827b04ee SHA256 927845ba0a3de1da2d0ecefc27e835dd23a413cdf05fd044442bffb5e901442f
 DIST dovecot-1.2.16-managesieve-0.11.12.diff.gz 6459 RMD160 58369056e8f0f094fd28adf64d4de4dada24a955 SHA1 54000390e45d0d3978158322ab6377f79cd87fa0 SHA256 f2a933405361856a983235aec5e013df841bcc32fc0dc0afa2f0f9f32d16c251
 DIST dovecot-1.2.16.tar.gz 2949818 RMD160 50fbaec8a7a258be17912ea962cafaa51b4e8bc7 SHA1 84246be1c285de935bbe7649b1920efea91b12d6 SHA256 2b429a8a1666ccc97d159ce0df408ae9b524dcb72cffc7a3aabfc1c6da5dfb4c
 DIST dovecot-2.0-pigeonhole-0.2.1.tar.gz 1195090 RMD160 a3cd58c13c3de33e6941c94633c580af4406ad85 SHA1 ef06d157302576a9276c8f1181a3c5de018e2f36 SHA256 8249421cb69ca299e2830da8b635ca0a5ab692ab29456c188ba8078d7672ccda
@@ -14,12 +9,9 @@ DIST dovecot-2.0-pigeonhole-0.2.2.tar.gz 1199973 RMD160 7aa58935acb5a89348c53f8e
 DIST dovecot-2.0.7.tar.gz 3174912 RMD160 b284c99630935e87b124f48f132970a14737c985 SHA1 3aab6cee878bd02e364aebcb70741bf1e4affc0d SHA256 d862ca1bf5aaa3bc15f5962058351517b8f42fa6947feeb634f4d085ec0f4ce3
 DIST dovecot-2.0.8.tar.gz 3177602 RMD160 3a0a42a771b0bff8a04731e6ae4847faf340a1ea SHA1 daf25ba788369055f349f37c172be33beced916c SHA256 c22406028b8eeec2961845196811de6ed5d5f3f4fdd56c902f8793be7fb197c2
 DIST dovecot-2.0.9.tar.gz 3208677 RMD160 3c6c430f867dba7fa4d9da33342892b3c631bac7 SHA1 1cf5d331c770e09f47c7f98297f8af67e150cafa SHA256 37b4f3112284eeb099e4c9e89b9d433261d8b22040bc5d6b28f275c2e70070ee
-DIST dovecot-sieve-1.1.6.tar.gz 470071 RMD160 ed6f75dc1ffdb0ec51ecf3786aa71092851289f5 SHA1 c109ee8ab1c7ffece7940fb2e37104baf784440e SHA256 a2130a8e7d732bb341a96a96a24b4ddb66834e116573a10c17e68344fe712b36
-EBUILD dovecot-1.1.19.ebuild 8556 RMD160 31b66b06d538fb7a6719daeb19639633e1d7b5cb SHA1 524599a50ce525bc5deff63b24bb17b1446d06c5 SHA256 45610fede6f0f6d9b07ba2d3b38f8cb0e6f5292f3c4705c3b55327bb61307e8e
-EBUILD dovecot-1.2.15.ebuild 8826 RMD160 015d945f24dcd9fb73b6635ee624be0056893502 SHA1 7d3323f4eb086b1f3b9ddaaa8c8a911a77323751 SHA256 7e830fa0dcd0fcb91abb6dc66af1b7bff14dc17782fa9d9cc2dca20aa4bb06ff
 EBUILD dovecot-1.2.16.ebuild 8827 RMD160 c4da85e63c65784c50fca6b8cbfa4d276432c254 SHA1 dedcc6b7da960d89a7b66024556c1b1df1b12718 SHA256 980b1cc7b84add1c4b49231eef821eefa6d8edbf58181b2520e44beb9452d18a
 EBUILD dovecot-2.0.7.ebuild 8940 RMD160 02e5a0d9391b742153f818135017e6cb889cbe5e SHA1 48c82c87f009b21d74e40c580499d3cf0cb84524 SHA256 041c3a7c7c8511e39d507867a5b27f836236ceb7814874bc2c8da3b69354b94a
 EBUILD dovecot-2.0.8-r2.ebuild 8944 RMD160 2e301ee151475d1c1146f95e6ca5d5cb87abc390 SHA1 5c3694d9a4aa8ce2904e61dab652060a24bbea16 SHA256 83ba86f9af52473374bf6634f59d1a9c9997f65f061f161c7b1513de769917eb
-EBUILD dovecot-2.0.9.ebuild 8941 RMD160 1de0b4cc5dc362838a369434487c0e185c20054a SHA1 c91bc4d70ea6b2807b160a7829da562327998153 SHA256 f10a39614373b675446bbcde19332ea2378bc3111b0968daf9dbcd9b6c1c64b5
-MISC ChangeLog 45616 RMD160 70fb316ec88a2e6c17fa2d665266b1a4a0b37c45 SHA1 0cefc0d57bafdd4557a07f28de1a3954cbda5d9b SHA256 9a0c90a26b3bb5625dd5f941e27bf82dc02e41158c63343127f20353b329410d
+EBUILD dovecot-2.0.9.ebuild 8955 RMD160 6672256fcf8009d9a1f71353db47c88ebfdb8a5d SHA1 0b323ab861ff594de5f566eec5e4645b822a8e1f SHA256 df39c4925eb80905f3af20ec5831454feabb4daaa949c368d6f9703bd2bd09d2
+MISC ChangeLog 45828 RMD160 cd5bb8fcc70857a70ed965edeb2940005813e8c9 SHA1 0560f0034d3399258cf160ec27990b6c28f1d73b SHA256 793e436aba6663df0f36d7dcb2b2bce8d5cd2f6ad36c5c01e2a88023e59efc0a
 MISC metadata.xml 751 RMD160 5fa27151621a1de02d487372e454e82f4be4f789 SHA1 e1091b831c76e32c53e62a5ea921d7f17fa4dae9 SHA256 4952db40dfb832c18a2b29c99ed9da00926b13dca46c413434e5af8609039473
diff --git a/net-mail/dovecot/dovecot-1.1.19.ebuild b/net-mail/dovecot/dovecot-1.1.19.ebuild
deleted file mode 100644
index 3dfb6ba3a245..000000000000
--- a/net-mail/dovecot/dovecot-1.1.19.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.1.19.ebuild,v 1.8 2010/10/15 13:02:27 darkside Exp $
-
-inherit autotools eutils ssl-cert versionator
-
-MY_P="${P/_/.}"
-MY_PV12=$(get_version_component_range 1-2 ${PV})
-S="${WORKDIR}/${MY_P}"
-SIEVE="dovecot-sieve-1.1.6"
-SIEVE_S="${WORKDIR}/${SIEVE}"
-MANAGESIEVE_PATCH="managesieve-0.10.7"
-MANAGESIEVE="managesieve-0.10.7"
-MANAGESIEVE_S="${WORKDIR}/${PN}-${MY_PV12}-${MANAGESIEVE}"
-
-SRC_URI="http://dovecot.org/releases/${MY_PV12}/${MY_P}.tar.gz
-sieve? ( http://dovecot.org/releases/sieve/${SIEVE}.tar.gz )
-managesieve? ( http://www.rename-it.nl/${PN}/${MY_PV12}/${MY_P}-${MANAGESIEVE_PATCH}.diff.gz
-http://www.rename-it.nl/${PN}/${MY_PV12}/${PN}-${MY_PV12}-${MANAGESIEVE}.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"
-KEYWORDS="~x86-fbsd"
-
-IUSE="berkdb debug doc ipv6 kerberos ldap managesieve mbox mysql pop3d pam postgres sieve sqlite3 ssl suid vpopmail"
-
-# Developer documentation, controlled by the doc USE flag
-DEVDOCS="auth-protocol index multiaccess securecoding"
-
-DEPEND=">=sys-apps/sed-4
-	sys-libs/libcap
-	berkdb? ( >=sys-libs/db-4.2 )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	pam? ( virtual/pam )
-	ssl? ( dev-libs/openssl )
-	postgres? ( dev-db/postgresql-base )
-	mysql? ( virtual/mysql )
-	sqlite3? ( =dev-db/sqlite-3* )
-	vpopmail? ( net-mail/vpopmail )"
-
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00-r8"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	if use managesieve; then
-		epatch "${WORKDIR}"/${MY_P}-${MANAGESIEVE_PATCH}.diff
-		eautoreconf
-	fi
-}
-
-pkg_setup() {
-	if ! use sieve && use managesieve; then
-		eerror "managesieve USE flag selected but sieve USE flag unselected"
-		die "USE flag problem"
-	fi
-	# Add user and group for login process (same as for fedora/redhat)
-	enewgroup dovecot 97
-	enewuser dovecot 97 -1 /dev/null dovecot
-}
-
-src_compile() {
-	local myconf=
-	use ssl && myconf="${myconf} --with-ssl=openssl" \
-		|| myconf="${myconf} --without-ssl"
-	econf \
-		--localstatedir=/var \
-		--sysconfdir=/etc/dovecot \
-		--enable-header-install \
-		--with-ioloop=best \
-		--with-poll=best \
-		$(use_with berkdb db) \
-		$(use_enable debug) \
-		$(use_enable ipv6) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with mysql) \
-		$(use_with pam) \
-		$(use_with pop3d) \
-		$(use_with postgres pgsql) \
-		$(use_with sqlite3 sqlite) \
-		$(use_with vpopmail) \
-		${myconf} \
-		|| die "configure failed"
-	emake || die "make failed"
-
-	if use sieve; then
-		einfo "Building sieve"
-		cd "${SIEVE_S}"
-		econf --with-dovecot="${S}" || die "configure failed (sieve)"
-		emake || die "make failed (sieve)"
-	fi
-
-	if use managesieve; then
-		einfo "Building managesieve"
-		cd "${MANAGESIEVE_S}"
-		econf --with-dovecot="${S}" --with-dovecot-sieve="${SIEVE_S}" \
-			|| die "configure failed (managesieve)"
-		emake || die "make failed (managesieve)"
-	fi
-}
-
-src_install () {
-	make DESTDIR="${D}" install || die "make install failed"
-	use suid && fperms u+s /usr/libexec/dovecot/deliver
-
-	rm -f "${D}"/etc/dovecot/dovecot-{ldap,sql}-example.conf
-
-	newinitd "${FILESDIR}"/dovecot.init-r2 dovecot
-
-	# Documentation
-	rm -rf "${D}"/usr/share/doc/dovecot
-	dodoc AUTHORS NEWS README TODO dovecot-example.conf
-	use managesieve && newdoc ${MANAGESIEVE_S}/README README.managesieve
-	if use doc; then
-		dodoc doc/*.txt
-	else
-		local x= n=
-		for x in doc/*.txt; do
-			n=$(basename "${x}" .txt)
-			[[ " ${DEVDOCS} " != *" ${n} "* ]] && dodoc "${x}"
-		done
-	fi
-
-	# Create the dovecot.conf file from the dovecot-example.conf file that
-	# the dovecot folks nicely left for us....
-	local conf="${D}/etc/dovecot/dovecot.conf"
-	mv "${D}"/etc/dovecot/dovecot-example.conf "${D}"/etc/dovecot/dovecot.conf
-
-	# .maildir is the Gentoo default, but we need to support mbox to
-	local mail_location="maildir:~/.maildir"
-	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|' "${conf}"
-	fi
-	sed -i -e \
-		"s|#mail_location =|mail_location = ${mail_location}|" "${conf}" \
-		|| die "failed to update mail location settings in dovecot.conf"
-
-	# We're using pam files (imap and pop3) provided by mailbase
-	if use pam; then
-		sed -i -e '/passdb pam/, /^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
-			"${conf}" || die "failed to update PAM settings in dovecot.conf"
-		# mailbase does not provide a managesieve pam file
-		use managesieve && dosym imap /etc/pam.d/managesieve
-	fi
-
-	# Listen on ipv6 and ipv4
-	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_cert_file =.*,ssl_cert_file = /etc/ssl/dovecot/server.pem,' \
-			-e 's,^#ssl_key_file =.*,ssl_key_file = /etc/ssl/dovecot/server.key,' \
-			"${conf}" || die "failed to update SSL settings in dovecot.conf"
-	fi
-
-	# Install SQL configuration
-	if use mysql || use postgres; then
-		cp doc/dovecot-sql-example.conf "${D}"/etc/dovecot/dovecot-sql.conf
-		fperms 600 /etc/dovecot/dovecot-sql.conf
-		sed -i -e '/db sql/,/args/ s|=|= /etc/dovecot-sql.conf|' "${conf}" \
-			|| die "failed to update SQL settings in dovecot-sql.conf"
-		dodoc doc/dovecot-sql-example.conf
-	fi
-
-	# Install LDAP configuration
-	if use ldap; then
-		cp doc/dovecot-ldap-example.conf "${D}"/etc/dovecot/dovecot-ldap.conf
-		fperms 600 /etc/dovecot/dovecot-ldap.conf
-		sed -i -e '/db ldap/,/args/ s|=|= /etc/dovecot-ldap.conf|' "${conf}" \
-			|| die "failed to update LDAP settings in dovecot-ldap.conf"
-		dodoc doc/dovecot-ldap-example.conf
-	fi
-
-	# Install sieve plugin
-	if use sieve; then
-		make -C "${SIEVE_S}" DESTDIR="${D}" install \
-			|| die "make install failed (sieve)"
-	fi
-
-	# Install managesieve
-	if use managesieve; then
-		make -C "${MANAGESIEVE_S}" DESTDIR="${D}" install \
-			|| die "make install failed (managesieve)"
-	fi
-
-	dodir /var/run/dovecot
-	fowners root:0 /var/run/dovecot
-	fperms 0755 /var/run/dovecot
-	keepdir /var/run/dovecot/login
-	fowners root:dovecot /var/run/dovecot/login
-	fperms 0750 /var/run/dovecot/login
-}
-
-get_config_var() {
-	local varname=${1}
-	if [[ -z ${varname} ]]; then
-		die "${FUNCNAME}: variable name missing"
-	fi
-	sed -n 's/^[[:space:]]\?'"${varname}"'[[:space:]]*="*\([^#"]\+\)"*/\1/p' \
-		"${ROOT}"/etc/dovecot/dovecot.conf
-}
-
-pkg_postinst() {
-	elog "The Dovecot configuration has vastly changed since 0.99."
-	elog "You are encouraged to start afresh with a new configuration file."
-	elog "see http://wiki.dovecot.org/ for configuration examples."
-
-	if [[ -e "${ROOT}"/etc/dovecot.conf ]]; then
-		echo
-		ewarn "The Dovecot configuration now resides in ${ROOT}/etc/dovecot"
-	fi
-
-	local base_dir="$(get_config_var base_dir)"
-	base_dir="${base_dir:-/var/run/dovecot}"
-	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
-			chown dovecot:mail "${ROOT}"/etc/ssl/dovecot/server.{key,pem}
-		fi
-		if [[ ! -e "${ROOT}${base_dir}/login/ssl-parameters.dat" ]]; then
-			echo
-			elog "Dovecot requires DH SSL Parameters if you use SSL connections"
-			elog "These take some time to make, and dovecot will create them before"
-			elog "it allows any SSL connections."
-			elog "You can create them now before starting dovecot like so"
-			elog "   emerge --config =${PF}"
-		fi
-	fi
-
-	if grep -q '^ssl_key_password' "${ROOT}"/etc/dovecot/dovecot.conf; then
-		echo
-		ewarn "*** ATTENTION ATTENTION ATTENTION ATTENTION ATTENTION ***"
-		ewarn
-		ewarn "You have set ssl_key_password in dovecot.conf!"
-		ewarn "You are URGED to read the advice in the current"
-		ewarn "dovecot-example.conf regarding sensible handling"
-		ewarn "of that password, as it might be readable by any"
-		ewarn "user on your system who can access that file!"
-		ewarn
-		ewarn "*** ATTENTION ATTENTION ATTENTION ATTENTION ATTENTION ***"
-		echo
-	fi
-}
-
-pkg_config() {
-	local base_dir="$(get_config_var base_dir)"
-	base_dir="${base_dir:-/var/run/dovecot}"
-
-	if use ssl; then
-		einfo "Regenerating SSL parameters. This will take some time."
-		"${ROOT}"/usr/libexec/dovecot/ssl-build-param "${base_dir}/login/ssl-parameters.dat"
-	fi
-}
diff --git a/net-mail/dovecot/dovecot-1.2.15.ebuild b/net-mail/dovecot/dovecot-1.2.15.ebuild
deleted file mode 100644
index c7244168e6af..000000000000
--- a/net-mail/dovecot/dovecot-1.2.15.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.2.15.ebuild,v 1.7 2010/10/15 14:21:11 maekke Exp $
-
-EAPI="3"
-
-inherit eutils versionator ssl-cert
-
-major_minor="$( get_version_component_range 1-2 )"
-sieve_version="0.1.18"
-managesieve_version="0.11.12"
-SRC_URI="http://dovecot.org/releases/${major_minor}/${P}.tar.gz
-	sieve? ( http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${major_minor}-sieve-${sieve_version}.tar.gz )
-	managesieve? (
-		http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${PV}-managesieve-${managesieve_version}.diff.gz
-		http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${major_minor}-managesieve-${managesieve_version}.tar.gz
-		http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${major_minor}-sieve-${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 ppc sparc x86"
-
-IUSE="berkdb caps cydir dbox doc ipv6 kerberos ldap +maildir managesieve mbox mysql pam postgres sieve sqlite +ssl suid vpopmail zlib"
-
-DEPEND="berkdb? ( sys-libs/db )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base )
-	sqlite? ( dev-db/sqlite )
-	ssl? ( dev-libs/openssl )
-	vpopmail? ( net-mail/vpopmail )"
-
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00-r8"
-
-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
-
-	if use dbox && ! use maildir; then
-		ewarn "dbox USE flag selected but  maildir USE flag unselected"
-		ewarn "maildir USE flag will be turned on"
-	fi
-
-	# Add user and group for login process (same as for fedora/redhat)
-	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
-}
-
-src_prepare() {
-	use managesieve && epatch "${WORKDIR}"/dovecot-${PV}-managesieve-${managesieve_version}.diff
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	local storages=""
-	for storage in cydir dbox maildir mbox; do
-		use ${storage} && storages="${storage} ${storages}"
-	done
-	if use dbox && ! use maildir; then
-		storages="${storages/dbox/dbox maildir}"
-	fi
-	[ "${storages}" ] || storages="maildir"
-
-	econf \
-		--sysconfdir="${EPREFIX}/etc/dovecot" \
-		--localstatedir="${EPREFIX}/var" \
-		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-		$( use_with berkdb db ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with ldap ) \
-		$( use_with mysql ) \
-		$( use_with pam ) \
-		$( use_with postgres pgsql ) \
-		$( use_with sqlite ) \
-		$( use_with ssl ) \
-		$( use_with vpopmail ) \
-		$( use_with zlib ) \
-		$( use_with ldap) \
-		--with-storages="${storages}" \
-		--with-pic \
-		--enable-header-install \
-		${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_minor}-sieve-${sieve_version}"
-		econf --with-dovecot="${S}"
-
-		if use managesieve; then
-			cd "../dovecot-${major_minor}-managesieve-${managesieve_version}"
-			econf --with-dovecot="${S}" --with-dovecot-sieve="../dovecot-${major_minor}-sieve-${sieve_version}"
-		fi
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
-
-	if use sieve || use managesieve; then
-		cd "../dovecot-${major_minor}-sieve-${sieve_version}"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
-
-		if use managesieve; then
-			cd "../dovecot-${major_minor}-managesieve-${managesieve_version}"
-			emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
-		fi
-	fi
-}
-
-src_install () {
-	emake DESTDIR="${ED}" install || die "make install failed"
-
-	# 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 /usr/libexec/dovecot/deliver
-		fperms 4750 /usr/libexec/dovecot/deliver
-	fi
-
-	rm -f "${ED}"/etc/dovecot/dovecot-{ldap,sql}-example.conf
-
-	newinitd "${FILESDIR}"/dovecot-1.2.init dovecot
-
-	rm -rf "${ED}"/usr/share/doc/dovecot
-
-	if use ssl; then
-		sed -i -e 's,^CERTDIR=.*,CERTDIR=\$SSLDIR/dovecot,' \
-			-e 's,^KEYDIR=.*,KEYDIR=\$SSLDIR/dovecot,' \
-			-e 's,^CERTFILE=.*,CERTFILE=\$CERTDIR/server.pem,' \
-			-e 's,^KEYFILE=.*,KEYFILE=\$KEYDIR/server.key,' \
-			doc/mkcert.sh || die "failed to update SSL settings in mkcert.sh"
-	fi
-
-	dodoc AUTHORS NEWS README TODO dovecot-example.conf || die "basic dodoc failed"
-	dodoc doc/*.{txt,cnf,xml,sh}  || die "dodoc doc/ failed"
-	docinto wiki
-	dodoc doc/wiki/* || die "dodoc doc/wiki/ failed"
-
-	# 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"
-	mv "${ED}"/etc/dovecot/dovecot-example.conf "${ED}"/etc/dovecot/dovecot.conf
-
-	# .maildir is the Gentoo default, but we need to support mbox too
-	local mail_location="maildir:~/.maildir"
-	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|' "${conf}"
-	fi
-	sed -i -e \
-		"s|#mail_location =|mail_location = ${mail_location}|" "${conf}" \
-		|| die "failed to update mail location settings in dovecot.conf"
-
-	# We're using pam files (imap and pop3) provided by mailbase
-	if use pam; then
-		sed -i -e '/passdb pam/, /^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
-			"${conf}" || die "failed to update PAM settings in dovecot.conf"
-		# mailbase does not provide a sieve pam file
-		use managesieve && dosym imap /etc/pam.d/sieve
-	fi
-
-	# Listen on ipv6 and ipv4
-	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_cert_file =.*,ssl_cert_file = /etc/ssl/dovecot/server.pem,' \
-			-e 's,^#ssl_key_file =.*,ssl_key_file = /etc/ssl/dovecot/server.key,' \
-			"${conf}" || die "failed to update SSL settings in dovecot.conf"
-	fi
-
-	# Install SQL configuration
-	if use mysql || use postgres; then
-		cp doc/dovecot-sql-example.conf "${ED}"/etc/dovecot/dovecot-sql.conf
-		fperms 600 /etc/dovecot/dovecot-sql.conf
-		sed -i -e '/db sql/,/args/ s|=|= /etc/dovecot-sql.conf|' "${conf}" \
-			|| die "failed to update SQL settings in dovecot-sql.conf"
-		dodoc doc/dovecot-sql-example.conf
-	fi
-
-	# Install LDAP configuration
-	if use ldap; then
-		cp doc/dovecot-ldap-example.conf "${ED}"/etc/dovecot/dovecot-ldap.conf
-		fperms 600 /etc/dovecot/dovecot-ldap.conf
-		sed -i -e '/db ldap/,/args/ s|=|= /etc/dovecot-ldap.conf|' "${conf}" \
-			|| die "failed to update LDAP settings in dovecot-ldap.conf"
-		dodoc doc/dovecot-ldap-example.conf
-	fi
-
-	if use sieve || use managesieve; then
-		cd "../dovecot-${major_minor}-sieve-${sieve_version}"
-		emake DESTDIR="${ED}" install || die "make install failed (sieve)"
-
-		if use managesieve; then
-			cd "../dovecot-${major_minor}-managesieve-${managesieve_version}"
-			emake DESTDIR="${ED}" install || die "make install failed (managesieve)"
-		fi
-	fi
-
-	dodir /var/run/dovecot
-	fowners root:root /var/run/dovecot
-	fperms 0755 /var/run/dovecot
-	fowners root:dovecot /var/run/dovecot/login
-	fperms 0750 /var/run/dovecot/login
-
-	ewarn "If you are upgrading from Dovecot 1.1, read "
-	ewarn " http://wiki.dovecot.org/Upgrading/1.2"
-	if use sieve || use managesieve; then
-		ewarn " http://wiki.dovecot.org/LDA/Sieve/Dovecot#Migration_from_CMUSieve"
-		ewarn " In particular, do not forget to change cmusieve to sieve"
-	fi
-}
-
-pkg_postinst() {
-	if use ssl; then
-	# Let's not make a new certificate if we already have one
-		if ! [[ -e "${EROOT}"/etc/ssl/dovecot/server.pem && \
-		-e "${EROOT}"/etc/ssl/dovecot/server.key ]];	then
-			einfo "Creating SSL	certificate"
-			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-			install_cert /etc/ssl/dovecot/server
-			chown dovecot:mail "${EROOT}"/etc/ssl/dovecot/server.{key,pem}
-		fi
-	fi
-
-	if grep -q '^ssl_key_password' "${EROOT}"/etc/dovecot/dovecot.conf; then
-		echo
-		ewarn "You have set ssl_key_password in dovecot.conf!"
-		ewarn "You are URGED to read the advice in the current"
-		ewarn "dovecot.conf regarding sensible handling of that"
-		ewarn "password, as it might be readable by any user"
-		ewarn "on your system who can access that file!"
-	fi
-}
diff --git a/net-mail/dovecot/dovecot-2.0.9.ebuild b/net-mail/dovecot/dovecot-2.0.9.ebuild
index 4d2ec247d080..04c288877035 100644
--- a/net-mail/dovecot/dovecot-2.0.9.ebuild
+++ b/net-mail/dovecot/dovecot-2.0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.0.9.ebuild,v 1.1 2011/01/13 19:30:53 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.0.9.ebuild,v 1.2 2011/02/21 16:30:13 darkside Exp $
 
 EAPI="3"
 
@@ -21,7 +21,7 @@ HOMEPAGE="http://www.dovecot.org/"
 
 SLOT="0"
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
 
 IUSE="berkdb bzip2 caps cydir sdbox doc ipv6 kerberos ldap +maildir managesieve mbox mdbox mysql pam postgres sieve sqlite +ssl suid vpopmail zlib"