fixed bug #251392, removed old and devel versions

migrated to new python_get* instead of PYVER,..
bump to 2.2.15
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

8 files changed, 47 insertions, 374 deletions

diff --git a/net-mail/dbmail/ChangeLog b/net-mail/dbmail/ChangeLog
index 1e5e102fb950..b05c0e541809 100644
--- a/net-mail/dbmail/ChangeLog
+++ b/net-mail/dbmail/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-mail/dbmail
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/ChangeLog,v 1.37 2010/01/04 02:55:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/ChangeLog,v 1.38 2010/03/28 20:33:23 lordvan Exp $
+
+*dbmail-2.2.15 (28 Mar 2010)
+
+  28 Mar 2010; <lordvan@gentoo.org> dbmail-2.2.9.ebuild,
+  -dbmail-2.2.10.ebuild, -dbmail-2.2.11_rc3.ebuild,
+  -dbmail-2.2.11_rc3-r1.ebuild, dbmail-2.2.11.ebuild, +dbmail-2.2.15.ebuild,
+  -dbmail-2.3.4.ebuild:
+  fixed bug #251392 (sqlite3 -> sqlite)
+  added 2.2.15, removed 2.2.11_rc3*, removed 2.3.*
 
   04 Jan 2010; Diego E. Pettenò <flameeyes@gentoo.org> dbmail-2.2.9.ebuild,
   dbmail-2.2.10.ebuild, dbmail-2.2.11_rc3.ebuild,
diff --git a/net-mail/dbmail/Manifest b/net-mail/dbmail/Manifest
index d12cd503fb3d..c1c3c11ca165 100644
--- a/net-mail/dbmail/Manifest
+++ b/net-mail/dbmail/Manifest
@@ -2,16 +2,11 @@ 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 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-rc3.tar.gz 900334 RMD160 9b80bd24974fa70c451c569836880e2682f0dc83 SHA1 2e38e5781e419f914e497b2296ac8c7c32c79cdc SHA256 544e6d77010dc4f096a0542b6f760572b7b1099c561e024c8e43937b0f08eedc
 DIST dbmail-2.2.11.tar.gz 901705 RMD160 e8a506b850d1610b66059b685b7a2318ce5e37a9 SHA1 7b9c19de7ca14d849e8388377b8aa941f3f3538b SHA256 7d61ce32b5f1cbbc42fa39e3c1cc10659c524a7d3135555efe4b272064939148
+DIST dbmail-2.2.15.tar.gz 875592 RMD160 b0f2beb37566b9b2a650b90f5d8f011c93cd8be5 SHA1 d8b036edc6c39586d326cfa5b1c615e2edc71ff9 SHA256 ca88e4a3bc1360b3621ffd8567103668a896ecb22102d3886ab5e59e7747217b
 DIST dbmail-2.2.9.tar.gz 900072 RMD160 f4b2f29d6890556c85a2b801737e8a5aa0642490 SHA1 c7ea4bb1de94794493f2f157b292cb8fb6084354 SHA256 f6a222b142f4aa05f8b458acda50022ec85c6ec46b78658a414d6e7055b2bb84
-DIST dbmail-2.3.4.tar.gz 894841 RMD160 5846ee396916f9f46165e79ff0926e105d357091 SHA1 191c147be930ba9c81689aa7c6e138d180fcbe34 SHA256 86523cfb2511d5e004a8f5a3f6581aa41752ff178507c4dac206e4c8414b51ce
-EBUILD dbmail-2.2.10.ebuild 3579 RMD160 ea6e8d8327dd7e47c3576f83d69a65590f812596 SHA1 5e834399b981bbc00516a0257138dd1c7bf16d24 SHA256 781ad1fbfb68ed6785a4605e6e1094e86a2c4f0711eaadc06a65024de79afee5
-EBUILD dbmail-2.2.11.ebuild 5034 RMD160 c2a43b15e4913a09fc2abdbd66a47fbdfea36dd7 SHA1 e40692a4b4a9fa17b2347ca3fc100461747e0b21 SHA256 1a067db09468d6a65b313ca715defef42aba30db98f49888f30861f65a57f61f
-EBUILD dbmail-2.2.11_rc3-r1.ebuild 5041 RMD160 3518118320c5ef5b1ebb81b27019b238a8a6addd SHA1 84f2abd7aa6cf444d0fc4b69ab2b415014bca472 SHA256 8bcf65a421f19f77cd88b6b315d059956ed994f016948392f54044a86de458b8
-EBUILD dbmail-2.2.11_rc3.ebuild 3623 RMD160 14cc9c9c15f6295c3d6fe07a9effbfa15f027faa SHA1 08aa4a2e2ba6d8bc672e0676305240cdb8d408bf SHA256 38d6006bd81dd5492f0e356cc05c48dace86712d8a460d9e313f50a62254984f
-EBUILD dbmail-2.2.9.ebuild 3576 RMD160 15a9946562acea4f147f0f888ce5d0b6a1bbdbce SHA1 6a8e175329d3b5017c75aff82566e184f1682bed SHA256 227d3bd0b1fa4c03752e9d66175e33ae012a4c0f7d5eb6431474570897c12238
-EBUILD dbmail-2.3.4.ebuild 3664 RMD160 4df283981dc0239fed48ab549d4699a1f635c29e SHA1 8be1399df5fe415a57f23d14bac5986c253e679b SHA256 200f95c5c59a78854f34d1aa2e1f19b91db92aa440753deb107b278e560041a9
-MISC ChangeLog 7693 RMD160 363c6627b43775a00a27ad45137fdf24b5df0c28 SHA1 6902c4e7b17870870ab66108ef5955d73dec717b SHA256 128b26ece8f29c422c5914fb7cbfc94ab981643a9223a9126f295e96878bf578
+EBUILD dbmail-2.2.11.ebuild 5025 RMD160 886a85a25ee5dafa5fd65f755b3052d3de53a4f8 SHA1 14e460260fb0bed9eb39929377df6be96d5b58ad SHA256 8f3bf0a0fadd75b05c8de009cb1478718269d6bcbf4cc47cc57c7274087c5d2e
+EBUILD dbmail-2.2.15.ebuild 4845 RMD160 a37565345265e6f22937459b49957325ffdfd53a SHA1 851f6e8dd846470d3dacb058480e2955e424c9c3 SHA256 40c419be968bdacaf30f4419cc40c78fe17e3cea815b8c8f8ab28e6a037c5b2e
+EBUILD dbmail-2.2.9.ebuild 3568 RMD160 314c5a7b5fc8e58b9f65cecbabc75143cdac94ce SHA1 ef10dcdd0633f3139b8e1aecc82f772f29cad67c SHA256 0695e9a145bb4422af9165f8c7c3e65a04daf2029618630ec8d8d57cf778a6f1
+MISC ChangeLog 8023 RMD160 8fe81f733c1c3328ed3ff948be8a9b358426ff5d SHA1 26071b44fa833d5dcb55028e1dc37bdcdc8552ff SHA256 a1336d66bd1c7c7f0f01a959474bee2a7e2ed990a6b2c7c52ce51239736f3102
 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
deleted file mode 100644
index f0acfa6dbafc..000000000000
--- a/net-mail/dbmail/dbmail-2.2.10.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2010 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.6 2010/01/04 02:55:30 flameeyes 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"
-	if ! use postgres && ! use mysql && ! use sqlite3; then myconf="${myconf} --with-sqlite" ; fi
-	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 the INSTALL file in /usr/share/doc/${PF}/"
-	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.ebuild b/net-mail/dbmail/dbmail-2.2.11.ebuild
index b03100a155fe..9b89111da393 100644
--- a/net-mail/dbmail/dbmail-2.2.11.ebuild
+++ b/net-mail/dbmail/dbmail-2.2.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.ebuild,v 1.4 2010/01/04 02:55:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/dbmail-2.2.11.ebuild,v 1.5 2010/03/28 20:33:23 lordvan Exp $
 
 inherit eutils multilib python
 
@@ -13,13 +13,13 @@ 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 python"
+IUSE="ldap mysql postgres sieve sqlite ssl static python"
 
 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 ) ) )
+	sqlite? ( >=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 )
 	python? ( net-zope/zope-interface )
@@ -37,8 +37,8 @@ pkg_setup() {
 }
 
 src_compile() {
-	use sqlite3 && myconf="--with-sqlite"
-	if ! use postgres && ! use mysql && ! use sqlite3; then myconf="${myconf} --with-sqlite" ; fi
+	use sqlite && myconf="--with-sqlite"
+	if ! use postgres && ! use mysql && ! use sqlite; then myconf="${myconf} --with-sqlite" ; fi
 	use ldap && myconf=${myconf}" --with-auth-ldap"
 
 	econf \
@@ -124,8 +124,8 @@ 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 "DBMail requires either SQLite, PostgreSQL or MySQL."
+	elog "If none of the use-flags are specified SQLite is"
 	elog "used as default. To use another database please"
 	elog "specify the appropriate use-flag and re-emerge dbmail."
 	echo
diff --git a/net-mail/dbmail/dbmail-2.2.11_rc3.ebuild b/net-mail/dbmail/dbmail-2.2.11_rc3.ebuild
deleted file mode 100644
index 7314f27a38fd..000000000000
--- a/net-mail/dbmail/dbmail-2.2.11_rc3.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2010 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.4 2010/01/04 02:55:30 flameeyes 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"
-	if ! use postgres && ! use mysql && ! use sqlite3; then myconf="${myconf} --with-sqlite" ; fi
-	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 the INSTALL file in /usr/share/doc/${PF}/"
-	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-r1.ebuild b/net-mail/dbmail/dbmail-2.2.15.ebuild
index aa9410e463fe..c1cf62b0728e 100644
--- a/net-mail/dbmail/dbmail-2.2.11_rc3-r1.ebuild
+++ b/net-mail/dbmail/dbmail-2.2.15.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2010 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-r1.ebuild,v 1.5 2010/01/04 02:55:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/dbmail-2.2.15.ebuild,v 1.1 2010/03/28 20:33:23 lordvan Exp $
 
+EAPI="1"
 inherit eutils multilib python
 
 MY_P="${P/_/-}" # for rcX was without the - for versions < 2.2.6
@@ -13,20 +14,20 @@ 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 python"
+IUSE="ldap mysql postgres sieve sqlite ssl static python"
 
 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 ) ) )
+	sqlite? ( >=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 )
 	python? ( net-zope/zope-interface )
 	app-text/asciidoc
 	app-text/xmlto
 	sys-libs/zlib
-	=dev-libs/gmime-2.2*
+	>=dev-libs/gmime-2.2.10:0
 	>=dev-libs/glib-2.8"
 
 S=${WORKDIR}/${P/_/-}
@@ -37,8 +38,8 @@ pkg_setup() {
 }
 
 src_compile() {
-	use sqlite3 && myconf="--with-sqlite"
-	if ! use postgres && ! use mysql && ! use sqlite3; then myconf="${myconf} --with-sqlite" ; fi
+	use sqlite && myconf="--with-sqlite"
+	if ! use postgres && ! use mysql && ! use sqlite; then myconf="${myconf} --with-sqlite" ; fi
 	use ldap && myconf=${myconf}" --with-auth-ldap"
 
 	econf \
@@ -96,16 +97,15 @@ src_install() {
 	fi
 
 	if use python; then
-	   python_version
-	   insinto /usr/$(get_libdir)/python${PYVER}/site-packages/dbmail
+	   insinto $(python_get_sitedir)/dbmail
 	   doins python/*.py
-	   insinto /usr/$(get_libdir)/python${PYVER}/site-packages/dbmail/app
+	   insinto $(python_get_sitedir)/dbmail/app
 	   doins python/app/*.py
-	   insinto /usr/$(get_libdir)/python${PYVER}/site-packages/dbmail/bin
+	   insinto $(python_get_sitedir)/dbmail/bin
 	   doins python/bin/*.py
-	   insinto /usr/$(get_libdir)/python${PYVER}/site-packages/dbmail/lib
+	   insinto $(python_get_sitedir)/dbmail/lib
 	   doins python/lib/*.py
-	   insinto /usr/$(get_libdir)/python${PYVER}/site-packages/dbmail/tests
+	   insinto $(python_get_sitedir)/dbmail/tests
 	   doins python/tests/*.py
 	fi
 
@@ -116,16 +116,15 @@ src_install() {
 
 pkg_postinst() {
 	if use python; then
-	   python_version
-	   python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/dbmail
+	   python_mod_optimize $(python_get_sitedir)/dbmail
 	fi
 	elog "Please read the INSTALL file in /usr/share/doc/${PF}/"
 	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 "DBMail requires either SQLite, PostgreSQL or MySQL."
+	elog "If none of the use-flags are specified SQLite is"
 	elog "used as default. To use another database please"
 	elog "specify the appropriate use-flag and re-emerge dbmail."
 	echo
diff --git a/net-mail/dbmail/dbmail-2.2.9.ebuild b/net-mail/dbmail/dbmail-2.2.9.ebuild
index 6634905d53dd..896ee0906fc6 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-2010 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.9 2010/01/04 02:55:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/dbmail-2.2.9.ebuild,v 1.10 2010/03/28 20:33:23 lordvan Exp $
 
 inherit eutils
 
@@ -13,13 +13,13 @@ 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"
+IUSE="ldap mysql postgres sieve sqlite 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 ) ) )
+	sqlite? ( >=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
@@ -36,8 +36,8 @@ pkg_setup() {
 }
 
 src_compile() {
-	use sqlite3 && myconf="--with-sqlite"
-	if ! use postgres && ! use mysql && ! use sqlite3; then myconf="${myconf} --with-sqlite" ; fi
+	use sqlite && myconf="--with-sqlite"
+	if ! use postgres && ! use mysql && ! use sqlite; then myconf="${myconf} --with-sqlite" ; fi
 	use ldap && myconf=${myconf}" --with-auth-ldap"
 
 	econf \
@@ -87,8 +87,8 @@ 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 "DBMail requires either SQLite, PostgreSQL or MySQL."
+	elog "If none of the use-flags are specified SQLite is"
 	elog "used as default. To use another database please"
 	elog "specify the appropriate use-flag and re-emerge dbmail."
 	echo
diff --git a/net-mail/dbmail/dbmail-2.3.4.ebuild b/net-mail/dbmail/dbmail-2.3.4.ebuild
deleted file mode 100644
index 06b81635cee4..000000000000
--- a/net-mail/dbmail/dbmail-2.3.4.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/dbmail-2.3.4.ebuild,v 1.3 2010/01/04 02:55:30 flameeyes 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"
-	if ! use postgres && ! use mysql && ! use sqlite3; then myconf="${myconf} --with-sqlite" ; fi
-	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 the INSTALL file in /usr/share/doc/${PF}/"
-	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."
-}