nopop3d USE flag changed to pop3d - I hate double negatives

  sasl USE flag dropped as dovecot has its own internal version - no need to
  depend on cyrus-sasl
  maildir USE flag dropped as -mbox implies maildir
  kerberos USE flag added
  init script is now more robust and should start after all authenticators
  Oh yeah - new upstream version too ;)

(Portage version: 2.0.51.22-r3)

5 files changed, 159 insertions, 24 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index 7ce357d9fd66..d8edb0083f74 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-mail/dovecot
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.32 2005/11/10 13:05:16 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.33 2005/12/14 23:32:08 uberlord Exp $
+
+*dovecot-1.0_alpha5 (14 Dec 2005)
+
+  14 Dec 2005; Roy Marples <uberlord@gentoo.org> files/dovecot.init,
+  +dovecot-1.0_alpha5.ebuild:
+  nopop3d USE flag changed to pop3d - I hate double negatives
+  sasl USE flag dropped as dovecot has its own internal version - no need to
+  depend on cyrus-sasl
+  maildir USE flag dropped as -mbox implies maildir
+  kerberos USE flag added
+  init script is now more robust and should start after all authenticators
+  Oh yeah - new upstream version too ;)
 
   10 Nov 2005; Fernando J. Pereda <ferdy@gentoo.org>
   dovecot-0.99.14-r1.ebuild:
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index f67e15af64ed..e67c773497c7 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,26 +1,18 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 6aff5aa92785e8c05383a2b4c174b645 dovecot-0.99.13.ebuild 4755
+MD5 e8a87e45204be10f963e561e52b711f7 dovecot-0.99.14.ebuild 4756
+MD5 528a02a1cc1fd0e86d4f6d3a3cad49f1 ChangeLog 6047
 MD5 5d61659b291440014d20fe180ce752b8 dovecot-1.0_alpha2.ebuild 5434
+MD5 6fe466c43488b4941ac909c9a29cd11b dovecot-1.0_alpha3.ebuild 5434
+MD5 785e264d99213d660d3bdc64ae3ea594 dovecot-1.0_alpha5.ebuild 3709
 MD5 f1a232989766277e9cbeea9d06ee295d dovecot-0.99.11-r1.ebuild 4758
-MD5 e8a87e45204be10f963e561e52b711f7 dovecot-0.99.14.ebuild 4756
 MD5 016773a9d3c70b74b98b7fcb8a602a1b dovecot-0.99.14-r1.ebuild 5165
-MD5 6fe466c43488b4941ac909c9a29cd11b dovecot-1.0_alpha3.ebuild 5434
-MD5 528a02a1cc1fd0e86d4f6d3a3cad49f1 ChangeLog 6047
 MD5 61e0d05b1306513aede2838fa81b05b5 metadata.xml 225
-MD5 6aff5aa92785e8c05383a2b4c174b645 dovecot-0.99.13.ebuild 4755
-MD5 07b795b2b49257dee3743d5698d0d919 files/dovecot.init 517
-MD5 d7a52bb7835818feb1f4acd85eba3d57 files/digest-dovecot-0.99.13 67
-MD5 2a50200054849ca5e0173cb709ef649d files/digest-dovecot-0.99.14 67
 MD5 3d6d703cf014f2defc8fed34b50849a9 files/digest-dovecot-0.99.11-r1 67
-MD5 2a50200054849ca5e0173cb709ef649d files/digest-dovecot-0.99.14-r1 67
-MD5 1c0a9ca75cadf12377e70c2ef725ba0e files/dovecot.pam 220
 MD5 0e0a4098190f115ce3517dd26dc78bc8 files/digest-dovecot-1.0_alpha2 71
+MD5 87fd5966b0ec45ae9c5249814d229c80 files/dovecot.init 619
 MD5 5f5d2bc364708fa2db07f05685ad61fb files/digest-dovecot-1.0_alpha3 71
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDc0WdViELBEf1JB0RAhp9AJ4gD9oEgNhi3uHFEhydlhD89bBQUwCghN0J
-IKiGeiiZ+vx8ululIwMxXxM=
-=c0Mv
------END PGP SIGNATURE-----
+MD5 2a50200054849ca5e0173cb709ef649d files/digest-dovecot-0.99.14-r1 67
+MD5 649b89c2ee32019d3a25820fbe158f99 files/digest-dovecot-1.0_alpha5 71
+MD5 1c0a9ca75cadf12377e70c2ef725ba0e files/dovecot.pam 220
+MD5 2a50200054849ca5e0173cb709ef649d files/digest-dovecot-0.99.14 67
+MD5 d7a52bb7835818feb1f4acd85eba3d57 files/digest-dovecot-0.99.13 67
diff --git a/net-mail/dovecot/dovecot-1.0_alpha5.ebuild b/net-mail/dovecot/dovecot-1.0_alpha5.ebuild
new file mode 100644
index 000000000000..058995de3502
--- /dev/null
+++ b/net-mail/dovecot/dovecot-1.0_alpha5.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.0_alpha5.ebuild,v 1.1 2005/12/14 23:32:08 uberlord Exp $
+
+inherit eutils
+
+DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
+HOMEPAGE="http://dovecot.org/"
+MY_P="${P/_/.}"
+S="${WORKDIR}/${MY_P}"
+SRC_URI="http://dovecot.org/releases/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+IUSE="debug ipv6 kerberos ldap mbox mysql pop3d pam postgres ssl vpopmail"
+
+DEPEND=">=sys-libs/db-3.2
+	>=sys-apps/sed-4
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	pam? ( virtual/pam )
+	ssl? ( dev-libs/openssl )
+	postgres? ( dev-db/postgresql )
+	mysql? ( dev-db/mysql )
+	vpopmail? ( net-mail/vpopmail )"
+
+RDEPEND="${DEPEND}
+	>=net-mail/mailbase-0.00-r8"
+
+pkg_setup() {
+	# 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"
+
+#	Enable when linux-headers-2.6.13 hits portage for inotify
+#	or epoll gets more stable.
+#
+#	# Enable Linux only features
+#	if [[ ${KERNEL} == "linux" ]] ; then
+#		# epoll is too unstable
+#		# myconf="${myconf} --with-ioloop=epoll"
+#		if has_version ">=linux-headers-2.6.13" ; then
+#			myconf="${myconf} --with-notify=inotify"
+#		fi
+#	fi
+
+	econf --localstatedir=/var \
+		$(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"
+}
+
+src_install () {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	newinitd "${FILESDIR}"/dovecot.init dovecot
+
+	# Create the dovecot.conf file from the dovecot-example.conf file that
+	# the dovecot folks nicely left for us....
+	mv "${D}"/etc/dovecot-example.conf "${D}"/etc/dovecot.conf
+
+	# .maildir is the Gentoo default, but we need to support mbox to
+	local mailenv="maildir:%h/.maildir"
+	if use mbox ; then
+		mailenv="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
+		keepdir /var/dovecot
+		sed -i -e 's|#mail_extra_groups =|mail_extra_groups = mail|' \
+			"${D}"/etc/dovecot.conf
+	fi
+	sed -i -e \
+		"s|#default_mail_env =|default_mail_env = ${mailenv}|" \
+		"${D}"/etc/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 = "\*"|' \
+			"${D}"/etc/dovecot.conf
+	fi
+
+	# Documentation
+	rm -rf "${D}"/usr/share/doc/dovecot
+	dodoc AUTHORS NEWS README TODO dovecot-example.conf
+	dodoc doc/*.txt doc/*.conf doc/*.cnf doc/mkcert.sh
+
+	# Create SSL certificates
+	if use ssl ; then
+		dodir /etc/ssl/certs
+		dodir /etc/ssl/private
+		# Let's not make a new certificate if we already have one
+		if ! [[ -e /etc/ssl/certs/dovecot.pem && \
+			-e /etc/ssl/private/dovecot.pem ]]; then
+			einfo "Generating X.509 certificate for SSL"
+			pushd doc >/dev/null && \
+				SSLDIR="${D}"/etc/ssl sh mkcert.sh && \
+				popd >/dev/null
+		fi
+	fi
+
+	dodir /var/run/dovecot
+	fowners root:0 /var/run/dovecot
+	fperms 0700 /var/run/dovecot
+	keepdir /var/run/dovecot/login
+	fowners root:dovecot /var/run/dovecot/login
+	fperms 0750 /var/run/dovecot/login
+	fperms 0600 /etc/dovecot.conf
+}
+
+pkg_postinst() {
+	einfo "The dovecot configuration has vastly changed since 0.99."
+	einfo "You are encouraged to start afresh with a new configuration file."
+	einfo "see http://wiki.dovecot.org/ for configuration examples."
+}
diff --git a/net-mail/dovecot/files/digest-dovecot-1.0_alpha5 b/net-mail/dovecot/files/digest-dovecot-1.0_alpha5
new file mode 100644
index 000000000000..ea0e08ee481d
--- /dev/null
+++ b/net-mail/dovecot/files/digest-dovecot-1.0_alpha5
@@ -0,0 +1 @@
+MD5 a3277835f04d73485ff5ce3cc3daeea7 dovecot-1.0.alpha5.tar.gz 1266342
diff --git a/net-mail/dovecot/files/dovecot.init b/net-mail/dovecot/files/dovecot.init
index b6f15295e8a5..54746cba5a9e 100644
--- a/net-mail/dovecot/files/dovecot.init
+++ b/net-mail/dovecot/files/dovecot.init
@@ -1,23 +1,25 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/files/dovecot.init,v 1.2 2004/07/14 23:49:56 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/files/dovecot.init,v 1.3 2005/12/14 23:32:08 uberlord Exp $
 
 depend() {
 	need net
-	after saslauthd
+	after saslauthd ldap slapd postgresql mysql
 	use logger
 }
 
 start() {
 	ebegin "Starting dovecot"
-	start-stop-daemon --start --quiet --exec /usr/sbin/dovecot
+	start-stop-daemon --start --exec /usr/sbin/dovecot \
+	    --pidfile /var/run/dovecot/master.pid
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping dovecot"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/dovecot
+	start-stop-daemon --stop --exec /usr/sbin/dovecot \
+	    --pidfile /var/run/dovecot/master.pid
 	eend $?
 }