removed some old versions, added 2.3.4 and fixed bug 239670 (see ChangeLog for credits)

Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.24-gentoo-r3 x86_64

10 files changed, 26 insertions, 454 deletions

diff --git a/net-mail/dbmail/ChangeLog b/net-mail/dbmail/ChangeLog
index eedad632edee..da0baa8034da 100644
--- a/net-mail/dbmail/ChangeLog
+++ b/net-mail/dbmail/ChangeLog
@@ -1,6 +1,17 @@
 # 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.31 2008/11/06 15:02:37 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/ChangeLog,v 1.32 2008/12/01 12:38:03 lordvan Exp $
+
+*dbmail-2.3.4 (01 Dec 2008)
+
+  01 Dec 2008; Thomas Raschbacher <lordvan@gentoo.org> -dbmail-2.2.7.ebuild,
+  -dbmail-2.2.8.ebuild, dbmail-2.2.9.ebuild, dbmail-2.2.10.ebuild,
+  -dbmail-2.2.11_rc1.ebuild, dbmail-2.2.11_rc3.ebuild, -dbmail-2.3.2.ebuild,
+  -dbmail-2.3.3.ebuild, +dbmail-2.3.4.ebuild:
+  removed 2.2.7 and 2.2.8
+  removed old rc and old dev versions. fixed bug 239670 (thanks to Evil
+  Compile Person <bugs@dev.gentooexperimental.org> and tove@gentoo.org)
+  added 2.3.4
 
   06 Nov 2008; Thomas Raschbacher <lordvan@gentoo.org> ChangeLog:
   added 2.2.11 rc3
diff --git a/net-mail/dbmail/Manifest b/net-mail/dbmail/Manifest
index e88f2dac3435..bb5c88c1b7d0 100644
--- a/net-mail/dbmail/Manifest
+++ b/net-mail/dbmail/Manifest
@@ -3,20 +3,12 @@ AUX dbmail-lmtpd.initd 730 RMD160 c0d1d8dee950e7e30deddd5df9772881154430db SHA1
 AUX dbmail-pop3d.initd 730 RMD160 f8376e0dfa1a721cd4d99b3797f92c4c30285fd8 SHA1 35c6b6e2f40e42b61e3add7f4f4d5f231904c851 SHA256 2b1ee1f7491e6fb94f0d9a6a1424ff3cba66b2880d6bc1d50f008da8be0a7c52
 AUX dbmail-timsieved.initd 716 RMD160 563e506fd21e97bc722aee4b0ccfe59846713440 SHA1 b1f93ac69a423d3a43cc1d5ffc942f58b60d6877 SHA256 c92cd221b37391703ec7aaff2eb3b33ed2b9b699a281f318f54ba6efd6e69224
 DIST dbmail-2.2.10.tar.gz 900636 RMD160 64eaa94824fe27f485de7bb8578c8656c4417e22 SHA1 421c39e49669677a4876f4faf57bbec14b4cd348 SHA256 f890167073498d87ea0ce374af2cf0498cfd7aa1af7aeb330726d1910de951b6
-DIST dbmail-2.2.11-rc1.tar.gz 900883 RMD160 37c4b85dac754f67520acfe1b3a79b6001a5ecdd SHA1 b43649abbb3079c4ec7793ef3b75a55fe59c217b SHA256 628dc9681339361f799dbdd8648689891ae76f0a1946e6d62ae4905bfdc50af3
 DIST dbmail-2.2.11-rc3.tar.gz 900334 RMD160 9b80bd24974fa70c451c569836880e2682f0dc83 SHA1 2e38e5781e419f914e497b2296ac8c7c32c79cdc SHA256 544e6d77010dc4f096a0542b6f760572b7b1099c561e024c8e43937b0f08eedc
-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.9.tar.gz 900072 RMD160 f4b2f29d6890556c85a2b801737e8a5aa0642490 SHA1 c7ea4bb1de94794493f2f157b292cb8fb6084354 SHA256 f6a222b142f4aa05f8b458acda50022ec85c6ec46b78658a414d6e7055b2bb84
-DIST dbmail-2.3.2.tar.gz 921616 RMD160 491008d66f9431ea66d2a79eb8fbf4215187adb3 SHA1 61578397f4a90f4f1d4bdc5c5a0574d36db96c49 SHA256 38739e32e209d30c8c4efdde4a7737d4c40fb36dd30b0e2dfd65993843b39fcb
-DIST dbmail-2.3.3.tar.gz 889218 RMD160 947653cd449037d99b70a30fa2ae71f7dfb54c49 SHA1 f6c42a4dc8d0cb402a9921ccdc0a231f2d2ca3d7 SHA256 9dd41b2910650661d1f439d21f2eee7d9ef4dc2043637d53eccaa7f52ae929cc
-EBUILD dbmail-2.2.10.ebuild 3468 RMD160 44e8c9088fa312855e1abb703df5eacebeb9f244 SHA1 11694fd9b42369ab6f7e6c88f29269070bc86f7e SHA256 9f90e580f78bd65bac4e939dbab3f6c463f70da5473d90665bbe3866e87768f0
-EBUILD dbmail-2.2.11_rc1.ebuild 3512 RMD160 7a75c7776f05ec45e808a46b447b89e881f9a2f0 SHA1 f37b1961aa55b1ab16e9532f6f8403a2b0413502 SHA256 7466ad4d15f77b1a174a1322928f9ab0851a59047c38898ed6c8b72be83a6027
-EBUILD dbmail-2.2.11_rc3.ebuild 3516 RMD160 d9bf0ad752fbe8ffcfd50dbb4c5d6c367463d49a SHA1 87f700ec34d14a564796ed331cd8e2f5d6991239 SHA256 e7c39ca2d3c888792ea13ae746d713789f5e5436e8f17f286b0c0cb113d01fc3
-EBUILD dbmail-2.2.7.ebuild 3468 RMD160 227852908993094e6e81e702e7f1f6c4fc5d1c2a SHA1 4600dff9fdf5cd9ad2a46577bdd01ca6e8ea2c43 SHA256 4afad0b22096c9d11cb2b1142cc4ddbde6d710a41ad54636046236cc32a35862
-EBUILD dbmail-2.2.8.ebuild 3465 RMD160 f8b9ef2b695ba31061d70f7986910c4188f9f9a3 SHA1 99231fc16ab57f01d0f1625c72cad8ed3f656444 SHA256 54b6dee277a12a55d201d0717848416381d129efd0b8895fa9aa75faa0f3f57d
-EBUILD dbmail-2.2.9.ebuild 3465 RMD160 e2ac3743c9f4be6396a48d688c8519661d76f331 SHA1 cc74e112b738f3a408ba2cdd47f8e80e6a5dd3bf SHA256 182d7303b301b6ce16ce36bd9a18229c57b994354294dd65f9bfb6ffb24523a5
-EBUILD dbmail-2.3.2.ebuild 3553 RMD160 77aaf99f1bda723317b79446ec76326dab13518b SHA1 dc5d62e5a4d81c788d1a9361c59f7ca593613098 SHA256 e1e8cd98af1053ff4b17d71bf39bcc69365f06befcd6178ff3980a09413b5703
-EBUILD dbmail-2.3.3.ebuild 3553 RMD160 a4a62a2772234fbe022b7ea49cda627d1b430870 SHA1 8a211126ca8f3e59ebfc5752e1d1fa1ea5879517 SHA256 84ebf723fed4ca76cedb207316fae274a63cd8bba9a72ec164a07152c3720d11
-MISC ChangeLog 6093 RMD160 b448e4e22ba5c8ff6521e5192ada73f5cb508a99 SHA1 5e6a5c45cabc49ac61e7aee9be34017887f7d4fb SHA256 87d0e0baa7d1801d78a180ac43e5f6b15c0042e13b8323d5e522cb102358ccbf
+DIST dbmail-2.3.4.tar.gz 894841 RMD160 5846ee396916f9f46165e79ff0926e105d357091 SHA1 191c147be930ba9c81689aa7c6e138d180fcbe34 SHA256 86523cfb2511d5e004a8f5a3f6581aa41752ff178507c4dac206e4c8414b51ce
+EBUILD dbmail-2.2.10.ebuild 3564 RMD160 40b53b456c03e9a70672cc64ada03b5c33641c97 SHA1 a9502150f6f6a402cd39f94e2740bdedeb1f8982 SHA256 46c740834bfbb5b2e36eedebe16a5fd66847e11a9f4cba4fcba38d1233dc512e
+EBUILD dbmail-2.2.11_rc3.ebuild 3608 RMD160 997844ab949027d8ff97ace63f1bb343cd8b1c4e SHA1 260c5e0abc17647030cf84b83ad01075bb6f773f SHA256 43af8362b3f4e04fb433ffdd4bbab747c032034ea06823d364a1ef2363817873
+EBUILD dbmail-2.2.9.ebuild 3561 RMD160 a4358b41534f1f3544f09b415ae4769a60255302 SHA1 3f503f4cac7fe697b194ca40600142af1bf10196 SHA256 88f5dbd1e016c480b3c4da853f22d032faaf7b360f8e6fcd594e1cc627f0bae1
+EBUILD dbmail-2.3.4.ebuild 3649 RMD160 2288b129a2cd2836e2dfdaac221e901981e893c3 SHA1 b410bff97b9248199445c04348370067b0c8b3c0 SHA256 a7b2fba3cd016a2549359eacc5dd59017797a9bb139b554814b62e181b1e6d18
+MISC ChangeLog 6574 RMD160 37ccc31b613752259f0320523bdb73efd9a5ca8d SHA1 3c5d996d62f0bf3d61420a662f2f1c459667b075 SHA256 5ca28b4a9cc2ddc4f22ad3749554cd7bf2fec832949c050935f8ec269b3a9046
 MISC metadata.xml 580 RMD160 e824692f7f60c50f5afffb04e3ef2eb47c44efaf SHA1 96720e52cc8f2387b57f3db2e55e87a660aa1815 SHA256 8a14856cce888d8658e3ea9388e18a9b6892c6e00fd478c1afd4c5f496dccc14
diff --git a/net-mail/dbmail/dbmail-2.2.10.ebuild b/net-mail/dbmail/dbmail-2.2.10.ebuild
index 45713dbd8420..5f8cfad82737 100644
--- a/net-mail/dbmail/dbmail-2.2.10.ebuild
+++ b/net-mail/dbmail/dbmail-2.2.10.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.10.ebuild,v 1.3 2008/10/11 23:07:47 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/dbmail-2.2.10.ebuild,v 1.4 2008/12/01 12:38:03 lordvan Exp $
 
 inherit eutils
 
@@ -37,6 +37,7 @@ pkg_setup() {
 
 src_compile() {
 	use sqlite3 && myconf="--with-sqlite"
+	if !use postgres && !use mysql && !use sqlite3; then myconf="${myconf} --with-sqlite" ; fi
 	use ldap && myconf=${myconf}" --with-auth-ldap"
 
 	econf \
diff --git a/net-mail/dbmail/dbmail-2.2.11_rc1.ebuild b/net-mail/dbmail/dbmail-2.2.11_rc1.ebuild
deleted file mode 100644
index db3918a6709b..000000000000
--- a/net-mail/dbmail/dbmail-2.2.11_rc1.ebuild
+++ /dev/null
@@ -1,108 +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.11_rc1.ebuild,v 1.2 2008/10/11 23:07:47 eva Exp $
-
-inherit eutils
-
-MY_P="${P/_/-}" # for rcX was without the - for versions < 2.2.6
-#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? ( >=virtual/postgresql-server-7.4 )
-	mysql? ( >=virtual/mysql-4.1 )
-	sqlite3? ( >=dev-db/sqlite-3.0 )
-	!mysql? ( !postgres? ( !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.2*
-	>=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 "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."
-	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.11_rc3.ebuild b/net-mail/dbmail/dbmail-2.2.11_rc3.ebuild
index 9493aba10086..d344cb07c537 100644
--- a/net-mail/dbmail/dbmail-2.2.11_rc3.ebuild
+++ b/net-mail/dbmail/dbmail-2.2.11_rc3.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.11_rc3.ebuild,v 1.1 2008/11/06 15:02:37 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/dbmail-2.2.11_rc3.ebuild,v 1.2 2008/12/01 12:38:03 lordvan Exp $
 
 inherit eutils
 
@@ -37,6 +37,7 @@ pkg_setup() {
 
 src_compile() {
 	use sqlite3 && myconf="--with-sqlite"
+	if !use postgres && !use mysql && !use sqlite3; then myconf="${myconf} --with-sqlite" ; fi
 	use ldap && myconf=${myconf}" --with-auth-ldap"
 
 	econf \
diff --git a/net-mail/dbmail/dbmail-2.2.7.ebuild b/net-mail/dbmail/dbmail-2.2.7.ebuild
deleted file mode 100644
index 0a6c5b210d6a..000000000000
--- a/net-mail/dbmail/dbmail-2.2.7.ebuild
+++ /dev/null
@@ -1,108 +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.7.ebuild,v 1.7 2008/10/11 23:07:47 eva 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? ( >=virtual/postgresql-server-7.4 )
-	mysql? ( >=virtual/mysql-4.1 )
-	sqlite3? ( >=dev-db/sqlite-3.0 )
-	!mysql? ( !postgres? ( !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.2*
-	>=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 "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."
-	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
deleted file mode 100644
index 54ea7cd4f265..000000000000
--- a/net-mail/dbmail/dbmail-2.2.8.ebuild
+++ /dev/null
@@ -1,108 +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.ebuild,v 1.7 2008/10/11 23:07:47 eva 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? ( >=virtual/postgresql-server-7.4 )
-	mysql? ( >=virtual/mysql-4.1 )
-	sqlite3? ( >=dev-db/sqlite-3.0 )
-	!mysql? ( !postgres? ( !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.2*
-	>=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 "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."
-	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 da16e7b2dba8..1b1a549715da 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.6 2008/10/11 23:07:47 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/dbmail-2.2.9.ebuild,v 1.7 2008/12/01 12:38:03 lordvan Exp $
 
 inherit eutils
 
@@ -37,6 +37,7 @@ pkg_setup() {
 
 src_compile() {
 	use sqlite3 && myconf="--with-sqlite"
+	if !use postgres && !use mysql && !use sqlite3; then myconf="${myconf} --with-sqlite" ; fi
 	use ldap && myconf=${myconf}" --with-auth-ldap"
 
 	econf \
diff --git a/net-mail/dbmail/dbmail-2.3.2.ebuild b/net-mail/dbmail/dbmail-2.3.2.ebuild
deleted file mode 100644
index 2f263419a073..000000000000
--- a/net-mail/dbmail/dbmail-2.3.2.ebuild
+++ /dev/null
@@ -1,111 +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.3.2.ebuild,v 1.8 2008/10/11 23:07:47 eva 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.3/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-x86 -amd64"
-IUSE="ldap mysql postgres sieve sqlite3 ssl static"
-
-DEPEND="ssl? ( dev-libs/openssl )
-	postgres? ( >=virtual/postgresql-server-7.4 )
-	mysql? ( >=virtual/mysql-4.1 )
-	sqlite3? ( >=dev-db/sqlite-3.0 )
-	!mysql? ( !postgres? ( !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.2*
-	>=dev-libs/glib-2.8
-	>=app-crypt/mhash-0.9.9-r1"
-
-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 "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."
-	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."
-
-	ewarn "This is a Development release. use at own risk."
-}
diff --git a/net-mail/dbmail/dbmail-2.3.3.ebuild b/net-mail/dbmail/dbmail-2.3.4.ebuild
index 75d217d2956f..81150eacda57 100644
--- a/net-mail/dbmail/dbmail-2.3.3.ebuild
+++ b/net-mail/dbmail/dbmail-2.3.4.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.3.ebuild,v 1.2 2008/10/11 23:07:47 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/dbmail-2.3.4.ebuild,v 1.1 2008/12/01 12:38:03 lordvan Exp $
 
 inherit eutils
 
@@ -38,6 +38,7 @@ pkg_setup() {
 
 src_compile() {
 	use sqlite3 && myconf="--with-sqlite"
+	if !use postgres && !use mysql && !use sqlite3; then myconf="${myconf} --with-sqlite" ; fi
 	use ldap && myconf=${myconf}" --with-auth-ldap"
 
 	econf \