Revert "gentoo resync : 13.09.2019"

This reverts commit a1392efe64137262023d92492396ca9156d22396.

3 files changed, 113 insertions, 0 deletions

diff --git a/net-mail/offlineimap/Manifest b/net-mail/offlineimap/Manifest
index f852149d874e..191fdaccba5b 100644
--- a/net-mail/offlineimap/Manifest
+++ b/net-mail/offlineimap/Manifest
@@ -1,7 +1,11 @@
 AUX offlineimap-6.5.3.1-darwin10.patch 361 BLAKE2B 3331f6bde79b55792d7fbb6d3183c363a7142bb8abbb25c13b8cfe2b7e652c366aa2002b9e9995d6cc2e197a34315556e5db4586012ccd24fdf6d3faa1352956 SHA512 2183ae09cb9ed489ea447180f7b50e9e023a4630f8612b829e84499257590e9bb99ac0aa65cb45073c4a1ed5d537151df451b35aeaa45b5a1eb9e063246e5a02
 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.2.2.tar.gz 721359 BLAKE2B f59f26aa3cb7a3a5d994e5e9f48dd9de4f00193a71dbb2cd976dd6c8459b7dc6750c0a0bbcc8b954745ffe18e16cbeb6739f63ec9c4a530fbf2489db36771117 SHA512 de60472d24368ff4f5c43ecb50b021c671e6fe713220475da8bd900de6bfb6a10ec8c585f96f6091caea32344f65886e2870d097974ebef343b0ca56a81ddd7c
 DIST offlineimap-7.2.4.tar.gz 721887 BLAKE2B f5c7c8eb541167b3f0d46ee71be418d4697f89a1dc11a1c5c9840e5def09d108b7ab391d773dc79e0882ce0a9e21388e11217915112f476d384bf3018d5ea750 SHA512 837f822a08f5df59f5332c65b33e0186c215a633c5c17f08790f4c2128a4f6470a75eb02e883dd592b456dbc0ba2b32f670cb716eb602dd8a6bdf12ba2d72cd8
 EBUILD offlineimap-6.5.6.ebuild 2381 BLAKE2B f7ec4774682b618458484be57ba484d41d4c9df17517ce00ee1c8198a49580afba304d48371dd464d477698039edbfcb47dc93fee20239fa45780a248809b207 SHA512 083714ce7939b4d7c214bcde3e74ac8bb2050406c35f21ef2d5d5d658afbe6bdf84ff1dab87623e1c50c90cab2e7634a3c3590e91599e4217b55be09a1f1f5be
+EBUILD offlineimap-6.7.0.3.ebuild 1788 BLAKE2B 401360e6f39b200f26b39717af6e0fe3ee3f1f65dfb94a4238c19077959df016febd76f9fe74260e1781c2cb3792714a7b86e23e378bcab1a57da57e67094002 SHA512 8542909e6a463fcaba54f6c86101a4681328d12dd491624d7d2775ba92d8058775957f23f6b71332eed53f46bd04984179d96966c997c4de4005eb3008468dcb
+EBUILD offlineimap-7.2.2.ebuild 1639 BLAKE2B b97d8f3c6249086a47c6d628d055918db8298fedf9c5ba85b67b0df22c4a79456a399a3e247d19fe190537339b232c627b476c2bc8f732051e1e0ea940e98157 SHA512 a4a9177eaae725f07912a733164bf872aca4879cc9adb58ec35b8fb1aa5303279b2af3b1df9d37ae78ac6e8f3a4128fb2a03d14d92db332840240265319441ab
 EBUILD offlineimap-7.2.4.ebuild 1639 BLAKE2B b97d8f3c6249086a47c6d628d055918db8298fedf9c5ba85b67b0df22c4a79456a399a3e247d19fe190537339b232c627b476c2bc8f732051e1e0ea940e98157 SHA512 a4a9177eaae725f07912a733164bf872aca4879cc9adb58ec35b8fb1aa5303279b2af3b1df9d37ae78ac6e8f3a4128fb2a03d14d92db332840240265319441ab
 MISC metadata.xml 365 BLAKE2B 44c143951196526dbc7e8c23fe3719a33ecf633361b9aa5294dd4e61c1dd0aecca12159a33c3ef7e0706a5c57162f170559c44c554541754cf5049118c8d89c8 SHA512 ec19d9f99d945536a02dfd7d8c113c6a6337e80190ee60ab172ac9c248398f4faad49aabe4f56e5e4d5eb09ea35810a47ad263b8df59f7368e1f8bed6e780c2a
diff --git a/net-mail/offlineimap/offlineimap-6.7.0.3.ebuild b/net-mail/offlineimap/offlineimap-6.7.0.3.ebuild
new file mode 100644
index 000000000000..c2de9712b17a
--- /dev/null
+++ b/net-mail/offlineimap/offlineimap-6.7.0.3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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="https://www.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 sqlite"
+
+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."
+		echo
+
+		if use sqlite ; then
+			elog "The sqlite USE flag only enables a dependency on sqlite. To use"
+			elog "the sqlite backend you need to enable it in your .offlineimaprc"
+		fi
+	fi
+}
diff --git a/net-mail/offlineimap/offlineimap-7.2.2.ebuild b/net-mail/offlineimap/offlineimap-7.2.2.ebuild
new file mode 100644
index 000000000000..401eb0958288
--- /dev/null
+++ b/net-mail/offlineimap/offlineimap-7.2.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# 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="https://www.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
+}