removed old versions + fixes bug #195149 (missing openldap dependency)

(Portage version: 2.1.3.9)

15 files changed, 13 insertions, 614 deletions

diff --git a/net-mail/dbmail/ChangeLog b/net-mail/dbmail/ChangeLog
index 2edf8dbb768b..3c5969db730c 100644
--- a/net-mail/dbmail/ChangeLog
+++ b/net-mail/dbmail/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-mail/dbmail
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/ChangeLog,v 1.8 2007/09/30 08:21:11 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/ChangeLog,v 1.9 2007/10/10 12:29:07 lordvan Exp $
+
+  10 Oct 2007; Thomas Raschbacher <lordvan@gentoo.org> -dbmail-2.2.4.ebuild,
+  -dbmail-2.2.5_rc2.ebuild, -dbmail-2.2.5_rc3.ebuild, dbmail-2.2.5.ebuild,
+  -dbmail-2.2.6_rc1.ebuild, -dbmail-2.2.6_rc2.ebuild,
+  -dbmail-2.2.7_rc1.ebuild, dbmail-2.2.7_rc2.ebuild:
+  removed 2.2.4 and old rcX versions + added openldap dependency when
+  USE="ldap". fixes bug #195149 thanks to Brandon Adams <bmadams@gmail.com>
+  for pointing this out.
 
 *dbmail-2.2.7_rc2 (30 Sep 2007)
 *dbmail-2.2.7_rc1 (30 Sep 2007)
diff --git a/net-mail/dbmail/dbmail-2.2.4.ebuild b/net-mail/dbmail/dbmail-2.2.4.ebuild
deleted file mode 100644
index 9057d5f86816..000000000000
--- a/net-mail/dbmail/dbmail-2.2.4.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/dbmail-2.2.4.ebuild,v 1.2 2007/04/17 14:36:43 opfer Exp $
-
-inherit eutils
-
-DESCRIPTION="A mail storage and retrieval daemon that uses MySQL or PostgreSQL as its data store"
-HOMEPAGE="http://www.dbmail.org/"
-SRC_URI="http://www.dbmail.org/download/2.2/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ldap mysql postgres sieve sqlite3 ssl static"
-
-DEPEND="ssl? ( dev-libs/openssl )
-	postgres? ( >=dev-db/postgresql-7.4 )
-	mysql? ( >=virtual/mysql-4.1 )
-	sqlite3? ( >=dev-db/sqlite-3.0 )
-	sieve? ( >=mail-filter/libsieve-2.2.1 )
-	app-text/asciidoc
-	app-text/xmlto
-	sys-libs/zlib
-	>=dev-libs/gmime-2.1.18
-	>=dev-libs/glib-2.8"
-
-pkg_setup() {
-	enewgroup dbmail
-	enewuser dbmail -1 -1 /var/lib/dbmail dbmail
-}
-
-src_compile() {
-	use sqlite3 && myconf="--with-sqlite"
-	use ldap && myconf=${myconf}" --with-auth-ldap"
-
-	econf \
-		--sysconfdir=/etc/dbmail \
-		${myconf} \
-		$(use_enable static) \
-		$(use_with sieve) \
-		$(use_with ssl) \
-		$(use_with postgres pgsql) \
-		$(use_with mysql) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS BUGS UPGRADING ChangeLog README* INSTALL* NEWS THANKS
-	dodoc sql/mysql/*
-	dodoc sql/postgresql/*
-	dodoc sql/sqlite/*
-
-	sed -i -e "s:nobody:dbmail:" dbmail.conf
-	sed -i -e "s:nogroup:dbmail:" dbmail.conf
-	insinto /etc/dbmail
-	newins dbmail.conf dbmail.conf.dist
-
-	newinitd "${FILESDIR}"/dbmail-imapd.initd dbmail-imapd
-	newinitd "${FILESDIR}"/dbmail-lmtpd.initd dbmail-lmtpd
-	newinitd "${FILESDIR}"/dbmail-pop3d.initd dbmail-pop3d
-	use sieve && newinitd "${FILESDIR}"/dbmail-timsieved.initd dbmail-timsieved
-
-	dobin contrib/mailbox2dbmail/mailbox2dbmail
-	doman contrib/mailbox2dbmail/mailbox2dbmail.1
-
-	keepdir /var/lib/dbmail
-	fperms 750 /var/lib/dbmail
-
-}
-
-pkg_postinst() {
-	elog "Please read /usr/share/doc/${PF}/INSTALL.gz"
-	elog "for remaining instructions on setting up dbmail users and "
-	elog "for finishing configuration to connect to your MTA and "
-	elog "to connect to your db."
-	echo
-	elog "Database schemes can be found in /usr/share/doc/${PF}/"
-	elog "You will also want to follow the installation instructions"
-	elog "on setting up the maintenance program to delete old messages."
-	elog "Don't forget to edit /etc/dbmail/dbmail.conf as well."
-	echo
-	elog "For regular maintenance, add this to crontab:"
-	elog "0 3 * * * /usr/bin/dbmail-util -cpdy >/dev/null 2>&1"
-}
diff --git a/net-mail/dbmail/dbmail-2.2.5.ebuild b/net-mail/dbmail/dbmail-2.2.5.ebuild
index 124904f27d61..c910eb9eaec3 100644
--- a/net-mail/dbmail/dbmail-2.2.5.ebuild
+++ b/net-mail/dbmail/dbmail-2.2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/dbmail-2.2.5.ebuild,v 1.1 2007/06/05 08:39:03 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/dbmail-2.2.5.ebuild,v 1.2 2007/10/10 12:29:07 lordvan Exp $
 
 inherit eutils
 
@@ -20,6 +20,7 @@ DEPEND="ssl? ( dev-libs/openssl )
 	mysql? ( >=virtual/mysql-4.1 )
 	sqlite3? ( >=dev-db/sqlite-3.0 )
 	sieve? ( >=mail-filter/libsieve-2.2.1 )
+	ldap? ( >=net-nds/openldap-2.3.33 )
 	app-text/asciidoc
 	app-text/xmlto
 	sys-libs/zlib
diff --git a/net-mail/dbmail/dbmail-2.2.5_rc2.ebuild b/net-mail/dbmail/dbmail-2.2.5_rc2.ebuild
deleted file mode 100644
index 6a2736ce78bf..000000000000
--- a/net-mail/dbmail/dbmail-2.2.5_rc2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/dbmail-2.2.5_rc2.ebuild,v 1.1 2007/05/15 11:44:12 lordvan Exp $
-
-inherit eutils
-
-MY_P="${P/_/}" # for rcX
-#MY_P="${P}" # releases
-DESCRIPTION="A mail storage and retrieval daemon that uses MySQL or PostgreSQL as its data store"
-HOMEPAGE="http://www.dbmail.org/"
-SRC_URI="http://www.dbmail.org/download/2.2/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ldap mysql postgres sieve sqlite3 ssl static"
-
-DEPEND="ssl? ( dev-libs/openssl )
-	postgres? ( >=dev-db/postgresql-7.4 )
-	mysql? ( >=virtual/mysql-4.1 )
-	sqlite3? ( >=dev-db/sqlite-3.0 )
-	sieve? ( >=mail-filter/libsieve-2.2.1 )
-	app-text/asciidoc
-	app-text/xmlto
-	sys-libs/zlib
-	>=dev-libs/gmime-2.1.18
-	>=dev-libs/glib-2.8"
-
-S=${WORKDIR}/${P/_/-}
-
-pkg_setup() {
-	enewgroup dbmail
-	enewuser dbmail -1 -1 /var/lib/dbmail dbmail
-}
-
-src_compile() {
-	use sqlite3 && myconf="--with-sqlite"
-	use ldap && myconf=${myconf}" --with-auth-ldap"
-
-	econf \
-		--sysconfdir=/etc/dbmail \
-		${myconf} \
-		$(use_enable static) \
-		$(use_with sieve) \
-		$(use_with ssl) \
-		$(use_with postgres pgsql) \
-		$(use_with mysql) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS BUGS UPGRADING ChangeLog README* INSTALL* NEWS THANKS
-	dodoc sql/mysql/*
-	dodoc sql/postgresql/*
-	dodoc sql/sqlite/*
-
-	cp dbmail.conf.dist dbmail.conf
-	sed -i -e "s:nobody:dbmail:" dbmail.conf
-	sed -i -e "s:nogroup:dbmail:" dbmail.conf
-	#sed -i -e "s:#library_directory:library_directory:" dbmail.conf
-	insinto /etc/dbmail
-	newins dbmail.conf dbmail.conf.dist
-
-	newinitd "${FILESDIR}"/dbmail-imapd.initd dbmail-imapd
-	newinitd "${FILESDIR}"/dbmail-lmtpd.initd dbmail-lmtpd
-	newinitd "${FILESDIR}"/dbmail-pop3d.initd dbmail-pop3d
-	use sieve && newinitd "${FILESDIR}"/dbmail-timsieved.initd dbmail-timsieved
-
-	dobin contrib/mailbox2dbmail/mailbox2dbmail
-	doman contrib/mailbox2dbmail/mailbox2dbmail.1
-
-	keepdir /var/lib/dbmail
-	fperms 750 /var/lib/dbmail
-
-}
-
-pkg_postinst() {
-	elog "Please read /usr/share/doc/${PF}/INSTALL.gz"
-	elog "for remaining instructions on setting up dbmail users and "
-	elog "for finishing configuration to connect to your MTA and "
-	elog "to connect to your db."
-	echo
-	elog "Database schemes can be found in /usr/share/doc/${PF}/"
-	elog "You will also want to follow the installation instructions"
-	elog "on setting up the maintenance program to delete old messages."
-	elog "Don't forget to edit /etc/dbmail/dbmail.conf as well."
-	echo
-	elog "For regular maintenance, add this to crontab:"
-	elog "0 3 * * * /usr/bin/dbmail-util -cpdy >/dev/null 2>&1"
-	echo
-	elog "Please make sure to run etc-update."
-	elog "If you get an error message about plugins not found"
-	elog "please add the library_directory configuration switch to"
-	elog "dbmail.conf and set it to the correct path"
-	elog "(usually /usr/lib/dbmail or /usr/lib64/dbmail on amd64)"
-	elog "A sample can be found in dbmail.conf.dist after etc-update."
-}
diff --git a/net-mail/dbmail/dbmail-2.2.5_rc3.ebuild b/net-mail/dbmail/dbmail-2.2.5_rc3.ebuild
deleted file mode 100644
index 9420ce301bca..000000000000
--- a/net-mail/dbmail/dbmail-2.2.5_rc3.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/dbmail-2.2.5_rc3.ebuild,v 1.1 2007/05/29 17:39:30 lordvan Exp $
-
-inherit eutils
-
-MY_P="${P/_/}" # for rcX
-#MY_P="${P}" # releases
-DESCRIPTION="A mail storage and retrieval daemon that uses MySQL or PostgreSQL as its data store"
-HOMEPAGE="http://www.dbmail.org/"
-SRC_URI="http://www.dbmail.org/download/2.2/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ldap mysql postgres sieve sqlite3 ssl static"
-
-DEPEND="ssl? ( dev-libs/openssl )
-	postgres? ( >=dev-db/postgresql-7.4 )
-	mysql? ( >=virtual/mysql-4.1 )
-	sqlite3? ( >=dev-db/sqlite-3.0 )
-	sieve? ( >=mail-filter/libsieve-2.2.1 )
-	app-text/asciidoc
-	app-text/xmlto
-	sys-libs/zlib
-	>=dev-libs/gmime-2.1.18
-	>=dev-libs/glib-2.8"
-
-S=${WORKDIR}/${P/_/}
-
-pkg_setup() {
-	enewgroup dbmail
-	enewuser dbmail -1 -1 /var/lib/dbmail dbmail
-}
-
-src_compile() {
-	use sqlite3 && myconf="--with-sqlite"
-	use ldap && myconf=${myconf}" --with-auth-ldap"
-
-	econf \
-		--sysconfdir=/etc/dbmail \
-		${myconf} \
-		$(use_enable static) \
-		$(use_with sieve) \
-		$(use_with ssl) \
-		$(use_with postgres pgsql) \
-		$(use_with mysql) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS BUGS UPGRADING ChangeLog README* INSTALL* NEWS THANKS
-	dodoc sql/mysql/*
-	dodoc sql/postgresql/*
-	dodoc sql/sqlite/*
-
-	cp dbmail.conf.dist dbmail.conf
-	sed -i -e "s:nobody:dbmail:" dbmail.conf
-	sed -i -e "s:nogroup:dbmail:" dbmail.conf
-	#sed -i -e "s:#library_directory:library_directory:" dbmail.conf
-	insinto /etc/dbmail
-	newins dbmail.conf dbmail.conf.dist
-
-	newinitd "${FILESDIR}"/dbmail-imapd.initd dbmail-imapd
-	newinitd "${FILESDIR}"/dbmail-lmtpd.initd dbmail-lmtpd
-	newinitd "${FILESDIR}"/dbmail-pop3d.initd dbmail-pop3d
-	use sieve && newinitd "${FILESDIR}"/dbmail-timsieved.initd dbmail-timsieved
-
-	dobin contrib/mailbox2dbmail/mailbox2dbmail
-	doman contrib/mailbox2dbmail/mailbox2dbmail.1
-
-	keepdir /var/lib/dbmail
-	fperms 750 /var/lib/dbmail
-
-}
-
-pkg_postinst() {
-	elog "Please read /usr/share/doc/${PF}/INSTALL.gz"
-	elog "for remaining instructions on setting up dbmail users and "
-	elog "for finishing configuration to connect to your MTA and "
-	elog "to connect to your db."
-	echo
-	elog "Database schemes can be found in /usr/share/doc/${PF}/"
-	elog "You will also want to follow the installation instructions"
-	elog "on setting up the maintenance program to delete old messages."
-	elog "Don't forget to edit /etc/dbmail/dbmail.conf as well."
-	echo
-	elog "For regular maintenance, add this to crontab:"
-	elog "0 3 * * * /usr/bin/dbmail-util -cpdy >/dev/null 2>&1"
-	echo
-	elog "Please make sure to run etc-update."
-	elog "If you get an error message about plugins not found"
-	elog "please add the library_directory configuration switch to"
-	elog "dbmail.conf and set it to the correct path"
-	elog "(usually /usr/lib/dbmail or /usr/lib64/dbmail on amd64)"
-	elog "A sample can be found in dbmail.conf.dist after etc-update."
-}
diff --git a/net-mail/dbmail/dbmail-2.2.6_rc1.ebuild b/net-mail/dbmail/dbmail-2.2.6_rc1.ebuild
deleted file mode 100644
index 06b03d62cd9a..000000000000
--- a/net-mail/dbmail/dbmail-2.2.6_rc1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/dbmail-2.2.6_rc1.ebuild,v 1.1 2007/07/16 08:53:57 lordvan Exp $
-
-inherit eutils
-
-MY_P="${P/_/-}" # for rcX
-#MY_P="${P}" # releases
-DESCRIPTION="A mail storage and retrieval daemon that uses MySQL or PostgreSQL as its data store"
-HOMEPAGE="http://www.dbmail.org/"
-SRC_URI="http://www.dbmail.org/download/2.2/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ldap mysql postgres sieve sqlite3 ssl static"
-
-DEPEND="ssl? ( dev-libs/openssl )
-	postgres? ( >=dev-db/postgresql-7.4 )
-	mysql? ( >=virtual/mysql-4.1 )
-	sqlite3? ( >=dev-db/sqlite-3.0 )
-	sieve? ( >=mail-filter/libsieve-2.2.1 )
-	app-text/asciidoc
-	app-text/xmlto
-	sys-libs/zlib
-	>=dev-libs/gmime-2.1.18
-	>=dev-libs/glib-2.8"
-
-S=${WORKDIR}/${P/_/-}
-
-pkg_setup() {
-	enewgroup dbmail
-	enewuser dbmail -1 -1 /var/lib/dbmail dbmail
-}
-
-src_compile() {
-	use sqlite3 && myconf="--with-sqlite"
-	use ldap && myconf=${myconf}" --with-auth-ldap"
-
-	econf \
-		--sysconfdir=/etc/dbmail \
-		${myconf} \
-		$(use_enable static) \
-		$(use_with sieve) \
-		$(use_with ssl) \
-		$(use_with postgres pgsql) \
-		$(use_with mysql) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS BUGS UPGRADING ChangeLog README* INSTALL* NEWS THANKS
-	dodoc sql/mysql/*
-	dodoc sql/postgresql/*
-	dodoc sql/sqlite/*
-
-	cp dbmail.conf.dist dbmail.conf
-	sed -i -e "s:nobody:dbmail:" dbmail.conf
-	sed -i -e "s:nogroup:dbmail:" dbmail.conf
-	#sed -i -e "s:#library_directory:library_directory:" dbmail.conf
-	insinto /etc/dbmail
-	newins dbmail.conf dbmail.conf.dist
-
-	newinitd "${FILESDIR}"/dbmail-imapd.initd dbmail-imapd
-	newinitd "${FILESDIR}"/dbmail-lmtpd.initd dbmail-lmtpd
-	newinitd "${FILESDIR}"/dbmail-pop3d.initd dbmail-pop3d
-	use sieve && newinitd "${FILESDIR}"/dbmail-timsieved.initd dbmail-timsieved
-
-	dobin contrib/mailbox2dbmail/mailbox2dbmail
-	doman contrib/mailbox2dbmail/mailbox2dbmail.1
-
-	keepdir /var/lib/dbmail
-	fperms 750 /var/lib/dbmail
-
-}
-
-pkg_postinst() {
-	elog "Please read /usr/share/doc/${PF}/INSTALL.gz"
-	elog "for remaining instructions on setting up dbmail users and "
-	elog "for finishing configuration to connect to your MTA and "
-	elog "to connect to your db."
-	echo
-	elog "Database schemes can be found in /usr/share/doc/${PF}/"
-	elog "You will also want to follow the installation instructions"
-	elog "on setting up the maintenance program to delete old messages."
-	elog "Don't forget to edit /etc/dbmail/dbmail.conf as well."
-	echo
-	elog "For regular maintenance, add this to crontab:"
-	elog "0 3 * * * /usr/bin/dbmail-util -cpdy >/dev/null 2>&1"
-	echo
-	elog "Please make sure to run etc-update."
-	elog "If you get an error message about plugins not found"
-	elog "please add the library_directory configuration switch to"
-	elog "dbmail.conf and set it to the correct path"
-	elog "(usually /usr/lib/dbmail or /usr/lib64/dbmail on amd64)"
-	elog "A sample can be found in dbmail.conf.dist after etc-update."
-}
diff --git a/net-mail/dbmail/dbmail-2.2.6_rc2.ebuild b/net-mail/dbmail/dbmail-2.2.6_rc2.ebuild
deleted file mode 100644
index fcf7d57d2103..000000000000
--- a/net-mail/dbmail/dbmail-2.2.6_rc2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/dbmail-2.2.6_rc2.ebuild,v 1.1 2007/09/10 18:14:20 lordvan Exp $
-
-inherit eutils
-
-MY_P="${P/_/-}" # for rcX
-#MY_P="${P}" # releases
-DESCRIPTION="A mail storage and retrieval daemon that uses MySQL or PostgreSQL as its data store"
-HOMEPAGE="http://www.dbmail.org/"
-SRC_URI="http://www.dbmail.org/download/2.2/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ldap mysql postgres sieve sqlite3 ssl static"
-
-DEPEND="ssl? ( dev-libs/openssl )
-	postgres? ( >=dev-db/postgresql-7.4 )
-	mysql? ( >=virtual/mysql-4.1 )
-	sqlite3? ( >=dev-db/sqlite-3.0 )
-	sieve? ( >=mail-filter/libsieve-2.2.1 )
-	app-text/asciidoc
-	app-text/xmlto
-	sys-libs/zlib
-	>=dev-libs/gmime-2.1.18
-	>=dev-libs/glib-2.8"
-
-S=${WORKDIR}/${P/_/-}
-
-pkg_setup() {
-	enewgroup dbmail
-	enewuser dbmail -1 -1 /var/lib/dbmail dbmail
-}
-
-src_compile() {
-	use sqlite3 && myconf="--with-sqlite"
-	use ldap && myconf=${myconf}" --with-auth-ldap"
-
-	econf \
-		--sysconfdir=/etc/dbmail \
-		${myconf} \
-		$(use_enable static) \
-		$(use_with sieve) \
-		$(use_with ssl) \
-		$(use_with postgres pgsql) \
-		$(use_with mysql) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS BUGS UPGRADING ChangeLog README* INSTALL* NEWS THANKS
-	dodoc sql/mysql/*
-	dodoc sql/postgresql/*
-	dodoc sql/sqlite/*
-
-	cp dbmail.conf.dist dbmail.conf
-	sed -i -e "s:nobody:dbmail:" dbmail.conf
-	sed -i -e "s:nogroup:dbmail:" dbmail.conf
-	#sed -i -e "s:#library_directory:library_directory:" dbmail.conf
-	insinto /etc/dbmail
-	newins dbmail.conf dbmail.conf.dist
-
-	newinitd "${FILESDIR}"/dbmail-imapd.initd dbmail-imapd
-	newinitd "${FILESDIR}"/dbmail-lmtpd.initd dbmail-lmtpd
-	newinitd "${FILESDIR}"/dbmail-pop3d.initd dbmail-pop3d
-	use sieve && newinitd "${FILESDIR}"/dbmail-timsieved.initd dbmail-timsieved
-
-	dobin contrib/mailbox2dbmail/mailbox2dbmail
-	doman contrib/mailbox2dbmail/mailbox2dbmail.1
-
-	keepdir /var/lib/dbmail
-	fperms 750 /var/lib/dbmail
-
-}
-
-pkg_postinst() {
-	elog "Please read /usr/share/doc/${PF}/INSTALL.gz"
-	elog "for remaining instructions on setting up dbmail users and "
-	elog "for finishing configuration to connect to your MTA and "
-	elog "to connect to your db."
-	echo
-	elog "Database schemes can be found in /usr/share/doc/${PF}/"
-	elog "You will also want to follow the installation instructions"
-	elog "on setting up the maintenance program to delete old messages."
-	elog "Don't forget to edit /etc/dbmail/dbmail.conf as well."
-	echo
-	elog "For regular maintenance, add this to crontab:"
-	elog "0 3 * * * /usr/bin/dbmail-util -cpdy >/dev/null 2>&1"
-	echo
-	elog "Please make sure to run etc-update."
-	elog "If you get an error message about plugins not found"
-	elog "please add the library_directory configuration switch to"
-	elog "dbmail.conf and set it to the correct path"
-	elog "(usually /usr/lib/dbmail or /usr/lib64/dbmail on amd64)"
-	elog "A sample can be found in dbmail.conf.dist after etc-update."
-}
diff --git a/net-mail/dbmail/dbmail-2.2.7_rc1.ebuild b/net-mail/dbmail/dbmail-2.2.7_rc1.ebuild
deleted file mode 100644
index 4fca79f4ba36..000000000000
--- a/net-mail/dbmail/dbmail-2.2.7_rc1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/dbmail-2.2.7_rc1.ebuild,v 1.1 2007/09/30 08:21:11 lordvan Exp $
-
-inherit eutils
-
-MY_P="${P/_/-}" # for rcX
-#MY_P="${P}" # releases
-DESCRIPTION="A mail storage and retrieval daemon that uses MySQL or PostgreSQL as its data store"
-HOMEPAGE="http://www.dbmail.org/"
-SRC_URI="http://www.dbmail.org/download/2.2/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ldap mysql postgres sieve sqlite3 ssl static"
-
-DEPEND="ssl? ( dev-libs/openssl )
-	postgres? ( >=dev-db/postgresql-7.4 )
-	mysql? ( >=virtual/mysql-4.1 )
-	sqlite3? ( >=dev-db/sqlite-3.0 )
-	sieve? ( >=mail-filter/libsieve-2.2.1 )
-	app-text/asciidoc
-	app-text/xmlto
-	sys-libs/zlib
-	>=dev-libs/gmime-2.1.18
-	>=dev-libs/glib-2.8"
-
-S=${WORKDIR}/${P/_/-}
-
-pkg_setup() {
-	enewgroup dbmail
-	enewuser dbmail -1 -1 /var/lib/dbmail dbmail
-}
-
-src_compile() {
-	use sqlite3 && myconf="--with-sqlite"
-	use ldap && myconf=${myconf}" --with-auth-ldap"
-
-	econf \
-		--sysconfdir=/etc/dbmail \
-		${myconf} \
-		$(use_enable static) \
-		$(use_with sieve) \
-		$(use_with ssl) \
-		$(use_with postgres pgsql) \
-		$(use_with mysql) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS BUGS UPGRADING ChangeLog README* INSTALL* NEWS THANKS
-	dodoc sql/mysql/*
-	dodoc sql/postgresql/*
-	dodoc sql/sqlite/*
-
-	cp dbmail.conf.dist dbmail.conf
-	sed -i -e "s:nobody:dbmail:" dbmail.conf
-	sed -i -e "s:nogroup:dbmail:" dbmail.conf
-	#sed -i -e "s:#library_directory:library_directory:" dbmail.conf
-	insinto /etc/dbmail
-	newins dbmail.conf dbmail.conf.dist
-
-	newinitd "${FILESDIR}"/dbmail-imapd.initd dbmail-imapd
-	newinitd "${FILESDIR}"/dbmail-lmtpd.initd dbmail-lmtpd
-	newinitd "${FILESDIR}"/dbmail-pop3d.initd dbmail-pop3d
-	use sieve && newinitd "${FILESDIR}"/dbmail-timsieved.initd dbmail-timsieved
-
-	dobin contrib/mailbox2dbmail/mailbox2dbmail
-	doman contrib/mailbox2dbmail/mailbox2dbmail.1
-
-	keepdir /var/lib/dbmail
-	fperms 750 /var/lib/dbmail
-
-}
-
-pkg_postinst() {
-	elog "Please read /usr/share/doc/${PF}/INSTALL.gz"
-	elog "for remaining instructions on setting up dbmail users and "
-	elog "for finishing configuration to connect to your MTA and "
-	elog "to connect to your db."
-	echo
-	elog "Database schemes can be found in /usr/share/doc/${PF}/"
-	elog "You will also want to follow the installation instructions"
-	elog "on setting up the maintenance program to delete old messages."
-	elog "Don't forget to edit /etc/dbmail/dbmail.conf as well."
-	echo
-	elog "For regular maintenance, add this to crontab:"
-	elog "0 3 * * * /usr/bin/dbmail-util -cpdy >/dev/null 2>&1"
-	echo
-	elog "Please make sure to run etc-update."
-	elog "If you get an error message about plugins not found"
-	elog "please add the library_directory configuration switch to"
-	elog "dbmail.conf and set it to the correct path"
-	elog "(usually /usr/lib/dbmail or /usr/lib64/dbmail on amd64)"
-	elog "A sample can be found in dbmail.conf.dist after etc-update."
-}
diff --git a/net-mail/dbmail/dbmail-2.2.7_rc2.ebuild b/net-mail/dbmail/dbmail-2.2.7_rc2.ebuild
index b5191a4dd0fa..5178f41f9f10 100644
--- a/net-mail/dbmail/dbmail-2.2.7_rc2.ebuild
+++ b/net-mail/dbmail/dbmail-2.2.7_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/dbmail-2.2.7_rc2.ebuild,v 1.1 2007/09/30 08:21:11 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/dbmail-2.2.7_rc2.ebuild,v 1.2 2007/10/10 12:29:07 lordvan Exp $
 
 inherit eutils
 
@@ -20,6 +20,7 @@ DEPEND="ssl? ( dev-libs/openssl )
 	mysql? ( >=virtual/mysql-4.1 )
 	sqlite3? ( >=dev-db/sqlite-3.0 )
 	sieve? ( >=mail-filter/libsieve-2.2.1 )
+	ldap? ( >=net-nds/openldap-2.3.33 )
 	app-text/asciidoc
 	app-text/xmlto
 	sys-libs/zlib
diff --git a/net-mail/dbmail/files/digest-dbmail-2.2.4 b/net-mail/dbmail/files/digest-dbmail-2.2.4
deleted file mode 100644
index 5bc2668fbebb..000000000000
--- a/net-mail/dbmail/files/digest-dbmail-2.2.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b7f56437df764e7046438f81f4b7df18 dbmail-2.2.4.tar.gz 873538
-RMD160 06b9bf2ede178096d597a7291ca11075b612caa5 dbmail-2.2.4.tar.gz 873538
-SHA256 2fdf2f22e9d0437e8331d33a956f12ca85d7370651c943f09f8886e94a93f379 dbmail-2.2.4.tar.gz 873538
diff --git a/net-mail/dbmail/files/digest-dbmail-2.2.5_rc2 b/net-mail/dbmail/files/digest-dbmail-2.2.5_rc2
deleted file mode 100644
index bba303c6f3ee..000000000000
--- a/net-mail/dbmail/files/digest-dbmail-2.2.5_rc2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 db20bf6a04ae5d78eaf74d8c0142ffce dbmail-2.2.5rc2.tar.gz 879242
-RMD160 918394e580fb0f3bd0d36f387d4dc156ba5a8ef0 dbmail-2.2.5rc2.tar.gz 879242
-SHA256 58aec2309a1a7827ef36847aac25af04af081e2443f9df360411d2a1e727d14a dbmail-2.2.5rc2.tar.gz 879242
diff --git a/net-mail/dbmail/files/digest-dbmail-2.2.5_rc3 b/net-mail/dbmail/files/digest-dbmail-2.2.5_rc3
deleted file mode 100644
index 29658cf0109b..000000000000
--- a/net-mail/dbmail/files/digest-dbmail-2.2.5_rc3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 aa645b04fed7c0d851d9019f3e82bf2a dbmail-2.2.5rc3.tar.gz 883343
-RMD160 9a38733e8e56b28c49e8203bb31a03e62956b315 dbmail-2.2.5rc3.tar.gz 883343
-SHA256 5f6eb25cb71c7ef61d1a66df44ef5e6fdbb562e78be1caa76cc09bb99f8c9f3e dbmail-2.2.5rc3.tar.gz 883343
diff --git a/net-mail/dbmail/files/digest-dbmail-2.2.6_rc1 b/net-mail/dbmail/files/digest-dbmail-2.2.6_rc1
deleted file mode 100644
index bada6da0cd09..000000000000
--- a/net-mail/dbmail/files/digest-dbmail-2.2.6_rc1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 fc83b5891c6992008ea154b343c626ae dbmail-2.2.6-rc1.tar.gz 890856
-RMD160 b07854cb1cdd23137a421614fb2efaaddd6cf7f1 dbmail-2.2.6-rc1.tar.gz 890856
-SHA256 526713cb07d5d0678bb4468aeca785b9e8d4135e26ba5042705785572bfe8534 dbmail-2.2.6-rc1.tar.gz 890856
diff --git a/net-mail/dbmail/files/digest-dbmail-2.2.6_rc2 b/net-mail/dbmail/files/digest-dbmail-2.2.6_rc2
deleted file mode 100644
index c18dbc86c8f7..000000000000
--- a/net-mail/dbmail/files/digest-dbmail-2.2.6_rc2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 eb9353ef9d8cf1ac72e15ec87ef589c5 dbmail-2.2.6-rc2.tar.gz 893389
-RMD160 a2cc23ebc3bfe3eef48eca73a14e242836e4c69f dbmail-2.2.6-rc2.tar.gz 893389
-SHA256 e61adb512a65ed386e0f57c2b451695df71db498796d3a80011a29f1802bfeca dbmail-2.2.6-rc2.tar.gz 893389
diff --git a/net-mail/dbmail/files/digest-dbmail-2.2.7_rc1 b/net-mail/dbmail/files/digest-dbmail-2.2.7_rc1
deleted file mode 100644
index 50a3c235429b..000000000000
--- a/net-mail/dbmail/files/digest-dbmail-2.2.7_rc1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 da3322c60a47118d1356d6f2c3a7a556 dbmail-2.2.7-rc1.tar.gz 893945
-RMD160 50f400e9c09a6f3f353ecfd9fc27e21a7d7a499d dbmail-2.2.7-rc1.tar.gz 893945
-SHA256 62a0b61b32f1aa9b86a9555cf9ce92114eec05074ac357551e9ff72888dea4bd dbmail-2.2.7-rc1.tar.gz 893945