gentoo resync : 18.12.2020

20 files changed, 20 insertions, 158 deletions

diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 8a6414910a82..d40b31db9153 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index b99776d7df26..40660d54afca 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -8,5 +8,5 @@ AUX imapd.conf 1471 BLAKE2B 5373950ac08b630a82fc00b5bf3fed9d400e092458310b64cb66
 DIST cyrus-imapd-3.0.13.tar.gz 10840005 BLAKE2B f4790837a198673b42d553bc7cbc825456ff5a3d1d14ff382ca0f40252d09eb355f92c2020c0a974cc99eda9af4323a3a5b9428375288bf8892dfba35602da4e SHA512 5cd066916797efb975cdb97720f65edc72d3fe82afbd78a26aa8369d95ae4ca09c0593dd4bec5521156c64ea38af7a13065f3b35447a76267dec93feb0ac6ac6
 DIST cyrus-imapd-3.0.14.tar.gz 10865880 BLAKE2B 36f3e60d715d2eab430040964e93cb332cfc4d9097f0f863b94325eb4eb964a4030d1d0f8ddb7870a08b655e1694bbc751d5aab99af6670ab33ad6747f55f6bd SHA512 0bade56f4f7834ef51efc4081f2915bf0f98a2a555cd1b847f13a34418e4c52f2abcb4018906c144c161241433a8ff9ddc6d88499804d3fe616a05f186a3f209
 EBUILD cyrus-imapd-3.0.13.ebuild 6068 BLAKE2B f6f8e1e4ed70120380a8115820fde63a86bf1eec1472ab58b3a382eb73fd643b87668fa5bb6af48b752d8f6df91b39b3e99083a0401b71bc36fa22399f8f5fb1 SHA512 dd16ecf950d4ef61c7cee53133d8890d940a2d91d10ff32bc56ce17b9a7fb9ae0da47a40d31e1435e9ed14d26579de1a4e6945b787b712f09e2773ed9316bf74
-EBUILD cyrus-imapd-3.0.14.ebuild 6032 BLAKE2B 993cb480007f6a76a8789ece078fc162f86ba79d926b488a06d681cb84668abf52e745419bb7f7b3eb07328285d26a7ebb58b469d972baca6e87067cb52ba929 SHA512 eb934a7a3ade30240159999e210bdaf0b638a46d94c89ce25e07c09f35db686d161fd89916c817dabd24c91b0e67fa167d37be88ca8bdd56bfc186d70b86b60d
+EBUILD cyrus-imapd-3.0.14.ebuild 6030 BLAKE2B e7d0db2591288b58214176f1095180d3fe4b6ea2fb02747dc4d716e321b84f5ddb1265a91b404a3aa4e1966631705efc63a3ceeb41def4ed0a410968f5049ccc SHA512 425664231a5b1e38c8e67cf97e6d2c42e7b8a1f8692abc5ec7c4e537e625a0b9855d585e6394d9bdb9c4e40d628294be52308c708f8043cd12fe7bed4ee7ec4b
 MISC metadata.xml 688 BLAKE2B 123d6658cc5bd6f9ac3c20dcc7a06cf6300dcb83129d59e8b275d82b64c1c3ff2c315891c0ee432e6cfb445f74c78f49195e89a20616a51d70ef8bf25aeb9092 SHA512 77075e3673b25f4b4c31815f0bfa8f112e6609a36b9c57a843be5bcf9d5d1ad743e05010fbb4809960b0b74498763bc69b6abbe16e8eced683268398a7be077b
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.14.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.14.ebuild
index 3487441622a7..c7bac016fb15 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.14.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.14.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86"
 IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
 	mysql nntp pam perl postgres replication +server sieve snmp \
 	sqlite ssl static-libs tcpd test xapian"
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 3f65eb6c3b1f..81de961518ba 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -12,9 +12,9 @@ DIST dovecot-2.3.10.1.tar.gz 7226958 BLAKE2B 2f9223d9184b3f8809b573ebd5637e1fd32
 DIST dovecot-2.3.11.3.tar.gz 7353412 BLAKE2B 0067989b35fe29c0d23f6ca25712a87fa69608cc4ee6081d9eb929d63e7a586ccc0d86fcdbe1aac67aea9f2678ab0e150f053667817b08f4a7246947bb812fdb SHA512 d83e52a7faab918a8e6f6257acc5936b81733c10489affd042c3a043cb842db060286cba9978be378e4958e9ac2e60b55ce289d7f3a88df08e7637e4785e23bb
 DIST dovecot-2.3.7.2.tar.gz 7076231 BLAKE2B 2cb93aa594db722489063b490469dfe284b1f997b64c9a699b506ccbd04e8e7c2d503ddc12a2598958dfca88560c19487801a728f386b8fea5f637a75b83812e SHA512 172f7f0edb884259e4c050607510aee67a35c3a20b7dd147e7c8a25a04921c18f7d6b5c85af2c69ae8c4d53791550970e471b033dbfae94253e331053b6a317d
 EBUILD dovecot-2.2.36.4.ebuild 8605 BLAKE2B b649cd8db3cc6ed5fe93a6013a16e7f99a121e35d684fdfa9fc74aec1487f571fb1f59f4433ad89a6bdcd33de0d916b111226a33bdacc084383580c881d98551 SHA512 811bd1cb2ebec984f98d02a975c7774e0449e1b87c26840107d2e93c79ba69f0c8714d2db5c63513233893c0230080d2fd002962aa6b536f12f6ba6d36f7b5a9
-EBUILD dovecot-2.3.10.1.ebuild 8629 BLAKE2B 4d664f1ff75b846a2be7dcca52b7189efac3c6f95e40a0af935dd16f857c51db53aa72023e94b4ae86a5bf892475fd4259dc5085ea41a5053b702ced5b2725cd SHA512 d783676c087faaa047de828eb6a38f21a4512e81cea4a1dcb03d4e852518cb520cfa66d88540a63c3805fdc1144f4895d8a4db8269c3bbf93691bcea080dcbec
-EBUILD dovecot-2.3.11.3-r1.ebuild 8837 BLAKE2B 668d4a31360b252a60ebf808038bdf9c20c67d069098d2aa698a96479e40ffd5f9355fc5c720896d196d9cb4821881caef2cacc341dd9df147bb67bad8c76eaa SHA512 021460cdab894122d2ff9265cb2e909518a362295ae77bb04735d0e995464f9feec7695651055ca78c6716c890f50a976b057e9c7745d3d90740af8efeb550de
-EBUILD dovecot-2.3.11.3-r2.ebuild 8882 BLAKE2B 11c3702ab1c2fd8f885ab69c177b03b6ca997aa10b0360b94b9f84e99b195eeb28d27f2dc323b151eda418d7e8c3244100fdfc83521ef0f071530201a584594a SHA512 061968137d1af8c8a1c42c0af82352fac8633896a324488931f12c93c1cc754eb550e819244b348263c15f5b1d4e7645cc55bacc7a57b2ba856d056c8c3920c8
-EBUILD dovecot-2.3.11.3.ebuild 8675 BLAKE2B 87492e78db3585858250f39a426e68eed7cd56086e13872e7e676b1071eaae3b435d84a56ae086196ee6916883197932b8055de58a548c36d26237b43852c9d2 SHA512 1e3b8a3e9441194c4bad143d47515d5bcc9b48fe8643fcdf57739b2405055ae8413560993549585a9a08b30a09e958d218821e6e7199546f612205e112fef3a1
-EBUILD dovecot-2.3.7.2.ebuild 8717 BLAKE2B 2aef6fffe859d0965f3e809739cdec16165fc4935cda3eae6ea89dce803366ac7fb0ad0dd1a95b3a4ee040a2be61cb44e58e61fb44feb47d0ef9e3496febe30e SHA512 3412f9224528f4872777d580e352e8cd679b7d1a9f88a20594e56358cd026f74343b624205e8ea0972ead3b3c9157a8061ddc7c3181c183fb6caf1d1c2f2f515
+EBUILD dovecot-2.3.10.1.ebuild 8630 BLAKE2B 225309f96696de58410097589fef31f07c3ae25d91d42577ec140a7ffb4ed6d7f230fe78e65cd330ae6cfa8b8d3a275d57984927755cbf99713e07ac72084c5e SHA512 4f806e5741cc787d6a5d15e052d126f7f187814502cd1879bf45bb174bf30a82c868305cc98c8cf91079101ee03905e9a8f37f7d2108ef937314ba473dcd75cf
+EBUILD dovecot-2.3.11.3-r1.ebuild 8838 BLAKE2B d2db4a8a2f3dd6d6ee2cd4ab6401dbddb34834fbc2bf60bfe27800b30560e42aefa9d977c2ccd8109c31208cbd4c95f5a435cedb50dc718c311a610cc74542e8 SHA512 796c4e3b0cf7677b52af6a8c03c68479c37b7ee797aff2222a09ffcfd24cccebd1ab8208c035ec8fa4f4d02ea1b58f7b29e43a08d8c060ca635ad77634d4490c
+EBUILD dovecot-2.3.11.3-r2.ebuild 8883 BLAKE2B c87d5ede5ed17d3fff195063dac545466964ca659cc2b6f09abc63965cf8c66ac0c4be7fb89ae8e88bf62aa69ad1d3bb6c511e326c3eed45272e891a9223d7a6 SHA512 e79953c4ef81d4551450cbf4df9c9b20151752291092ced4320fb3e43954367d8243927e37d02cc84dd36f7b95708f156b697e72d800f27c77da9eb68445cd25
+EBUILD dovecot-2.3.11.3.ebuild 8676 BLAKE2B ddede1b054dde5b42d23cccfb06f4e66060d720b934c49804edeee423191baae808ae34fb50c86caf0b5b953eb5a073408396f2504e9f32ccf9834a7490f4a99 SHA512 8ff4591d1b3122c084d644b19ba4e482490f7700b14fa20d680ab023e472d8d570528b568cf159b4949f24bbdb991b0bfecb6393cd714117ba5abf771b223b08
+EBUILD dovecot-2.3.7.2.ebuild 8718 BLAKE2B 5ef26dfdf336f8f81d23f9e74a79146f4fe796bf84a159645a4c074603702eb9240cfbf5f6dc6fd5279d3d8d7405ef3168b099edbb1d9d595149dfaaf180b0ad SHA512 2dfe8a18c6b4e006028c84ebf48ba0e8cc35fc33000db39becab5ed835a911e41b12360869a6ca9112030151708abed3e93f776041a0b3d79955f5cf4931ead7
 MISC metadata.xml 998 BLAKE2B c65428e9f0019e942fc1d634d53c2a85c7f8a699e34cf9c49ae09bfe9ce8a54fd368512f7a4d74f6a10baff949a9fe8021e1e0c009f8315b100fb5736efd34ae SHA512 f285f0928dc0915c8e8cebb966de84f5564be9f7dd3baa7c0cccb3343da75507003aeadf80fe34ffb4b69dd9208997a80fdb47c20bfd65fdc60c43423a00813c
diff --git a/net-mail/dovecot/dovecot-2.3.10.1.ebuild b/net-mail/dovecot/dovecot-2.3.10.1.ebuild
index d8f21727e299..f22ac9b03955 100644
--- a/net-mail/dovecot/dovecot-2.3.10.1.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.10.1.ebuild
@@ -41,7 +41,7 @@ DEPEND="argon2? ( dev-libs/libsodium )
 	caps? ( sys-libs/libcap )
 	kerberos? ( virtual/krb5 )
 	ldap? ( net-nds/openldap )
-	lua? ( dev-lang/lua:* )
+	lua? ( dev-lang/lua:0= )
 	lucene? ( >=dev-cpp/clucene-2.3 )
 	lzma? ( app-arch/xz-utils )
 	lz4? ( app-arch/lz4 )
diff --git a/net-mail/dovecot/dovecot-2.3.11.3-r1.ebuild b/net-mail/dovecot/dovecot-2.3.11.3-r1.ebuild
index 1c463e0ac87c..9712daf5d27b 100644
--- a/net-mail/dovecot/dovecot-2.3.11.3-r1.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.11.3-r1.ebuild
@@ -41,7 +41,7 @@ DEPEND="argon2? ( dev-libs/libsodium )
 	caps? ( sys-libs/libcap )
 	kerberos? ( virtual/krb5 )
 	ldap? ( net-nds/openldap )
-	lua? ( dev-lang/lua:* )
+	lua? ( dev-lang/lua:0= )
 	lucene? ( >=dev-cpp/clucene-2.3 )
 	lzma? ( app-arch/xz-utils )
 	lz4? ( app-arch/lz4 )
diff --git a/net-mail/dovecot/dovecot-2.3.11.3-r2.ebuild b/net-mail/dovecot/dovecot-2.3.11.3-r2.ebuild
index 2b42893baff2..8c5a2e86c596 100644
--- a/net-mail/dovecot/dovecot-2.3.11.3-r2.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.11.3-r2.ebuild
@@ -41,7 +41,7 @@ DEPEND="argon2? ( dev-libs/libsodium )
 	caps? ( sys-libs/libcap )
 	kerberos? ( virtual/krb5 )
 	ldap? ( net-nds/openldap )
-	lua? ( dev-lang/lua:* )
+	lua? ( dev-lang/lua:0= )
 	lucene? ( >=dev-cpp/clucene-2.3 )
 	lzma? ( app-arch/xz-utils )
 	lz4? ( app-arch/lz4 )
diff --git a/net-mail/dovecot/dovecot-2.3.11.3.ebuild b/net-mail/dovecot/dovecot-2.3.11.3.ebuild
index 92349c006ef1..a698c9698b94 100644
--- a/net-mail/dovecot/dovecot-2.3.11.3.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.11.3.ebuild
@@ -41,7 +41,7 @@ DEPEND="argon2? ( dev-libs/libsodium )
 	caps? ( sys-libs/libcap )
 	kerberos? ( virtual/krb5 )
 	ldap? ( net-nds/openldap )
-	lua? ( dev-lang/lua:* )
+	lua? ( dev-lang/lua:0= )
 	lucene? ( >=dev-cpp/clucene-2.3 )
 	lzma? ( app-arch/xz-utils )
 	lz4? ( app-arch/lz4 )
diff --git a/net-mail/dovecot/dovecot-2.3.7.2.ebuild b/net-mail/dovecot/dovecot-2.3.7.2.ebuild
index dcbc6f0840d2..fafbab682ee1 100644
--- a/net-mail/dovecot/dovecot-2.3.7.2.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.7.2.ebuild
@@ -41,7 +41,7 @@ DEPEND="argon2? ( dev-libs/libsodium )
 	caps? ( sys-libs/libcap )
 	kerberos? ( virtual/krb5 )
 	ldap? ( net-nds/openldap )
-	lua? ( dev-lang/lua:* )
+	lua? ( dev-lang/lua:0= )
 	lucene? ( >=dev-cpp/clucene-2.3 )
 	lzma? ( app-arch/xz-utils )
 	lz4? ( app-arch/lz4 )
diff --git a/net-mail/imapsync/Manifest b/net-mail/imapsync/Manifest
index e546d430702f..fe1637c2420b 100644
--- a/net-mail/imapsync/Manifest
+++ b/net-mail/imapsync/Manifest
@@ -1,7 +1,3 @@
-DIST imapsync-1.592.tgz 906578 BLAKE2B 8048edddef4a3d9dad751b051c3e0d88eea883cbc57c0b31526ebe13cc818a5996fa07a746801c05aca8ae50429ad2aaee0983d6c4b9cef843a9169824ec293e SHA512 3d41b28396d9b8bf83200b324b2e312c76ef88e42f4ff8993c8d697b18f321400d7a157b1fee2d3ad4eae11400dc2186a18528bde50e370d856eac1b09c28f68
-DIST imapsync-1.836.tar.gz 1741595 BLAKE2B 6502105147cf2f7d13c0af997cab05e3d65a75d54924c8100a82a322da31c8797710e5370a52998384270713ec7ade1c86e5c8c021b7e0937c188dfc1cf178df SHA512 f1ea1ef887ebcfa62c90254b3738602dc78275400a7d8dd5af33bc399c82c28d8567ee42d9ebf85735e7df857bf548608e09f01a06bd146f317faa3b4702cbeb
 DIST imapsync-1.882.tar.gz 1557501 BLAKE2B 92f37d0c6c64569016a15d71d1b95ca08e4a8bb2402a5151f1429260fb37db47ebfc273e2bb73b06ba77974100780924fa3f256565fcd3e77cbff4c7bbf7b56e SHA512 3953cb29b210c283be3fe72f1e1537594415bd5457b469b801625d6c857b982d2b2b3da9528dd1e6ccc6831c022ce495f7a5eaaea04d228bca374f185344f455
-EBUILD imapsync-1.592-r1.ebuild 756 BLAKE2B fd235050e9336afebd5c73044791cfafb258455cd022e627cf8611707244684ede95f0ebc28a27432cc7760f1256b4f79067b828f672678d13a09d04aff59f54 SHA512 e04c4ce91b7e9e44356ab9672848dfae3e5150c3a7d5d6be1441fa9691d664c62b3fac655f782b52964ef46c64cd306b57fd48c5ebb182168db1d05ff1cb3300
-EBUILD imapsync-1.836.ebuild 921 BLAKE2B 4bdff06ddc043c38875613b673683f2d97b7d25055fb199e22463ca2feb2bad7bed7debaca1102c8141d0169a14033c2d5265748ebcefbd31138ad49e39fa295 SHA512 6e4c5c4bccc4810b379639edf16db43c997d1239a9ba8eb77f29a0ace593f40909039103bf9d0ef3adeda8064b708b05fca4c303b70a394ff0423723b755d481
-EBUILD imapsync-1.882.ebuild 1943 BLAKE2B 1cb4a84337796c267b8b22f80cccf6fc72e8b487b0ab2c78924079f798779ab6450b1a5cd0cae53efca6c6d9202cc2210a40b02d92b286f4e4b1c1674743a136 SHA512 1839ea2d5a271c7253a91cb1f97b9e55d1f66c8269496af747fabbb01685acf270d998e2f527d31c859c0c9456c8d01ec92861eca6b5bd4cd18bb1ac32691af1
+EBUILD imapsync-1.882.ebuild 1942 BLAKE2B 9fb12473d1bf460d5b1a80924b3abf7c4c0480fc33b08cc5eea9258bb87db7cd0040bb29551670991806e92f028bff28f606eaa7da590bb924978a5d2f6174ee SHA512 39831b911f0a92d5d3000e7d69cecb068a8fca0dc66f033a2bc6c03ad5dc48390081bcaf3452d2aeb9396c1b5d6291af292d9f4c863f3b352f9333cf37289eae
 MISC metadata.xml 249 BLAKE2B 0bccb43703238e66606acc0f395e496ed36dc25e319354565dd990baa7ef595a42aa7f931d50b65e9cd77ee72103b8c0210c68fadd54ff8ff6bfaeff60850a9f SHA512 a5b4caa063a5e6f2d954e30608a5051b567fe1e869e1662282d6d12813105152833fb824043f7501d9fdc628cf2ad88c53c90c48798f27f8240e541956f63dce
diff --git a/net-mail/imapsync/imapsync-1.592-r1.ebuild b/net-mail/imapsync/imapsync-1.592-r1.ebuild
deleted file mode 100644
index 65e587b45b56..000000000000
--- a/net-mail/imapsync/imapsync-1.592-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A tool allowing incremental and recursive imap transfer from one mailbox to another"
-HOMEPAGE="http://ks.lamiral.info/imapsync/"
-SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tgz"
-
-LICENSE="WTFPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	dev-perl/Digest-HMAC
-	dev-perl/File-Copy-Recursive
-	dev-perl/IO-Socket-SSL
-	dev-perl/IO-Tee
-	dev-perl/Mail-IMAPClient
-	dev-perl/TermReadKey
-	virtual/perl-Digest-MD5
-	virtual/perl-MIME-Base64"
-
-RESTRICT="test"
-
-src_prepare() {
-	sed -e "s/^install: testp/install:/" \
-		-e "/^DO_IT/,/^$/d" \
-		-i "${S}"/Makefile || die
-}
-
-src_compile() { :; }
diff --git a/net-mail/imapsync/imapsync-1.836.ebuild b/net-mail/imapsync/imapsync-1.836.ebuild
deleted file mode 100644
index 1a4e6a72185c..000000000000
--- a/net-mail/imapsync/imapsync-1.836.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A tool allowing incremental and recursive IMAP transfers between mailboxes"
-HOMEPAGE="http://ks.lamiral.info/imapsync/ https://github.com/imapsync/imapsync"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
-
-LICENSE="WTFPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="
-	dev-lang/perl"
-
-RDEPEND="
-	${DEPEND}
-	dev-perl/Digest-HMAC
-	dev-perl/File-Copy-Recursive
-	dev-perl/IO-Socket-INET6
-	dev-perl/IO-Socket-SSL
-	dev-perl/IO-Tee
-	dev-perl/Mail-IMAPClient
-	dev-perl/Readonly
-	dev-perl/Sys-MemInfo
-	dev-perl/TermReadKey
-	dev-perl/Unicode-String
-	virtual/perl-Digest-MD5
-	virtual/perl-MIME-Base64"
-
-RESTRICT="test"
-
-S=${WORKDIR}/${PN}-${P}
-
-src_prepare() {
-	sed -e "s/^install: testp/install:/" \
-		-e "/^DO_IT/,/^$/d" \
-		-i "${S}"/Makefile || die
-
-	default
-}
-
-src_compile() { :; }
diff --git a/net-mail/imapsync/imapsync-1.882.ebuild b/net-mail/imapsync/imapsync-1.882.ebuild
index 9fef3c968f72..1341851d6e31 100644
--- a/net-mail/imapsync/imapsync-1.882.ebuild
+++ b/net-mail/imapsync/imapsync-1.882.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
 
 LICENSE="WTFPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc x86"
+KEYWORDS="amd64 ppc x86"
 # ppc dropped pending keywording of:
 # dev-perl/App-cpanminus
 # dev-perl/Data-Uniqid
diff --git a/net-mail/lbdb/Manifest b/net-mail/lbdb/Manifest
index 2d45c9933b20..3e0100238899 100644
--- a/net-mail/lbdb/Manifest
+++ b/net-mail/lbdb/Manifest
@@ -1,5 +1,5 @@
 DIST lbdb_0.41.tar.gz 160632 BLAKE2B 7cbb0178f2983255eef8ce86146e104e33a1d31b6fd5cf3e5dea69cad8fa485424a5d8b89d1e2024f34a688bfb018724b05bf8e5e57ab5338c9973b78d203d4b SHA512 c99d8c4549d781252192e07dfb89adbae6daae5a4f4c94de692c4289848ba8599c2b0aeb28bac69313e6828995eac32acf3fbc76b1695c6464c6339236cdb341
 DIST lbdb_0.47.tar.gz 182477 BLAKE2B 9ac0073ea4151ae84f9aeafb1a6bde52a39809987da87bd252665f9ef729ad1a5ee4cf91e4c1ebec1f8be17e1a9a3e31dbfda5484ae114fc99cd273f93b39cf9 SHA512 95cae9b108d875203dce2a8243c3dcb979606529202fd9b4d1ddd211a3d617a421440f6532abd38432607b39da84a6da4d09b15e95cddc01f94e018b9e712078
 EBUILD lbdb-0.41.ebuild 1358 BLAKE2B ea4aab82df8950ae3881c4b9568fa142abfea76527e61f4772e8c74d6908d7ac3e70bd898f8839b9bc811ea7eb574747bb5398aae6705f60bbe2c9552c7fcdc6 SHA512 763463673da26cc678b93468702a3629a3294316bbfee7144616338359919a0611241a171f3676c021faf9b3b78ab3065dd1407fe134c535348d9901653cac4e
-EBUILD lbdb-0.47.ebuild 1486 BLAKE2B bc5c6fb4a8f77c2b0ac77753c86e17ed85ce8dd414562209bfc9036a07f2671c757caee88263d1088f5617a06907114e6f1a7ccddbabea745b6c3bc2382f5c9b SHA512 ec769f976f1435e89b078008297784e1d2cc612eebff969e5b3ab60a11c3475a8ee147540df7cb3c0788edae06b73d29cc64001bf92ec4a4b4421ac8065a757a
+EBUILD lbdb-0.47.ebuild 1485 BLAKE2B 63a26a6eedda8b9c23ed13ea8fd6a203d0b4fbcee5e1b15dc88793ac3e8a818d7f01cb9b45a9821dd35a4887f271eaede9f728156b0296b22c600474b3bc5a9e SHA512 fb8c7d50ea380ae98d15750b2d8f116d64ea980583ef9a6648c2ed2de549e7aed2129e39a4dfcaac4aa93a524ee6fd6691d5f2e3430c4e93d27aa8d6fc2f610b
 MISC metadata.xml 452 BLAKE2B fb14006c0ff46ee5b6e9c72682db885497f93a3b48e6852c87128a2b17b91a0459ccdb2d5fe94cf2e26459c9176251f79ac18ec31d3f03cf060c0ea2f8294c5f SHA512 38c22e435ea247d967a8d04092be6f0195436db16fc03d7fd7aa3cd0fe0f3dbfbda3ffe6a58cb7e8a5d1dfb18fb0a048b7d525300bd265a7d0522dc91d991a79
diff --git a/net-mail/lbdb/lbdb-0.47.ebuild b/net-mail/lbdb/lbdb-0.47.ebuild
index 1d0c6752cfca..724b8c323066 100644
--- a/net-mail/lbdb/lbdb-0.47.ebuild
+++ b/net-mail/lbdb/lbdb-0.47.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.spinnaker.de/lbdb/"
 SRC_URI="https://www.spinnaker.de/lbdb/download/${MY_P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc ~x86"
 LICENSE="GPL-2"
 IUSE="abook bbdb crypt evo finger ldap pda test"
 RESTRICT="!test? ( test )"
diff --git a/net-mail/rss2email/Manifest b/net-mail/rss2email/Manifest
index 9d1c5bf5236e..a795fa83b681 100644
--- a/net-mail/rss2email/Manifest
+++ b/net-mail/rss2email/Manifest
@@ -1,7 +1,3 @@
-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.12.1.ebuild 668 BLAKE2B 3ec18a77a6e2f57d6e815e6686338131fd240e240b4192ac162d6c862aea9d0baccbed42f29236841bf76746c91f7df5af71a7606b981cbcd6d6c085f9bc528e SHA512 ead1bbbba4c49e17ff3d58565c8999c2057790a585a3939a0ad6b100acb824554a0f52268fa9e2cb09293b6b26f49e179c8d3d79022b56e6895555253d1f29c1
-EBUILD rss2email-3.12.2.ebuild 666 BLAKE2B 7d3fcdf43282a0a4414ad25803832c84772317124315d319fbb8a14023918124a367545bf1726b3947bce3ed88beffde4e432de6b6cb6b023f990ff41d426703 SHA512 cf4ed8a443faae5504893b6410e6c3d8384204940799010b75e1d7094b85db5be991c35a465e6c71763ffc84de0109c94d1ac231058d9e908c79ab7d73734fcc
-MISC metadata.xml 435 BLAKE2B 92960d2f537c61ec2639907d5d2071d06ef3b29a49a70b8cf69dc3625d358e015cfd6bed1c735713d44c780de43d75082d1df133540ef4da38f996f44bcd31dd SHA512 2b7d4a2bafc039030ae131a0c567a782488a6d5b225fe0b0b62f2ffe9852c2006ce377b5cc05407503dc01ed427a8c8be4853d5c03902708f38841df24c9fcd8
+EBUILD rss2email-3.12.2.ebuild 665 BLAKE2B d6faa770509922640ea8982792c7e308fde43ca8d09c1018499d34c8be47ac8fb98e900cec6dd542fd13d36f9b44b7dad59f4f08e9bb50c88bc0601a06de57c0 SHA512 7ae0cdf040c5c95ccacd449998f95a4f2e6930fca6998e686a4dcd3d8e38e79153cca2cc5e6bb365945d02bf260e02654250732b9f2a5a2908be6f36f1d46173
+MISC metadata.xml 459 BLAKE2B d361bd0e82327a97b801bb7c064f0609a67d2fc0cd58b69216e6acb0f304ce0897da7843255f1ce1bbeed76c5fc1e199201b2eb35910fc7b1c5e09d4995bb838 SHA512 4a05845c1148372f0c22bb68bba353aca4fc03e1c418b72f67e85f3cc0a9ee4b029c8bd0271c1d5cbbffe1e5b0105a13dcac544f36b4e3e91fc6c9c0e93d8983
diff --git a/net-mail/rss2email/metadata.xml b/net-mail/rss2email/metadata.xml
index 41e50cc50ae9..2a596c639daa 100644
--- a/net-mail/rss2email/metadata.xml
+++ b/net-mail/rss2email/metadata.xml
@@ -5,6 +5,7 @@
 		<email>sping@gentoo.org</email>
 		<name>Sebastian Pipping</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<longdescription>
 		rss2email is a simple Python script that lets you subscribe to a
 		list of XML newsfeeds (RSS or Atom) and get new items sent to
diff --git a/net-mail/rss2email/rss2email-3.11-r1.ebuild b/net-mail/rss2email/rss2email-3.11-r1.ebuild
deleted file mode 100644
index deb3783c221d..000000000000
--- a/net-mail/rss2email/rss2email-3.11-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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/rss2email/rss2email-3.12.1.ebuild b/net-mail/rss2email/rss2email-3.12.1.ebuild
deleted file mode 100644
index 0d679cf6d547..000000000000
--- a/net-mail/rss2email/rss2email-3.12.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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/rss2email/rss2email-3.12.2.ebuild b/net-mail/rss2email/rss2email-3.12.2.ebuild
index fe48fe281661..5da3f971c5e1 100644
--- a/net-mail/rss2email/rss2email-3.12.2.ebuild
+++ b/net-mail/rss2email/rss2email-3.12.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rss2email/rss2email/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="<dev-python/feedparser-6[${PYTHON_USEDEP}]