net-mail/dbmail: added sieve and ldap support, removed db dep logic

svn path=/sunrise/; revision=1804

5 files changed, 134 insertions, 22 deletions

diff --git a/net-mail/dbmail/ChangeLog b/net-mail/dbmail/ChangeLog
index 833243c08..f5d6d2200 100644
--- a/net-mail/dbmail/ChangeLog
+++ b/net-mail/dbmail/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Nov 2006; Martin Hierling <mad@cc.fh-luh.de> dbmail-2.1.7-r1.ebuild:
+  no db deps anymore
+  added ldap use flag
+  added sieve support
+   needs useflag sieve and
+   libsieve http://bugs.gentoo.org/show_bug.cgi?id=149770
+
+
   02 Nov 2006; Martin Hierling <mad@cc.fh-luh.de> dbmail-2.1.7.ebuild:
   glib dep to 2.6
 
diff --git a/net-mail/dbmail/Manifest b/net-mail/dbmail/Manifest
index 7dc7fb656..72c80ab59 100644
--- a/net-mail/dbmail/Manifest
+++ b/net-mail/dbmail/Manifest
@@ -10,15 +10,23 @@ AUX dbmail-pop3d.initd 730 RMD160 f8376e0dfa1a721cd4d99b3797f92c4c30285fd8 SHA1
 MD5 504dd74912daeea4268f8c25ddf6de0f files/dbmail-pop3d.initd 730
 RMD160 f8376e0dfa1a721cd4d99b3797f92c4c30285fd8 files/dbmail-pop3d.initd 730
 SHA256 2b1ee1f7491e6fb94f0d9a6a1424ff3cba66b2880d6bc1d50f008da8be0a7c52 files/dbmail-pop3d.initd 730
+AUX dbmail-timsieved.initd 744 RMD160 0b733fba999532536b07a9ec5b572c362ed96f08 SHA1 5076a33925b43898e6f12cdc1c73e76fa406d6b8 SHA256 572358fcddea2981f29cd267c55e6de8e840f5442bcc8520ad40edfaed71577d
+MD5 96ea543e77e04294deef1dd4abfba59a files/dbmail-timsieved.initd 744
+RMD160 0b733fba999532536b07a9ec5b572c362ed96f08 files/dbmail-timsieved.initd 744
+SHA256 572358fcddea2981f29cd267c55e6de8e840f5442bcc8520ad40edfaed71577d files/dbmail-timsieved.initd 744
 DIST dbmail-2.1.7.tar.gz 842237 RMD160 65e470501c6cc5e5ef50d8da736e2792168cbe8b SHA1 16c383dcd095ba2544b1f7ad1fabe40d551b7e9e SHA256 f46272083fcf4a30cd79a4c97ef19d3e4abc047dbea39eb137eab66c1b6ae133
-EBUILD dbmail-2.1.7.ebuild 2538 RMD160 a446ff7bb6a6338a344c0aa5cfdf5109b811c3e6 SHA1 32e9b88e196245f1ff9602bdd476f0e484fef9c1 SHA256 f12d14c767ce3d83179c1384b53116f13b9a8d267fcd80a6f0e9c0589eb9ec80
-MD5 97edc21447cb99a18d41410ad6ccf5e1 dbmail-2.1.7.ebuild 2538
-RMD160 a446ff7bb6a6338a344c0aa5cfdf5109b811c3e6 dbmail-2.1.7.ebuild 2538
-SHA256 f12d14c767ce3d83179c1384b53116f13b9a8d267fcd80a6f0e9c0589eb9ec80 dbmail-2.1.7.ebuild 2538
-MISC ChangeLog 887 RMD160 8602d430273e992f3b79fd15520a0968860a1df5 SHA1 5e7f4ca60dbcbe804d53c2ba9d6d69794ba91199 SHA256 df4a69958bf882242bbd348bbbdd39cb5872f44327de9c32fe38458cca3471c2
-MD5 ee65aed1de7bb4b931da790a7644e885 ChangeLog 887
-RMD160 8602d430273e992f3b79fd15520a0968860a1df5 ChangeLog 887
-SHA256 df4a69958bf882242bbd348bbbdd39cb5872f44327de9c32fe38458cca3471c2 ChangeLog 887
+EBUILD dbmail-2.1.7-r1.ebuild 2530 RMD160 e60b49bdd601ab297b83c1baaa90a583d71684c7 SHA1 35dd1cfc10f2edd275d9072deb8d58a756b9362d SHA256 e528516271c158b0fa97bf60ef74d73262a2a268d04f5184756e1370d6d7cccf
+MD5 a05c6fc471b2e15b9d865b01c65a2383 dbmail-2.1.7-r1.ebuild 2530
+RMD160 e60b49bdd601ab297b83c1baaa90a583d71684c7 dbmail-2.1.7-r1.ebuild 2530
+SHA256 e528516271c158b0fa97bf60ef74d73262a2a268d04f5184756e1370d6d7cccf dbmail-2.1.7-r1.ebuild 2530
+EBUILD dbmail-2.1.7.ebuild 2530 RMD160 e60b49bdd601ab297b83c1baaa90a583d71684c7 SHA1 35dd1cfc10f2edd275d9072deb8d58a756b9362d SHA256 e528516271c158b0fa97bf60ef74d73262a2a268d04f5184756e1370d6d7cccf
+MD5 a05c6fc471b2e15b9d865b01c65a2383 dbmail-2.1.7.ebuild 2530
+RMD160 e60b49bdd601ab297b83c1baaa90a583d71684c7 dbmail-2.1.7.ebuild 2530
+SHA256 e528516271c158b0fa97bf60ef74d73262a2a268d04f5184756e1370d6d7cccf dbmail-2.1.7.ebuild 2530
+MISC ChangeLog 1113 RMD160 e55ac1fd47f859687f8727de996b3374811fe021 SHA1 e2fa827472db2ccb54643925d2af75a6dbc8f382 SHA256 84e6a15f393f965c7b7ae7456b9c94b18364e2307b9212ef9281bdacd220e0ee
+MD5 2d3d568bb27111688304530546f1d6be ChangeLog 1113
+RMD160 e55ac1fd47f859687f8727de996b3374811fe021 ChangeLog 1113
+SHA256 84e6a15f393f965c7b7ae7456b9c94b18364e2307b9212ef9281bdacd220e0ee ChangeLog 1113
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170
@@ -26,3 +34,6 @@ SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 metadata
 MD5 9989b2fc2de0b352f1840a751bc3af91 files/digest-dbmail-2.1.7 238
 RMD160 d13d7dbf71b05dab90294916aadeb642b2efbeb7 files/digest-dbmail-2.1.7 238
 SHA256 dd5e06f51dc30a53de0722d7e236535152b90dcbf474d518d6a00d641063c03c files/digest-dbmail-2.1.7 238
+MD5 9989b2fc2de0b352f1840a751bc3af91 files/digest-dbmail-2.1.7-r1 238
+RMD160 d13d7dbf71b05dab90294916aadeb642b2efbeb7 files/digest-dbmail-2.1.7-r1 238
+SHA256 dd5e06f51dc30a53de0722d7e236535152b90dcbf474d518d6a00d641063c03c files/digest-dbmail-2.1.7-r1 238
diff --git a/net-mail/dbmail/dbmail-2.1.7-r1.ebuild b/net-mail/dbmail/dbmail-2.1.7-r1.ebuild
new file mode 100644
index 000000000..b6b4b819a
--- /dev/null
+++ b/net-mail/dbmail/dbmail-2.1.7-r1.ebuild
@@ -0,0 +1,89 @@
+# 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/dbmail-2.1.7.ebuild b/net-mail/dbmail/dbmail-2.1.7.ebuild
index 135cd755b..b6b4b819a 100644
--- a/net-mail/dbmail/dbmail-2.1.7.ebuild
+++ b/net-mail/dbmail/dbmail-2.1.7.ebuild
@@ -11,11 +11,13 @@ SRC_URI="http://www.dbmail.org/download/2.1/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="ssl postgres"
+IUSE="ssl postgres mysql sqlite3 sieve"
 
 DEPEND="ssl? ( dev-libs/openssl )
 	postgres? ( >=dev-db/postgresql-7.4 )
-	!postgres? ( >=dev-db/mysql-4.1.13 )
+	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
@@ -26,35 +28,33 @@ DEPEND="ssl? ( dev-libs/openssl )
 	#depend dev-db/sqlite
 
 pkg_setup() {
-	if use postgres && has_version dev-db/mysql ; then
-		elog "You have postgres use flag set, ${PN} will compile against PostgreSQL."
-		elog "If you want to use MySQL instead, unset postgres use flag for this ebuild:"
-		einfo
-		elog "echo \"net-mail/dbmail -postgres\" >> /etc/portage/package.use"
-		einfo
-		epause 3
-	fi
-
 	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 !postgres mysql) || die "econf failed"
+		$(use_with mysql) || die "econf failed"
 	emake || die "emake failed"
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 
-	dodoc AUTHORS BUGS EXTRAS ChangeLog UPGRADING \
-		INSTALL* VERSION NEWS README THANKS TODO
+	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
@@ -64,6 +64,7 @@ src_install() {
 	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
diff --git a/net-mail/dbmail/files/digest-dbmail-2.1.7-r1 b/net-mail/dbmail/files/digest-dbmail-2.1.7-r1
new file mode 100644
index 000000000..7c36ea613
--- /dev/null
+++ b/net-mail/dbmail/files/digest-dbmail-2.1.7-r1
@@ -0,0 +1,3 @@
+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