removed old version + vulnerable version - fixes bug #534020

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x3E59FAEF53F400D2

4 files changed, 18 insertions, 303 deletions

diff --git a/net-mail/dbmail/ChangeLog b/net-mail/dbmail/ChangeLog
index 83707e872728..19d60ccefa64 100644
--- a/net-mail/dbmail/ChangeLog
+++ b/net-mail/dbmail/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/dbmail
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/ChangeLog,v 1.70 2015/01/02 13:47:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/ChangeLog,v 1.71 2015/01/04 09:14:05 lordvan Exp $
+
+  04 Jan 2015; Thomas Raschbacher <lordvan@gentoo.org> -dbmail-3.1.15.ebuild,
+  -dbmail-3.2.0.ebuild:
+  removed vulnerable 3.2.0 (bug #534020) and old ~arch 3.1.15
 
   02 Jan 2015; Agostino Sarubbo <ago@gentoo.org> dbmail-3.2.2.ebuild:
   Stable for x86, wrt bug #534020
@@ -18,7 +22,7 @@
   02 Nov 2014; Thomas Raschbacher <lordvan@gentoo.org> -dbmail-3.1.9.ebuild,
   -dbmail-3.1.10.ebuild, -dbmail-3.1.11.ebuild, -dbmail-3.1.12.ebuild,
   +dbmail-3.2.0.ebuild:
-  removed old versions + added 3.2.0 
+  removed old versions + added 3.2.0
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> dbmail-3.1.10.ebuild,
   dbmail-3.1.11.ebuild, dbmail-3.1.12.ebuild, dbmail-3.1.13.ebuild,
@@ -225,8 +229,8 @@
 
   05 May 2008; Thomas Raschbacher <lordvan@gentoo.org>
   +dbmail-2.2.10.ebuild:
-  added 2.2.10 fixes bug #218136.
-  Thanks to svrmarty <svrmarty@gmx.net> for pointing this out	
+  added 2.2.10 fixes bug #218136
+  Thanks to svrmarty <svrmarty@gmx.net> for pointing this out
 
   17 Apr 2008; Markus Meier <maekke@gentoo.org> dbmail-2.2.9.ebuild:
   amd64/x86 stable, security bug #218154
diff --git a/net-mail/dbmail/Manifest b/net-mail/dbmail/Manifest
index deaf1e4c9953..97dab23d0efd 100644
--- a/net-mail/dbmail/Manifest
+++ b/net-mail/dbmail/Manifest
@@ -6,31 +6,23 @@ AUX dbmail-lmtpd.initd 1542 SHA256 971118743b2322c69774f7d310292ec6aae392dbb6eb7
 AUX dbmail-pop3d.initd 1542 SHA256 79682143fdf7c9f883f39aae0c455b7dbe44caa14196e933d24042dadeefbc55 SHA512 e5afd8556c03ff1b79b67f5075f744fff466d60bfc4b5f51fb6c439c9de041a7c25b3b3ea8642dd517615ec7f46e9aa49938419112daaa109c2216153c207913 WHIRLPOOL f93ac418c13c337bafeef07dcbcf2e4a2f4669dfd5ea7a6aff87fcf659b29780a94f398b42ad76cff01e0f5a68d76e4e5d34d03aefee84996aab7b2a474bf364
 AUX dbmail-timsieved.initd 1557 SHA256 012e1f286f11c06cbdc5422fc5dc813f5d6b7a18bee789beabb98f9848f901c4 SHA512 bdf633348a7944157f7ddaab7ad418b905b47bbba094d60bf758ad4f7a48ce2ea222be429751411904e9a8456e50bb3c7405b81f6eb64dfa53979d521518375f WHIRLPOOL 676238837736f26546a041eb90d01fade5419dd47a10a28343a551cc12c09abeeb07e99a52c0c744815829e8e02534b5d8a304deb6baa14375cd43a2ba81400a
 DIST dbmail-3.1.13.tar.gz 2400222 SHA256 ad1cb6502cd115ffbc47cacf3770b7808765ecb2704df1201349bd6a9707b799 SHA512 3852b38606a79b8997f3c2200476ecf2d83bfe030eb1fb49b404bc778ec9d89c8512a93dec0505517e48212e3e84eae345ca26d4357189276668afbc40cf31cd WHIRLPOOL 34856d5b1cc5321ee27e516dc80773df810ff009e8bc2b2bd8112ebdc3f0a2e72747a61304e0bbbd88d8d921c546ee2f8a43708afecabed9a45bbd609cea35fc
-DIST dbmail-3.1.15.tar.gz 2407119 SHA256 c8f83433ec694fcc93359055cfa5642a6b8cba95367e8c3fe9e9e3edb1a0371a SHA512 9ff75746c5d4b3d393d95017d4043bca367b2bf6b5c57102c8f642794dff4f385263dc5a4baf20afc0c15fefc46b78c5d65009324e2efdbace20408a1514512e WHIRLPOOL 62c53a1c51c1017d04c175ea54ade08154e4051ca9c6d31606ea0e4c688a0b2cd4b2734177687075eec215a674cdfbe6282241ad7305ebc011f03bdae5b4a05f
 DIST dbmail-3.1.17.tar.gz 2391054 SHA256 0e96121fe2af0d317651dbec79d740710562c1ac7e5687c24f2f6bf3b155aae4 SHA512 31afff1bd517c1fb792338eff8880c217905a7a65a8c8a09569f22750376da619e12bf88049a15c2cea8fb2171d9ef1761118364a6cd8ecfc6a861bd4ed41aa3 WHIRLPOOL 3f27e2bdbd4f3f10fe9aedec5600d7803dddb0cc51f61f0e50012475f33b0d3c73e28bb02dce03f0023c7a7ca8accce73f84e41dd9be6514e442ecb88ed26adb
-DIST dbmail-3.2.0.tar.gz 2425015 SHA256 7ca495aae5348c6e2ff21882e464bc23ad0e65995a5479c2740cdd24e38930e1 SHA512 79b491ae0c52c93ce57c65f87f5ab8784723825025dba83ac6473b84a83e00f91e2e957544043eae1d6ea6f3ccc21d9f65d89341e844867ed3f2d7dd3b41d8f9 WHIRLPOOL 3d7232519fd3d670c83d9fdaaf0a4142633e8478b35d7366810723d5ef75111341bf65628f9ec5cd759e4d556cbcd5b2d2fa86ccbb00d78da9166886882e875b
 DIST dbmail-3.2.2.tar.gz 2444241 SHA256 77d2fcf343cc1312fca565a9eeef3927b257b55910be2b198562516334a2c62a SHA512 a2125ea3b9d0ec387135d87854510f36ef0fe87b70f33d54f8af89f22a83802e5838979ba94d6ba66ef986f6f67b08aa6d5e2bfc2f1f2bc44edf03a9f51afb37 WHIRLPOOL 8fa60754e55b56e293a187cd10922586e1c38c0079e8f6eb98b8aaba503705046cf7b6954f677bb295ea799f9261ef62c8589433657a0ad2775dd2cfa1d1ee15
 EBUILD dbmail-3.1.13.ebuild 4930 SHA256 5a422e4c0ff43d68cfe104542f8546d8cd671886fd68186752e2f2daefae40e0 SHA512 b72dcaed6fcd487b838f710c65017398b008607653410cec898964be46d3317634058c39cc580634b1e9ae2b077eb824037cb97d2a200933b00f1fd495aef1bb WHIRLPOOL 1ae4bf46409278b484547b30e55f0c1f34bc9416e0fda7100b90367728c71ea8347cee2ec3f601c42a51b9350cee8823b37245665fae090ea1a1d9a34567fa8e
-EBUILD dbmail-3.1.15.ebuild 4932 SHA256 af8059d794202782c38b6771ff6ee7a0d1b3e2f170174c82c826228c47094885 SHA512 a7b7442afbc8284e9c3308bd365dfb9fb9a0552662f72f35c9e168351e61994edbcdb78de35b48700efa4f35501fdca6bd279592a883ea1999dda74f92175096 WHIRLPOOL 89ac7c7ab37f4ce6461db4a12c191d6eca6ee013620eb7569f9b02ad84cb0596bb85f9c702f183d606076b787a0a330c3c5ffac3aad94bec247cf3c1f20be049
 EBUILD dbmail-3.1.17.ebuild 4932 SHA256 0774b77fa71c02c2d83750aa3c473025e5fa377711260ef12db7000313cb68a1 SHA512 520291610c537ef4b1501e87426b64302d6dd28848e6db44cd0ca91ea14b338dbe157a59a243c82cdfa98fa3f58515a2d432f4baf5390c621045177be9ef1905 WHIRLPOOL 50e1dbf489e61e097619fc69b60266e4d4057a4f80fb59134e0e0e52286b42a0f6b682e1f0c41280dbf95ca2dad4054a533644c9fd14e20ae1b7b5ad4bd05c68
-EBUILD dbmail-3.2.0.ebuild 4990 SHA256 48be49e97f320e2b6c7f63e91f798bc468bc6e738ad4c3882a6b602f12f64f0c SHA512 07eee7293362922a493e8ef83806aa7d8be61580c810e77e473ab9eb7c2640f12ab3a6042f53153fcf276712028c6d7f05a5853ac8acf5900cd0065194ad42fc WHIRLPOOL 8ae21439c986183b371b9542369d54b2834cffb605e119b7e4c88c3396d2a213d940a138e678ba0676d36520bd033292781f444f2d8759177f93709fc820a227
 EBUILD dbmail-3.2.2.ebuild 4984 SHA256 3d7bec623b74cab22487c95e7914b5c7403944f1b7893e4d99b1c9e17f8758ff SHA512 5cf409c0acb4f72595e710276088403d87d166de81ff49a8161019ab4e6d643341df3bac2dd02b31b59bc272ba4cde52bf8f61c639aa4163ed8d7072409d58d9 WHIRLPOOL d5aaafe84236d54876c63ea9d849e6ef3e5fc851a91208d858a29ccf027f011ba2e183559d2807ee0bc0cb423a4cf31d6c8830163af60698ffd2d22529d893d8
-MISC ChangeLog 12700 SHA256 c22b6e9d397cb9a1eb22e2295495f51b1c16fbcb4f08cd59f0e4d2a7e1de721e SHA512 91184dd129fd61671e31fddbd86da469adda598edefff965428d9fa8acb2de9dd4f7a6f68dec498d026125bbd2336f52d18f47550d38444095bf959a8cfa8bf1 WHIRLPOOL 3042a35bf6a3dfb013fb6a751153e77b8c9ebd71b69d721e6737e38b1486f7121245ca24dc2b7f34b0bf26e4e4c523383acd8388d691761a0afcd08ada557cb2
+MISC ChangeLog 12866 SHA256 dccdff31d0dc442898330e2bb05650121c841c43da1577e440566e739ecc1e48 SHA512 132c523583623f96e7da6bdbf62273e54f1672439b9e77620cdbfc8ef1d868406d8a02e596559da41974a620468e915ffab7c11c0d250cdafccf53d467eccff1 WHIRLPOOL 94d0b68513101d07549605a78132b6b526d15d979574f9d0d9e3cb26c201cde8f6220f1a546e3724280809ad14de2173ac56639f0e33f5b0d3dabb8b359e0e17
 MISC metadata.xml 580 SHA256 8a14856cce888d8658e3ea9388e18a9b6892c6e00fd478c1afd4c5f496dccc14 SHA512 4533cb22ee9b8cec8565bde5ebbcb7ac1f9bbbac49cb38af370e3e6325a6a7a31d04adb301ccf23c53c0478bf692466a9599c8bf8ed2715be9a3d28741f6f6f7 WHIRLPOOL c920b009c23cfedf06ecf9814de3e71314153c8879b14891e2f39580cffa100f8544684d60d7802558f383778900f914598bb9ee9cd0b52f839ff4c7bad566b6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUpqF5AAoJELp701BxlEWfR2gP/1wyQog6J2RmLz+oprq+HoxW
-1yFahk5HhTX16qtSjgvUJM8KPnCgWgIeUPzccvBUB+umBDPEKxphwdgKBilP7dWy
-JxeEuV38/2k67PvesE1uTp2vRZwu2JLQhD11OUZ6GNAlUKqXqsAZTXuJO5kXiPUF
-XwfIIaCFOYUjsKs/2ru7pVryocYM9YMP3a0reqP49ZIu54f1rRTVrX73j2HzpkFt
-2PJdBfoMaWpFbUA52W2/XnUHNRVYK4SAu8DiCCjG8Y1Do/YobSCtrSSnN4S792CC
-cGMvOoJzrCfS4HPTK0d9Lp4YrxAjGNag8sW+PIo75HDhUYMNaBr15mmTH7po1ZJp
-KLShStT7pzTxDw7ALpq8rL+L8XrGC6D5I0/5Cm6INbktva7Cida5JYTG4ebegIPe
-uGZcYbuCgFYz6NjoxFAhWtEcfcAo24JiNc7RXwDyT2V/PyX26955G9MOz4GDwos2
-YQ47FzHt+k9ZHrGjkFko2YajIw/VN1WeHRUyQmdFWUvgszOiXBlNOfF07wKRKged
-3VJpMBTFU4er60yqGHE1CYp7NgASjrhCUXID6dTc77CAVuB309vH2mjP/g2y3JqC
-yuQN8hf45DpXXHZYfMBHxhRsA1NZ2+Dvl6+V6r4L31QIdp8+lM8KSrOu3wuwLz02
-JQVvuZ314jsH0zgx1Fuw
-=pceS
+iQF8BAEBCABmBQJUqRJyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQxQkJBODJCMjJCN0YzOTExNEFFQjU4RkUz
+RTU5RkFFRjUzRjQwMEQyAAoJED5Z+u9T9ADSl8AH/RNBG5S2OAeYxfdnNuFEhLB0
+H3kaTZiRME8yrkmuj3OnEj+yWLdig5g3QnXKZiItECkqyZx4k1gN5hokizVY6QV5
+RPjnrlIcElNFzsATeB/9DXI/V0CXpetvFgSFr6p7vgGfrmIuHtOiDq3nszvAOJbZ
+1sLxr6RQadCNr9zLnA239xSh+Bzju3MEOLj5XE5TO+TcOUmajuRJS5uYfyIB0E/e
+JG7t9x9gt7mUG87ufe40u9qutV7sN0vFVncRxoT69cyk+vG62kRdQOKjke5uToSK
+GrWJfTl+IYchjvuYVJh7dFzvnvc0xGwoTb29E3pr53+6DD4dKQVXaLnY46hzYxM=
+=umGx
 -----END PGP SIGNATURE-----
diff --git a/net-mail/dbmail/dbmail-3.1.15.ebuild b/net-mail/dbmail/dbmail-3.1.15.ebuild
deleted file mode 100644
index 92a2d154dae5..000000000000
--- a/net-mail/dbmail/dbmail-3.1.15.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/dbmail-3.1.15.ebuild,v 1.2 2014/08/10 20:44:28 slyfox Exp $
-
-EAPI="4"
-inherit eutils multilib versionator user
-
-DESCRIPTION="DBMail is an open-source project that enables storage of mail messages in a relational database"
-HOMEPAGE="http://www.dbmail.org/"
-SRC_URI="http://www.dbmail.org/download/$(get_version_component_range 1-2)/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ldap sieve +sqlite ssl static"
-
-DEPEND="dev-db/libzdb
-	sieve? ( >=mail-filter/libsieve-2.2.1 )
-	ldap? ( >=net-nds/openldap-2.3.33 )
-	app-text/asciidoc
-	app-text/xmlto
-	app-crypt/mhash
-	sys-libs/zlib
-	>=dev-libs/gmime-2.4.6:2.4
-	>=dev-libs/glib-2.16
-	dev-libs/libevent
-	ssl? ( dev-libs/openssl )"
-#asciidoc and xmlto needed?
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup dbmail
-	enewuser dbmail -1 -1 /var/lib/dbmail dbmail
-}
-
-src_configure() {
-	local myconf=""
-	use ldap && myconf=${myconf}" --with-auth-ldap"
-
-	econf \
-		--sysconfdir=/etc/dbmail \
-		$(use_enable static) \
-		$(use_with sieve) \
-		${myconf}
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS BUGS ChangeLog README* INSTALL NEWS THANKS UPGRADING
-
-	dodoc -r sql
-	dodoc -r test-scripts
-	dodoc -r contrib
-	## TODO: install other contrib stuff
-
-	sed -i -e "s:nobody:dbmail:" dbmail.conf
-	sed -i -e "s:nogroup:dbmail:" dbmail.conf
-	sed -i -e "s:/var/run:/var/run/dbmail:" dbmail.conf
-	#sed -i -e "s:#library_directory:library_directory:" dbmail.conf
-
-	insinto /etc/dbmail
-	newins dbmail.conf dbmail.conf.dist
-
-	# change config path to our default and use the conf.d and init.d files from the contrib dir
-	sed -i -e "s:/etc/dbmail.conf:/etc/dbmail/dbmail.conf:" contrib/startup-scripts/gentoo/init.d-dbmail
-	#sed -i -e "s:exit 0:return 1:" contrib/startup-scripts/gentoo/init.d-dbmail
-	#sed -i -e "s:/var/run:/var/run/dbmail:" contrib/startup-scripts/gentoo/init.d-dbmail
-	#newconfd contrib/startup-scripts/gentoo/conf.d-dbmail dbmail
-	#newinitd contrib/startup-scripts/gentoo/init.d-dbmail dbmail
-	# use custom init scripts until updated in upstream contrib
-	newinitd "${FILESDIR}/dbmail-imapd.initd" dbmail-imapd
-	newinitd "${FILESDIR}/dbmail-lmtpd.initd" dbmail-lmtpd
-	newinitd "${FILESDIR}/dbmail-pop3d.initd" dbmail-pop3d
-	newinitd "${FILESDIR}/dbmail-timsieved.initd" dbmail-timsieved
-
-	dobin contrib/mailbox2dbmail/mailbox2dbmail
-	doman contrib/mailbox2dbmail/mailbox2dbmail.1
-	#doman man/*.{1,5,8}
-
-	# ldap schema
-	if use ldap; then
-	   insinto /etc/openldap/schema
-	   doins "${S}/dbmail.schema"
-	fi
-
-	keepdir /var/lib/dbmail
-	fperms 750 /var/lib/dbmail
-	fowners dbmail:dbmail /var/lib/dbmail
-	# create this through init-scripts instead of at installt ime (bug #455002)
-	#keepdir /var/run/dbmail
-	#fowners dbmail:dbmail /var/run/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 SQLite, PostgreSQL or MySQL."
-	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."
-	echo
-	elog "We are now using the init script from upstream."
-	elog "Please edit /etc/conf.d/dbmail to set which services to start"
-	elog "and delete /etc/init.d/dbmail-* when you are done. (don't"
-	elog "forget to rc-update del dbmail-* first)"
-	echo
-	elog "Changed pid directory to /var/run/dbmail (see"
-	elog "http://www.dbmail.org/mantis/view.php?id=949 for details)"
-	echo
-	ewarn "The database config has changed to support libzdb db URI"
-	ewarn "Please check the documentation (or Bug #479664)"
-	echo
-	ewarn "The database schema has changed since 3.0.x make sure"
-	ewarn "to run the migration script"
-	echo
-	ewarn "Please be aware, that the single init-script for all services"
-	ewarn "has been replaced with seperate init scripts for the individual services."
-	ewarn "Make sure to add dbmail-(imapd|lmtpd|pop3d|timsieved) using rc-update"
-	ewarn "and remove dbmail if you want to take advantage of this change."
-	echo
-}
diff --git a/net-mail/dbmail/dbmail-3.2.0.ebuild b/net-mail/dbmail/dbmail-3.2.0.ebuild
deleted file mode 100644
index 8f33026a3224..000000000000
--- a/net-mail/dbmail/dbmail-3.2.0.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/dbmail-3.2.0.ebuild,v 1.1 2014/11/02 12:50:17 lordvan Exp $
-
-EAPI="4"
-inherit eutils multilib versionator user
-
-DESCRIPTION="DBMail is an open-source project that enables storage of mail messages in a relational database"
-HOMEPAGE="http://www.dbmail.org/"
-SRC_URI="http://www.dbmail.org/download/$(get_version_component_range 1-2)/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ldap sieve +sqlite ssl static"
-
-DEPEND="dev-db/libzdb
-	sieve? ( >=mail-filter/libsieve-2.2.1 )
-	ldap? ( >=net-nds/openldap-2.3.33 )
-	app-text/asciidoc
-	app-text/xmlto
-	app-crypt/mhash
-	sys-libs/zlib
-	|| ( dev-libs/gmime:2.6 dev-libs/gmime:2.4 )
-	>=dev-libs/glib-2.16
-	dev-libs/libevent
-	ssl? ( dev-libs/openssl )"
-#asciidoc and xmlto needed?
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup dbmail
-	enewuser dbmail -1 -1 /var/lib/dbmail dbmail
-}
-
-src_configure() {
-	local myconf=""
-	use ldap && myconf=${myconf}" --with-auth-ldap"
-
-	econf \
-		--sysconfdir=/etc/dbmail \
-		$(use_enable static) \
-		$(use_with sieve) \
-		${myconf}
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS BUGS ChangeLog README* INSTALL NEWS THANKS UPGRADING
-
-	docompress -x /usr/share/doc/${PF}/sql
-	dodoc -r sql
-	dodoc -r test-scripts
-	dodoc -r contrib
-	## TODO: install other contrib stuff
-
-	sed -i -e "s:nobody:dbmail:" dbmail.conf
-	sed -i -e "s:nogroup:dbmail:" dbmail.conf
-	sed -i -e "s:/var/run:/var/run/dbmail:" dbmail.conf
-	#sed -i -e "s:#library_directory:library_directory:" dbmail.conf
-
-	insinto /etc/dbmail
-	newins dbmail.conf dbmail.conf.dist
-
-	# change config path to our default and use the conf.d and init.d files from the contrib dir
-	sed -i -e "s:/etc/dbmail.conf:/etc/dbmail/dbmail.conf:" contrib/startup-scripts/gentoo/init.d-dbmail
-	#sed -i -e "s:exit 0:return 1:" contrib/startup-scripts/gentoo/init.d-dbmail
-	#sed -i -e "s:/var/run:/var/run/dbmail:" contrib/startup-scripts/gentoo/init.d-dbmail
-	#newconfd contrib/startup-scripts/gentoo/conf.d-dbmail dbmail
-	#newinitd contrib/startup-scripts/gentoo/init.d-dbmail dbmail
-	# use custom init scripts until updated in upstream contrib
-	newinitd "${FILESDIR}/dbmail-imapd.initd" dbmail-imapd
-	newinitd "${FILESDIR}/dbmail-lmtpd.initd" dbmail-lmtpd
-	newinitd "${FILESDIR}/dbmail-pop3d.initd" dbmail-pop3d
-	newinitd "${FILESDIR}/dbmail-timsieved.initd" dbmail-timsieved
-
-	dobin contrib/mailbox2dbmail/mailbox2dbmail
-	doman contrib/mailbox2dbmail/mailbox2dbmail.1
-	#doman man/*.{1,5,8}
-
-	# ldap schema
-	if use ldap; then
-	   insinto /etc/openldap/schema
-	   doins "${S}/dbmail.schema"
-	fi
-
-	keepdir /var/lib/dbmail
-	fperms 750 /var/lib/dbmail
-	fowners dbmail:dbmail /var/lib/dbmail
-	# create this through init-scripts instead of at installt ime (bug #455002)
-	#keepdir /var/run/dbmail
-	#fowners dbmail:dbmail /var/run/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 SQLite, PostgreSQL or MySQL."
-	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."
-	echo
-	elog "We are now using the init script from upstream."
-	elog "Please edit /etc/conf.d/dbmail to set which services to start"
-	elog "and delete /etc/init.d/dbmail-* when you are done. (don't"
-	elog "forget to rc-update del dbmail-* first)"
-	echo
-	elog "Changed pid directory to /var/run/dbmail (see"
-	elog "http://www.dbmail.org/mantis/view.php?id=949 for details)"
-	echo
-	ewarn "The database config has changed to support libzdb db URI"
-	ewarn "Please check the documentation (or Bug #479664)"
-	echo
-	ewarn "The database schema has changed since 3.0.x make sure"
-	ewarn "to run the migration script"
-	echo
-	ewarn "Please be aware, that the single init-script for all services"
-	ewarn "has been replaced with seperate init scripts for the individual services."
-	ewarn "Make sure to add dbmail-(imapd|lmtpd|pop3d|timsieved) using rc-update"
-	ewarn "and remove dbmail if you want to take advantage of this change."
-	echo
-}