gentoo resync : 02.09.2020

24 files changed, 222 insertions, 145 deletions

diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 9265df13000c..bf7c3d9c209e 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/email/Manifest b/net-mail/email/Manifest
index bbd578ac0c10..45a0cb97443c 100644
--- a/net-mail/email/Manifest
+++ b/net-mail/email/Manifest
@@ -1,5 +1,5 @@
 AUX email-3.1.3-fno-common.patch 560 BLAKE2B c592ea54a13089e65cb6fd6bdcb80438f8a0f7f8734149b0b8f58649a94eb17f5cb4e87f96131e2d03ad8dc057a5c4f1bab71b64d071ec0ea565622d4d5ca834 SHA512 34bee203fa588e6ba785c331208086448b39c4bb4725b04166a165980e8b5b4c1e5d0bb87a59b540a7df0f0a3b88dd0427e715c736ef443bcb40eb3a3495f6d9
 DIST email-3.1.3.tar.bz2 178396 BLAKE2B 645d1fd3f0585ce6cbe2e0f2354989f07b39c83c8d21789a94d27a9e9820ea02ec1b213080018c560c7c79ef6f8fa2b636df4f40c9bc5390321d438cf64c448e SHA512 3fc1a8aa653a519261614e54b3215b89e41273207aa63f64572c8820093922a820ecad5e939b0eadf8d4c0587be83ffcb239bb31fd959b96dcf566157420f33b
-EBUILD email-3.1.3-r1.ebuild 447 BLAKE2B 471538835dad9a4e1230771cdc6635984735cc7b70aa5cf1345f2ef9145e030dc31742e571b149ba5a17e07997b84ba1e0ce03ee1cd01f8ec7cd85eb67883d13 SHA512 a2a96961d82f57aa9544b0a347e75c76f7f55af1a968aea2ccf4ea8453b93a9ee466c774ac0737cff952b84df372746de9c8dc153eb79c44679d6fad3732cb32
+EBUILD email-3.1.3-r1.ebuild 446 BLAKE2B 902f3d748da96149c357a6bd710d45d717f49f55a09e9525971a53ee3b8fe7825c4dafcae5eabd68df93cb550cb9dfa16033ca7b5f0a1090881e5615b6cba24b SHA512 7f338c82575e37c5d4aab4ae443d830e5e73e4811b9370bc14acafecba556d78909029fbd7f266371b6afc0822e38d3f76749c3eafbd6fd83f5d159e56f6127c
 EBUILD email-3.1.3.ebuild 556 BLAKE2B eab248d080b827b2526f6d0284310b0f66e2f3cdc24be511efb387b4b5e3a95d47d2360037115108f9810706d9c29153c0f73c2e27e68325b36578dc37810eb7 SHA512 c7c11d031d578bf3b5423cf1125ccb469515ecbb8be3b10afcd93f7741a864d535a546be6ec0c2ced2c9fd672a9985e10dd95b00140969210e576d24e74be5ce
 MISC metadata.xml 259 BLAKE2B 340db8ab484f8fe7b7a74af660d7ef8f4d99d98b2feaaa02836808ef6da6176f6c15ea5525a097b8556d434a4c8d6a6c49d97a1deb1376edac3220b4d9a07208 SHA512 be960a9ee308ff2013fbd23ae68a484a273afb04a49490859d0bd5f01e21d176937386bb2704b6dba5599ae3c71f5c91c995a46dbb162b0925c41a025567ed81
diff --git a/net-mail/email/email-3.1.3-r1.ebuild b/net-mail/email/email-3.1.3-r1.ebuild
index e8b2a103b89f..3f20f43dd79d 100644
--- a/net-mail/email/email-3.1.3-r1.ebuild
+++ b/net-mail/email/email-3.1.3-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.cleancode.org/downloads/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 x86"
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.1.3-fno-common.patch
 )
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index 69aa2ae2cd92..58e517970266 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -5,5 +5,5 @@ AUX fetchmail.initd 993 BLAKE2B 76fb355805afc0b62f350f02dc0b0d6ac83659d2e15a4930
 AUX fetchmail.service 204 BLAKE2B 4683577d0da4929b068bd2f49516838644ac399e6ab27fb6ff9f3d5f1d8357302e11e6fc4d22d8944d504bdbb600e87b853e039601b8cca9763e1ca465573508 SHA512 088d7ff2c473d4b514cc5349ba6f10bb7f29ace1141d152db082c801a9dd0e6144a2dd350e27e97f633aaf286c2daa5253e52b5c410737c44f3fd9b5b57bab75
 AUX fetchmail_at.service 289 BLAKE2B ab28a4b96625404f5451aa2dd37b671a18d7bf72bb3792d20eecded0ef42f15ddd768470a9dd541a66a495e954632e9b12ba3c0cfb446c4e2832eb9d3993f8c3 SHA512 4f8208a286f2868a466e69919b7c9d965da099b44675105689bcc52b0d16acc8d46e77f6b9a72968e82a6cf900e20d07a9a7373fe26a1ba9c925edf6663180ed
 DIST fetchmail-6.4.8.tar.xz 1282300 BLAKE2B 31b7f9fa31edff534210a2a0764cc6dec461968071a8aa29b1d1e9915ff6b8d2949b128f97d72fafe6d431b06d4e5c6b38d4a3cdba06736bdf8ec1879a991798 SHA512 c1052389baafa3a48186733133130bf69b87c8dda8faa00e82f5947037845b95d3271c8183df729728a351888175174ca11eb18f9adb8b3515860cba95ab8987
-EBUILD fetchmail-6.4.8.ebuild 2504 BLAKE2B a2b5a37b819b65db9bfdca8f32fbc834719a7d55f628ef8e8135e1a1835ef88105e248ba3b4507f79fc344aec50daf0b5797ad79ac859704d686e30828996ea6 SHA512 7f49692ea00fca151e02226c7f2d2488a6fc4bfefae48f0cf3e7db574c00282d6ca2f3aa7499d485d8c9d34b09caaa4d990f6502598c8d13fbc78f4df7a95c59
+EBUILD fetchmail-6.4.8.ebuild 2511 BLAKE2B ebc8a846792c69dc12b7d8030efbd68994d41e1cab51ec8ef5007ec5b8f036f09ac12a69b5c02efb06fa2eb71e5d24655d844661b50737bb4cad5d8322acf9ec SHA512 03e1eb61afe94c73b103f3a56e016f28eb8ed719c44e2f75cf11d81acec5c911a2485d99a74de8bb6c37710f0e6be0daf55b8a675f98a330d02dceea21b0cea8
 MISC metadata.xml 521 BLAKE2B 8e33fe9b7e4e041ed3990e710b9d903cb6284d4ea9675ae781a0b73aa404c97f39718baccfa9441f388848fe82d2e97e6aaba602df4a8d1f6cbc1093081a718d SHA512 e7efcf6511fa7467455e9af104d83f814ee2342a6956ae5b98b39319ddc3b431d8255e5755fa447f3a20ad5caffe8810f343245239657af211e177dd39a7d974
diff --git a/net-mail/fetchmail/fetchmail-6.4.8.ebuild b/net-mail/fetchmail/fetchmail-6.4.8.ebuild
index fe2a41ee0afc..aacadaf2ec82 100644
--- a/net-mail/fetchmail/fetchmail-6.4.8.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.4.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="ssl nls kerberos tk socks libressl"
 REQUIRED_USE="tk? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/net-mail/libpst/Manifest b/net-mail/libpst/Manifest
deleted file mode 100644
index f940fdf66970..000000000000
--- a/net-mail/libpst/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-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-r3.ebuild 1661 BLAKE2B 18ff6fa687d9e48307fa92000f26c21284c46bdeb1345f383775576ed3c6a6637506e66deea4cc9da8d8cd4a9640e12946959bdc7e2419a08e5acbf338b20be6 SHA512 33ce03c37eb3dc82262d3a729a1f01948bf0a6fe5286cfa0e862f0a2416c44fb89e27e5e2e1e6a07376852d0c9eeb4db03ccb91de71b51c1442c18326c81e804
-MISC metadata.xml 232 BLAKE2B 63277f4f8d2b807cb55686cc487bf534330a954fcb2e43dc24fe5cad241229545305bfd7517ab2b8a652f0ef89c93774f7636fe848145f29695575bd15100418 SHA512 bc3293101ebc8838fe7c3a9ba19bb540a8c5357d9181545dd460bc404637e469866428445b8340833b20cdd44b55ccf88ff97433bd88ba8ee8b7353ceb140b8a
diff --git a/net-mail/libpst/files/libpst-0.6.52-no-static-python-lib.patch b/net-mail/libpst/files/libpst-0.6.52-no-static-python-lib.patch
deleted file mode 100644
index 5bf53c6dd81c..000000000000
--- a/net-mail/libpst/files/libpst-0.6.52-no-static-python-lib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libpst-0.6.52/python/Makefile.am.orig
-+++ libpst-0.6.52/python/Makefile.am
-@@ -8,7 +8,7 @@
- 
- pythonlibdir            = $(libdir)/@PYTHON_VERSION@/site-packages
- pythonlib_LTLIBRARIES   = _libpst.la
--_libpst_la_LDFLAGS      = -module $(NO_UNDEFINED) -avoid-version
-+_libpst_la_LDFLAGS      = -module $(NO_UNDEFINED) -avoid-version -shared
- _libpst_la_SOURCES      = python-libpst.cpp
- _libpst_la_LIBADD       = -lboost_python ../src/libpst.la
- 
diff --git a/net-mail/libpst/files/libpst-0.6.53-pkgconfig-static.patch b/net-mail/libpst/files/libpst-0.6.53-pkgconfig-static.patch
deleted file mode 100644
index 373533b75935..000000000000
--- a/net-mail/libpst/files/libpst-0.6.53-pkgconfig-static.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- libpst-0.6.53/libpst.pc.in.orig
-+++ libpst-0.6.53/libpst.pc.in
-@@ -8,4 +8,5 @@
- Version: @VERSION@
- Requires:
- Libs: -L${libdir} -lpst
-+Libs.private: @LIBS@
- Cflags: -I${includedir}/libpst-@LIBPST_SO_MAJOR@
diff --git a/net-mail/libpst/libpst-0.6.66-r3.ebuild b/net-mail/libpst/libpst-0.6.66-r3.ebuild
deleted file mode 100644
index 4a038ca366b6..000000000000
--- a/net-mail/libpst/libpst-0.6.66-r3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools python-single-r1
-
-DESCRIPTION="Tools and library for reading Outlook files (.pst format)"
-HOMEPAGE="https://www.five-ten-sg.com/libpst/"
-SRC_URI="https://www.five-ten-sg.com/${PN}/packages/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="debug dii doc python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	gnome-extra/libgsf:=
-	dii? ( media-gfx/imagemagick:=[png] )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			>=dev-libs/boost-1.70:=[python,${PYTHON_MULTI_USEDEP}]
-		')
-	)"
-DEPEND="${RDEPEND}
-	virtual/libiconv
-	virtual/pkgconfig
-	dii? ( media-libs/gd[png] )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# don't build the static python library
-	eapply "${FILESDIR}"/${PN}-0.6.52-no-static-python-lib.patch
-
-	# fix pkgconfig file for static linking
-	eapply "${FILESDIR}"/${PN}-0.6.53-pkgconfig-static.patch
-
-	# conditionally install the extra documentation
-	if ! use doc; then
-		sed -i -e "/SUBDIRS/s: html::" Makefile.am || die
-	fi
-
-	# don't install duplicate docs
-	sed -i -e "/^html_DATA =/d" Makefile.am || die
-
-	eapply_user
-
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-libpst-shared \
-		$(use_enable debug pst-debug) \
-		$(use_enable dii) \
-		$(use_enable python) \
-		$(use_enable static-libs static) \
-		$(use_with python boost-python "boost_${EPYTHON/./}")
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-mail/libpst/metadata.xml b/net-mail/libpst/metadata.xml
deleted file mode 100644
index 1ec1cdf5e944..000000000000
--- a/net-mail/libpst/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <use>
-    <flag name="dii">enable dii support</flag>
-  </use>
-</pkgmetadata>
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index 77823c3edcbf..cc729e5324c6 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -1,6 +1,7 @@
 AUX comsatd.initd 569 BLAKE2B 1b4ad287b67ef6d95fbc626296e79a857264754159967c54105e9d9f4493e95d3494cfce6082f289358021e02bbaac580a1b4d78ca8b2cc713af57197e532431 SHA512 9c36ddf70bf4f0e3c56f55651a740014078e3a1a79569a62ccd74e1ec7167eac6ecb69d56c15913d815c472fe943d17a1e781a669208d37c97671afea2208f8f
 AUX imap4d.initd 566 BLAKE2B 2d030e47f63b4133eed4b47c9069c54de290f907d9429eb99675380569e1e0efdbb1172664ba1ee0f2924ac7284981fbe350d1543a6d0790722456523d997535 SHA512 51d6cf4285c6823d97e52c7eb408a80aa66376f329685acdc21e096c2099a044b2fd18e7b9e5ed89406a3cd1f16b7aa7b0243f8ea46aa7824da48b566ec00324
 AUX mail 82 BLAKE2B 6d9cc293deff8f99cea0ce8842dd34e658844ca9a1f4e530d3c95f8154ed337ab6ccc2b6263af9cfa8078913a7b70beb5874c999174d5648c1faeace8f68e146 SHA512 80080a3118ed66cfde44ad3663e4b07bcd5fe756b86a213ea4e1ab86e27f8485dcf02af3ee6b7f6f12105a267b9619376668e0cb6e60743ffb7664d2dbea9144
+AUX mailutils-3.10-get_size.patch 989 BLAKE2B b24d0c942d35b943ff211d9b688ee3a4f805e42de63f1d0a9309beec7a0619d2e2d093e5e632bda8268bd34cac460fe9ed38c0e7fe7e827faaba4d6a2099ef80 SHA512 13aea65571a073eb9a556d74ae0384ffd326ca39854b47b04208f2543fc26bf6fcad5ced60b912c2569e23a2d89b8109ddc1182ec95bd40d6ed0cbb5acf677d8
 AUX mailutils-3.5-add-include.patch 275 BLAKE2B 2502fb3226bc63ae98d018392fa1107b4079ea51cd8e57b4e97522d21e696bd6048fad2de885f88644d23f434a6e407f42ba8fcbcfe5b1e65884f37718e34328 SHA512 0972cde536a1a82fe243c9b048fc15f4863586a2344b54c9b4f6f8a5935762c7272c0af2698239af7de9da62b1c2928bc7f621e01f447423fdd8288cedee88b6
 AUX mailutils-3.6-underlinking.patch 368 BLAKE2B d578b46b45bba39fe8b776abfa4394e3adc10c2f811ed4d20fe7a8cf7b2442ebd040dd8a8c5c9023e1f9b635e252cade01ecb08b898bf8e4e2da97e5349497ba SHA512 a958be77edbd01af80f824c70b5f85fde526eadfd58db2476317d44b1d48fb2c2a90c84e49204a84f9efee91c51c33275f6c8254eecd84fa2681c84230b42173
 AUX mailutils-3.8-fix-tests.patch 1254 BLAKE2B 68fc23fc1a6cc98fd5cc6f50afec22373cba028a8b5c81472a843b00d390cb93b7e3194cb8ecd6274552d0610137286bbbac2d33c548b93f2c8c18cc39cf2775 SHA512 2de6971a0811e2501c55a45bf72c80010c81f347178219fa75725cdfc3263f77cc42fd2d8a9209055e889ea8d6eb918a8fc5d86c3fd7f1ac6d5c387bd6f4dbe5
@@ -9,8 +10,10 @@ AUX mailutils-3.9-python-config.patch 905 BLAKE2B c7f5553b89a93d025cca13b4a882d0
 AUX mailutils-3.9-underlinking.patch 404 BLAKE2B d162f818580bcdbba54f0aa56fff49461c8efe1e06e3dee213f9910253e014a8e44a3ae34006c2b8bc56dad687d0522eb86e6bd040c08bc714717c49fe2885ad SHA512 8782f59323ea426ecac65ad5b5e22e37f1150bab8782889b0c16f7d28c10030a78f77210141d1f74edcdaf47db70154616003df4143f664cb01b875e2fee1348
 AUX mailutils.rc 258 BLAKE2B 3dc68190e11c8bf5016b0fe8b22c61f79ba7de96a1f230f7d0743ba23fa903cb9f99fac94a7363c7d80b7bbaf76e2d4de848e7ac726642fb23c56caf43a46568 SHA512 691bcc81fd355d8f2776e72006c149996273579e099f24970ff0c5dd6bdf65cd64e31597f8b3d8e0a900a91c3325b8d2a1a96682a9b3ff53acd41218fe8721fe
 AUX pop3d.initd 563 BLAKE2B fd09d7a7499c888eddfb812644102f979c2423e9b1a9f0077655b6ae4c1eb4214f685ef7843e74a808e52ee988cc3fbefa278754db824256a4972c83fc0ada31 SHA512 7847c29a03f21df82d36c077ccb38329457a332cccdfba24bee3b1c9a8170fc71c07ee674408f069693953dd1bf44b8b8f782dcc35d6b16e62f70b2b32ce018f
+DIST mailutils-3.10.tar.xz 3102328 BLAKE2B 49ea417f71816db2ca1e6a514e5f662d7ef66dc72ae93141ebb8ee006d78ad89587f4b09a96985fdb17335b5f58f8eb654cef23d64fc6d994948786e4a4b1410 SHA512 3a74c9a4bb197feecb2e2c4acfdfac6104c723722b1b2026183bc4cdb6872a45563034f82a56374fd3f51a79999b0f1d47e1169c971d1222fdc1f7b67e66550f
 DIST mailutils-3.8.tar.xz 2998596 BLAKE2B 4d09c7b5113129b3d2f3b113808d4460d025d4f0eec00dd1209a95f23abe97683b5d50cfe5229f1e5db48ddd6ca66c73fa6b0c1bfe03b324dbf40b6a26ff76f5 SHA512 4d081ae492beb0f9c1945541d63b52f155f11ca172abaedbe465955ac11097037f440e1aaed8d512cd3aab65f7792b755a7e4b9428a90ad7a833de87b1c4f1f9
 DIST mailutils-3.9.tar.xz 3075268 BLAKE2B 43ee5bf297951b3c894b467a46d3983dac3e115c02169da0ee2ccbc23f8b71d7439083093f4b0710f19c78f108df99dee3310f5f6adc5b7c1792a0a7be33aab6 SHA512 1eef9bebeeafbf974e54b87705444ee02b663a86e22442a9ec5db16ade38e6e9a3079ee8a8267393e97d6e9e477917617b2e1d57d3287ab19e4df73b66e5a8d4
+EBUILD mailutils-3.10.ebuild 3655 BLAKE2B 6b34da19de69f19160256cbcf613ecd8fe194b8e31e0c9701f9d1f93226726d54e0630c03b14f24269c76ac1fe93497e5aaee167a1dabb7665dca69d484d263c SHA512 d0c35a6299ac8b3983ed1d4aeb6b66333cc29cc310a95d86d4ab6536c8b2077d87065db65bb38ea103a847431b0553c3afb1ee98ac24855d86325a7a636437c2
 EBUILD mailutils-3.8.ebuild 3728 BLAKE2B d09f95b50dab9521553121380f839d30babf0c00c607051c73f8c0a6db58f04dbc17219536ac1d8d445df5185869b4fa8d315b939006b5fad8d786d599be447c SHA512 4add163fc3f0d120fcb75405858f993f36ed1e44bbb5fa3f40221e18653aea750bb0a9ac35026755a3bf160ce046d95ad98bf0f7b13ec0488461b1f0c8c7f4c6
 EBUILD mailutils-3.9.ebuild 3739 BLAKE2B 13fb7f18735f13d30efae2f7c2648cb5c4086a22b6040b1fb8bc241db05f2564b13cde55e89e1fab7f860cb5a1fe0c8031cd9f13a59797d0a733f77135983387 SHA512 ae48e56b879c5fa53332632d9afab159faa7d34db252d7e4b6ae7c7188b1e4eec0b0b6b4b8287b9ab226e72e5947ef17fe71e3ce783592660786a599f728551a
 MISC metadata.xml 602 BLAKE2B e29b6203ef727041c0bb5483d46ddbd256f55f40d26ff94008fc3869dea23036369029a168a5b31fe3da8ee9c529d8c1cd9d0004691670cb9bebe77ef4973270 SHA512 602ef10835b14c359ac19dbce157ef5c073acb52286f7349feb4b8ec3940899ea4dba9d77ad4d4a3d540d86576cfb9f46e502cb9e8aa60cecb4a2f4b0b6358da
diff --git a/net-mail/mailutils/files/mailutils-3.10-get_size.patch b/net-mail/mailutils/files/mailutils-3.10-get_size.patch
new file mode 100644
index 000000000000..3ec15968916b
--- /dev/null
+++ b/net-mail/mailutils/files/mailutils-3.10-get_size.patch
@@ -0,0 +1,38 @@
+From 37713b42a501892469234b90454731d8d8b7a3e6 Mon Sep 17 00:00:00 2001
+From: Sergey Poznyakoff <gray@gnu.org>
+Date: Mon, 17 Aug 2020 20:34:21 +0300
+Subject: Bugfix (complements fd9a86d37b)
+
+* mda/lib/mailquota.c (sql_retrieve_quota): Fix a leftover use of
+get_size.
+---
+ mda/lib/mailquota.c | 12 +++---------
+ 1 file changed, 3 insertions(+), 9 deletions(-)
+
+diff --git a/mda/lib/mailquota.c b/mda/lib/mailquota.c
+index 7b7dd52d9..af719a591 100644
+--- a/mda/lib/mailquota.c
++++ b/mda/lib/mailquota.c
+@@ -270,16 +270,10 @@ sql_retrieve_quota (char *name, mu_off_t *quota)
+ 	}
+       else if (tmp == NULL || tmp[0] == 0 || mu_c_strcasecmp (tmp, "none") == 0)
+ 	rc = RETR_UNLIMITED;
+-      else
++      else if (get_quota (quota, tmp)) 
+ 	{
+-	  char *p;
+-	  
+-	  if (get_size (tmp, quota, &p))
+-	    {
+-	      mu_error (_("bogus mailbox quota for `%s' (near `%s')"),
+-			name, p);
+-	      *quota = groupquota;
+-	    }
++	  *quota = groupquota;
++	  rc = RETR_OK;
+ 	}
+     }
+   
+-- 
+cgit v1.2.1
+
diff --git a/net-mail/mailutils/mailutils-3.10.ebuild b/net-mail/mailutils/mailutils-3.10.ebuild
new file mode 100644
index 000000000000..fe26904e0882
--- /dev/null
+++ b/net-mail/mailutils/mailutils-3.10.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit autotools elisp-common eutils flag-o-matic python-single-r1 toolchain-funcs
+
+DESCRIPTION="A useful collection of mail servers, clients, and filters"
+HOMEPAGE="https://www.gnu.org/software/mailutils/mailutils.html"
+SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
+	ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd \
+	tokyocabinet"
+
+RDEPEND="!mail-client/nmh
+	!mail-filter/libsieve
+	!mail-client/mailx
+	!mail-client/nail
+	sys-libs/ncurses:=
+	sys-libs/readline:=
+	dev-libs/libltdl:0
+	virtual/mta
+	berkdb? ( sys-libs/db:= )
+	bidi? ( dev-libs/fribidi )
+	emacs? ( >=app-editors/emacs-23.1:* )
+	gdbm? ( sys-libs/gdbm:= )
+	guile? ( dev-scheme/guile:12/2.2-1 )
+	kerberos? ( virtual/krb5 )
+	kyotocabinet? ( dev-db/kyotocabinet )
+	ldap? ( net-nds/openldap )
+	mysql? ( dev-db/mysql-connector-c )
+	nls? ( sys-devel/gettext )
+	pam? ( sys-libs/pam )
+	postgres? ( dev-db/postgresql:= )
+	python? ( ${PYTHON_DEPS} )
+	sasl? ( virtual/gsasl )
+	servers? ( virtual/libiconv dev-libs/libunistring )
+	ssl? ( net-libs/gnutls:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+	tokyocabinet? ( dev-db/tokyocabinet )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+	servers? ( tcpd ldap )"
+
+DOCS=( ABOUT-NLS AUTHORS COPYING COPYING.LESSER ChangeLog INSTALL NEWS README THANKS TODO )
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5-add-include.patch
+	"${FILESDIR}"/${PN}-3.10-get_size.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	if use mysql; then
+		sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \
+			sql/Makefile.am || die
+	fi
+	eautoreconf
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	# maildir is the Gentoo default
+	econf MU_DEFAULT_SCHEME=maildir \
+		CURSES_LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" \
+		$(use_with berkdb berkeley-db) \
+		$(use_with bidi fribidi) \
+		$(use_enable ipv6) \
+		$(use_with gdbm) \
+		$(use_with sasl gsasl) \
+		$(use_with guile) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with mysql) \
+		$(use_enable nls) \
+		$(use_enable pam) \
+		$(use_with postgres) \
+		$(use_enable python) \
+		$(use_with ssl gnutls) \
+		$(use_enable static-libs static) \
+		$(use_enable threads pthread) \
+		$(use_with tokyocabinet) \
+		$(use_with kyotocabinet) \
+		$(use_with tcpd tcp-wrappers) \
+		$(use_enable servers build-servers) \
+		$(use_with servers unistring ) \
+		$(use_enable clients build-clients) \
+		EMACS=$(usex emacs emacs no) \
+		--with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
+		--with-mail-spool=/var/spool/mail \
+		--with-readline \
+		--enable-sendmail \
+		--disable-debug
+}
+
+src_install() {
+	default
+
+	insinto /etc
+	# bug 613112
+	newins "${FILESDIR}/mailutils.rc" mailutils.conf
+	keepdir /etc/mailutils.d/
+	insinto /etc/mailutils.d
+	doins "${FILESDIR}/mail"
+
+	if use python; then
+		python_optimize
+		if use static-libs; then
+			rm -r "${D}$(python_get_sitedir)/mailutils"/*.{a,la} || die
+		fi
+	fi
+
+	if use servers; then
+		newinitd "${FILESDIR}"/imap4d.initd imap4d
+		newinitd "${FILESDIR}"/pop3d.initd pop3d
+		newinitd "${FILESDIR}"/comsatd.initd comsatd
+	fi
+
+	# compatibility link
+	if use clients && use split-usr; then
+		dosym ../usr/bin/mail /bin/mail
+	fi
+
+	if ! use static-libs; then
+		find "${D}" -name "*.la" -delete || die
+	fi
+}
diff --git a/net-mail/mboxgrep/Manifest b/net-mail/mboxgrep/Manifest
index c5484c6f9aba..62f88af5a4a4 100644
--- a/net-mail/mboxgrep/Manifest
+++ b/net-mail/mboxgrep/Manifest
@@ -3,5 +3,5 @@ AUX mboxgrep-0.7.9-fno-common.patch 301 BLAKE2B f509ad202b6f82afe7d4ef71686198a3
 AUX mboxgrep-0.7.9-ldflags.patch 1212 BLAKE2B 30c7cc0f233d207838b5a24d189f4c442f98f2c3150e99dc202c4438f46f2ebea034e03c60e7f29d6c4bcd055be30b9aafdda37fe404ae44d552d2df631e91de SHA512 9aab0c978b1085cbbb915bd883f7c2b4808b9d5458b2fdbb8bfbeaeab709c9b5f0563c864904253bc0fc84e7e000e4587b755491601e3eabd30154a44d5dfacd
 DIST mboxgrep-0.7.9.tar.gz 76067 BLAKE2B e808f71c730fcf7edcefadcc579ede559a90db1f1a335fcf08a2002903cdaeac36080235450b6bc802b7cb100afd37a831fe6c57b40711aa70334633891d4330 SHA512 d7e768a0ad11bc3df8619f2a888d2943c68ef72dd036c2fe58268686efb50cb1f62ba379571b6cd6efa8493c5ea0d7c09a29520eae6c68f66d9453710eeeba11
 EBUILD mboxgrep-0.7.9-r1.ebuild 561 BLAKE2B d3e18ee1d573f6d9187d1897c0d28c4d4a9b31217a4f0c3baa723a250482c2b371fda8c01d95c13c22feec8796d3dcedf919046f831d68efb30d4b826ef53b53 SHA512 ebbb369bcd0974941e37c657b1d3e943e10436538bd35b5058f4ee9a6b0f7653851be962675e89da9f7258664f6aacb3cbfac718615dcfc616a4d508d821c4ca
-EBUILD mboxgrep-0.7.9-r2.ebuild 770 BLAKE2B 4c033bf6d0e4d46062aadd5552f1ba5a60565686948fbc676dcc8ad9a7e2cdc6e409f812a9404fab1c66fe2a5a70210047a3f430389173c1260a31961d19e099 SHA512 cee11e03166ebd31eb8b7ab42396ddb5c584ab212133ba56f6575cfc1db06030007cf07ebd37595ca99d83ca933943b12eae150ac88051ea28b60a5c41fdb1a6
+EBUILD mboxgrep-0.7.9-r2.ebuild 769 BLAKE2B ee4caf15c4bd95c572d2d618d5c17689ece9ff4d366664f5c3957ba4134a92a0a84791c5d7a5bd55412db04ad9c70b7bd2544b6f27715ed2283e6d6f0c60ca58 SHA512 cc93b883c9c0da0bda4aa7c59ff364c58d008de6f5efa17a793f82ee3a595ec95fba8648c1644e8c6f0d8be1c4b5b543dd7e28d9f85ccaa64114ab79497a20d9
 MISC metadata.xml 337 BLAKE2B 278e5cc4a7081de0b6f8cbbba8f25d762014c869676683b41dcd74a1fb9ec8bdf73d412652dc867117204ce9d509a6a79f496aa22e69a65f234e4323f8059a14 SHA512 ab0f3ce2bfd3a959ef8132b4ad3b578cc71e3714002ec7433ff68084926176792eca1b319062878fbe984487514324d228b3d75065ae13747e1b22f1aa898d72
diff --git a/net-mail/mboxgrep/mboxgrep-0.7.9-r2.ebuild b/net-mail/mboxgrep/mboxgrep-0.7.9-r2.ebuild
index 5e42763bd887..d6c2dee2ae4c 100644
--- a/net-mail/mboxgrep/mboxgrep-0.7.9-r2.ebuild
+++ b/net-mail/mboxgrep/mboxgrep-0.7.9-r2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://datatipp.se/mboxgrep/"
 
 SLOT="0"
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="dmalloc"
 
 RDEPEND="
diff --git a/net-mail/pop2imap/Manifest b/net-mail/pop2imap/Manifest
index 96948e22ba6c..bbf3291ff91b 100644
--- a/net-mail/pop2imap/Manifest
+++ b/net-mail/pop2imap/Manifest
@@ -1,5 +1,3 @@
-DIST pop2imap-1.18.tgz 20059 BLAKE2B 022eacdf48ca65f1f62372cbf3b63ca45906e8433d2797be3e7e49c0a72b85ef8ebf4466eef75d4643e1bdf1da32f83b1aa55744c910ca3e7dce143b49e3c836 SHA512 8b3a41cc2c7f9b51890d2ba19897f0b1576a027f0f3443fb3fcfeec9beecd797cba383ad83f0b56abb8e79625ad52b25fda20b94dc80cc11ddfe60550809a86f
 DIST pop2imap-1.21.tgz 10920 BLAKE2B 6f35fc081aa2b27854aaeec191d9d084fbe063e647fc2042ff8a0670dd4420442e1d2da747b6c5ea05481c25751f8f5f774b0afef4d9007e09a15c879585a7e2 SHA512 8f49ce6ee0dbb71699ec83415f3002f752975eaa39c70ccdc0f2e62ab2791a29d483e1159c2ef035c411fe5e351b9c99845ba2451e95fd3331c3bfb03b8a061e
-EBUILD pop2imap-1.18.ebuild 579 BLAKE2B 0d480a17454def29ff077fc94d1014ee8e61320ef9b3237a2bfaf0197cb8f3d0109c1e1e8c8706014d06c9e71bba11a78689fcd763d73a50c44d7d4b554cae93 SHA512 217c7022b15474df98b44a2bc669873a1280ef5342ef584af086e6b37caec8c95df27bf6b16eae044b426da6204e118e235ac847e37dadfbc72674f12d313673
-EBUILD pop2imap-1.21.ebuild 588 BLAKE2B c4601c2cea0cb9a05e18c610929bb959183a65763c15efa214446b2ffed78d1e8795898c1e2ae4750b851d2d2a8a826f2a94ebaf8cfcbd098b362c76e50335fa SHA512 60d0cb21eef13c53685f3c7faea1ba50d8ff2b4dc6c2f256b1c6d0de7cc1ba92d9d867f7b78d31138cc3597aca146ddb97b465bfeec584f52be6dc3b313fd192
+EBUILD pop2imap-1.21.ebuild 587 BLAKE2B c2933661d99e58b973a483813a0f1825d23076886357ab5f5dd2702536e5be9d0c8a658cb02dbc8ace4b06f6af15cd237fad9301653ac48f2647d28c1b10740e SHA512 a50c510992d4fd7b6aa215b483ed247c0a1eb9f30505dd919559a472ed63a7182444d585903c1dcb47446a96acc42d8dcb907bf26644c197c0d1264e315f495b
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-mail/pop2imap/pop2imap-1.18.ebuild b/net-mail/pop2imap/pop2imap-1.18.ebuild
deleted file mode 100644
index 6f6a40519685..000000000000
--- a/net-mail/pop2imap/pop2imap-1.18.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Synchronize mailboxes between a pop and an imap servers"
-HOMEPAGE="http://www.linux-france.org/prj/pop2imap/"
-SRC_URI="http://www.linux-france.org/prj/pop2imap/dist/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-lang/perl
-	dev-perl/Mail-POP3Client
-	dev-perl/Mail-IMAPClient
-	dev-perl/Email-Simple
-	dev-perl/Date-Manip
-	dev-perl/IO-Socket-SSL"
-
-src_install() {
-	dobin pop2imap
-	dodoc ChangeLog README VERSION
-}
diff --git a/net-mail/pop2imap/pop2imap-1.21.ebuild b/net-mail/pop2imap/pop2imap-1.21.ebuild
index 541e50751c7a..cef59036ef8d 100644
--- a/net-mail/pop2imap/pop2imap-1.21.ebuild
+++ b/net-mail/pop2imap/pop2imap-1.21.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.linux-france.org/prj/pop2imap/dist/${P}.tgz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/net-mail/rss2email/Manifest b/net-mail/rss2email/Manifest
index 8c1a88551573..cbaf3f27a90b 100644
--- a/net-mail/rss2email/Manifest
+++ b/net-mail/rss2email/Manifest
@@ -1,6 +1,8 @@
 DIST rss2email-3.11.tar.gz 66441 BLAKE2B 24be7c4d280e337869833f9fa492186a9f4cc208e9f6152c1d4012edb016993a37cddd991d6211888d6aa7654d66bc79d9d70f1508dae20fa39d79fffeeef55b SHA512 2efdef703a4b4774d85926f500a37689aea3a324f63a13a686a2322c9f69ac7b940c5b953f417d9259e1493b3dafde4c2e1ddb3433d085fb2400cd06001141bb
 DIST rss2email-3.12.1.tar.gz 73942 BLAKE2B be522ec88b4bbc7831713681dbd157b27c0c410bd6a960d80c72169ed2931346b83fc74f7ded663b13ea92f0dd1f5720647208f425bb4de32081579f6c5e3c51 SHA512 8b62a149172cf13c9b03841191f3b214cd1bc2c071f75150a76dacee3edf8a21e0a083a46eba8fabea695cb5077eb84aa4262a709e4aae1e15facee4bbecd1d6
+DIST rss2email-3.12.2.tar.gz 74096 BLAKE2B 5b7d6808d5741795de805e49bb955694a39a087e1dd64820303243227bf4b12ff9ee9354008c4f6cce415a8a8f84266266f8a677d6fed4eefa69713e5f664de9 SHA512 4df498cebd74bb25ffa2caa5aa851ccb106b0fa1b98113c5643cdd3ed8f9a73d266a649df521b8237740ea491ba086a65df0ba60c28a60a3d63360b8280a3888
 EBUILD rss2email-3.11-r1.ebuild 666 BLAKE2B a38fc2dc7182cb7c9e5b97f971d4cb88d89a8fd5adb0687c4229a5a7dda4588e398886de21d115594411817c3d92bf6ebddaa55180d24dea0f905abd433918fd SHA512 8fe6db64a3cd3ddb2169690277ec317cf3ed8ab60237bbb671760b408f1fabcb83d831f986c22ed8bcbae972029c10caa1f5d2aed4b9c48cdc587a47a3544dc0
 EBUILD rss2email-3.11.ebuild 755 BLAKE2B 817ea1f2e4a551d709951a269114cd1be122af38f35de07e0e1a1d94581430b4c236fc5be58f085fd13ff9850b5aa5ffc08d83321dd75eb372d729c987070e48 SHA512 2a69931b3803c53dd16060ea04534ca57b37a4da07d6c59071fb4ce48caf4ffd4f9438c1ea1a6f4a3d66e34d28980a87af15a109cda135bff936972c14694307
 EBUILD rss2email-3.12.1.ebuild 668 BLAKE2B 3ec18a77a6e2f57d6e815e6686338131fd240e240b4192ac162d6c862aea9d0baccbed42f29236841bf76746c91f7df5af71a7606b981cbcd6d6c085f9bc528e SHA512 ead1bbbba4c49e17ff3d58565c8999c2057790a585a3939a0ad6b100acb824554a0f52268fa9e2cb09293b6b26f49e179c8d3d79022b56e6895555253d1f29c1
+EBUILD rss2email-3.12.2.ebuild 668 BLAKE2B 3ec18a77a6e2f57d6e815e6686338131fd240e240b4192ac162d6c862aea9d0baccbed42f29236841bf76746c91f7df5af71a7606b981cbcd6d6c085f9bc528e SHA512 ead1bbbba4c49e17ff3d58565c8999c2057790a585a3939a0ad6b100acb824554a0f52268fa9e2cb09293b6b26f49e179c8d3d79022b56e6895555253d1f29c1
 MISC metadata.xml 435 BLAKE2B 92960d2f537c61ec2639907d5d2071d06ef3b29a49a70b8cf69dc3625d358e015cfd6bed1c735713d44c780de43d75082d1df133540ef4da38f996f44bcd31dd SHA512 2b7d4a2bafc039030ae131a0c567a782488a6d5b225fe0b0b62f2ffe9852c2006ce377b5cc05407503dc01ed427a8c8be4853d5c03902708f38841df24c9fcd8
diff --git a/net-mail/rss2email/rss2email-3.12.2.ebuild b/net-mail/rss2email/rss2email-3.12.2.ebuild
new file mode 100644
index 000000000000..0d679cf6d547
--- /dev/null
+++ b/net-mail/rss2email/rss2email-3.12.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="A python script that converts RSS/Atom newsfeeds to email"
+HOMEPAGE="https://github.com/rss2email/rss2email"
+SRC_URI="https://github.com/rss2email/rss2email/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="<dev-python/feedparser-6[${PYTHON_USEDEP}]
+	>=dev-python/html2text-3.01[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	distutils-r1_src_install
+	doman r2e.1
+}
diff --git a/net-mail/smtptools/Manifest b/net-mail/smtptools/Manifest
index efbeea637f09..0419af5fc811 100644
--- a/net-mail/smtptools/Manifest
+++ b/net-mail/smtptools/Manifest
@@ -2,6 +2,6 @@ AUX smtptools-0.2.3-autotools.patch 3951 BLAKE2B d3d60ac0ace9369e66c23487fb2dddd
 AUX smtptools-0.2.3-cleanups.patch 1830 BLAKE2B 7d634aa4e21572cdbc0f4e94e18ad0fe45010e331d9b121e8454faa696285a60ca97c5dc74567eb4afd88e4444f4da318f75c02b70d4f5c9ba6b2d2664b68fcd SHA512 55db66e01d6a252e4c9c265de2c14e40a92b5eb33421d05879823a6fc1e37e1b80951bf84087739f39e32850873371461a604584e465576b6f3b269b2ff83085
 AUX smtptools-0.2.3-fno-common.patch 651 BLAKE2B bfdceebddf4b6631d53e94b5e90522412de5dacfbcc006624a53bbc4f1c2f32437f93f928a88440dae4c884b28ef249f2eadbd4dbda2018ff73c07635acf4fcd SHA512 d9cfb1abd62f6dd3f57b3288e1adc18cdbedb6c296c7516535b406ff52393ea177afd5d22480b5be013d18497c670e0569d9ee1476298f58824a33d99f251d42
 DIST smtptools-0.2.3.tar.gz 117859 BLAKE2B ca1713dc4ec668de1491423c7463cc21fa460017744c34bf6ac5619294ca6bdcda8b78ab3fcf1b2225c3c3897b7ada89b48ab68defdae28a69543fa713362e87 SHA512 2d5f5a4fc5d25e5b652800047c7dcba62eb033919e485e42efd07be0e00062f9d89200dd0e65991a13b1366b5b28bb5c2d84d0468e71d05d1540178111b3cf2f
-EBUILD smtptools-0.2.3-r1.ebuild 672 BLAKE2B 344305769928c9e3d0fde238870c33611057139b7daec7216c4b6ccdc4499dfb984057500df026080b119b36f128a2bd94bcdbd3a108423fdefa5751d96a969f SHA512 5b2bcf2e8ee213d9820d55ad0512672780c3b29bfc8b9d189064190091b815184f5ac6408e5c45659501e7c6032528860ca3a715e840eb7f0b24019956abc387
+EBUILD smtptools-0.2.3-r1.ebuild 669 BLAKE2B 4bd0a7ad2c6c32ec53b531f88a15644bf496dace37b55007bffba168fce7a6ac1bfb218c886762c9743826f7c2d6164c33fc73232979a52f1dc93b8a283bae1c SHA512 ce7b23964aa1481207d4e06bad9921ff8c8f8f2c299fb0ff84791ce1be60a44afb8207c3262eac45bb74949d7b0fcaf7443ff12cf82757e52a4f322b242617a7
 EBUILD smtptools-0.2.3.ebuild 650 BLAKE2B 54308618cd0518e3039862c431be13d048ee8cc44724d84c5486c988ea45f4990e7b7d843361f555f403df05ef22ca24032d78bfc85a4b9aef975c2ea147725a SHA512 d203f71608ab6dc8d7d6539d9355d3d237f1d235b31eb65df5ff8693ab33233a6c274bbe0649f6d783a35168fa97f096f3091b53979766ac343d7141896b928e
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-mail/smtptools/smtptools-0.2.3-r1.ebuild b/net-mail/smtptools/smtptools-0.2.3-r1.ebuild
index 4c93c7172b36..38e8de1024d9 100644
--- a/net-mail/smtptools/smtptools-0.2.3-r1.ebuild
+++ b/net-mail/smtptools/smtptools-0.2.3-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.ohse.de/uwe/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 x86"
 
 RDEPEND="!net-mail/qtools"
 PATCHES=(
diff --git a/net-mail/tpop3d/Manifest b/net-mail/tpop3d/Manifest
index fd95adacdc2e..607646b2b34d 100644
--- a/net-mail/tpop3d/Manifest
+++ b/net-mail/tpop3d/Manifest
@@ -1,6 +1,6 @@
 AUX tpop3d-1.5.4-gold.patch 730 BLAKE2B e3f30e0aae7ca80c3834dbe63216bff73de20981ad7b02b062b3f13d61c83e4183d0228a065139d2be5b2792f2bf5001b1bede35b7382a57ff895e7fc9437955 SHA512 cf4b2ab8b6f51bf749e32a8204e850ef97426a6de14f3d5d5128725791838717b5b8cbcc4fb80a5534d6820200ebef50dde8d2e20e44133f029be3a2d72a57c6
 AUX tpop3d-1.5.4.init 607 BLAKE2B 8cc947bb35566f09236a5a6c06f6b1b8938d51f9dfe0ef3230507a5a6885bdee8eac11a3e90cdee52b24219cade824c45b15e5777a154a28b78167eaef6decce SHA512 004d2e5ca802ad7681c3f6392728602f54c13c6072d38b147be469e5f9ef09916f7c6c57af944c845e4b504f46fe4893323d5a125b7dc4bdfc2d479a5ee696e9
 DIST tpop3d-1.5.5.tar.gz 285027 BLAKE2B e8cc76040757a5c8931ee34b27a57c52889f3533b71a53c7a2fe589823129ce5972f2ddfa9ecdb46d7a04ac77e8d735c02b07cf7e8192135e4ebea6c392b38ab SHA512 918a057c62d7518613daa6335d8fd5a2553d278dc4d6adbcf5ba3caa3ba561587f1d9e18f564690383e91f3ee2e5120af919d2799b69e93bfe3a3b8ea4f5d7e6
-EBUILD tpop3d-1.5.5-r1.ebuild 2904 BLAKE2B ce1bf3a39f113223f195104569efc54d229e5a52846e0551ab4473ed1346a10d9fe0fb76ecff744ee31c8a993943358f6b216718a7e1e91b0034eddbdbc2906a SHA512 6a9131b9cafebf01b12efa3e136392ef1ffb5e3deddf36fb0e905cef91e6bd6e0af73dcc63bd335bc8391fbe14a70d9d3db04345da57a1a2e19c119050ca4e52
+EBUILD tpop3d-1.5.5-r1.ebuild 2903 BLAKE2B cbbaca6d70dfaa5901a5816b3b1df861e0351aae6d4162936c3ddede25f5c846e50685c2f4e806851ed3c2d8ec3623898d70e6a224ee462a49063b80ae9acbe0 SHA512 3d7eae7439692f4b8f39aa335787bd6fd078e4e898a5053a86edf018e6286fd532fbd2c75358a4776dd1b2d7217fcba5e74e212f62a02b86d859a4c38df67f46
 EBUILD tpop3d-1.5.5.ebuild 2853 BLAKE2B 32a4478cf782de6f24548c56bdb089f7ea5db555b94042223d88b7b10d169022118b7b262f75fa23950782d721c4ce57f4c695ede9812e97b573e88e1fc03e20 SHA512 1424ce654a8b0b3bf8fc38857bcb8488be370473260d64d5ac0a224cab153be7d033b8c55c8525af02600a322e6fb13504101127a8a93fd1cc267e88ef05a6a2
 MISC metadata.xml 560 BLAKE2B f0fabe58e865bfe72fc237eca7cba05badd40682b5a03e420a00c96460106743c10d700082522f379828be1000fd1302863ad7f975ace5786c8f312fb5c6053c SHA512 892cc588c2be8dce623ed1844a7680339ce36fdee74e16b99436925b2defec116b164926f3a000db186ca25a079f90352d73795561a6c361e0c65c8c22c92eaf
diff --git a/net-mail/tpop3d/tpop3d-1.5.5-r1.ebuild b/net-mail/tpop3d/tpop3d-1.5.5-r1.ebuild
index 1729f170b240..9bce01af9548 100644
--- a/net-mail/tpop3d/tpop3d-1.5.5-r1.ebuild
+++ b/net-mail/tpop3d/tpop3d-1.5.5-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
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/tpop3d/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="authexternal debug flatfile gdbm ldap maildir mbox mysql offensive
 	pam passwd perl postgres +sha1 shadow ssl tcpd"