cleanout + fix for bug 205448

Package-Manager: portage-2.1.4.1

11 files changed, 46 insertions, 537 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/Manifest b/net-mail/dbmail/Manifest
index 4d15765c2058..11b1a36af664 100644
--- a/net-mail/dbmail/Manifest
+++ b/net-mail/dbmail/Manifest
@@ -2,23 +2,13 @@ AUX dbmail-imapd.initd 730 RMD160 c6da3a0cda2e767853c0c3239287dd347bed6ccc SHA1
 AUX dbmail-lmtpd.initd 730 RMD160 c0d1d8dee950e7e30deddd5df9772881154430db SHA1 60a1a2e8828cfbb3ef48e38a472f4ddc01c3cfb1 SHA256 2aedd5fecc1ef28289c870030c31f8ecaded4f2651be355a40216262a8a4d4a3
 AUX dbmail-pop3d.initd 730 RMD160 f8376e0dfa1a721cd4d99b3797f92c4c30285fd8 SHA1 35c6b6e2f40e42b61e3add7f4f4d5f231904c851 SHA256 2b1ee1f7491e6fb94f0d9a6a1424ff3cba66b2880d6bc1d50f008da8be0a7c52
 AUX dbmail-timsieved.initd 744 RMD160 0b733fba999532536b07a9ec5b572c362ed96f08 SHA1 5076a33925b43898e6f12cdc1c73e76fa406d6b8 SHA256 572358fcddea2981f29cd267c55e6de8e840f5442bcc8520ad40edfaed71577d
-DIST dbmail-2.2.5.tar.gz 883843 RMD160 e78f7c669352f0c8b8f3de70f2a6921249b6cb3c SHA1 0b959c9ab97a01e7a3f9be0d6823cf14c64454a3 SHA256 e5dc9ae6bf70d5930cdb609cb72db98251163cc95b8a73fb06fc66f89f9460e0
-DIST dbmail-2.2.7-rc2.tar.gz 894380 RMD160 ef1299c748c3fb9349f8ed9d56a64674761053a0 SHA1 13bbf507ce1312d10e15fe5338511686a4a99daa SHA256 6676a982a406f96a5a8e809ec576f9b04cebdf8326ef4311f5bfb1ed1fb584d8
-DIST dbmail-2.2.7-rc3.tar.gz 895413 RMD160 9c6a04f3b45a93dc67b2a8f82fbe1232fe1b057e SHA1 8d119697641b6bbc80da3bd72e937afe185e059d SHA256 c11baccc1c888ae8de0274b4fc08dc1c8fd079b182e6a0481cb8524b48b98f18
-DIST dbmail-2.2.7-rc4.tar.gz 896482 RMD160 c6ad3ffd13482159321f943403c7009a73d32cdd SHA1 871e650f0c51928128e99ad636cbb9022f2a91da SHA256 1302dc5ac6e28035e41f38a20e914b2f77e25232d7b6e4a8e8ed9cb76b48e654
 DIST dbmail-2.2.7.tar.gz 895586 RMD160 aac1d5a7d049b7384455b37e8380d4e57eae5164 SHA1 15d3bbd945ee09fdc36da6f988f2b4723bd1cc28 SHA256 9e2ab6d45eb841fc08b8d38a1a08fb95b3fdeae3fbc00c50b8acba624ff565e6
 DIST dbmail-2.2.8.tar.gz 898224 RMD160 ad740224581ee753354a629514ef09c42b06adaa SHA1 83927a431d8c7da47ab004ea4839dfe432095fab SHA256 d23649a9ccea9086943000fe7a74cead38544a2d19e721995772dcc57a4f5aeb
-DIST dbmail-2.2.8rc1.tar.gz 896965 RMD160 6786b529b84487b1e9c223d6002b827121a7139c SHA1 1dfdeb49671fae08eb76aea56819265176e99bb5 SHA256 bfb188de9eb9675b7fe430bee4ba14a09c2e08d68dfef8e9fce583eb8b6285cc
 DIST dbmail-2.2.9.tar.gz 900072 RMD160 f4b2f29d6890556c85a2b801737e8a5aa0642490 SHA1 c7ea4bb1de94794493f2f157b292cb8fb6084354 SHA256 f6a222b142f4aa05f8b458acda50022ec85c6ec46b78658a414d6e7055b2bb84
 DIST dbmail-2.3.2.tar.gz 921616 RMD160 491008d66f9431ea66d2a79eb8fbf4215187adb3 SHA1 61578397f4a90f4f1d4bdc5c5a0574d36db96c49 SHA256 38739e32e209d30c8c4efdde4a7737d4c40fb36dd30b0e2dfd65993843b39fcb
-EBUILD dbmail-2.2.5.ebuild 3159 RMD160 54f9936a43da681aaec0801d11c7d81fa9068b80 SHA1 79b03c894d14a264f35cb15c58d8f9ed0f0f07ee SHA256 c740f1c231d7cc76b94b796da19a73401b3c8aab171565623a131097e1639ea0
-EBUILD dbmail-2.2.7.ebuild 3159 RMD160 53c29a4870f7211bca2ace7d502aa3ff97d7fbef SHA1 a971679151a42874b69f41d5c3512814424c7e57 SHA256 d8e4c4092a36388b3b9d352e049a4929a4b788edabfb493622daef266b8b7337
-EBUILD dbmail-2.2.7_rc2.ebuild 3163 RMD160 8095b7fe0e6d27fde19e091ea36a86dcbfa50078 SHA1 e83bc2564570f09985bb1b7561c6b9d11cad3b7a SHA256 70be76b1c7d19f630abb1bf19350b0024d6ac41453b276d26a0d6c9890df4178
-EBUILD dbmail-2.2.7_rc3.ebuild 3165 RMD160 4c58c7c4b7fbe9e52ccd77512e38c3cd3bbbe4b9 SHA1 7c0930d02b70df29a5517a9dcb4cbd9ee46ebd94 SHA256 98476e127579546ed4a823b679ee8163d74003b2abb8bcb577c2f29d30176721
-EBUILD dbmail-2.2.7_rc4.ebuild 3165 RMD160 fdbf36096fc88854e498a34ef3542a6174f93c9f SHA1 0372068acc8a33a493067bd7cc22bbcf88390b11 SHA256 65076c59c303025f4eb4c39a4f40d38af6f40477107162f12e5cd21147b50785
-EBUILD dbmail-2.2.8.ebuild 3160 RMD160 31ed20266d50b27f7ce9c728fdf32f863e796612 SHA1 82af6fffad38a0eab81c650942d6d652e9ad26a2 SHA256 bdfcfa3d6c2bad3d96d849bb4ef135887aba7f41539a4aff85f0be89a6f9dfe8
-EBUILD dbmail-2.2.8_rc1.ebuild 3163 RMD160 45834f939dcbc90348d3f1db7908a664dfd9d498 SHA1 415dedfb8e6f51d1b35e58cdfcde7117a78ef8b7 SHA256 ae07049d85b11d961163e9a840c86142b6b74efdb16602012e8186f1914e2e2d
-EBUILD dbmail-2.2.9.ebuild 3160 RMD160 4080e3f7905e25d7fd49d82d7cf73064ef78e759 SHA1 d40b859ee071cf38082b441d33e53cc187a18e89 SHA256 e705bd8d30326fec4a720d6f5a2c97df6cc8b78792900e9eec1b5a2769848023
-EBUILD dbmail-2.3.2.ebuild 3267 RMD160 85d6ea03ea4d9160993f123db3cb3163d91097fc SHA1 4e42a4c00e7325d1ed88930449cc8418076ef741 SHA256 b67901a9efcd4ae61967280680c8a0a35f031f8208f1f15b66422f3afd55847e
-MISC ChangeLog 3853 RMD160 47ba70ab1993cb06ce7ef1bd47b5776b9d376970 SHA1 9756ec279f728bff0f69d3b214c3e1a3e1a31a77 SHA256 148039ac0b355d97ffa6aad21027050de5557990c8226777e0bdd6d2f3674585
+EBUILD dbmail-2.2.7.ebuild 3466 RMD160 c17e5f68954d5ca3556e617c51f3034c64906a5a SHA1 dd67e923d4d5c8b565dc06dcbf1516df27aab802 SHA256 d693ffbf389ff123a451a6d2f914c5928db2bbd6e137b25000015991b2ca6630
+EBUILD dbmail-2.2.8.ebuild 3465 RMD160 17234e351fa4e00dd5ba4a80f43e867ca2cc9179 SHA1 127eb5f87b0727cbed08ba55bbc4ffe8975c2077 SHA256 0713913c3d568b66fcdb67ab3fd22cae39527567705b633f70768ffe39178a73
+EBUILD dbmail-2.2.9.ebuild 3465 RMD160 2110bfa140e111ec06c011c1d7fb120059986bcc SHA1 dfced22dd6020b50704750cf1dc446d7c101da61 SHA256 6f6d0406c222aa1b150163e783e2ec08ef28ff11e010d9618eb9bb0de2baf8b6
+EBUILD dbmail-2.3.2.ebuild 3493 RMD160 3608667d96bb48edc63e04149929d53f06a9ce68 SHA1 b1a782c6dcdf3769d7fd0092d04399668526a12b SHA256 ead1ad932b9a0cfa7663b076aa8a4143bf5e33a2b18c93100478a065a437e9cb
+MISC ChangeLog 4266 RMD160 a230e89e29c127233dc53c7dfd405e771f7f13d2 SHA1 3244209f278b64581d85d7f9c9a64395f9ac0e24 SHA256 1a124b34844adae0b4a975d38c904ef711fba2e099462395cb3ac45a99fcb4c0
 MISC metadata.xml 491 RMD160 7c82ebc22fb7f11153131770cb2da0c631e15166 SHA1 adbd2335fd20c417175644e3218d9f7d69a015c5 SHA256 970aa28bc8d7f62212d3e1fee873b8353cc5240d9d2233c9397492fb714f29eb
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."