gentoo resync : 07.07.2018

17 files changed, 108 insertions, 348 deletions

diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 285331d17e87..4375f33f2067 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/imapsync/Manifest b/net-mail/imapsync/Manifest
index 6852d9e67f5f..295ab987673a 100644
--- a/net-mail/imapsync/Manifest
+++ b/net-mail/imapsync/Manifest
@@ -9,5 +9,5 @@ EBUILD imapsync-1.607-r1.ebuild 784 BLAKE2B 815bc5222b7ca23748aa95e0e5865b794ae5
 EBUILD imapsync-1.644.ebuild 784 BLAKE2B b29b0d59d6b6e91c3f90f56fa9553ccc49715e6c185935316d7afe692c245e5de4d3b48994e45fcf4c88b77e31237ee1e2eaab187a898f0f51a2c050b9939f95 SHA512 a1e581107f28d4b030f489dac3b5dfc87159b20f950d030e5112b6e0a6aaca194b958fbab946fcf72bbd46b6075b51379f1055c0f93e4aa7de6c200ab1d6e77a
 EBUILD imapsync-1.684.ebuild 785 BLAKE2B 510b45d577026bad26eed137c20475fc86cf6bf205f2f454478464f36e718084d996556ec90b14844c8d88a8ba16d5af7bbed847e976121d84ed8867415c948a SHA512 0f38b8221b85c460ba9a149ee5cec573143e2413d1fabbe26469d169052f82eec1dff823a9775d2afc93efec961e8d521100c889db3b11f4706446258587e540
 EBUILD imapsync-1.836.ebuild 921 BLAKE2B 4bdff06ddc043c38875613b673683f2d97b7d25055fb199e22463ca2feb2bad7bed7debaca1102c8141d0169a14033c2d5265748ebcefbd31138ad49e39fa295 SHA512 6e4c5c4bccc4810b379639edf16db43c997d1239a9ba8eb77f29a0ace593f40909039103bf9d0ef3adeda8064b708b05fca4c303b70a394ff0423723b755d481
-EBUILD imapsync-1.882.ebuild 2082 BLAKE2B 849f0d6e394d18fae9aa5e86cd361b8920763163b5193b2a531d938cd9435837b68d28c2ecd1fab0820d789c107b14bf6e703ce8022a52391b0f4308fa822eb7 SHA512 58e8c6f904f8352ad0154b947401635357b26c299b80d13e0e2b816608fd8bd19bcc021b8a90d2369dbbb1bd8ef92695d8c19ec801f073aac8b69597ab048906
+EBUILD imapsync-1.882.ebuild 1943 BLAKE2B 09891b19c95241c592ea38f048728be00d65bb862cf960557805abfb56a8883e241a5f0d484c6436866c15480e1fc7ea13920f646c714c674f1d0f02acd86bfd SHA512 71b0698544d99be72aff2b6aa9a9063d3aca64b99e5dc247b77a65e9b57d37d988463d5e2fa9a3887658177e5854be4fa6c2ab2d610fbe4c5f1b54584fa4f44b
 MISC metadata.xml 326 BLAKE2B 5bc18c049b6907e1efa4ebd4bcf8d07346ca02ff93a48cd69df9461a44d3394167c110aadab2f90f1d721188c65c818477d6cf861306a3274fa1a1725111d499 SHA512 b16222d629a0208e627ab47284c4eec08f0598c5c12e1ed62b8dbe23727711b396b5764429c07f7b85ef035d04398a9233b400344fc72e974dcbae90d4e7d8b7
diff --git a/net-mail/imapsync/imapsync-1.882.ebuild b/net-mail/imapsync/imapsync-1.882.ebuild
index dc2734c050fa..d3498548fa25 100644
--- a/net-mail/imapsync/imapsync-1.882.ebuild
+++ b/net-mail/imapsync/imapsync-1.882.ebuild
@@ -31,7 +31,6 @@ RDEPEND="
 	dev-perl/JSON
 	dev-perl/libwww-perl
 	dev-perl/Mail-IMAPClient
-	dev-perl/Mail-IMAPClient
 	dev-perl/Module-Implementation
 	dev-perl/Module-Runtime
 	dev-perl/Module-ScanDeps
@@ -41,22 +40,17 @@ RDEPEND="
 	dev-perl/PAR
 	dev-perl/Parse-RecDescent
 	dev-perl/Readonly
-	dev-perl/Readonly
 	dev-perl/Readonly-XS
 	dev-perl/Regexp-Common
 	dev-perl/Sys-MemInfo
-	dev-perl/Sys-MemInfo
-	dev-perl/TermReadKey
 	dev-perl/TermReadKey
 	dev-perl/Try-Tiny
 	dev-perl/Unicode-String
-	dev-perl/Unicode-String
 	dev-perl/URI
 	virtual/perl-Compress-Raw-Zlib
 	virtual/perl-Data-Dumper
 	virtual/perl-Digest
 	virtual/perl-Digest-MD5
-	virtual/perl-Digest-MD5
 	virtual/perl-Digest-SHA
 	virtual/perl-Encode
 	virtual/perl-MIME-Base64
@@ -65,8 +59,8 @@ RDEPEND="
 	# HTML::Entities
 	# JSON::WebToken
 	# JSON::WebToken::Crypt::RSA
-RDEPEND="
-	${DEPEND}
+DEPEND="
+	${RDEPEND}
 	test? (
 		virtual/perl-Test
 		dev-perl/Test-Deep
diff --git a/net-mail/isync/Manifest b/net-mail/isync/Manifest
index c904ee779d54..760461203ddb 100644
--- a/net-mail/isync/Manifest
+++ b/net-mail/isync/Manifest
@@ -1,8 +1,4 @@
-DIST isync-1.2.1.tar.gz 281990 BLAKE2B 37f3231395bb5b74689ee1e3ac009c15c263a15883c12d31ceaad03751ecd2ea025198aabd0d5a759e250e0f3d756585ee66e0c82af43b79beed5568ebfbe9d0 SHA512 706379e602cdcef3a1ca7eaf2301cfea15b9bbb5ee46c8f598308ad68a48725c6a4d13a2e73cc4633efec34fda1dbcb89bdd0e4c2e06993fa24db69cce9ff50b
-DIST isync-1.2.2.tar.gz 285745 BLAKE2B c3aef606df7c84879f924685aebca4823d77e6bf6d53a8b67bc0f40aa310eea29afa2c6a477acb49317c202d8ff143458ec9758eb1403ff66b93af67052c1835 SHA512 246dcf0704c0afaad7c402a5fc304ccfd533dc084cd775df4d8d2cb53e69f5236a603d56a54f63b389049a556e23c0dfafb80a4ba929e1b4cffb90200eaf65d6
 DIST isync-1.3.0.tar.gz 309459 BLAKE2B 852b37e1d9d5b0c4fc2f84305e88263adff5448ea355782da17f295a22e3265e68edcc049ce6172155ab0be7518a0431091d45f4e012f49b500fde7c28491ece SHA512 b5186f2afe97cab58ce55d3ec19ae7371676ae614448614a9e3e02d09662c34b74e559f0926661fa0300ab22dab9e2e9089b78ee38b94141ff3f8b4d75578ffa
-EBUILD isync-1.2.1.ebuild 707 BLAKE2B cbc88a46258693097c196fcc4ef71aa3bf37eaa294fb12379c63ad322f468a672cd4082059fcf5ac37aade2965fbdc17297ab7f7b97847f50be437aaac438596 SHA512 c7fccacd5e7332f4a266475427d66e91b044a8841299a70d03a489a49e4906538fac8e9f5a70c2e21d4c0f310481d4b1754aedff08de45e5ca671ebb8aa06a2f
-EBUILD isync-1.2.2.ebuild 709 BLAKE2B dc2f6ac61722eb766331d2d74c4207f8df2a597b854840f90ca859a0f724116fbd7e9f49fc5a32048e46fb302424a8e374fa18c50a77b2d119a472fab085820b SHA512 8297884c0ee86c9d55e1f4c0ed12317c7bdd592d8bf1fa389dca9ab2d05914182fe61e260f2ae2329f1d58dca6a7eb668acd4ce936e0a5838080e624d2e89462
 EBUILD isync-1.3.0.ebuild 707 BLAKE2B 187a92a7da6c4d8fa8ee0651b36fb209e7c1fa054f82ec6351c5ef16d044583ed6f7af0b31e32efd450e25f678679cc6d7d5a3edc264902f8d0de7a28a65395f SHA512 ae1539349cd2097bc69243900bd6920a72a49557272464eae0507a36c42564f6be240c2692c61396cb70e4b6147b3b182e42a569c8cc30b9a500b60d56db5d81
 EBUILD isync-9999.ebuild 836 BLAKE2B 40b42361c93c1cc350318e81c5cd4d6438f89eb64adf45fe65433c993df045322eef4466249375f583ab6da95e27797e9b2688f2ce1f274a017316dcd60b5425 SHA512 178cacd53cabcdddf89dfdb7ec3a0a84fde49d46c3fe260a43a3dd025771f90cacd9aa284d69e8fa99fb1448055c489c2a2799918e077a7d27fa46939c7eab95
 MISC metadata.xml 468 BLAKE2B e1d79a9299b8abba3f692bd43bed3d9860496d9efde30710b03e8583736327bd33e53fb09fb3c00258d7e0510418a5e5ccaaf22f8890859cae2c1dfd1e71774d SHA512 fa787ea7cb87f19bed04af3060b0c06135662baa65ae631d799e461dfc2e88aa52ad8998b5bd3074537d034fd566413bbf8055e678e12300f151701489e316fc
diff --git a/net-mail/isync/isync-1.2.1.ebuild b/net-mail/isync/isync-1.2.1.ebuild
deleted file mode 100644
index b09a08848da9..000000000000
--- a/net-mail/isync/isync-1.2.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="MailDir mailbox synchronizer"
-HOMEPAGE="http://isync.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
-IUSE="compat sasl libressl ssl zlib"
-
-DEPEND=">=sys-libs/db-4.2:*
-	zlib? ( sys-libs/zlib )
-	sasl? ( dev-libs/cyrus-sasl )
-	ssl? (
-	    !libressl? ( >=dev-libs/openssl-0.9.6:* )
-	    libressl? ( dev-libs/libressl )
-	)"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		$(use_with ssl) \
-		$(use_with sasl) \
-		$(use_with zlib) \
-		$(use_enable compat)
-}
diff --git a/net-mail/isync/isync-1.2.2.ebuild b/net-mail/isync/isync-1.2.2.ebuild
deleted file mode 100644
index 838bb0f289a6..000000000000
--- a/net-mail/isync/isync-1.2.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="MailDir mailbox synchronizer"
-HOMEPAGE="http://isync.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="compat sasl libressl ssl zlib"
-
-DEPEND=">=sys-libs/db-4.2:*
-	zlib? ( sys-libs/zlib )
-	sasl? ( dev-libs/cyrus-sasl )
-	ssl? (
-	    !libressl? ( >=dev-libs/openssl-0.9.6:* )
-	    libressl? ( dev-libs/libressl )
-	)"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		$(use_with ssl) \
-		$(use_with sasl) \
-		$(use_with zlib) \
-		$(use_enable compat)
-}
diff --git a/net-mail/mairix/Manifest b/net-mail/mairix/Manifest
index ad1177bf82af..67d32f748846 100644
--- a/net-mail/mairix/Manifest
+++ b/net-mail/mairix/Manifest
@@ -1,4 +1,6 @@
 DIST mairix-0.23-gnus-marks-propagation.patch.gz 3401 BLAKE2B 258e1dec608c896d7ffdff4ebffe959703ef371bcd9c3dddad44793cf43377dec78e289517c3bc5cef3f51d56eb0996c1f873c7ed092ca4d0084b50b35d10a9f SHA512 89572c1dc1913b974461a3cd75787d9360cabfaf08dc987ccf2ae5519dcf8d12935e22ca5ff3e2e58038f04b818884bab305a11393ca99bb6dad86018d863d1c
 DIST mairix-0.23.tar.gz 193726 BLAKE2B e1de3f7d8b81a23a87845fe4cc285ee46232a14eea77e9f8191dc26fbaddd435d1a1e194158b13542ef201851cc03e32eece2e7b16fcd6be71595f60f82e10d1 SHA512 3ea372304e91eed6127d8e71cf0970c9380e4dec96fd9ad38a6deb1af455ae6eb604dfbb2ec372cbb940beb8459c39d8620af12a996d7f6a37e893fbb588e61b
+DIST mairix-0.24.tar.gz 206903 BLAKE2B b18832dbd5d570d428c454ade693ab0746b6e601d94a9b6d5dd4ca81356cbaecaec5c88623fe5bd612e94112dc4b6f16929fc210ce3c5c8e1e5d2a0c62309d79 SHA512 3e0af50c2c5857c5e1661e1be131c9c184377947b2ed884d1d9faa6d8bd88c17a7b7a29e105e65c990d2ede5d9fff679e57e83c4b8eedf2870493395e3ec8cf3
 EBUILD mairix-0.23.ebuild 1127 BLAKE2B 5849c85e56f2d6fcb7c36db6e6a57a9320df46d469b942a3138c56b307bc0259a4f3d934a0274b250d583fcdde360a602bdfd00416b3c00dda7248637e1c460b SHA512 c5dcaf358b4d6813173545ee12d582b377df0a341d28b820b7b2f708924e0bdd64db2c7c8f5a1e7cd6a88a1ae3a7526d399d00e0ed39d3555cee570658bdb0b7
+EBUILD mairix-0.24.ebuild 940 BLAKE2B 663da72cc3f39b05b88786d42dbf21e6cff8d3bc7dd0c8312acc6e663d68335aef4012d79e7189d4956ea6a6cf88b7a9fa31e34e227183d60b4b39e67a6cf8dc SHA512 04706eb4755fea2b4814396d28d227f2388519887714dc9008b14573650e50fd2be6a6f55bbba56b651a5d0990738edca255e808f56c4e6fdb336b64360ce08f
 MISC metadata.xml 512 BLAKE2B afcbf886af3bd45c9f9a0ff97d1dd38b6b93a240205948e025de1a77b57a8c85e694748720f4cb8a2274d82b878263fd087a8ebd22e96f4e58cd5009233cbfb4 SHA512 0e5324d0a9b4963342d439deb7fe7def81e523a30b1fc6a2cbd6b475529ad1183835fb281b3445ece75e0cc49f753b9e2908316bb804d0d66cde9577d984302c
diff --git a/net-mail/mairix/mairix-0.24.ebuild b/net-mail/mairix/mairix-0.24.ebuild
new file mode 100644
index 000000000000..2fb5df966c5f
--- /dev/null
+++ b/net-mail/mairix/mairix-0.24.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Indexes and searches Maildir/MH folders"
+HOMEPAGE="http://www.rpcurnow.force9.co.uk/mairix/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-macos"
+
+IUSE="zlib bzip2"
+
+RDEPEND="zlib? ( sys-libs/zlib )
+	bzip2? ( app-arch/bzip2 )"
+
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	sys-devel/bison"
+
+# Fail on various locales
+RESTRICT="test"
+
+src_prepare() {
+	default
+
+	# econf would fail with unknown options.
+	# Now it only prints "Unrecognized option".
+	sed -i -e "/^[[:space:]]*bad_options=yes/d" "${S}"/configure || die "sed failed"
+}
+
+src_configure() {
+	tc-export CC
+	econf \
+		$(use_enable zlib gzip-mbox) \
+		$(use_enable bzip2 bzip-mbox)
+}
+
+src_install() {
+	dobin mairix
+	doman mairix.1 mairixrc.5
+	dodoc NEWS README dotmairixrc.eg
+}
diff --git a/net-mail/mpop/Manifest b/net-mail/mpop/Manifest
index 8044def11c91..b4b3c1148b2d 100644
--- a/net-mail/mpop/Manifest
+++ b/net-mail/mpop/Manifest
@@ -1,7 +1,9 @@
 DIST mpop-1.2.4.tar.xz 268900 BLAKE2B 9469c450930864ca902d333fac0fad492a798ca8012caa38730a31ba70caf11c65b8e56f67d0517c30303d880139ca161163bf52e334fea74a066993163cfcdb SHA512 2ddc395f76adcc9fa1a1bdf0749a29eeb40a51b3c1633fb0e6b967b68be79a160ae8aab8433a2565a2146ca0d24d2ad00e1cb5a66652e737dd0ccdbac27ae70f
 DIST mpop-1.2.5.tar.xz 269204 BLAKE2B bbcaef547676827c89c04dc8afb84f6679788b085d39dac5cc9881b0334ec1aae9752fedc44d762c85f381403a90c1e62306e1fc7ea9ef6fe075b8a1f6f642ee SHA512 9c724915f2f6b776ed0d8f27b3af5e2c86c63ccfd2eb4bcdf69f4f86f47d10ab23a21cd76e5ee173ba18bb7ccbc5f13a2dc9c2cbbfa91b9a40dddc5197c4c1de
 DIST mpop-1.2.6.tar.xz 269912 BLAKE2B cfcdf1cf4bf8e2ba6a9ccc8d7c725f2bcbcbcb545ad27b0bccfceba0d9b6d04d729035c96346027eb9c5821832f740d388163dcc7a15555d4d5c6361ab0824fe SHA512 ba4dedebbe4b7b9f84a339e7c605cc9082e95d8cf0c5331dbc74b83ef64f7de47da996e61dbbaa33dd093650a3021eb75a7f188a9abc985c741108d060b6bd7b
+DIST mpop-1.2.8.tar.xz 272632 BLAKE2B aebea78c44103284929d7819e00377c8d64d0de1c7cd877e8d63ea4e3481ccf05d9d27ec5b5f7433bf723bdd421a7fe8ed54a2e44ede9dbb3a6447a98e5596cd SHA512 34039d6a4b3b316679cb646ed0db6b0a11f47554576e9aad35402388718c3c7787e3854c144cec921cab0aea22e0484a1f71c2283bc1d0a37e6e69a0f6530602
 EBUILD mpop-1.2.4.ebuild 1103 BLAKE2B e377cbfc5858795778c509d3d3db6901dca5fab1ec62189f3500c8461bff0ae66c2aefbac67acc16ec8aa73e4689c536982dce484815e82ca5ad734edfc1f52d SHA512 2e4da67d2793521dd7178faf45b67f800219be22740a1be55858f5de0700afdc7c0cc105e4a692d7075c16ab27287af5de99345d9388e6b3af6948e2de782882
 EBUILD mpop-1.2.5.ebuild 1103 BLAKE2B e377cbfc5858795778c509d3d3db6901dca5fab1ec62189f3500c8461bff0ae66c2aefbac67acc16ec8aa73e4689c536982dce484815e82ca5ad734edfc1f52d SHA512 2e4da67d2793521dd7178faf45b67f800219be22740a1be55858f5de0700afdc7c0cc105e4a692d7075c16ab27287af5de99345d9388e6b3af6948e2de782882
 EBUILD mpop-1.2.6.ebuild 1103 BLAKE2B e377cbfc5858795778c509d3d3db6901dca5fab1ec62189f3500c8461bff0ae66c2aefbac67acc16ec8aa73e4689c536982dce484815e82ca5ad734edfc1f52d SHA512 2e4da67d2793521dd7178faf45b67f800219be22740a1be55858f5de0700afdc7c0cc105e4a692d7075c16ab27287af5de99345d9388e6b3af6948e2de782882
+EBUILD mpop-1.2.8.ebuild 1103 BLAKE2B 48d3ddc531310bdda5557bcb979356081c85a9147ddcc6188dd618e1cea9b29ae8b9df84e1b9bbd7f077f185c960b231b060485f5222b4861d4a549c924fbbea SHA512 8b9ac4154d874b5cddf9e5b5efe50b267f5d31b09ef92ca9fd598c0e1aafb517c85e8c8cd00b9db669b4a433ec7f105f772f7ac717b62fa1124dab3edd94daa9
 MISC metadata.xml 417 BLAKE2B 3c7a493ab2f179da566b98df102d3bfc7df20a3eef4694b1ec6ea8dde00197dd526f77af2d42e9c63670eace496992def5d2d29cc929f52f858935941e2ad669 SHA512 a0e8a9f86bf3a53d1ba38cb3da1c12a9df7372876f3cecf089dbef4048149ec7a11fc3f007aa2c50059a0be72c91a4c608e87d206be89c8f996f246e8a828012
diff --git a/net-mail/mpop/mpop-1.2.8.ebuild b/net-mail/mpop/mpop-1.2.8.ebuild
new file mode 100644
index 000000000000..df810dc76e57
--- /dev/null
+++ b/net-mail/mpop/mpop-1.2.8.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A small, fast, and portable POP3 client"
+HOMEPAGE="https://marlam.de/mpop/"
+SRC_URI="https://marlam.de/mpop/releases/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="gnutls idn libressl libsecret nls sasl ssl vim-syntax"
+
+RDEPEND="
+	idn? ( net-dns/libidn )
+	libsecret? ( app-crypt/libsecret )
+	nls? ( virtual/libintl )
+	sasl? ( virtual/gsasl )
+	ssl? (
+		gnutls? ( net-libs/gnutls )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig"
+
+REQUIRED_USE="gnutls? ( ssl )"
+
+DOCS="AUTHORS ChangeLog NEWS NOTES README THANKS"
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_with ssl ssl $(usex gnutls "gnutls" "openssl")) \
+		$(use_with sasl libgsasl) \
+		$(use_with idn libidn) \
+		$(use_with libsecret )
+}
+
+src_install() {
+	default
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins scripts/vim/mpop.vim
+	fi
+}
diff --git a/net-mail/offlineimap/Manifest b/net-mail/offlineimap/Manifest
index b1f02df6ddd6..0f407b010f3c 100644
--- a/net-mail/offlineimap/Manifest
+++ b/net-mail/offlineimap/Manifest
@@ -2,20 +2,10 @@ AUX offlineimap-6.5.3.1-darwin10.patch 361 BLAKE2B 3331f6bde79b55792d7fbb6d3183c
 AUX offlineimap-7.0.3-darwin10.patch 316 BLAKE2B 3f9adc406881e43462aee6764ef7aafc69a94f7e744722856da04448e68972c9942f8b6a8e4eba84c7fe714be6cc3b7de25424984f21b96df24e22d2eff333ff SHA512 b195392db8e39264891b91c855cc0b1cfeb76e7b0a22281e509c17d4ae07458e980f7810c223f2a835f01f4ba63c1f9592c934121e763bb01846f20c51013186
 DIST offlineimap-6.5.6.tar.gz 187801 BLAKE2B 78561ffc0b0dcd3dcd3c75448f1e412661ac5061eebfae5796dffb3a6e8767b54138328aa0a8ab5a1745ed0690809965ea76b9b8e66ef250936b0b72cd07e337 SHA512 3f7cb63d00486de2d648aa9dd3637ce252dd100bc8237742d11f749726b2b14907c07c802ba0fd5891c88f5062f9a2d05ebc78ceee8c30981f4c4579c3143d6e
 DIST offlineimap-6.7.0.3.tar.gz 679221 BLAKE2B bdc5013dff0a3dc1e79326d6c7bac6ebb524e6b1f2ea7f8492abaa54ec2436406ecbebe981e085e9f4ee572355b798806b76ea5998cbd0225db03c03d5fc9093 SHA512 21800eb14e814fa04b983e9718a5780deda4c99ae55ef900ccec9f1e65f9bb783c3469e00e6595c7dfddb60d760a6b3c98ae979da3219de51c8ae107ff1c077a
-DIST offlineimap-7.0.14.tar.gz 698081 BLAKE2B 7b3752db8fec161b83405e904212bd7f775bceb743ff66e18097615036279bafce5907e6a98f9af4f419b6a6e5f80fba51064d1427eebb64e3c7a503d505cd61 SHA512 05d5ee81e5b0483038ad3bf8ba27f7b57423a75a3456df192c0c8b7926d7252424ef8f357f99dee2fa2f2590341e9f95d225ee2ad7d01af3466fb9d5488541f9
-DIST offlineimap-7.1.0.tar.gz 698600 BLAKE2B a786fb8302e2a60ab4004fda3e18dba631b5e5495281f61626de29c35d83a35b7b68a0ea153a105474ca9b341a9db7eb942091ae5cafd4f8e9009587aeeab37a SHA512 9e9d5ea2b58dc212c9b69adb701fb4cd1ac1a7c8af90623dcfba3115ee7e1f63cc8569c352bae8f1fe09eb8c9255c39d0bf947dfb5d683ee4b03c0c822cb192d
-DIST offlineimap-7.1.1.tar.gz 701776 BLAKE2B 3af42b07e694ff1e40340cafbf14b0da689f29a638bfe62c2c5020f4c091041bd458c7891064fbb23ffac36add5e6bf45cd0a2831cac484f9e935b23512648a9 SHA512 a04a8bdbd2b22f8b74681707faa4fcd768a11abd4eeab1e3b6fd7e7851d97c5c7f7db56c7e7e4809a7cb661a357c38941ea320d9bcb0fc509b3f79b223a0c602
-DIST offlineimap-7.1.2.tar.gz 708014 BLAKE2B 848e7cfdec79a443529307503e49a86729be620862530ea438747c0d9f437548cf81f6f586211c8b7109f7a8e0d5a41ef06fb3f10d43938f60843d768ba19f46 SHA512 14bf6c561ad9cde72f71651970b98380139a016b689c75ed150027f8b71d9f1a646f6738e8fd74d6328103b25c17985ac494d9929568f90bb4be37b71a4de22d
-DIST offlineimap-7.1.3.tar.gz 710766 BLAKE2B 6a4c80e0ef12a77a2cdd84ba79307636e9a08fdee1d989936c6f6c3d42eadb6d5c98fb8ce3ed530c49a4ad5c424702342b55b78fc5ba7e46dd6d276675b80cd7 SHA512 bf24be740b0e7607a1b53df7e872b5dd4b4c720601d99bd88a7ac8add078e5512b62b18c12177e28a00f510aaa8a48e25be82decfdd7ae2da76b671d44071e4a
-DIST offlineimap-7.1.4.tar.gz 711048 BLAKE2B 0ff678339cf7c90159e3f7f64ac581469503584e356a773804e513200b40eb8b99c3dd6367c21a69fe8ef46bdac146b6571f6ef2f1292014009af20df890e682 SHA512 f2623a400de2fac339249f887529e1f02224ba40c5f739b4084b5b26d1f8b6f26faf2c248aeaecd48dd7f6cc27bdaa8b7691c10f3db3b9673a1a5338f435447c
 DIST offlineimap-7.1.5.tar.gz 711529 BLAKE2B 055fcaa714529407d404b45afc56f2b9c407865bbb6403a205f916926905c845c3dd9d025824de82850c17e2791c335aa11a38e9688c847d388ffaa97dbf5d2b SHA512 5e49e5e2f13a15f02036860d1622a79a1342c8d3c0ad1c3e56c32a90e9c6e439ed9b9de6b67e36bda19229e28bd17dcb132f093eb19524375b182dde079d6101
+DIST offlineimap-7.2.1.tar.gz 720220 BLAKE2B 309a51e88ebbc8dd7a4d807bc506a0d0d8a355e71f464e5347ba3ea02de6fd89a089bb982475982d62bed0900eb1aa5320163e49ac787b9d8abff029ac47ee7d SHA512 4e6bcda576fbf023e0192e8d19627d72ea824cd795ef65604d56b00f239298031ea512dcc17d47ae340be1515770c8588907bc767489717a9ab136e34843c197
 EBUILD offlineimap-6.5.6.ebuild 2378 BLAKE2B a9c962d9f3fcf4d23e46264fc5f877a40e4aa6646f35f7cde9a70003cc4afb5f9811ce74de1733ca2f810bd912fea4e2c4d261b4839c16e3ea83548d9a0ba345 SHA512 13e3f2a90322e9fe125e1d5f61f5df3f43e0db647aab7d289e4012e767fb7c50c76b844551ff6cc42cbc0650700c704c0ae983d80cd4221c27568da1d9e939d4
 EBUILD offlineimap-6.7.0.3.ebuild 1785 BLAKE2B 43edc0187230509d01c5f7044b166b91f705ea25d3ceca46ace97d46257667e097f5ae52bd2c9af95bb21110eefd4b5a2eb34c69b3b525119dfa28ef35fd7407 SHA512 16fa39e4875b3b32526730446bec76d2ac905fbfda2e83c4fcef43004d6c551eed58189dd3a55ad1cd23761d5577d7d1af37d3b92a46df39bf4fbba25ee0cb5e
-EBUILD offlineimap-7.0.14.ebuild 1636 BLAKE2B 045e7fc7932531830b72cedb329948b35145bac6a2c5ac3e777853180c0fa32e335b2577732d3c61d94d11fbeea1d4133a8f912e308889d0dd8c78fe816411ef SHA512 033e5823d7eb6f0aebf8efab0e926f634f4df7299a1faa8c8df11b6b6e72255abb8596197deff53114cc9908d95ea7194d3f3cef2d4b89f9132e4479721b1c22
-EBUILD offlineimap-7.1.0.ebuild 1636 BLAKE2B 045e7fc7932531830b72cedb329948b35145bac6a2c5ac3e777853180c0fa32e335b2577732d3c61d94d11fbeea1d4133a8f912e308889d0dd8c78fe816411ef SHA512 033e5823d7eb6f0aebf8efab0e926f634f4df7299a1faa8c8df11b6b6e72255abb8596197deff53114cc9908d95ea7194d3f3cef2d4b89f9132e4479721b1c22
-EBUILD offlineimap-7.1.1.ebuild 1636 BLAKE2B 045e7fc7932531830b72cedb329948b35145bac6a2c5ac3e777853180c0fa32e335b2577732d3c61d94d11fbeea1d4133a8f912e308889d0dd8c78fe816411ef SHA512 033e5823d7eb6f0aebf8efab0e926f634f4df7299a1faa8c8df11b6b6e72255abb8596197deff53114cc9908d95ea7194d3f3cef2d4b89f9132e4479721b1c22
-EBUILD offlineimap-7.1.2.ebuild 1636 BLAKE2B 045e7fc7932531830b72cedb329948b35145bac6a2c5ac3e777853180c0fa32e335b2577732d3c61d94d11fbeea1d4133a8f912e308889d0dd8c78fe816411ef SHA512 033e5823d7eb6f0aebf8efab0e926f634f4df7299a1faa8c8df11b6b6e72255abb8596197deff53114cc9908d95ea7194d3f3cef2d4b89f9132e4479721b1c22
-EBUILD offlineimap-7.1.3.ebuild 1636 BLAKE2B 045e7fc7932531830b72cedb329948b35145bac6a2c5ac3e777853180c0fa32e335b2577732d3c61d94d11fbeea1d4133a8f912e308889d0dd8c78fe816411ef SHA512 033e5823d7eb6f0aebf8efab0e926f634f4df7299a1faa8c8df11b6b6e72255abb8596197deff53114cc9908d95ea7194d3f3cef2d4b89f9132e4479721b1c22
-EBUILD offlineimap-7.1.4.ebuild 1636 BLAKE2B 045e7fc7932531830b72cedb329948b35145bac6a2c5ac3e777853180c0fa32e335b2577732d3c61d94d11fbeea1d4133a8f912e308889d0dd8c78fe816411ef SHA512 033e5823d7eb6f0aebf8efab0e926f634f4df7299a1faa8c8df11b6b6e72255abb8596197deff53114cc9908d95ea7194d3f3cef2d4b89f9132e4479721b1c22
 EBUILD offlineimap-7.1.5.ebuild 1636 BLAKE2B 045e7fc7932531830b72cedb329948b35145bac6a2c5ac3e777853180c0fa32e335b2577732d3c61d94d11fbeea1d4133a8f912e308889d0dd8c78fe816411ef SHA512 033e5823d7eb6f0aebf8efab0e926f634f4df7299a1faa8c8df11b6b6e72255abb8596197deff53114cc9908d95ea7194d3f3cef2d4b89f9132e4479721b1c22
+EBUILD offlineimap-7.2.1.ebuild 1636 BLAKE2B 5d5280b9461889f799d71f1b756cd5812673b388476c01a857fb2d6e76f1c31c2b688f601f2035d55873d0a243def598191ef0fb0261f5749e8fa45c42903dda SHA512 919380d9ae801b6208403849ae00fbd1ee79996170e2b95eb1a72bbcffbf99832423540a639cfabcd5295eda01608d9b86727d3ec96a507468be6495fb0cff85
 MISC metadata.xml 447 BLAKE2B 4bbdba65866601fada2c8123f208ee9f3956478b686a8491a80e092e1705f387b9cef50fdf8ec909e56b225ea5c1c63b74af3436ca95820d5b8d380bea45a01d SHA512 58d5e16ad0ea7a82e114eb99bbb6513229833523a4b3459e567083a6b21a63dbc0ca0c9559a5e4e04c64d66d19e71215154cab275d7114e0f6b57bec8020021b
diff --git a/net-mail/offlineimap/offlineimap-7.0.14.ebuild b/net-mail/offlineimap/offlineimap-7.0.14.ebuild
deleted file mode 100644
index 3258d1bf16b5..000000000000
--- a/net-mail/offlineimap/offlineimap-7.0.14.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Normally you need only one version of this.
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads,sqlite,ssl?"
-
-inherit distutils-r1
-
-DESCRIPTION="Powerful IMAP/Maildir synchronization and reader support"
-HOMEPAGE="http://offlineimap.org"
-SRC_URI="https://github.com/OfflineIMAP/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc ssl"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="doc? ( app-text/asciidoc )"
-
-# see http://pogma.com/2009/09/09/snow-leopard-and-offlineimap/ and bug 284925
-PATCHES=(
-	"${FILESDIR}/${PN}-7.0.3-darwin10.patch"
-)
-
-src_compile() {
-	distutils-r1_src_compile
-	use doc && emake -C docs man
-}
-
-src_install() {
-	distutils-r1_src_install
-	dodoc offlineimap.conf offlineimap.conf.minimal
-	use doc && doman docs/{offlineimap.1,offlineimapui.7}
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "You will need to configure offlineimap by creating ~/.offlineimaprc"
-		elog "Sample configurations are in /usr/share/doc/${PF}/"
-		elog ""
-		elog "If you connect via ssl/tls and don't use CA cert checking, it will"
-		elog "display the server's cert fingerprint and require you to add it to the"
-		elog "configuration file to be sure it connects to the same server every"
-		elog "time. This serves to help fixing CVE-2010-4532 (offlineimap doesn't"
-		elog "check SSL server certificate) in cases where you have no CA cert."
-	fi
-}
diff --git a/net-mail/offlineimap/offlineimap-7.1.0.ebuild b/net-mail/offlineimap/offlineimap-7.1.0.ebuild
deleted file mode 100644
index 3258d1bf16b5..000000000000
--- a/net-mail/offlineimap/offlineimap-7.1.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Normally you need only one version of this.
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads,sqlite,ssl?"
-
-inherit distutils-r1
-
-DESCRIPTION="Powerful IMAP/Maildir synchronization and reader support"
-HOMEPAGE="http://offlineimap.org"
-SRC_URI="https://github.com/OfflineIMAP/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc ssl"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="doc? ( app-text/asciidoc )"
-
-# see http://pogma.com/2009/09/09/snow-leopard-and-offlineimap/ and bug 284925
-PATCHES=(
-	"${FILESDIR}/${PN}-7.0.3-darwin10.patch"
-)
-
-src_compile() {
-	distutils-r1_src_compile
-	use doc && emake -C docs man
-}
-
-src_install() {
-	distutils-r1_src_install
-	dodoc offlineimap.conf offlineimap.conf.minimal
-	use doc && doman docs/{offlineimap.1,offlineimapui.7}
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "You will need to configure offlineimap by creating ~/.offlineimaprc"
-		elog "Sample configurations are in /usr/share/doc/${PF}/"
-		elog ""
-		elog "If you connect via ssl/tls and don't use CA cert checking, it will"
-		elog "display the server's cert fingerprint and require you to add it to the"
-		elog "configuration file to be sure it connects to the same server every"
-		elog "time. This serves to help fixing CVE-2010-4532 (offlineimap doesn't"
-		elog "check SSL server certificate) in cases where you have no CA cert."
-	fi
-}
diff --git a/net-mail/offlineimap/offlineimap-7.1.2.ebuild b/net-mail/offlineimap/offlineimap-7.1.2.ebuild
deleted file mode 100644
index 3258d1bf16b5..000000000000
--- a/net-mail/offlineimap/offlineimap-7.1.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Normally you need only one version of this.
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads,sqlite,ssl?"
-
-inherit distutils-r1
-
-DESCRIPTION="Powerful IMAP/Maildir synchronization and reader support"
-HOMEPAGE="http://offlineimap.org"
-SRC_URI="https://github.com/OfflineIMAP/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc ssl"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="doc? ( app-text/asciidoc )"
-
-# see http://pogma.com/2009/09/09/snow-leopard-and-offlineimap/ and bug 284925
-PATCHES=(
-	"${FILESDIR}/${PN}-7.0.3-darwin10.patch"
-)
-
-src_compile() {
-	distutils-r1_src_compile
-	use doc && emake -C docs man
-}
-
-src_install() {
-	distutils-r1_src_install
-	dodoc offlineimap.conf offlineimap.conf.minimal
-	use doc && doman docs/{offlineimap.1,offlineimapui.7}
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "You will need to configure offlineimap by creating ~/.offlineimaprc"
-		elog "Sample configurations are in /usr/share/doc/${PF}/"
-		elog ""
-		elog "If you connect via ssl/tls and don't use CA cert checking, it will"
-		elog "display the server's cert fingerprint and require you to add it to the"
-		elog "configuration file to be sure it connects to the same server every"
-		elog "time. This serves to help fixing CVE-2010-4532 (offlineimap doesn't"
-		elog "check SSL server certificate) in cases where you have no CA cert."
-	fi
-}
diff --git a/net-mail/offlineimap/offlineimap-7.1.3.ebuild b/net-mail/offlineimap/offlineimap-7.1.3.ebuild
deleted file mode 100644
index 3258d1bf16b5..000000000000
--- a/net-mail/offlineimap/offlineimap-7.1.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Normally you need only one version of this.
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads,sqlite,ssl?"
-
-inherit distutils-r1
-
-DESCRIPTION="Powerful IMAP/Maildir synchronization and reader support"
-HOMEPAGE="http://offlineimap.org"
-SRC_URI="https://github.com/OfflineIMAP/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc ssl"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="doc? ( app-text/asciidoc )"
-
-# see http://pogma.com/2009/09/09/snow-leopard-and-offlineimap/ and bug 284925
-PATCHES=(
-	"${FILESDIR}/${PN}-7.0.3-darwin10.patch"
-)
-
-src_compile() {
-	distutils-r1_src_compile
-	use doc && emake -C docs man
-}
-
-src_install() {
-	distutils-r1_src_install
-	dodoc offlineimap.conf offlineimap.conf.minimal
-	use doc && doman docs/{offlineimap.1,offlineimapui.7}
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "You will need to configure offlineimap by creating ~/.offlineimaprc"
-		elog "Sample configurations are in /usr/share/doc/${PF}/"
-		elog ""
-		elog "If you connect via ssl/tls and don't use CA cert checking, it will"
-		elog "display the server's cert fingerprint and require you to add it to the"
-		elog "configuration file to be sure it connects to the same server every"
-		elog "time. This serves to help fixing CVE-2010-4532 (offlineimap doesn't"
-		elog "check SSL server certificate) in cases where you have no CA cert."
-	fi
-}
diff --git a/net-mail/offlineimap/offlineimap-7.1.4.ebuild b/net-mail/offlineimap/offlineimap-7.1.4.ebuild
deleted file mode 100644
index 3258d1bf16b5..000000000000
--- a/net-mail/offlineimap/offlineimap-7.1.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Normally you need only one version of this.
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads,sqlite,ssl?"
-
-inherit distutils-r1
-
-DESCRIPTION="Powerful IMAP/Maildir synchronization and reader support"
-HOMEPAGE="http://offlineimap.org"
-SRC_URI="https://github.com/OfflineIMAP/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc ssl"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="doc? ( app-text/asciidoc )"
-
-# see http://pogma.com/2009/09/09/snow-leopard-and-offlineimap/ and bug 284925
-PATCHES=(
-	"${FILESDIR}/${PN}-7.0.3-darwin10.patch"
-)
-
-src_compile() {
-	distutils-r1_src_compile
-	use doc && emake -C docs man
-}
-
-src_install() {
-	distutils-r1_src_install
-	dodoc offlineimap.conf offlineimap.conf.minimal
-	use doc && doman docs/{offlineimap.1,offlineimapui.7}
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "You will need to configure offlineimap by creating ~/.offlineimaprc"
-		elog "Sample configurations are in /usr/share/doc/${PF}/"
-		elog ""
-		elog "If you connect via ssl/tls and don't use CA cert checking, it will"
-		elog "display the server's cert fingerprint and require you to add it to the"
-		elog "configuration file to be sure it connects to the same server every"
-		elog "time. This serves to help fixing CVE-2010-4532 (offlineimap doesn't"
-		elog "check SSL server certificate) in cases where you have no CA cert."
-	fi
-}
diff --git a/net-mail/offlineimap/offlineimap-7.1.1.ebuild b/net-mail/offlineimap/offlineimap-7.2.1.ebuild
index 3258d1bf16b5..c616c5e01582 100644
--- a/net-mail/offlineimap/offlineimap-7.1.1.ebuild
+++ b/net-mail/offlineimap/offlineimap-7.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6