Version bump and ebuild cleanup.

8 files changed, 16 insertions, 145 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index 0fba0fdacad5..eb79cb503ee1 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/dovecot
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.11 2004/06/24 23:21:27 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.12 2004/08/16 23:50:08 g2boojum Exp $
+
+*dovecot-0.99.10.7 (16 Aug 2004)
+
+  16 Aug 2004; Grant Goodyear <g2boojum@gentoo.org> dovecot-0.99.10.6.ebuild,
+  +dovecot-0.99.10.7.ebuild:
+  Version bump (Bug 57136; thanks to Andreas Simon and Daniel Webert),
+  removing old versions, marking .6 stable on x86.
 
 *dovecot-0.99.10.6 (24 Jun 2004)
 
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 3044fef2b930..eef00f7dc937 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,9 +1,11 @@
+MD5 1705e9c30cceff6b67e34b5d97ea0f5a dovecot-0.99.10.7.ebuild 4400
 MD5 9c71843b0163a23b2a72033554e78ea6 dovecot-0.99.10.4-r1.ebuild 4099
 MD5 a754fc1fdf1acd97416bf2a7fecb625a dovecot-0.99.10.6.ebuild 4401
 MD5 a65ac6c2e3df46d63f467cce701b9b0a ChangeLog 2138
 MD5 61e0d05b1306513aede2838fa81b05b5 metadata.xml 225
 MD5 2092e856e5d69a505c3a7f99b2e1251c dovecot-0.99.10.5-r1.ebuild 4404
 MD5 d0c98a89b6d8d960ae0312a96256ecb8 files/digest-dovecot-0.99.10.6 69
+MD5 686af23ff7d4c3e70b590c40b5b2fd03 files/digest-dovecot-0.99.10.7 69
 MD5 02900826bf90ce0fcbf43a3ebbfa31cf files/digest-dovecot-0.99.10.4-r1 69
 MD5 533a7de1250c369ae33b60c3c53586a1 files/digest-dovecot-0.99.10.5-r1 69
 MD5 07b795b2b49257dee3743d5698d0d919 files/dovecot.init 517
diff --git a/net-mail/dovecot/dovecot-0.99.10.4-r1.ebuild b/net-mail/dovecot/dovecot-0.99.10.4-r1.ebuild
deleted file mode 100644
index dcb5054ac96d..000000000000
--- a/net-mail/dovecot/dovecot-0.99.10.4-r1.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-0.99.10.4-r1.ebuild,v 1.2 2004/06/24 23:21:27 agriffis Exp $
-
-IUSE="debug gnutls ipv6 ldap maildir pam postgres sasl ssl vpopmail nopop3d"
-
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="http://dovecot.procontrol.fi/"
-SRC_URI="${HOMEPAGE}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~x86 ~amd64 ~sparc"
-
-#PROVIDE="virtual/imapd"
-
-# Note: current dovecot will break on gnutls-1.0.5
-DEPEND=">=sys-libs/db-3.2
-	>=sys-apps/sed-4
-	ldap? ( >=net-nds/openldap-1.2 )
-	pam? ( sys-libs/pam )
-	sasl? ( >=dev-libs/cyrus-sasl-2.1 )
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	gnutls? ( <=net-libs/gnutls-1.0.4 )
-	postgres? ( dev-db/postgresql )
-	vpopmail? ( net-mail/vpopmail )"
-
-RDEPEND="${DEPEND}
-	net-mail/mailbase"
-
-
-pkg_preinst() {
-	# Add user and group for login process
-	if ! getent group | grep -q ^dovecot
-	then
-		groupadd dovecot || die "problem adding group dovecot"
-	fi
-	if ! getent passwd | grep -q ^dovecot
-	then
-		useradd -c dovecot -d /usr/libexec/dovecot -g dovecot \
-		-s /bin/false dovecot  || die "problem adding user dovecot"
-	fi
-}
-
-src_compile() {
-	local myconf
-	use debug && myconf="--enable-debug"
-	use ldap && myconf="${myconf} --with-ldap"
-	use ipv6 || myconf="${myconf} --disable-ipv6"
-	use nopop3d && myconf="${myconf} --without-pop3d"
-	use pam || myconf="${myconf} --without-pam"
-	use postgres && myconf="${myconf} --with-pgsql"
-	use sasl && myconf="${myconf} --with-cyrus-sasl2"
-	use gnutls && myconf="${myconf} --with-ssl=gnutls"
-	use ssl && myconf="${myconf} --with-ssl=openssl"
-	! use gnutls && ! use ssl && myconf="${myconf} --without-ssl"
-	use vpopmail || myconf="${myconf} --without-vpopmail"
-
-	./configure \
-	  --prefix=/usr \
-	  --host=${CHOST} \
-	  --mandir=/usr/share/man \
-	  --infodir=/usr/share/info \
-	  --datadir=/usr/share \
-	  --sysconfdir=/etc \
-	  --localstatedir=/var \
-	  ${myconf} || die "configure failed"
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-
-	# If /etc/dovecot.conf doesn't already exist, install a copy of
-	# dovecot-example.conf, changing the default mailbox locations to
-	# Gentoo's default ($HOME/.maildiir/ or /var/spool/mail/$USER)
-	if [ ! -e /etc/dovecot.conf ]; then
-		cd ${D}/etc
-		if use maildir; then
-			sed s/^#default_mail_env.*$/default_mail_env\ =\ maildir:%h\\/.maildir/	dovecot-example.conf > dovecot.conf
-		else
-			sed s/^#default_mail_env.*$/default_mail_env\ =\ mbox:\\/var\\/spool\\/mail\\/%u/ dovecot-example.conf > dovecot.conf
-		fi
-		cd -
-	fi
-	rm -f ${D}/etc/dovecot-example.conf
-
-	# Documentation
-	rm -fr ${D}/usr/share/doc/dovecot
-	cd ${S}
-	dodoc AUTHORS COPYING* NEWS README TODO dovecot-example.conf
-	dodoc doc/*.txt doc/*.conf doc/*.cnf
-
-	# per default dovecot wants it ssl cert called dovecot.pem
-	# fix this in mkcert.sh, which we use to generate the ssl certs
-	cd ${S}/doc
-	mv mkcert.sh mkcert.sh.tmp
-	sed s/imapd.pem/dovecot.pem/g mkcert.sh.tmp > mkcert.sh
-	dodoc mkcert.sh
-
-	# rc script
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/dovecot.init dovecot
-
-	# PAM
-	if use pam ; then
-		dodir /etc/pam.d
-		insinto /etc/pam.d
-		newins ${FILESDIR}/dovecot.pam dovecot
-	fi
-
-	# Create SSL certificates
-	if  use ssl || use gnutls ; then
-		cd ${S}/doc
-		dodir /etc/ssl/certs
-		dodir /etc/ssl/private
-		[ -e /etc/ssl/certs/dovecot.pem -a -e /etc/ssl/private/dovecot.pem ] \
-			|| SSLDIR=${D}/etc/ssl sh mkcert.sh
-	fi
-
-	dodir /var/run/dovecot
-	fowners root:root /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
-	[[ -e ${D}/etc/dovecot.conf ]] && fperms 0600 /etc/dovecot.conf
-}
-
-pkg_postinst() {
-	if use pam ; then
-		ewarn "If you are upgrading from Dovecot prior to 0.99.10, be aware"
-		ewarn "that the PAM profile was changed from 'imap' to 'dovecot'."
-		einfo "Please review /etc/pam.d/dovecot."
-	fi
-	einfo "Please review /etc/dovecot.conf, particularly auth_userdb and auth_passdb."
-}
diff --git a/net-mail/dovecot/dovecot-0.99.10.6.ebuild b/net-mail/dovecot/dovecot-0.99.10.6.ebuild
index c77389addcc3..9dc080645b1b 100644
--- a/net-mail/dovecot/dovecot-0.99.10.6.ebuild
+++ b/net-mail/dovecot/dovecot-0.99.10.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-0.99.10.6.ebuild,v 1.2 2004/06/24 23:21:27 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-0.99.10.6.ebuild,v 1.3 2004/08/16 23:50:08 g2boojum Exp $
 
 IUSE="debug ipv6 ldap mbox pam postgres sasl ssl gnutls vpopmail nopop3d"
 
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc"
+KEYWORDS="x86 ~amd64 ~sparc ~ppc"
 
 #PROVIDE="virtual/imapd"
 
diff --git a/net-mail/dovecot/dovecot-0.99.10.5-r1.ebuild b/net-mail/dovecot/dovecot-0.99.10.7.ebuild
index 7b5e96bc6107..abb5ec12592a 100644
--- a/net-mail/dovecot/dovecot-0.99.10.5-r1.ebuild
+++ b/net-mail/dovecot/dovecot-0.99.10.7.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-0.99.10.5-r1.ebuild,v 1.2 2004/06/24 23:21:27 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-0.99.10.7.ebuild,v 1.1 2004/08/16 23:50:08 g2boojum Exp $
 
 IUSE="debug ipv6 ldap mbox pam postgres sasl ssl gnutls vpopmail nopop3d"
 
 DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="http://dovecot.procontrol.fi/"
-SRC_URI="${HOMEPAGE}/${P}.tar.gz"
+HOMEPAGE="http://dovecot.org/"
+SRC_URI="${HOMEPAGE}/releases/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
diff --git a/net-mail/dovecot/files/digest-dovecot-0.99.10.4-r1 b/net-mail/dovecot/files/digest-dovecot-0.99.10.4-r1
deleted file mode 100644
index 877af0bbff55..000000000000
--- a/net-mail/dovecot/files/digest-dovecot-0.99.10.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 81eda7985e99d28acd6d286aa0e13e07 dovecot-0.99.10.4.tar.gz 859856
diff --git a/net-mail/dovecot/files/digest-dovecot-0.99.10.5-r1 b/net-mail/dovecot/files/digest-dovecot-0.99.10.5-r1
deleted file mode 100644
index 71bfb2a284d9..000000000000
--- a/net-mail/dovecot/files/digest-dovecot-0.99.10.5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 acda02c8bdcff5e194a8b9227ccb74b5 dovecot-0.99.10.5.tar.gz 863825
diff --git a/net-mail/dovecot/files/digest-dovecot-0.99.10.7 b/net-mail/dovecot/files/digest-dovecot-0.99.10.7
new file mode 100644
index 000000000000..f7acf35289ea
--- /dev/null
+++ b/net-mail/dovecot/files/digest-dovecot-0.99.10.7
@@ -0,0 +1 @@
+MD5 6e5f32be84901bf0f8c027f4a5a999ad dovecot-0.99.10.7.tar.gz 860088