4 files changed, 9 insertions, 94 deletions
diff --git a/net-mail/dbmail/ChangeLog b/net-mail/dbmail/ChangeLog
index f5d6d2200..656005f01 100644
--- a/net-mail/dbmail/ChangeLog
+++ b/net-mail/dbmail/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 Nov 2006; Stefan Schweizer <genstef@gentoo.org> -dbmail-2.1.7.ebuild,
+  dbmail-2.1.7-r1.ebuild:
+  Remove sieve useflag because libsieve is not available, please add it to
+  sunrise and readd the useflag
+
   03 Nov 2006; Martin Hierling <mad@cc.fh-luh.de> dbmail-2.1.7-r1.ebuild:
   no db deps anymore
   added ldap use flag
diff --git a/net-mail/dbmail/dbmail-2.1.7-r1.ebuild b/net-mail/dbmail/dbmail-2.1.7-r1.ebuild
index b6b4b819a..cad833d90 100644
--- a/net-mail/dbmail/dbmail-2.1.7-r1.ebuild
+++ b/net-mail/dbmail/dbmail-2.1.7-r1.ebuild
@@ -11,13 +11,15 @@ SRC_URI="http://www.dbmail.org/download/2.1/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="ssl postgres mysql sqlite3 sieve"
+IUSE="ssl postgres mysql sqlite3"
+# sieve commented for now because libsieve is not in portage, please add it to
+# sunrise and uncomment this useflag
+#	sieve? ( >=mail-filter/libsieve-2.2.1 )
 
 DEPEND="ssl? ( dev-libs/openssl )
 	postgres? ( >=dev-db/postgresql-7.4 )
 	mysql? ( >=dev-db/mysql-4.1.13 )
 	sqlite3? ( >=dev-db/sqlite-3.0 )
-	sieve? ( >=mail-filter/libsieve-2.2.1 )
 	app-text/asciidoc
 	app-text/xmlto
 	sys-libs/zlib
diff --git a/net-mail/dbmail/dbmail-2.1.7.ebuild b/net-mail/dbmail/dbmail-2.1.7.ebuild
deleted file mode 100644
index b6b4b819a..000000000
--- a/net-mail/dbmail/dbmail-2.1.7.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils
-
-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.1/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ssl postgres mysql sqlite3 sieve"
-
-DEPEND="ssl? ( dev-libs/openssl )
-	postgres? ( >=dev-db/postgresql-7.4 )
-	mysql? ( >=dev-db/mysql-4.1.13 )
-	sqlite3? ( >=dev-db/sqlite-3.0 )
-	sieve? ( >=mail-filter/libsieve-2.2.1 )
-	app-text/asciidoc
-	app-text/xmlto
-	sys-libs/zlib
-	>=dev-libs/gmime-2.1
-	>=dev-libs/glib-2.6"
-
-	# not yet implemented
-	#depend dev-db/sqlite
-
-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) \
-		$(use_with mysql) || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS BUGS ChangeLog README README.* \
-		INSTALL* NEWS THANKS TODO
-	dodoc sql/mysql/*
-	dodoc sql/postgresql/*
-	dodoc sql/sqlite/*
-
-	sed -i -e "s:nobody:dbmail:" dbmail.conf
-	sed -i -e "s:nogroup:dbmail:" 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."
-	einfo
-	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. :)"
-	elog ">>> --- For maintenance ---"
-	elog ">>> add this to crontab: 0 3 * * * /usr/bin/dbmail-util -cpdy >/dev/null 2>&1 "
-}
diff --git a/net-mail/dbmail/files/digest-dbmail-2.1.7 b/net-mail/dbmail/files/digest-dbmail-2.1.7
deleted file mode 100644
index 7c36ea613..000000000
--- a/net-mail/dbmail/files/digest-dbmail-2.1.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b6523e36d228198eeaf631c9a78a7fec dbmail-2.1.7.tar.gz 842237
-RMD160 65e470501c6cc5e5ef50d8da736e2792168cbe8b dbmail-2.1.7.tar.gz 842237
-SHA256 f46272083fcf4a30cd79a4c97ef19d3e4abc047dbea39eb137eab66c1b6ae133 dbmail-2.1.7.tar.gz 842237