cleanup & new version

Package-Manager: portage-2.2.7/cvs/Linux x86_64

6 files changed, 11 insertions, 398 deletions

diff --git a/net-mail/dbmail/ChangeLog b/net-mail/dbmail/ChangeLog
index 66ed271a639d..1a3cb7dd661d 100644
--- a/net-mail/dbmail/ChangeLog
+++ b/net-mail/dbmail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/dbmail
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/ChangeLog,v 1.52 2013/09/25 17:53:43 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/ChangeLog,v 1.53 2013/12/17 13:57:58 lordvan Exp $
+
+*dbmail-3.1.8 (17 Dec 2013)
+
+  17 Dec 2013; <lordvan@gentoo.org> -dbmail-3.1.2.ebuild, -dbmail-3.1.3.ebuild,
+  -dbmail-3.1.4.ebuild, -dbmail-3.1.6.ebuild, +dbmail-3.1.8.ebuild:
+  removed old versions and added new version
 
 *dbmail-3.1.7 (24 Sep 2013)
 
diff --git a/net-mail/dbmail/Manifest b/net-mail/dbmail/Manifest
index 59db68e425c6..d77b6228e93e 100644
--- a/net-mail/dbmail/Manifest
+++ b/net-mail/dbmail/Manifest
@@ -3,16 +3,10 @@ AUX dbmail-lmtpd.initd 730 SHA256 2aedd5fecc1ef28289c870030c31f8ecaded4f2651be35
 AUX dbmail-pop3d.initd 730 SHA256 2b1ee1f7491e6fb94f0d9a6a1424ff3cba66b2880d6bc1d50f008da8be0a7c52 SHA512 b2df02acc6c941d195f8122ef79dc19b4b105f6cd7813969dc291a55350ae02a9cfaae16bc698da93d771a4b07aff5f6cda579b8ed597f41bba124ecdd4cc53d WHIRLPOOL 1000280545cdd50c5e90ba504a2d87f77b9fdae7db79fdba4fb4d7d745295d438893f1b7f5837af1976e3690a37defcf1f41543cd45ba744db061f1de094580b
 AUX dbmail-timsieved.initd 716 SHA256 c92cd221b37391703ec7aaff2eb3b33ed2b9b699a281f318f54ba6efd6e69224 SHA512 04f66443573fde84d220a0d808f98295a8931990a0d7bad13c0c86bfe7b2d95c3311f7fdbc6b4068223601286c34e97cb17b0f5fbc28ca05991d0cdc13d250f5 WHIRLPOOL 8f3c2a53f084861f63db8056b4b2ac82fb9e2ef6e0cf519073368c6bf59b8e2026872af0c847011bd6ac237e94dc7ac280805a3200ec738a96c8dfc50e0bc238
 DIST dbmail-3.0.2.tar.gz 867560 SHA256 139558f4fa3e0f460d688f6d29318366cc3f40dd570a1a29484bb580d0190c3e SHA512 ca1d30a114c1b2b8968227ed678e3857c6d5cb98eb9e7086d45c32b4e957396971bd76cfe2e278fe904fbe8a8ded53199ded76da300d9835b324839e42532834 WHIRLPOOL a79d8b344361bd032446e99bbbb865e798db54e60a730cb7191112e4320ca130d194d8a1ad2d676673b2bb06e50e9cc1ccc78a8a1fc7edcb2a9b3eeeb7841500
-DIST dbmail-3.1.2.tar.gz 2393373 SHA256 9231042ab345275f8704a69186a5e2531126d2890342dd5436bf51def75d760d SHA512 226aece1072882ea63254f9cd03d5f444e13c4075cd3fc1ca6b87032e29abbf16367433a7eeb91b1b22c6293294a313fc7626a32275d87475713057e070c00b5 WHIRLPOOL 06ba486e26f8ef07361012c187a6a5f43b7ce2e5e18a845a95ee6831d8013bed7c7e649975c3f7f9c36274aad61a0ee504e3fc1446ba8fde3a4765bfcd57bc84
-DIST dbmail-3.1.3.tar.gz 2392630 SHA256 508d288f3c5690387eeed94669f96cbd4cc686066bfd4cb9a5f97ec63c7ca304 SHA512 09c4d1741e062381c6bd11a510e0691c66b1683626ae57640a3470b8a2994d0492b7e2b67399cec890456f198cc95c16bc9e0952e975b31126819206965d6ad3 WHIRLPOOL ed40d90491993a9dbde046ed97c31233ae571b23a538640da26083d94bfa9040391011358baa9373e1b376929966e02e6fb4f2ae8d02a69a2cfd5e7a72b14496
-DIST dbmail-3.1.4.tar.gz 2393666 SHA256 1821474166d2b73ac89264f5aeffb5c0f8f6e94f13d74bd7e6a9e531a5672a59 SHA512 6168e6279df3516242fc11f81ec5c54af2dccf86aabe1c92ca16a69ebcd499e68fe5f7703b175e1a5674c198cb1fdab9bb157e840a1bee896e76ffb260dcdf30 WHIRLPOOL c5cd550977560743bbf15ab30d1eb7bcf3d0a5badde3114573594392291de03deb01fe976b36436ece3982a39854364457a46b0a2ee590a6275bef1a5dbcbedb
-DIST dbmail-3.1.6.tar.gz 2394514 SHA256 380fc123c8e6cfca7e9c06892d501ddea61c36f88e567d133202c16bf265a71a SHA512 8b2950ec55b8431c7074563779caa0fa9f037f3a215efcb05671ff309a4e5a0849ccbf93c750f2f19eae7f0f516c3fca89081506ffc28061f7b2f74a7382c045 WHIRLPOOL 49a10a4df70c05ca8cd9fb266bbbf4602d26f52e4ffd6ddd651ab567a3bddd6b17268abe4febcff0fd5446c895b9996357ade51a21a70fb62be8ed66ca0f4e97
 DIST dbmail-3.1.7.tar.gz 2395315 SHA256 657965a87a217495b2bd5f292ef1b4948e85d195e54e9c0e4981d46cf72427aa SHA512 6a9ab494c30760f7bad2acae54cbc241bcc6befe31dfbd1071cfd00ab720081339263d34694616fd6b2cfd047fc1837f1bd617eb999733d519f35b9995b8ff27 WHIRLPOOL 8406f40536fcacd6f132c26e676e67348fb58a4c288741ea36dd70274b3dc0333d10f382d42eb61e3aa2c108e69d9f36e17dfb3f1da03117e577c93d1a8a125a
+DIST dbmail-3.1.8.tar.gz 2397311 SHA256 38ae88c8a854044ec7eb4ac274238a02612ffed201352859eb3d426dc7b6fff3 SHA512 b86ba5c27beae95172da50692369b061176a256f9dd2b5e21ecc9e8541e6fc4d7c3a6cd22f3b3fdedccd762845636ffcb547f04cb28c0a42f5ed81e547a75f71 WHIRLPOOL cad5930388eb7248c95cb8d3628989ef4cfab6453416242fe64b948d1020ee516c1f25c42dacaa97778225163f789ad5749ae6f1663681774a11913ed3729358
 EBUILD dbmail-3.0.2.ebuild 4907 SHA256 56b7465f0e261506e41afe3e27183c40c4b94baf1634abc8165b03eab42392c5 SHA512 595510e757ddeb2c168143b671e069182e9f63c1a454ce90676460d9efd1a7014c458d9a91c9379fe2984069da3667935d8828aee944a0f7a5f55cdd53f78c32 WHIRLPOOL f149e4f4ec0d65986170d4f40637d49dc2c7ff3a7d6310af0968da80d3e8c4f372408449d2c947714503a0871ee42a1ff8b5afd034556bdbc33da506f5fe3e5e
-EBUILD dbmail-3.1.2.ebuild 4240 SHA256 ff560e04c770ff228f127084f28d91e0b40d4de99576b195daf5f3874a2a0afc SHA512 9e850bdc82f431c25a98812dc0830c6932852526203ff7beffe8f02c0c6735350eeb411f1c817aee5cf48396c963db822836f8d5d79d7c1e8023df23695b5fc6 WHIRLPOOL 863640ea45aa13735cab5bfc0e1d7074f167d9571d88d062e06d0454a22d2f8b5911c9c1722b6f98e149b736866519b06d62641adf5157da23356a907a6c1dbc
-EBUILD dbmail-3.1.3.ebuild 4240 SHA256 ccdd3632766f7ef9a9a060cee671180cebea3df0737bc97ac90a4fa1fedd92f9 SHA512 ccb71c69a34eae34de7d154290f3862a3edf9e31bc30e19cafaa456d25cc30115824cafdd7ff8f84b0150aeb01140a5e2dff2ca975dc168ca6e720def9d1c705 WHIRLPOOL d1f4a6c45bd0319be4e6cd2aea0e6d0cf98af1dc9ddd8e65abf526b25211cec048cbd25bb1476a756a64d5413d8b7ce84e835265febe64aba267f0f20d756ca9
-EBUILD dbmail-3.1.4.ebuild 4240 SHA256 89867d2820c687225296d368681d230916e1b6725ba258f272778dc0e4ef9957 SHA512 59b1fff1857b49526f869c5f8499c797a1193e7e7924db860245c829282500081f6fb53449d9a99381ba1910d3d86e5d1f834d9c85301b66863e6f9f244865bf WHIRLPOOL 1afc774d698a397d2eb412418dc1578298b242c436b34517e53521a15132e5ac0ccb470886fb48e653cd2df1b088bcad7e088dc5a5877dcb37ab9b6b0eb08cb4
-EBUILD dbmail-3.1.6.ebuild 4240 SHA256 1eabf122e3bbca3f122f1549de6a5f21b01e591b2b72bfca6a11bf51eebb1cc0 SHA512 23fb01c3e577da2109859cc49f5d9577e565db21c129574d3418c688fd67eb7f748d69a248b29feedb5aff1770b3fa989803624cf0174f5937257cc363019ada WHIRLPOOL df3a963dc9aa3f5c118ede457978d06ace4e83eb3f8c225d5d75bc50c1f1c89dc0847bf653ab9ea0727b352aaf000016ca3d5694722e562d407cff44bf84534e
 EBUILD dbmail-3.1.7.ebuild 4240 SHA256 d708a373217eb1c3fbca2ef244c6911ca4bc7b8031e56c3f90cc6e606dd46073 SHA512 b2fe9862f30ef6f7f67538d71318adba4725e173ec6cab4cf26c6a672566d85c2278dabbf528e5c9da0a9ccce55b5e8626838e2e8b0e8ded8631b47e607f20a0 WHIRLPOOL cb96e7dfc738b39744fc539bd0206221ecaf9520b704ef4a56624fd969deed1be5fad079a5402139d9b68b525ad2922598bd9df6fb559f992f397a9a2cfc1619
-MISC ChangeLog 9923 SHA256 2318a33857e32b73ce4fcc69a3812058776ce4bb9089a5ac7e576be3a63731eb SHA512 b56a2fb4ee29b56b8d9532ad8730f8d0293ac1cda8007ed0144bc4c38ecf160435942575fd2dcbdaa4640cd3ed904abe375c85d81eec87981e64bf69c76818d8 WHIRLPOOL 39afc390144ff22eb018ef011fb68d2cc2f67c5915eb29d92d403249b6f651d2fd9701618af634f6f68fa3af1dff16b33dacf875b10e79268f19387c90ec22b1
+EBUILD dbmail-3.1.8.ebuild 4240 SHA256 cf231b01d9ff0f83a69fbb8d8198d600c4758b1a36e31371e314c9b16b4cf198 SHA512 945c373cd18099181c7e107e5f62cd98e491bb006c5909352979a0c2e89e9bbf71f4044028fed404fff01def64588f139fe104821a79eb7afaad785e65520385 WHIRLPOOL b578ae868bff59cd279d7673ba8235328fc8e70bd077dbab34f7cc1bbfbb312be07641acbda4f2b77e120523bc7c157c773822f76d7f4330eed118abafffbcd4
+MISC ChangeLog 10146 SHA256 6d8876da018e29c0a9291f3eb1e416ab49c855592dd9dc040a406c57afdec57d SHA512 4c90c81c178237608272ad6313c18a6357d074e586067d292f9a62df8c6d933caa321ed917b190700233a499672f1f0f751ce2e745b6910b4e7158f27e4e29bd WHIRLPOOL bfb80258f38b3b273aaa35d0cd4a59d54fc8afe26554feee3c9a5ee9a9d20d14d8f608f4088e233eed95c83575a5fd8a8d614a8d82268a66a8d06c353cdacf74
 MISC metadata.xml 580 SHA256 8a14856cce888d8658e3ea9388e18a9b6892c6e00fd478c1afd4c5f496dccc14 SHA512 4533cb22ee9b8cec8565bde5ebbcb7ac1f9bbbac49cb38af370e3e6325a6a7a31d04adb301ccf23c53c0478bf692466a9599c8bf8ed2715be9a3d28741f6f6f7 WHIRLPOOL c920b009c23cfedf06ecf9814de3e71314153c8879b14891e2f39580cffa100f8544684d60d7802558f383778900f914598bb9ee9cd0b52f839ff4c7bad566b6
diff --git a/net-mail/dbmail/dbmail-3.1.3.ebuild b/net-mail/dbmail/dbmail-3.1.3.ebuild
deleted file mode 100644
index 2f97cf80b4d4..000000000000
--- a/net-mail/dbmail/dbmail-3.1.3.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/dbmail-3.1.3.ebuild,v 1.1 2013/08/20 08:54:47 lordvan Exp $
-
-EAPI="4"
-inherit eutils multilib versionator
-
-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.4.ebuild b/net-mail/dbmail/dbmail-3.1.4.ebuild
deleted file mode 100644
index e46d1ecb892f..000000000000
--- a/net-mail/dbmail/dbmail-3.1.4.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/dbmail-3.1.4.ebuild,v 1.1 2013/09/02 11:46:03 lordvan Exp $
-
-EAPI="4"
-inherit eutils multilib versionator
-
-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.6.ebuild b/net-mail/dbmail/dbmail-3.1.6.ebuild
deleted file mode 100644
index c4c9542cedff..000000000000
--- a/net-mail/dbmail/dbmail-3.1.6.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/dbmail-3.1.6.ebuild,v 1.1 2013/09/16 08:30:47 lordvan Exp $
-
-EAPI="4"
-inherit eutils multilib versionator
-
-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.2.ebuild b/net-mail/dbmail/dbmail-3.1.8.ebuild
index 41d1fc269d99..95a1e81dc94d 100644
--- a/net-mail/dbmail/dbmail-3.1.2.ebuild
+++ b/net-mail/dbmail/dbmail-3.1.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/dbmail-3.1.2.ebuild,v 1.1 2013/08/12 19:48:52 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/dbmail-3.1.8.ebuild,v 1.1 2013/12/17 13:57:58 lordvan Exp $
 
 EAPI="4"
 inherit eutils multilib versionator