cleanout + fix for bug 205448

(Portage version: 2.1.4.1)

10 files changed, 41 insertions, 522 deletions

diff --git a/net-mail/dbmail/ChangeLog b/net-mail/dbmail/ChangeLog
index 2a9040bc8ee6..d978ca417646 100644
--- a/net-mail/dbmail/ChangeLog
+++ b/net-mail/dbmail/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/dbmail
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/ChangeLog,v 1.20 2008/02/12 10:19:41 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/ChangeLog,v 1.21 2008/02/13 07:50:33 lordvan Exp $
+
+  13 Feb 2008; Thomas Raschbacher <lordvan@gentoo.org> -dbmail-2.2.5.ebuild,
+  -dbmail-2.2.7_rc2.ebuild, -dbmail-2.2.7_rc3.ebuild,
+  -dbmail-2.2.7_rc4.ebuild, dbmail-2.2.7.ebuild, -dbmail-2.2.8_rc1.ebuild,
+  dbmail-2.2.8.ebuild, dbmail-2.2.9.ebuild, dbmail-2.3.2.ebuild:
+  cleanout of old rcX ebuilds and fixes bug 205448 (thanks to Evil Compile
+  Person <bugs@dev.gentooexperimental.org> for pointing this out)
 
 *dbmail-2.3.2 (12 Feb 2008)
 *dbmail-2.2.9 (12 Feb 2008)
diff --git a/net-mail/dbmail/dbmail-2.2.5.ebuild b/net-mail/dbmail/dbmail-2.2.5.ebuild
deleted file mode 100644
index c910eb9eaec3..000000000000
--- a/net-mail/dbmail/dbmail-2.2.5.ebuild
+++ /dev/null
@@ -1,102 +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.ebuild,v 1.2 2007/10/10 12:29:07 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 )
-	ldap? ( >=net-nds/openldap-2.3.33 )
-	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.ebuild b/net-mail/dbmail/dbmail-2.2.7.ebuild
index 48144f4ac633..7f282e554ef9 100644
--- a/net-mail/dbmail/dbmail-2.2.7.ebuild
+++ b/net-mail/dbmail/dbmail-2.2.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.ebuild,v 1.3 2007/11/14 04:15:17 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/dbmail-2.2.7.ebuild,v 1.4 2008/02/13 07:50:33 lordvan Exp $
 
 inherit eutils
 
@@ -12,13 +12,14 @@ SRC_URI="http://www.dbmail.org/download/2.2/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+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 )
+	!mysql? ( !postgres? ( !sqlite? ( >=dev-db/sqlite-3.0 ) ) )
 	sieve? ( >=mail-filter/libsieve-2.2.1 )
 	ldap? ( >=net-nds/openldap-2.3.33 )
 	app-text/asciidoc
@@ -85,6 +86,11 @@ pkg_postinst() {
 	elog "for finishing configuration to connect to your MTA and "
 	elog "to connect to your db."
 	echo
+	elog "DBMail requires either SQLite3, PostgreSQL or MySQL."
+	elog "If none of the use-flags are specified SQLite3 is"
+	elog "used as default. To use another database please"
+	elog "specify the appropriate use-flag and re-emerge dbmail."
+	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."
diff --git a/net-mail/dbmail/dbmail-2.2.7_rc2.ebuild b/net-mail/dbmail/dbmail-2.2.7_rc2.ebuild
deleted file mode 100644
index 4ffd091ec38f..000000000000
--- a/net-mail/dbmail/dbmail-2.2.7_rc2.ebuild
+++ /dev/null
@@ -1,102 +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_rc2.ebuild,v 1.6 2007/11/02 04:35:25 beandog 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 )
-	ldap? ( >=net-nds/openldap-2.3.33 )
-	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_rc3.ebuild b/net-mail/dbmail/dbmail-2.2.7_rc3.ebuild
deleted file mode 100644
index e616540face6..000000000000
--- a/net-mail/dbmail/dbmail-2.2.7_rc3.ebuild
+++ /dev/null
@@ -1,102 +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_rc3.ebuild,v 1.1 2007/10/12 09:44:49 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 )
-	ldap? ( >=net-nds/openldap-2.3.33 )
-	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_rc4.ebuild b/net-mail/dbmail/dbmail-2.2.7_rc4.ebuild
deleted file mode 100644
index f46f17376899..000000000000
--- a/net-mail/dbmail/dbmail-2.2.7_rc4.ebuild
+++ /dev/null
@@ -1,102 +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_rc4.ebuild,v 1.1 2007/10/31 11:05:18 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 )
-	ldap? ( >=net-nds/openldap-2.3.33 )
-	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.8.ebuild b/net-mail/dbmail/dbmail-2.2.8.ebuild
index d49b98cd6f87..7ff130ba8810 100644
--- a/net-mail/dbmail/dbmail-2.2.8.ebuild
+++ b/net-mail/dbmail/dbmail-2.2.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/dbmail-2.2.8.ebuild,v 1.1 2007/12/18 13:39:08 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/dbmail-2.2.8.ebuild,v 1.2 2008/02/13 07:50:33 lordvan Exp $
 
 inherit eutils
 
@@ -19,6 +19,7 @@ DEPEND="ssl? ( dev-libs/openssl )
 	postgres? ( >=dev-db/postgresql-7.4 )
 	mysql? ( >=virtual/mysql-4.1 )
 	sqlite3? ( >=dev-db/sqlite-3.0 )
+	!mysql? ( !postgres? ( !sqlite? ( >=dev-db/sqlite-3.0 ) ) )
 	sieve? ( >=mail-filter/libsieve-2.2.1 )
 	ldap? ( >=net-nds/openldap-2.3.33 )
 	app-text/asciidoc
@@ -85,6 +86,11 @@ pkg_postinst() {
 	elog "for finishing configuration to connect to your MTA and "
 	elog "to connect to your db."
 	echo
+	elog "DBMail requires either SQLite3, PostgreSQL or MySQL."
+	elog "If none of the use-flags are specified SQLite3 is"
+	elog "used as default. To use another database please"
+	elog "specify the appropriate use-flag and re-emerge dbmail."
+	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."
diff --git a/net-mail/dbmail/dbmail-2.2.8_rc1.ebuild b/net-mail/dbmail/dbmail-2.2.8_rc1.ebuild
deleted file mode 100644
index 47d1a86c9579..000000000000
--- a/net-mail/dbmail/dbmail-2.2.8_rc1.ebuild
+++ /dev/null
@@ -1,102 +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/dbmail/dbmail-2.2.8_rc1.ebuild,v 1.2 2008/01/23 09:05:27 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 )
-	ldap? ( >=net-nds/openldap-2.3.33 )
-	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.9.ebuild b/net-mail/dbmail/dbmail-2.2.9.ebuild
index 433f53cb10e6..7269d986a997 100644
--- a/net-mail/dbmail/dbmail-2.2.9.ebuild
+++ b/net-mail/dbmail/dbmail-2.2.9.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/dbmail/dbmail-2.2.9.ebuild,v 1.1 2008/02/12 10:19:41 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/dbmail-2.2.9.ebuild,v 1.2 2008/02/13 07:50:33 lordvan Exp $
 
 inherit eutils
 
@@ -19,6 +19,7 @@ DEPEND="ssl? ( dev-libs/openssl )
 	postgres? ( >=dev-db/postgresql-7.4 )
 	mysql? ( >=virtual/mysql-4.1 )
 	sqlite3? ( >=dev-db/sqlite-3.0 )
+	!mysql? ( !postgres? ( !sqlite? ( >=dev-db/sqlite-3.0 ) ) )
 	sieve? ( >=mail-filter/libsieve-2.2.1 )
 	ldap? ( >=net-nds/openldap-2.3.33 )
 	app-text/asciidoc
@@ -85,6 +86,11 @@ pkg_postinst() {
 	elog "for finishing configuration to connect to your MTA and "
 	elog "to connect to your db."
 	echo
+	elog "DBMail requires either SQLite3, PostgreSQL or MySQL."
+	elog "If none of the use-flags are specified SQLite3 is"
+	elog "used as default. To use another database please"
+	elog "specify the appropriate use-flag and re-emerge dbmail."
+	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."
diff --git a/net-mail/dbmail/dbmail-2.3.2.ebuild b/net-mail/dbmail/dbmail-2.3.2.ebuild
index 49206a01a0fa..6fa72d818882 100644
--- a/net-mail/dbmail/dbmail-2.3.2.ebuild
+++ b/net-mail/dbmail/dbmail-2.3.2.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/dbmail/dbmail-2.3.2.ebuild,v 1.2 2008/02/12 16:31:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/dbmail-2.3.2.ebuild,v 1.3 2008/02/13 07:50:33 lordvan Exp $
 
 inherit eutils
 
@@ -8,18 +8,18 @@ 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.3/${MY_P}.tar.gz"
+SRC_URI="http://www.dbmail.org/download/2.2/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-#unstable version hard mask for now.
-KEYWORDS="-amd64 -x86"
+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 )
+	!mysql? ( !postgres? ( !sqlite? ( >=dev-db/sqlite-3.0 ) ) )
 	sieve? ( >=mail-filter/libsieve-2.2.1 )
 	ldap? ( >=net-nds/openldap-2.3.33 )
 	app-text/asciidoc
@@ -28,7 +28,6 @@ DEPEND="ssl? ( dev-libs/openssl )
 	>=dev-libs/gmime-2.1.18
 	>=dev-libs/glib-2.8
 	>=app-crypt/mhash-0.9.9-r1"
-#only tested with that version of mhash
 
 S=${WORKDIR}/${P/_/-}
 
@@ -88,6 +87,11 @@ pkg_postinst() {
 	elog "for finishing configuration to connect to your MTA and "
 	elog "to connect to your db."
 	echo
+	elog "DBMail requires either SQLite3, PostgreSQL or MySQL."
+	elog "If none of the use-flags are specified SQLite3 is"
+	elog "used as default. To use another database please"
+	elog "specify the appropriate use-flag and re-emerge dbmail."
+	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."