version bump, removed old versions

(Portage version: 2.1.4.4)

3 files changed, 9 insertions, 253 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index 2d6a4f9fda59..3385a378693c 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/dovecot
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.157 2008/03/18 23:15:34 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.158 2008/04/02 12:09:14 wschlich Exp $
+
+*dovecot-1.1_rc4 (02 Apr 2008)
+
+  02 Apr 2008; Wolfram Schlich <wschlich@gentoo.org>
+  -dovecot-1.1_rc3-r1.ebuild, -dovecot-1.1_rc3-r2.ebuild,
+  +dovecot-1.1_rc4.ebuild:
+  version bump, removed old versions
 
   18 Mar 2008; Wolfram Schlich <wschlich@gentoo.org> -dovecot-1.0.10.ebuild,
   -dovecot-1.0.13.ebuild, -dovecot-1.1_rc3.ebuild:
diff --git a/net-mail/dovecot/dovecot-1.1_rc3-r1.ebuild b/net-mail/dovecot/dovecot-1.1_rc3-r1.ebuild
deleted file mode 100644
index f216ad15d071..000000000000
--- a/net-mail/dovecot/dovecot-1.1_rc3-r1.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.1_rc3-r1.ebuild,v 1.2 2008/03/15 12:13:54 wschlich 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.4"
-SIEVE_S="${WORKDIR}/${SIEVE}"
-MANAGESIEVE_PATCH="managesieve-0.10.1"
-MANAGESIEVE="managesieve-0.10.1"
-MANAGESIEVE_S="${WORKDIR}/${PN}-${MY_PV12}-${MANAGESIEVE}"
-
-SRC_URI="http://dovecot.org/releases/${MY_PV12}/rc/${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="-* ~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
-
-IUSE="debug doc ipv6 kerberos ldap managesieve mbox mysql pop3d pam postgres sieve ssl suid vpopmail"
-
-# Developer documentation, controlled by the doc USE flag
-DEVDOCS="auth-protocol index multiaccess securecoding"
-
-DEPEND=">=sys-apps/sed-4
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	pam? ( virtual/pam )
-	ssl? ( dev-libs/openssl )
-	postgres? ( dev-db/postgresql )
-	mysql? ( virtual/mysql )
-	vpopmail? ( net-mail/vpopmail )"
-
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00-r8"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# http://hg.dovecot.org/dovecot-1.1/rev/7e27d67d3abe
-	epatch "${FILESDIR}"/${P}-body.patch
-	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_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 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 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"
-	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
-}
-
-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.1_rc3-r2.ebuild b/net-mail/dovecot/dovecot-1.1_rc4.ebuild
index 433586ee78a5..d8d5ea00afcb 100644
--- a/net-mail/dovecot/dovecot-1.1_rc3-r2.ebuild
+++ b/net-mail/dovecot/dovecot-1.1_rc4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.1_rc3-r2.ebuild,v 1.1 2008/03/18 23:09:31 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.1_rc4.ebuild,v 1.1 2008/04/02 12:09:14 wschlich Exp $
 
 inherit autotools eutils ssl-cert versionator
 
@@ -46,8 +46,6 @@ RDEPEND="${DEPEND}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	# http://hg.dovecot.org/dovecot-1.1/rev/7e27d67d3abe
-	epatch "${FILESDIR}"/${P}-body.patch
 	if use managesieve; then
 		epatch "${WORKDIR}"/${MY_P}-${MANAGESIEVE_PATCH}.diff
 		eautoreconf