version bump and cleanout old versions 3.1.x

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

4 files changed, 12 insertions, 156 deletions

diff --git a/net-mail/dbmail/ChangeLog b/net-mail/dbmail/ChangeLog
index c16e294e3035..782cc8dcb807 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.54 2014/01/08 06:40:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/ChangeLog,v 1.55 2014/01/09 10:31:37 lordvan Exp $
+
+*dbmail-3.1.9 (09 Jan 2014)
+
+  09 Jan 2014; <lordvan@gentoo.org> -dbmail-3.1.7.ebuild, -dbmail-3.1.8.ebuild,
+  +dbmail-3.1.9.ebuild:
+  added 3.1.9 bugfix release and removed old 3.1.x versions (both affected by
+  bugs)
 
   08 Jan 2014; Mike Frysinger <vapier@gentoo.org> dbmail-3.0.2.ebuild,
   dbmail-3.1.7.ebuild, dbmail-3.1.8.ebuild:
diff --git a/net-mail/dbmail/Manifest b/net-mail/dbmail/Manifest
index 5e57078b3517..74ea7dca7178 100644
--- a/net-mail/dbmail/Manifest
+++ b/net-mail/dbmail/Manifest
@@ -1,32 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX dbmail-imapd.initd 730 SHA256 f8c16208f31495d2557e6ac101f1dd9f18636268511c889a0ad4dee0c56612da SHA512 f7841d64447630b771d4c3b0885d188d143959f00db1caf08ac4cd32d8610ad2b9221114f08bb456c9ad99529c66a52c5b2403c96ffe62549e28dc64ff9b6f7b WHIRLPOOL 9b9cb243d70e00f744e9bd4eeab887eb525643fe77cfe3e8c1f01c376edff165052f82965a7486d630d5fac22500641745a0e88b33303bc56e6780e351eaaba3
 AUX dbmail-lmtpd.initd 730 SHA256 2aedd5fecc1ef28289c870030c31f8ecaded4f2651be355a40216262a8a4d4a3 SHA512 201161e87a5b14c4637c16bddd07ab2907d95a997b39bb4d40d6ad21d67588149d7d900d364ce7a28006e0fea2bf48ff11ceae83c05a292d80603ed9300e1357 WHIRLPOOL af80c16be5f3119a88871b007936c5cd3e2b4e9399b89eec832b13f587de48e563a0a024259fa463f514461b7f56693d4ced02e084c4954dbb5f0994f42bd1c3
 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.7.tar.gz 2395315 SHA256 657965a87a217495b2bd5f292ef1b4948e85d195e54e9c0e4981d46cf72427aa SHA512 6a9ab494c30760f7bad2acae54cbc241bcc6befe31dfbd1071cfd00ab720081339263d34694616fd6b2cfd047fc1837f1bd617eb999733d519f35b9995b8ff27 WHIRLPOOL 8406f40536fcacd6f132c26e676e67348fb58a4c288741ea36dd70274b3dc0333d10f382d42eb61e3aa2c108e69d9f36e17dfb3f1da03117e577c93d1a8a125a
-DIST dbmail-3.1.8.tar.gz 2397311 SHA256 38ae88c8a854044ec7eb4ac274238a02612ffed201352859eb3d426dc7b6fff3 SHA512 b86ba5c27beae95172da50692369b061176a256f9dd2b5e21ecc9e8541e6fc4d7c3a6cd22f3b3fdedccd762845636ffcb547f04cb28c0a42f5ed81e547a75f71 WHIRLPOOL cad5930388eb7248c95cb8d3628989ef4cfab6453416242fe64b948d1020ee516c1f25c42dacaa97778225163f789ad5749ae6f1663681774a11913ed3729358
+DIST dbmail-3.1.9.tar.gz 2397293 SHA256 665f42700654aae767d24647dde284a4df7aec1702a00d1122d55b3f9f4318dd SHA512 99b0c915256a1849fe41963e8ce64905e9a4533fa8821a98c2bc3ad0824b6417f370fe7c2411721480a93631db67be08e558b5282a29c3cb04a69ac358ab4775 WHIRLPOOL 2732a92b880440e4c98f6b305e8fd6b399bdaac097d284f4e69c493844977b558f6f06723f69ec0bdd5339784ce6feb58b17538eac877c2726d581e2c3931ee4
 EBUILD dbmail-3.0.2.ebuild 4911 SHA256 370222620c4674b6788295aae68c3418d5a703d22b550ecad4ac2968852ab5cd SHA512 f375a440feaa842499da6c1abb2e820e892333f1a912e41b1f969575bca1dacdf6aa8def389a5554af021a787e6cd04a00d195b6aecde7f7675eadaa6821cb70 WHIRLPOOL ce522bec13b2d8eab1452d66f91743eef828bcc523fa2a07f8b950dfed5db716a271fc3cc7f065a96ed60f6f2ba8cce593c5822dc276ee29837ab3857c2188ef
-EBUILD dbmail-3.1.7.ebuild 4244 SHA256 78aded0fd40252fbaa6c4cfa0597866229e70e088d3d94ff790a5654fedf61d7 SHA512 680d206f787e3daa1c04f731f8599da364d8125a2fc0b912bbab5d33d31e9e92d80d3fb4d43644f82e3f4656490f876903d8b79ba7f0e593b61de0fd029a80aa WHIRLPOOL f93bbea6bb890cd91e1b23e558a1eb555e1ff015d9fe826e7a3c5a43ea173ea88bd14c389517c1beb528c3bd9587efdce746f0c8d8b23a04a5bd21cad9699dc8
-EBUILD dbmail-3.1.8.ebuild 4244 SHA256 a686157dd8af7033f051aed832244ab540477565ec9bab75f31f24e61825c33f SHA512 2048de6b86b6f90f77edafaa4565db4811736c474ce7741b425ad8bdaa330833b804ce0266bd2b3920379b16f16e6af98d56b628e8f1578147cb48ca8b1fd0d3 WHIRLPOOL 4b7b97b987828e67063731477b196630fc8315a167bef4370a07803719989ec7416e9f10d0571e99423f4e9bad268035217ed1e4b39f5650bad207024d8a9969
-MISC ChangeLog 10307 SHA256 b66ad7a266efc3fc57a45ab3f393fda483b8a5ce03d37652ecca1fc05c3dbb19 SHA512 c83e2f887021e118dfae57b247d519a89d0822665bece547ad80e6a2c3cfbb5b1733e1cbe3e491c332fdc9e31b4d4f698c9e2bc8263e606b4439e389eaaff35f WHIRLPOOL 6ee2720131c848151f46942e18a8da09a05b116630d8476fea133a83e1e1e35ba238b0be3a773ab35153f89312b1a90c24f0b31e75db3cdff6d848d8e3b477de
+EBUILD dbmail-3.1.9.ebuild 4245 SHA256 10ff358c4b1456eb3e9885eb9e645eb7acc1b74ac517d6afd4c5a68c7d5b24ba SHA512 d9527624b055a1e5c3820182358cd99153f5cb100c88ea2a867e04b71a4e3f7c23c57cb0bfc7e169f1d5e06f587bf9e5292d98ae74bb05fa4bf6fc8f5703dab3 WHIRLPOOL aaff70eac092898240396eb306c9e7746479ee3494ec1ea920d464b6cdb51d13e3fd919b601bdb8516ed431bc05741a302f9a3ffc381c49b68c54849e832b23e
+MISC ChangeLog 10528 SHA256 5a50ac1afa7b3f842f2b77cc55c1f086cff879b120bd024dea5a293ec4509f19 SHA512 e571605caf3094324749b056dc3f13eb4ff19f1cbbc2edea59f62120f06461ef244b68032dd3fc03587e025ac1b5c942cd2a708cea7bf180e9b52e090c9dfa83 WHIRLPOOL f8b7187fd3eaaf82504989e2cdb26cbd9c73172d3b29bc8b0393a7e748782cb087b7f4d1d673644117a837d2187a310c4919387cfa59699c5b6c9e78593a9036
 MISC metadata.xml 580 SHA256 8a14856cce888d8658e3ea9388e18a9b6892c6e00fd478c1afd4c5f496dccc14 SHA512 4533cb22ee9b8cec8565bde5ebbcb7ac1f9bbbac49cb38af370e3e6325a6a7a31d04adb301ccf23c53c0478bf692466a9599c8bf8ed2715be9a3d28741f6f6f7 WHIRLPOOL c920b009c23cfedf06ecf9814de3e71314153c8879b14891e2f39580cffa100f8544684d60d7802558f383778900f914598bb9ee9cd0b52f839ff4c7bad566b6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQIcBAEBCAAGBQJSzPLoAAoJEPGu1DbS6WIAIbgP/RBIL2rQz/WLCDatQlpQXDmr
-JL1pTR0nMQ8KP5lv0tdR0oPWSYsuMfHsOCMXnGT60+M4PTWybuLy2j3/6wJwjSV8
-py1UslMKu3dqmtcgcxQHYQqKNAKqa47/rfYIxfnoddD0xYMYPT9uXmKNlolRrJk1
-OUwtJxm0dU0MkKtgeS0K9U900jJBieGL+8M6MFNm/14BiOyIs3KX2zoJlNO3MDzV
-0+k51VdBVWJaNVfPyfsWPQzoSaNH4hoCnhhqyr12ld5a7EOZVxZfbMei+4vEh9jI
-MbxRTKJ3y6CpvrREngZyAV+taS1+NQTTeKw7Gt7rN2JroNiLlXJ6us8BWhzhkhPp
-2AuoWyl4tvUwqbZfEZEKwWcuaaZPCIdE2UqMCMLvbOqhWVTRtOExOWCWiBuXR/su
-z17wnd+2gns69O2TCfx9uYIopEX/sWPMPbrxn5hHh1Q5Xe7QhadK3++/pcogWtO/
-63jNP3gM8DkeAA54O3PmEPMZTi9zvJifaIHuxwrANU+geAJwSe9oDvPcL6WaZDps
-VPXko8mhTYnscbK3cER9ByYwqFhXWTQXeFhyuA8hdvaZAuqAa2RlHwfhyI27i83Y
-6TL/5dP1K6yokxgJrUSQ3MhOdmWCIRx2bGSq8wz2ApMrJBpqre097yXwQZ2ep0e2
-VaS3SDp+UMPgd2AW3hMs
-=hmPi
------END PGP SIGNATURE-----
diff --git a/net-mail/dbmail/dbmail-3.1.8.ebuild b/net-mail/dbmail/dbmail-3.1.8.ebuild
deleted file mode 100644
index 570d8619cffa..000000000000
--- a/net-mail/dbmail/dbmail-3.1.8.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.8.ebuild,v 1.2 2014/01/08 06:40:32 vapier 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.7.ebuild b/net-mail/dbmail/dbmail-3.1.9.ebuild
index 9fe14693a284..309f38a46290 100644
--- a/net-mail/dbmail/dbmail-3.1.7.ebuild
+++ b/net-mail/dbmail/dbmail-3.1.9.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.7.ebuild,v 1.2 2014/01/08 06:40:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/dbmail-3.1.9.ebuild,v 1.1 2014/01/09 10:31:37 lordvan Exp $
 
 EAPI="4"
 inherit eutils multilib versionator user