gentoo resync : 10.02.2020

23 files changed, 115 insertions, 106 deletions

diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 88e81215fdd5..88168ea2240d 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/automx/Manifest b/net-mail/automx/Manifest
index 5b2d3607cf36..9dc76706830c 100644
--- a/net-mail/automx/Manifest
+++ b/net-mail/automx/Manifest
@@ -1,4 +1,4 @@
 DIST automx-0.10.2.tgz 410456 BLAKE2B 8ea2b84a2934d1cb6b97161906ae071e38729c5d297ace5b5874bba8d8a695fe0edf5023c3429cd9f510373286880e977f649861efefea7bdbd61e88d63420f0 SHA512 88f844d70439985dd55cc694a58bc1fe313162ba47c7675fb15143c107d76974eee043faf5715d7ba9a5918686d491f5efabe9785e90cf399492871f08b2e38d
-EBUILD automx-0.10.2-r1.ebuild 1421 BLAKE2B 86defecb23efbeaeb61cc27ea10b49cc0952a56c34a03ef631da74f2aaa9c3d947a845d0dd97ca9df7318c22ad072f8b98492aed7ec5a37eb6041249bb580f33 SHA512 ac37eefebdd77d8fd5cc06d138b6413affb8cb0cb81e0037505446de1b5c1c4d23f62add350c1a1d7134c91bef0235eb601ea79d8676d8ec9ab6b2a0c7707f62
-EBUILD automx-0.10.2-r2.ebuild 1460 BLAKE2B 6afb32dada7f5a6e62830dffc73c8e1bdc13a7b78a6aedea4f0ffce7515cc697702276b874ea9d2ca1da1e2d7b9ab5fe091fac76bdc8a58c7ab62516e0ded988 SHA512 71357c1b1bd8a5519e1c7332974c18b64fe7ae350325f7f050f588546d6eb358a08ea44e51fc453ba18838908b5e71a855a60c818f25823b4093d8ee0e891a1f
+EBUILD automx-0.10.2-r1.ebuild 1496 BLAKE2B 2ea117288cc9334e346a1ab77162aeea2f368be59c5806511b4f274a2d59dfb357bfdf4077f81986d8fa308c7ffe85152e38843c6f80db6df34315ffee857e31 SHA512 b6ccd66759ebfcd3eaa9657758b8927309c881c9722955a8d51b0885923fb44c6c46f903e845a9a80cf91355d2518e57aefe5b13154cfb7a0a1487018cc88c02
+EBUILD automx-0.10.2-r3.ebuild 1542 BLAKE2B bee9cc4dc2539d2bc2f7cb0fa9010d6d07f57c2f481bc466c88ec9af9d1aa07eeca6fdb2b21c651e538a828dfb7e75a333d6853d70162e9d1a8709e2203de3a9 SHA512 f738234a4297527a7794e7ca418f3d664d1dd3f1f1893edaa3ee7cc8f889610777dcfed539ab83f5129b100767193c2b096997a94207c1bd4ec801cbf1b04a90
 MISC metadata.xml 538 BLAKE2B 0a90c652c721d0ebda9b6359d0325ed40c8a356b6dada77c550b7f184a3073584c2e232ebab9c8be58f13ba1d93294479528128397a459281236cb4401f5ada4 SHA512 851cb5d749750e3c8b360248d32bdf5c7c5fa626ff329e5104f0e9f8f639a42df12d36ddd93b6cb962567094fa1150666900491b8bcb906aadd427c38fa2c5f2
diff --git a/net-mail/automx/automx-0.10.2-r1.ebuild b/net-mail/automx/automx-0.10.2-r1.ebuild
index 8e254aba86e7..272effe35240 100644
--- a/net-mail/automx/automx-0.10.2-r1.ebuild
+++ b/net-mail/automx/automx-0.10.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,13 +18,15 @@ KEYWORDS="amd64 x86"
 IUSE="ldap memcached sql +tools"
 
 DEPEND="
-	dev-python/ipaddr[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	|| ( www-apache/mod_wsgi[${PYTHON_USEDEP}] www-servers/uwsgi )
-	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}]  )
-	memcached? ( dev-python/python-memcached[${PYTHON_USEDEP}] )
-	sql? ( dev-python/sqlalchemy[${PYTHON_USEDEP}] )
+	$(python_gen_cond_dep '
+		dev-python/ipaddr[${PYTHON_MULTI_USEDEP}]
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
+		|| ( www-apache/mod_wsgi[${PYTHON_MULTI_USEDEP}] www-servers/uwsgi )
+		ldap? ( dev-python/python-ldap[${PYTHON_MULTI_USEDEP}]  )
+		memcached? ( dev-python/python-memcached[${PYTHON_MULTI_USEDEP}] )
+		sql? ( dev-python/sqlalchemy[${PYTHON_MULTI_USEDEP}] )
+	')
 	tools? ( net-dns/bind-tools net-misc/wget )
 	"
 RDEPEND="${DEPEND}"
diff --git a/net-mail/automx/automx-0.10.2-r2.ebuild b/net-mail/automx/automx-0.10.2-r3.ebuild
index 83f6b39167bf..6c1f32ad9c3a 100644
--- a/net-mail/automx/automx-0.10.2-r2.ebuild
+++ b/net-mail/automx/automx-0.10.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,14 +18,16 @@ KEYWORDS="amd64 x86"
 IUSE="ldap memcached sql +tools"
 
 DEPEND="
-	dev-python/ipaddr[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/m2crypto[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	|| ( www-apache/mod_wsgi[${PYTHON_USEDEP}] www-servers/uwsgi )
-	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}]  )
-	memcached? ( dev-python/python-memcached[${PYTHON_USEDEP}] )
-	sql? ( dev-python/sqlalchemy[${PYTHON_USEDEP}] )
+	$(python_gen_cond_dep '
+		dev-python/ipaddr[${PYTHON_MULTI_USEDEP}]
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		dev-python/m2crypto[${PYTHON_MULTI_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
+		|| ( www-apache/mod_wsgi[${PYTHON_MULTI_USEDEP}] www-servers/uwsgi )
+		ldap? ( dev-python/python-ldap[${PYTHON_MULTI_USEDEP}]  )
+		memcached? ( dev-python/python-memcached[${PYTHON_MULTI_USEDEP}] )
+		sql? ( dev-python/sqlalchemy[${PYTHON_MULTI_USEDEP}] )
+	')
 	tools? ( net-dns/bind-tools net-misc/wget )
 	"
 RDEPEND="${DEPEND}"
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 8dc159bdf1d3..6d873d4b7518 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -9,7 +9,7 @@ DIST dovecot-2.3.7.2.tar.gz 7076231 BLAKE2B 2cb93aa594db722489063b490469dfe284b1
 DIST dovecot-2.3.8.tar.gz 7136958 BLAKE2B 2769169519f0fd9293178e8d200467bc5be0f362bc6bfb3dcc6cc74ed146ecf66dab7730013704b70f0cc75a87ee5e52994137cd63c7c12c56bddcea37cedd07 SHA512 f62439e2ea77ffb544a7752c07085582c5653c64671cb42dd7a7e5aa69eb87059c677aa1fa071efa1ddd2287ab621e9a264ec115be2aeb2f43ab4c685411eae3
 DIST dovecot-2.3.9.2.tar.gz 7182306 BLAKE2B 942718ebdb7c447096895fc4309dea930ff87166f06be3365c6463e2aed95bb2620a5e45a8ce260df647593d9d2cef1d2a3ba3aa0afb397dac81653f9a4fd519 SHA512 36e8270bfa33e2bd6aa89017e65c7d1650c494c79ff297759a4b01c026aebcfdf5b1b542d4357e1f9dc2bb8169ef67064f0699b17ca36d658deb70b4c800b253
 EBUILD dovecot-2.2.36.4.ebuild 8572 BLAKE2B c5900ba2365ac280429b669a91f4cfc537f689c9fc9d52d3bd62a170467278ddd4736c2ba850ed1f97f775eb9fd132047bf9ea84625d3665270b83ab380c2931 SHA512 8c48542c6bd7831aca19b38b3af1c220cc43f1b9a1db22ce44d2c9c9f8f44a1387cb4e0b8ced38304e1e6b790c6ab81473f418f14ca922dbd50554e9190c596e
-EBUILD dovecot-2.3.7.2.ebuild 8685 BLAKE2B 3d1e881916c146ddb99e35d4b2685621b15b8fc53bed5c7f27722df2b0ed69d37c33fcbc815c2b9c4aed91d4345918d4537863b60cf902ca54d756ec52e58ebb SHA512 4069533fb22ad76836ccbfe3ef76ae9fa9cd276de0e21a23555cdaf9d645a76f65a9552037de26c1eeb04aa0ce18ea90255fdac09c91c09971384bf589eda185
-EBUILD dovecot-2.3.8.ebuild 8558 BLAKE2B 7aa5ef722151554d553c69c02aa8c38622306561acf87dd02d0f84d32121f3d527f13b7aaf45656aa7055594ba15ba45f4933ccd82456eb8276ab39bc64a4222 SHA512 a5448124ac35c0d660998f1de3d2209d1e7b6d6bdc6de4e1811b8572aa19b4aa41aad01f4741cc6ef9abcc66b051ffec9fd106be8c31772781d3e74f0a46042e
-EBUILD dovecot-2.3.9.2.ebuild 8558 BLAKE2B 8079b41d7d4a3e96aa36ee7e2a83a95142e0d54cd7a633211ba3d80fbb97f68edc65d559497b64c2cf912ed4d42b27e6f9bfd963ed1f13ad1bae6d05dd5df45c SHA512 2c8845baa6064cc79533f24a83bba84f322681710b76a9900e2b644d312db90c162155d2aa8ed2b40616dd7b22c6dd9f8d4a6fe7349eecb31831e35e498b2dec
+EBUILD dovecot-2.3.7.2.ebuild 8683 BLAKE2B ab304a1739decf2fc11fbda7c53089bca359a261de02b6e89ecd1e7991ef7a8a3bac56aa58daa17eeb3cfc7a3d09c7200948f8e73555d6d50d55be9fbf83d635 SHA512 5359acad69383ccd6f0a0397bed27ba4f65c2601480fc5fef576b12b405b769c65fa9c79652823e6974c8f99ebac04548a9a25fa1a8b1c14c6d098da571fb8b6
+EBUILD dovecot-2.3.8.ebuild 8550 BLAKE2B 4bbdc8ef748cf3d6743f5daf4b69582c64bc115ecac7f1b3fe84689a4ba08f0139353d6682b74ee8477ceb797a60d8d03b1cdbdb86747424ce53e1086cc684fb SHA512 cd3c5dd78cac9012464d110786ba5e571fa0945530af12a47105ea02568459cb71a7425ab3bcf86e3dd8004025b2c735420a9c81469de6b483f69ee83d1e61d1
+EBUILD dovecot-2.3.9.2.ebuild 8550 BLAKE2B 9423b7264c384580fefa0168ed2d2e95d8793ef556fa6fa464c86a6ab24ca2665f6f7e59f8e1fde34a121b0e75319404f711b5500516696192acc38879124c61 SHA512 c6be5dbe797c99304859a9c313089bfcab27e76f6a36580ce7851a7a9a4ba0547d12d0a9b7cec1f0c6561ad438be293c61d884055707f2b2a82d28af7ddb149f
 MISC metadata.xml 877 BLAKE2B 07dfbe6709d8abfe8a75bfce0ae605ba84519571bf4f85b572b0e7fe90846622dd74786c92c5da7c3829efd97075a94869eaa9b98542e0656a88a52c630c90d8 SHA512 95d9463fca2b5705778aba2ca0b175ed1e72a1e1d49f6ec52932b64dd976c9e06d59bd7c165ca76d75a1dad22888838076aaf73bbcf0a1d52a77e64eca7098f5
diff --git a/net-mail/dovecot/dovecot-2.3.7.2.ebuild b/net-mail/dovecot/dovecot-2.3.7.2.ebuild
index d8cce941ec7b..52fe0014c1f3 100644
--- a/net-mail/dovecot/dovecot-2.3.7.2.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.7.2.ebuild
@@ -133,7 +133,7 @@ src_configure() {
 		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
 		econf \
 			$( use_enable static-libs static ) \
-			--localstatedir="${EPREFIX%/}/var" \
+			--localstatedir="${EPREFIX}/var" \
 			--enable-shared \
 			--with-dovecot="${S}" \
 			$( use_with managesieve )
diff --git a/net-mail/dovecot/dovecot-2.3.8.ebuild b/net-mail/dovecot/dovecot-2.3.8.ebuild
index b32f3cabf59d..8260f0011116 100644
--- a/net-mail/dovecot/dovecot-2.3.8.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.8.ebuild
@@ -91,9 +91,9 @@ src_configure() {
 
 	# turn valgrind tests off. Bug #340791
 	VALGRIND=no econf \
-		--with-rundir="${EPREFIX%/}/run/dovecot" \
-		--with-statedir="${EPREFIX%/}/var/lib/dovecot" \
-		--with-moduledir="${EPREFIX%/}/usr/$(get_libdir)/dovecot" \
+		--with-rundir="${EPREFIX}/run/dovecot" \
+		--with-statedir="${EPREFIX}/var/lib/dovecot" \
+		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
 		--without-stemmer \
 		--disable-rpath \
 		--without-libbsd \
@@ -128,7 +128,7 @@ src_configure() {
 		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
 		econf \
 			$( use_enable static-libs static ) \
-			--localstatedir="${EPREFIX%/}/var" \
+			--localstatedir="${EPREFIX}/var" \
 			--enable-shared \
 			--with-dovecot="${S}" \
 			$( use_with managesieve )
diff --git a/net-mail/dovecot/dovecot-2.3.9.2.ebuild b/net-mail/dovecot/dovecot-2.3.9.2.ebuild
index 6a614a62c190..f2ee9cd425ca 100644
--- a/net-mail/dovecot/dovecot-2.3.9.2.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.9.2.ebuild
@@ -91,9 +91,9 @@ src_configure() {
 
 	# turn valgrind tests off. Bug #340791
 	VALGRIND=no econf \
-		--with-rundir="${EPREFIX%/}/run/dovecot" \
-		--with-statedir="${EPREFIX%/}/var/lib/dovecot" \
-		--with-moduledir="${EPREFIX%/}/usr/$(get_libdir)/dovecot" \
+		--with-rundir="${EPREFIX}/run/dovecot" \
+		--with-statedir="${EPREFIX}/var/lib/dovecot" \
+		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
 		--without-stemmer \
 		--disable-rpath \
 		--without-libbsd \
@@ -128,7 +128,7 @@ src_configure() {
 		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
 		econf \
 			$( use_enable static-libs static ) \
-			--localstatedir="${EPREFIX%/}/var" \
+			--localstatedir="${EPREFIX}/var" \
 			--enable-shared \
 			--with-dovecot="${S}" \
 			$( use_with managesieve )
diff --git a/net-mail/libpst/Manifest b/net-mail/libpst/Manifest
index 50f8a9e0834f..f940fdf66970 100644
--- a/net-mail/libpst/Manifest
+++ b/net-mail/libpst/Manifest
@@ -1,5 +1,5 @@
 AUX libpst-0.6.52-no-static-python-lib.patch 449 BLAKE2B c9d93e38a36485e23b8deaf3a91c8b6806db1526722a704ac3cf1eabd623ae3bf25aaf3a815d63b4b7873dd9a23f7399afe59dade5fa111db0e7ac3ba58f00fd SHA512 9cd44493406a58c522fdfe9423a7b15548af7e06332289c98fc1054822d209aa112d497622b3578531147934fd82335bf8c68cc8e371e31ef4716fb51cb26273
 AUX libpst-0.6.53-pkgconfig-static.patch 211 BLAKE2B 97d8939c3c81365a9100be4ceeacc8303fd2f07c4ece0af40af1bb8750174f6b994ce93089599956aa50b6ff3b17102e37cc16d5426a9b98675d910a7f0f80ff SHA512 eb8d95b07dc96435b7d753c1ea68dfb419867b7b092c3f243de9b5983af29ae368e7e5f3a4ea5a802c82c41a2096bd01564f7f74cd733ac038abb263b6ca4d1b
 DIST libpst-0.6.66.tar.gz 13836942 BLAKE2B f8ac86a2924576fc41aa7bb92a824748d858e9b6b42d3cc7e59959ca6377f458d7bcd738081a9547432f9153b839861f8c0fc5aa0a0c74b0447c2ab126b5bb64 SHA512 0d07b13554b9e009787ce651714281d21a4d38afae997bd87244690538bd18176ab74655c0a0646b1c475c916052d4295ffe749e6a03765450af7e9c8443dd86
-EBUILD libpst-0.6.66-r2.ebuild 1623 BLAKE2B 24092e687f6e8da4659ee80956e3b08c4644766a2c7de499c1c2bd9a741833e6d6a5b091138b0d3adc54f51596e056958dce4aedb587cd42f7b06e3172ef8ea8 SHA512 78852ca61e348a201ce8a9b86c71428806129ece63faad87aeb27261c0af5d9f0e22b11f906f0019478d63ad05ee2d3fd5a2093ada9ee6d20ef1940db42bcf7c
+EBUILD libpst-0.6.66-r3.ebuild 1661 BLAKE2B 18ff6fa687d9e48307fa92000f26c21284c46bdeb1345f383775576ed3c6a6637506e66deea4cc9da8d8cd4a9640e12946959bdc7e2419a08e5acbf338b20be6 SHA512 33ce03c37eb3dc82262d3a729a1f01948bf0a6fe5286cfa0e862f0a2416c44fb89e27e5e2e1e6a07376852d0c9eeb4db03ccb91de71b51c1442c18326c81e804
 MISC metadata.xml 232 BLAKE2B 63277f4f8d2b807cb55686cc487bf534330a954fcb2e43dc24fe5cad241229545305bfd7517ab2b8a652f0ef89c93774f7636fe848145f29695575bd15100418 SHA512 bc3293101ebc8838fe7c3a9ba19bb540a8c5357d9181545dd460bc404637e469866428445b8340833b20cdd44b55ccf88ff97433bd88ba8ee8b7353ceb140b8a
diff --git a/net-mail/libpst/libpst-0.6.66-r2.ebuild b/net-mail/libpst/libpst-0.6.66-r3.ebuild
index e868dd0afe3f..4a038ca366b6 100644
--- a/net-mail/libpst/libpst-0.6.66-r2.ebuild
+++ b/net-mail/libpst/libpst-0.6.66-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,7 +22,9 @@ RDEPEND="
 	dii? ( media-gfx/imagemagick:=[png] )
 	python? (
 		${PYTHON_DEPS}
-		>=dev-libs/boost-1.70:=[python,${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-libs/boost-1.70:=[python,${PYTHON_MULTI_USEDEP}]
+		')
 	)"
 DEPEND="${RDEPEND}
 	virtual/libiconv
diff --git a/net-mail/mailbase/Manifest b/net-mail/mailbase/Manifest
index 6f73f2a74a01..66912f1d26ae 100644
--- a/net-mail/mailbase/Manifest
+++ b/net-mail/mailbase/Manifest
@@ -3,5 +3,5 @@ AUX common-pamd 308 BLAKE2B 95a2b44b1bd2112da1160cf5c3f993debb85692111e046a79c14
 AUX common-pamd-include 245 BLAKE2B 3c2a5133b232869a5749df49a7e1f94a51f68d3bd37037d3ea10bfab18fb48fae565304bd2eba6fc686da3f3bf71249975e8f8bc9deada66eb3665d20929020d SHA512 3516815034b419bf4fd57a43536e7a25b820013d5339cb818bbbee3f0e8e26651f6b4aefae0177240219e05010ba8a2aaf6d0337220cf176801992204c3216f0
 AUX mailcap 2235 BLAKE2B 3cf2cba9c1f67feab3b63246f21f8aa78b808a42b2368add9f77c36cca8d92c13122f53663ac3fe4d8b0968a66a35803d98cce6197110f1efe08562e9f837e74 SHA512 1461deb4f065c0d1778acbbcb1e08db821740de0363d3905a569d45d459a76d8813ef1c2c052d6e84b4b9b5576c89e524ecf44a9fffd8e05e91f85eb917557b0
 AUX mailcap.5 9886 BLAKE2B a03170a94f30cda347c97909de7c066efbe2cc7295badd8f8c97abce52e154ce0b3635fadf83d18fe46966b2d550b2a321f4cf4483d1e32fbe420b85d2155f19 SHA512 fac60eeb754bbfa89518fd1ae5182e1ecf22f8d2b9f6883786fb78e5759eadbee58f927cf1084ea5e04958e6b505f178ba49dab7a570e91099a8ef2ceef608e3
-EBUILD mailbase-1.5-r1.ebuild 885 BLAKE2B 1e3badf3de05482415b45df62a011a58b60795b735f8a54ca374acf885d216100404836d24947a18db5a1ae74935d9b65dc5ac29f0498662b249b3d7c7f710e6 SHA512 f1888ace508c01145981bc733353d70994d517501ad69097a5557a77b0d7678607a75f1e8db5ef9379a6a8cb7619321eadcc53c8a28446888f009bf2c86107a1
+EBUILD mailbase-1.5-r1.ebuild 902 BLAKE2B 08ed6df926135f1442ef5a08af84afbc82eaec0b6c7117fbf73b6135ddc9113518d3cf150b33d659470b2da1d0b93f15af3bcf202a4405f5c709a79732accbc1 SHA512 975117937229b1da0ede26b49a4e5c3a188694f3656c7eb251f79c97b849d77ff11defd4d58c10a700611013beb6b6239ec3492c1b6cbab6230f2ce89e06e670
 MISC metadata.xml 247 BLAKE2B 167e8eb377614081cdfda6ab24f1a1bcbcac4b7db4a34c79d682d3c47bc6de17c14fa679aa3a1d82a61988ef0fc044b99061635e1a50de646b9ddfe88444ebe8 SHA512 6dd50c3fa3c6a61cc3590827074f4dd0586cb36ef78dfaf161c09a613b198af88aa874b96f7958aa59761b0689ea903fac1bfca9d05023c648cf8dabc0596f4d
diff --git a/net-mail/mailbase/mailbase-1.5-r1.ebuild b/net-mail/mailbase/mailbase-1.5-r1.ebuild
index 77a5c3c409cd..4368739cfcf1 100644
--- a/net-mail/mailbase/mailbase-1.5-r1.ebuild
+++ b/net-mail/mailbase/mailbase-1.5-r1.ebuild
@@ -6,7 +6,7 @@ inherit pam
 
 DESCRIPTION="MTA layout package"
 SRC_URI=""
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-mail/mailman/Manifest b/net-mail/mailman/Manifest
index a6691977d1ec..cdb95cc6de04 100644
--- a/net-mail/mailman/Manifest
+++ b/net-mail/mailman/Manifest
@@ -8,8 +8,8 @@ AUX mailman.service 288 BLAKE2B 64dad97b16458f9d9b64f249f9096e4217ce78e9a33e9d3e
 DIST mailman-2.1.29.tgz 9376258 BLAKE2B 63ae740abed79d2887eef35ddfd8b51f22ee984a0eaacddeb34afb8147c0d239e5eaf93579face987b3c604653fed4c13233de78298914b4eacf5a33f769a997 SHA512 ed25179a4580092629890664c5502908b20e326c2ed06ad4e597fb4e8de84076c369ecd7a272be5ed8a1cb4479413d0e004d87804de763ee850e4d04d9a83376
 DIST mailman-3.1.1.tar.gz 749014 BLAKE2B 00cf756de1a6ce5a05f30b033ad7d1ebc5664bb1c6fadb5d602c4e34e373ee7a0df0801e6b68b0816ee819f77caef33bbc4b8490df1c8f01fd2fb35664fd3757 SHA512 b09962ec99ca1ce1eafd40409a00f976dc47d82adb707313f4516400db6439af8597a1c4e30262fb228c102508ede688912480dbb1dcca9721bb0333693f1d85
 DIST mailman-3.2.1.tar.gz 781654 BLAKE2B ee9a9bf5505ba638417c363a885153dbaa795213a77ca9dd5abb7212ac0fe35d08c5e0e87da2d54aeb50d21c30df72a750bd25ffa0877d377a3871bded03c7de SHA512 b17fa878ffe539504ce7f28351f5bf3c7aafe29fe98957880a571e5b798ad4f9f56748fb69df699b8bf9889aebb6cef075c5d075d653fa5e9b6feb0322eab9e6
-EBUILD mailman-2.1.29-r1.ebuild 5828 BLAKE2B 8f17b0a8d7ff5ac0e8f9681ca0199313239283446edfe53eb09108fe66505f549e588b6c046fccaf74f187f41e6f71116ae6ef4cc133abe4cc07069ae8141573 SHA512 00334f2fefbdcb4214c82f4a524272ec86a8452a0570d361f80597c112e3bf5f05c7387b18c87b3a5eb6d88762477d43a39467feebe056e4f714ec423a7a5d66
-EBUILD mailman-2.1.29-r2.ebuild 6001 BLAKE2B 4601e581a3b2b754f28e750559f6dcda17d5612b2265e18aee50443dfb3c20236ed26e1bf1e78b1611433bdba9e426534bf05044cf508009ca8d50a96892c632 SHA512 313d4038138551515825450c2a9fd5363000c5e73ae2730fb2e7a789eab90825f7fd923d62815698634520c860881af2c111b3ab3509e6b66ed188862b23d827
+EBUILD mailman-2.1.29-r3.ebuild 5864 BLAKE2B 20091d601c3fb374a327b65503f1ec42552b0defadc5ccbac49c3b70cf72b1156a480f70cd6a607c843ad0ef2b7564b6d494433ded7ac1108bc0db07f4ad7b92 SHA512 7fec7675d2f2eabf1916190f38b565c4cee30f67fdd4e2e444e734546bd64af15ae6f19d999b494b39a0a07a387f974694993b101632b5daa5e619be7afee770
+EBUILD mailman-2.1.29-r4.ebuild 6037 BLAKE2B 7bf9d06db3efb0961fbcb8b66a3a9fa379ea40f7a78eaf5ec292faaa2c20743defa55612f24e707141e00977a12ed664de8b4dd90e324ede26936169272494c2 SHA512 634d49d59182a3f82f08e76335b6666daad9c1679830789b0be999f0a423f1ae1d4c7374a10393844f711407cd9c948cb980687b738d8b7fd8ef76c9b61df3e3
 EBUILD mailman-3.1.1.ebuild 1165 BLAKE2B 0f23ed03b36809a7ec4c42ea629127a9c68d6fa75372477fb184d811baba80695178b2712f9cbce043d38bf2f102cd6cdab3398a61079602f3100ef40098589b SHA512 156febe4b2c60b71beda0c2afda90c2ad807e488b657677dce58e3f3ffa1e56388017c7fd4e8e9e6e0ced949a6038b7e74d514bafe759b57c39f7bf6446bb3af
 EBUILD mailman-3.2.1.ebuild 1414 BLAKE2B d6743ff352481fb1aa702e9df744ce1fc247adfd836d3277b553106a526b6de0fad82172574e2f41492d7267154e6044e5920f56e1ae66c046252f00ba09109f SHA512 5479caf3c63863c9c46b79fdea27f16e5a33223912a6bed5baf2d2e6fd765e0f62046d5c12726e7243fdbdc6e51ae0c9fc6f69303bf36bdbeca7c920396df310
 MISC metadata.xml 293 BLAKE2B 374d60f4c201126bc672a15e1d2cc0e8ddac567760932fd51bf0abd758378c92d9c0c9bba81fdee2d30cfcf14c067f46a38e1b55f3ca09ed3c002316b48c1b74 SHA512 9be4ca21301ae46b1c80f63b365a69a855858f3b0f51b5f5dd88f572cce940f068d6de17261de1828b068bbef9061124840b66bd370e120c73b3589048653b8c
diff --git a/net-mail/mailman/mailman-2.1.29-r1.ebuild b/net-mail/mailman/mailman-2.1.29-r3.ebuild
index c3eb71cf99d9..98954d73b404 100644
--- a/net-mail/mailman/mailman-2.1.29-r1.ebuild
+++ b/net-mail/mailman/mailman-2.1.29-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,7 +19,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="
 	${PYTHON_DEPS}
-	dev-python/dnspython[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
+	')
 	virtual/mta
 	virtual/cron
 	virtual/httpd-cgi"
diff --git a/net-mail/mailman/mailman-2.1.29-r2.ebuild b/net-mail/mailman/mailman-2.1.29-r4.ebuild
index d6ef012802ec..ed0fc12b55eb 100644
--- a/net-mail/mailman/mailman-2.1.29-r2.ebuild
+++ b/net-mail/mailman/mailman-2.1.29-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,7 +19,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="
 	${PYTHON_DEPS}
-	dev-python/dnspython[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
+	')
 	virtual/mta
 	virtual/cron
 	virtual/httpd-cgi"
diff --git a/net-mail/mairix/Manifest b/net-mail/mairix/Manifest
index f8247228cf73..ea077c59d3af 100644
--- a/net-mail/mairix/Manifest
+++ b/net-mail/mairix/Manifest
@@ -1,6 +1,3 @@
-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 435 BLAKE2B 10c870e9494171a3842301820c03bb8502556d0c2a36e0e5062960db644273eb20edd82b1a9f28df3d06fd1b7205e9403e80275f00652d233f0b6d9a6b381f89 SHA512 8ee659642be4150429b6f925f930b647bef299eb1dfb2fb808eb0e2e06ba693416397f27681d1291d21a215b016a1c1887cdf802f00b7efc8bb0b526a24aaa81
+EBUILD mairix-0.24.ebuild 934 BLAKE2B 941e93ca2a862721ed2dbe89403007a041fa20cf6a98f2f0c848d65a8d84939ed9c9aac6561800c228c59034e35b280e667602d27b97a3af662b636c84cc9078 SHA512 3e763c38297b91838bf93a5afc57475b70a444e7f53418f5e81942866c2b9efe53b4794ed3cf36cf06c10dd2b7d59b522ff5cdf8e3a9a7523793d67678f0e2f9
+MISC metadata.xml 243 BLAKE2B d9d3e2a9c2df5ef86d73ee0d991b7cd768837c3cd73c5e3fc164583b5eba416994bcee999c2bd40e03d3b09504f291df80c5ae93deb545bc8aec3997c49465a8 SHA512 85c72e2ecb2b1328ebccb72908bacfacbb8b062937f13d0d5fe3c2131a91ff2be5cd999417a13f584277a21bae70cd7ff3d5d17c4a3a5f02e0b563a5d8947a54
diff --git a/net-mail/mairix/mairix-0.23.ebuild b/net-mail/mairix/mairix-0.23.ebuild
deleted file mode 100644
index a39bc552fb9b..000000000000
--- a/net-mail/mairix/mairix-0.23.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="Indexes and searches Maildir/MH folders"
-HOMEPAGE="http://www.rpcurnow.force9.co.uk/mairix/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	gnus? ( mirror://gentoo/${P}-gnus-marks-propagation.patch.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-macos"
-
-IUSE="zlib bzip2 gnus"
-
-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() {
-	# 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"
-
-	# Add support for gnus marks propagation (bug #274578)
-	use gnus && epatch "${WORKDIR}"/${P}-gnus-marks-propagation.patch
-}
-
-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/mairix/mairix-0.24.ebuild b/net-mail/mairix/mairix-0.24.ebuild
index 2fb5df966c5f..163f013cbd22 100644
--- a/net-mail/mairix/mairix-0.24.ebuild
+++ b/net-mail/mairix/mairix-0.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-macos"
+KEYWORDS="amd64 ppc x86 ~x86-macos"
 
 IUSE="zlib bzip2"
 
diff --git a/net-mail/mairix/metadata.xml b/net-mail/mairix/metadata.xml
index 1c5738b1e1f3..59ab1f3d05b1 100644
--- a/net-mail/mairix/metadata.xml
+++ b/net-mail/mairix/metadata.xml
@@ -2,11 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<use>
-		<flag name="gnus">Add support for the marks propagation feature
-			in GNUS (provided by <pkg>app-editors/emacs</pkg>
-			or <pkg>app-xemacs/gnus</pkg> for XEmacs users)</flag>
-	</use>
 	<upstream>
 		<remote-id type="sourceforge">mairix</remote-id>
 	</upstream>
diff --git a/net-mail/mpop/Manifest b/net-mail/mpop/Manifest
index e577eba9da51..c1927948fad9 100644
--- a/net-mail/mpop/Manifest
+++ b/net-mail/mpop/Manifest
@@ -1,3 +1,5 @@
 DIST mpop-1.4.4.tar.xz 319372 BLAKE2B acf5bdb62479126ae212bb008878872d16efba1eb9a077bf4697ba22ff512977fcd5affad090bc952fb01cf07a607a4dce91b873128c43f087c34dca6d6bae81 SHA512 1ed89108d35d7bbd6bcbd6de956f51cfcfaefd808f6aa7135b168d789f8cbe7070be9db676d1222dce5b6fe8b6692616d6b7adec9c23df11ac3de112897924da
+DIST mpop-1.4.7.tar.xz 322488 BLAKE2B ea73e84b5ed3b5aad7ef91ceb510187c3f2d42976329a6a53511329a84713edc056ca6db35b1de2c9bff8b417e2710e598c472e78acbdc499dd73b24c46dfb47 SHA512 ce0ac899fd2af1d50ef221c88282c12263c5862b9ff1f6341a8551c3fe6b69272772599a2040a0f553a776245514c55b8102ca8cf291b411e5127a3f39897832
 EBUILD mpop-1.4.4.ebuild 1131 BLAKE2B 98b3558b2b7fc70436fc0ab589a29d6bd4af7e0236b96cace86fce866d58bbc8c7c54ae4640a3c057c0c21855815f28ec6719580912f74bae3f1b4a5ce0edbff SHA512 18cd6d8cff3e4564f112b5053b32de2f6e3f6744e22e9009395efaa4e0067330a8a3ec0bcee0a965516e859f833665f2f6ee9277af058683494993636f5b7ca5
+EBUILD mpop-1.4.7.ebuild 1131 BLAKE2B 47380c5f65e45c2b66ca6d7f4fb6988f7e3a396568825d17dd766a0a824284b7cee96459bd549d5c6a5ff355c9440cbdf6d6c0f75cb821d8b9d44e11bdcb1ce9 SHA512 9a19f1cc5e6525dd87ada4167c115079de8f4cf12f9e16fa4ff5c2e89f3c400216774483e03bc11d4cf26c556cfa331c10e8a22174af693fedccce52b180fa9c
 MISC metadata.xml 241 BLAKE2B e97922b2760a2f8d0ae16406e640eb60631fc3de36ab2a76953fb0b78b14e9652f317120839b5b4f0decd3dfb4f2931d828eca1f8a60f6eb1e01f3d2e8a59236 SHA512 f43a36b5ac2474c93bd47933995c16936ddd5748811e13716dc1eb2eff2a9e8e2f0fce706fa82386bbda93e7cae791066118b960191e93ca2eab02175f9e020a
diff --git a/net-mail/mpop/mpop-1.4.7.ebuild b/net-mail/mpop/mpop-1.4.7.ebuild
new file mode 100644
index 000000000000..ee0c8845eb58
--- /dev/null
+++ b/net-mail/mpop/mpop-1.4.7.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 gnome-keyring nls sasl ssl vim-syntax"
+
+RDEPEND="
+	idn? ( net-dns/libidn2 )
+	gnome-keyring? ( app-crypt/libsecret )
+	nls? ( virtual/libintl )
+	sasl? ( virtual/gsasl )
+	ssl? (
+		gnutls? ( net-libs/gnutls:0=[idn?] )
+		!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 tls $(usex gnutls "gnutls" "openssl")) \
+		$(use_with sasl libgsasl) \
+		$(use_with idn libidn) \
+		$(use_with gnome-keyring 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 c28427edab4a..c6b5c9c42dc1 100644
--- a/net-mail/offlineimap/Manifest
+++ b/net-mail/offlineimap/Manifest
@@ -3,5 +3,5 @@ AUX offlineimap-7.0.3-darwin10.patch 316 BLAKE2B 3f9adc406881e43462aee6764ef7aaf
 DIST offlineimap-6.5.6.tar.gz 187801 BLAKE2B 78561ffc0b0dcd3dcd3c75448f1e412661ac5061eebfae5796dffb3a6e8767b54138328aa0a8ab5a1745ed0690809965ea76b9b8e66ef250936b0b72cd07e337 SHA512 3f7cb63d00486de2d648aa9dd3637ce252dd100bc8237742d11f749726b2b14907c07c802ba0fd5891c88f5062f9a2d05ebc78ceee8c30981f4c4579c3143d6e
 DIST offlineimap-7.2.4.tar.gz 721887 BLAKE2B f5c7c8eb541167b3f0d46ee71be418d4697f89a1dc11a1c5c9840e5def09d108b7ab391d773dc79e0882ce0a9e21388e11217915112f476d384bf3018d5ea750 SHA512 837f822a08f5df59f5332c65b33e0186c215a633c5c17f08790f4c2128a4f6470a75eb02e883dd592b456dbc0ba2b32f670cb716eb602dd8a6bdf12ba2d72cd8
 EBUILD offlineimap-6.5.6.ebuild 2346 BLAKE2B f4cea6677350da94c785a4abcb4b52f0b4bc7acdb041a216a0775dea8bd0680f2b56ead87ebc99163b01a8fd27e6fd46f5043035904f2e5a575b554660e07b6d SHA512 4fef94705b37cc7f84d824a34baeaaaba1497f94f6f8f8bcb838c62aa0077a1f4fdd7d5e059d795b089b9603a0ee77befa8d90f2b604fe44436a0d910a751e7f
-EBUILD offlineimap-7.2.4.ebuild 1643 BLAKE2B d847579f2285e1b76c7eae04d210bdb616f6da87ae123638157eeba6f9239da47595fd7aa1d27cde8f07a9413d8060934303f29e623135933c4edb185f3795c8 SHA512 15567462de5706d735d0a9e17a6ef6648fadbcab97067a36cf2a61ecdedfed955f2ec62afa22aa8fe8e7211d0d231fa852fe10cdc070319b339589ec0bf731a1
+EBUILD offlineimap-7.2.4-r1.ebuild 1681 BLAKE2B d5ceadd15b6c5c84b029d3886865d19a5a08ae26160bf7fbd51d685146407b9914ed9e394d5a69d14fe50e8488856721b2bb950b734294e3a5608a44b9c1a245 SHA512 e8956adf8a94eaa90251b060398d78a0b55cfb88b9cf2356fe2d951b912de2b2b08169a67dbb6d8d8587d35ff86a7269ef49afe14443c0fc9a1195aef6e78e36
 MISC metadata.xml 365 BLAKE2B 44c143951196526dbc7e8c23fe3719a33ecf633361b9aa5294dd4e61c1dd0aecca12159a33c3ef7e0706a5c57162f170559c44c554541754cf5049118c8d89c8 SHA512 ec19d9f99d945536a02dfd7d8c113c6a6337e80190ee60ab172ac9c248398f4faad49aabe4f56e5e4d5eb09ea35810a47ad263b8df59f7368e1f8bed6e780c2a
diff --git a/net-mail/offlineimap/offlineimap-7.2.4.ebuild b/net-mail/offlineimap/offlineimap-7.2.4-r1.ebuild
index cb75e15af026..505ce0297519 100644
--- a/net-mail/offlineimap/offlineimap-7.2.4.ebuild
+++ b/net-mail/offlineimap/offlineimap-7.2.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,10 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~ia64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc ssl"
 
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/six[${PYTHON_MULTI_USEDEP}]
+	')"
 DEPEND="doc? ( app-text/asciidoc )"
 
 # see http://pogma.com/2009/09/09/snow-leopard-and-offlineimap/ and bug 284925