new version + cleanup old versions

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64

6 files changed, 14 insertions, 409 deletions

diff --git a/net-mail/dbmail/ChangeLog b/net-mail/dbmail/ChangeLog
index 97647198aac4..7a27472aa089 100644
--- a/net-mail/dbmail/ChangeLog
+++ b/net-mail/dbmail/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/dbmail
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/ChangeLog,v 1.66 2014/08/10 20:44:28 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/ChangeLog,v 1.67 2014/11/02 12:50:17 lordvan Exp $
+
+*dbmail-3.2.0 (02 Nov 2014)
+
+  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 
 
   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,
diff --git a/net-mail/dbmail/Manifest b/net-mail/dbmail/Manifest
index 4ca9f5051034..bee97d120404 100644
--- a/net-mail/dbmail/Manifest
+++ b/net-mail/dbmail/Manifest
@@ -1,30 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX dbmail-imapd.initd 1542 SHA256 ea8100471b06543b65dc35485c0d07bb0d47ff5a51624ac4b892bf10ea287a85 SHA512 517a751efa6f844bf0a4e4c8e012cc5e0229e2b497a99ba52ab62f53b7ea3e2e1c4ad47941efda51807db1fe7bd5b9976384a38a1b559bd16104dbf364e64781 WHIRLPOOL e078a6c4f4f6ec261707fdd622e0bc0b9ecd42a7c33e3a182e994db6e906f9944780ca62d538d665591c1d58413d11deb2192f9fd49d0defeaf6a1ac82c26df5
 AUX dbmail-lmtpd.initd 1542 SHA256 971118743b2322c69774f7d310292ec6aae392dbb6eb770a5cd01abf81ecc664 SHA512 2926b5b9afc64956e53bfa139f811ec0f3fdec409ef83f7cc15b47718d3c1f0b00a9a254d77957013338b2a447b5952d36f2b3e653cf461e7ff2b39307f883fb WHIRLPOOL 7148cb049b983ba255a18f49b6d28c6fdcdf18bb450a3f7128afd4671dce0dba38151eedcb25263a8b2f19ec7eb9e99bed30761b3cc10a8828242c502f1233b1
 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.10.tar.gz 2397512 SHA256 7a5b82eb8feb45faf215bebee7fb648092e5eaa71b2d5acd5826ca36d8e63f4f SHA512 d90964f61058435b65be38ba4e04a45a9751eb5e294f983e8f215f9361e542d0e7af464a977e8eac6e0b9ef5380106f5ab0ed5c94125ea9bd7a7d31791e5a09e WHIRLPOOL 3b878fe4a82eacb24bcdbd795146812d6d56960a686a12e168164514fe4e68314d1e0c0de6f434e2d8d98f8ef8910d1679b214a7fbb501bb440a34e843e3b3d0
-DIST dbmail-3.1.11.tar.gz 2399545 SHA256 8c1b11f604447944ec23985a1ff30869a2cf58fb918f47d53bd7db4c610856d7 SHA512 bff44b18b6453716f30a486a606319c8c371677ba45bbd93df99945b877ae4635e5300851641af2e223a3246308a637054b4f3c49b0fb27c601dbbd341d34fc6 WHIRLPOOL 70bc3a22b3b104a4d6aad058b71cc5de27479a74c9b0cffdd86c64a9790b114748bb4ea6dfc6e573f829e81c80ea1087b8327b09cdf1723ee18e09850eca01cb
-DIST dbmail-3.1.12.tar.gz 2399757 SHA256 9156a77d272e6c5924ccdefa2b25beadbb2ab27f3debd11c5ffb6f8904b0196c SHA512 50c9c6c40730c074c1c3e9c7b7a78b78875638d38f1d2cfe22bf6ce837f2ef8ab5929b688081b6c17bf79347899c4f3cf7e75e6853b8ef7c17ce08f66d5e583b WHIRLPOOL b2fba37229f5043a3174b4fa7199481aeaa14cb6919109b8b13d8e24c01141d031afe1a3ffd831b2162a5fe4e8a5143f337aec2268231391f701ab7638a6511e
 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.1.9.tar.gz 2397293 SHA256 665f42700654aae767d24647dde284a4df7aec1702a00d1122d55b3f9f4318dd SHA512 99b0c915256a1849fe41963e8ce64905e9a4533fa8821a98c2bc3ad0824b6417f370fe7c2411721480a93631db67be08e558b5282a29c3cb04a69ac358ab4775 WHIRLPOOL 2732a92b880440e4c98f6b305e8fd6b399bdaac097d284f4e69c493844977b558f6f06723f69ec0bdd5339784ce6feb58b17538eac877c2726d581e2c3931ee4
-EBUILD dbmail-3.1.10.ebuild 4244 SHA256 4c43e400fb40086156ebb07d15743afc2dd820f6a4fbca20e00954c73031805e SHA512 40fd76dc8646c2fa4107dd943d0afade5e72b6e6291eb02b8d0dcb97913447e9ec451e2b8f38496b6a7167a304b9b735bc3bf7b1aa504cd3bc9eb2b6f9f2e9cb WHIRLPOOL 56a9d29f640929cb0102ba270ec19f556e0aaf2dac5cf168af0a8d8f8cdd49e506e981ec015a7025cfe93940ce6701b4c76789aa7a9314b031c7ab8db5473dd6
-EBUILD dbmail-3.1.11.ebuild 4244 SHA256 a4d043d4aecdd812f07f8fef1d58754a2a1d5b5ee7caaefa270df7a8c748328f SHA512 fe57ee1f3fe5cefda9707e4e7f4217b8069f7cb31f665af11781682e5868774de05a2ac5d377bfdafaa17ed20215864c032e11dfb20437decd46b84f0097b6b8 WHIRLPOOL 9cd5d3886ae8607690905f84dc542610a7dbabd8dadeece110e3f79d2db910634f871e9981881e2778aac33fcdf11e88835bf45a5e5ec06fdb1eafd546c8d027
-EBUILD dbmail-3.1.12.ebuild 4932 SHA256 a7cf8987076fb6d841d18c2c51dbd0652ee84ceb788f8192858b223bdc84d0ea SHA512 d840d58996c0261dce4655b80c4088cba96eedb594c25091da2ea107683129dd3c9cb713ab553c9dc081413bf1ffd4107d462e7162e054a3acef408a583cf9e0 WHIRLPOOL d00788103fbb280025a8ea21275f2de260e3568a2484cc883f4468f1223200ac132ee649bf4e88183e596b2fe4f59275213dedbb401526cd42f98d8b19ec704c
+DIST dbmail-3.2.0.tar.gz 2425015 SHA256 7ca495aae5348c6e2ff21882e464bc23ad0e65995a5479c2740cdd24e38930e1 SHA512 79b491ae0c52c93ce57c65f87f5ab8784723825025dba83ac6473b84a83e00f91e2e957544043eae1d6ea6f3ccc21d9f65d89341e844867ed3f2d7dd3b41d8f9 WHIRLPOOL 3d7232519fd3d670c83d9fdaaf0a4142633e8478b35d7366810723d5ef75111341bf65628f9ec5cd759e4d556cbcd5b2d2fa86ccbb00d78da9166886882e875b
 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.1.9.ebuild 4241 SHA256 0b85cf44abb8a8e9ab3c3d6dd87b8807f6b759ca79bb776f76e94cd667c20e4f SHA512 b27b8bae9c2412f4ce9ee620affe44da688d059cc7ad4eec036e90175fdba38df9acfeedb6b8a0c393ba01a280f33a350ae0fca7976f9b255714d3d16d1167e4 WHIRLPOOL 5276f375d9c06cc0a16ec2e62cf9c9c8cb1f65ed52a19bdaa23162b5d34026fe87751a1547d3b8f1de801f42bb90bd0684624fc95f23833e4c453e38176ed2a2
-MISC ChangeLog 12108 SHA256 51c90d8ef1a5cb95a30a876ceefea7ebcfd067420fe68108851a1ff3ea9e6439 SHA512 80ae527e8d86e8af119476d2a361634160b446637de1512808babb5caf40dff89c24026ee07e10d582cbd7ee831e244a14b0b0698cd961f25ffd9a50f61e1233 WHIRLPOOL acb09f0ea8647b32ebb79b64df319790a937d53f7e1dac76880003ffc60d9e994e92ae6139e3c6b9cc7038cf7d5dca7a566cba47996c7c8f675f9ad65839abb2
+EBUILD dbmail-3.2.0.ebuild 4990 SHA256 48be49e97f320e2b6c7f63e91f798bc468bc6e738ad4c3882a6b602f12f64f0c SHA512 07eee7293362922a493e8ef83806aa7d8be61580c810e77e473ab9eb7c2640f12ab3a6042f53153fcf276712028c6d7f05a5853ac8acf5900cd0065194ad42fc WHIRLPOOL 8ae21439c986183b371b9542369d54b2834cffb605e119b7e4c88c3396d2a213d940a138e678ba0676d36520bd033292781f444f2d8759177f93709fc820a227
+MISC ChangeLog 12349 SHA256 b864acd00f1baa89cfda0b602a0bf718b352b44e86efd44f521da91996595f88 SHA512 07dceb6e7639b536b006cbaa5aafa4feefd43df20eee3b9a1025aaaae17ed4af818c28d7831ad98e473e4d8dfa748aab8a7ad669edc4a1bc85429aed4b5f1244 WHIRLPOOL 616daa59775a86c6845073f2c4383d3c722c0aefc793752dd3816e3147719d628465d99e6bfee323c83913b25eda7993686954effad664e3e1ec6a48414d260d
 MISC metadata.xml 580 SHA256 8a14856cce888d8658e3ea9388e18a9b6892c6e00fd478c1afd4c5f496dccc14 SHA512 4533cb22ee9b8cec8565bde5ebbcb7ac1f9bbbac49cb38af370e3e6325a6a7a31d04adb301ccf23c53c0478bf692466a9599c8bf8ed2715be9a3d28741f6f6f7 WHIRLPOOL c920b009c23cfedf06ecf9814de3e71314153c8879b14891e2f39580cffa100f8544684d60d7802558f383778900f914598bb9ee9cd0b52f839ff4c7bad566b6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEAREIAAYFAlPn2a0ACgkQcaHudmEf86qdWQCfbPrSar9l9E5ldXYY3+ZZHhez
-HHIAmgPUpvuCoyWnB1IXrdYyVp0lePex
-=Iq4L
------END PGP SIGNATURE-----
diff --git a/net-mail/dbmail/dbmail-3.1.10.ebuild b/net-mail/dbmail/dbmail-3.1.10.ebuild
deleted file mode 100644
index 9826d32c4d81..000000000000
--- a/net-mail/dbmail/dbmail-3.1.10.ebuild
+++ /dev/null
@@ -1,129 +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.10.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
-
-	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
-	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
-}
diff --git a/net-mail/dbmail/dbmail-3.1.11.ebuild b/net-mail/dbmail/dbmail-3.1.11.ebuild
deleted file mode 100644
index 7f8509412924..000000000000
--- a/net-mail/dbmail/dbmail-3.1.11.ebuild
+++ /dev/null
@@ -1,129 +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.11.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
-
-	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
-	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
-}
diff --git a/net-mail/dbmail/dbmail-3.1.9.ebuild b/net-mail/dbmail/dbmail-3.1.9.ebuild
deleted file mode 100644
index 6a047aa40c96..000000000000
--- a/net-mail/dbmail/dbmail-3.1.9.ebuild
+++ /dev/null
@@ -1,129 +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.9.ebuild,v 1.4 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
-
-	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
-	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
-}
diff --git a/net-mail/dbmail/dbmail-3.1.12.ebuild b/net-mail/dbmail/dbmail-3.2.0.ebuild
index ba19860ea02c..8f33026a3224 100644
--- a/net-mail/dbmail/dbmail-3.1.12.ebuild
+++ b/net-mail/dbmail/dbmail-3.2.0.ebuild
@@ -1,6 +1,6 @@
 # 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.12.ebuild,v 1.2 2014/08/10 20:44:28 slyfox Exp $
+# $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
@@ -21,7 +21,7 @@ DEPEND="dev-db/libzdb
 	app-text/xmlto
 	app-crypt/mhash
 	sys-libs/zlib
-	>=dev-libs/gmime-2.4.6:2.4
+	|| ( dev-libs/gmime:2.6 dev-libs/gmime:2.4 )
 	>=dev-libs/glib-2.16
 	dev-libs/libevent
 	ssl? ( dev-libs/openssl )"
@@ -53,6 +53,7 @@ src_install() {
 
 	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