fixed bug #251392, removed old and devel versions

migrated to new python_get* instead of PYVER,..
bump to 2.2.15
(Portage version: 2.1.8.3/cvs/Linux x86_64)

7 files changed, 42 insertions, 364 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/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."
-}