gentoo resync : 13.11.2021

15 files changed, 84 insertions, 108 deletions

diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 6f605b02a790..2c06944774e7 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index c69df22593a0..5afbf73ef9a6 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -24,5 +24,5 @@ DIST courier-imap-5.1.3.tar.bz2 3361334 BLAKE2B 750a0fdca6882b26a7f9eef062b516a2
 DIST courier-imap-5.1.4.tar.bz2 3363196 BLAKE2B 272548fcbc560ebf39e63170702de30970bee1e0026c31e0c8f0a6dcf86271565cda1e83e9fe50174aa2db2f9172cfc78132746ca8eb2e6749f16c7e994d0db9 SHA512 33e54e3b369335f5bc234c638c9bf4f68bc39dc9cb6cc5e3e3ba200f72a7b2fcdca6a4f7e35f32f494406f8757749ccf5204be93ecd2edbfabab4b6316d5957c
 EBUILD courier-imap-5.1.2-r1.ebuild 7072 BLAKE2B bc723abc501907e230d5e9d32a1a70cb2f1329583d8dc998910a24a497534b97e2748c43c2071355912604830748e49126cf648987433f67288f3f42742db8f5 SHA512 f7e612733a7837682856ebac8c2ca5b83696ef6e4c24870a1918b9683143a5170ed6982d716b60b0a2ec787cb55a0f0a252cbc10acbc22e9709efc2350960fb8
 EBUILD courier-imap-5.1.3-r1.ebuild 7080 BLAKE2B 944830ce916eb392dcc8892d77eced7f72fcc1819097dc8d22ae229ea75934e891bcc0e33235c33ac84181c58d0234ad7a011643f5d417a7bb65a3f65914d9a8 SHA512 2d8342373f4740bd106304d4f84437d4dd142e2eda2ec5f7354466d3a9ec6413b77925b11133217e9e3ffb2616ab88290fd61436245637a4a43933be6099c65e
-EBUILD courier-imap-5.1.4.ebuild 7080 BLAKE2B 944830ce916eb392dcc8892d77eced7f72fcc1819097dc8d22ae229ea75934e891bcc0e33235c33ac84181c58d0234ad7a011643f5d417a7bb65a3f65914d9a8 SHA512 2d8342373f4740bd106304d4f84437d4dd142e2eda2ec5f7354466d3a9ec6413b77925b11133217e9e3ffb2616ab88290fd61436245637a4a43933be6099c65e
+EBUILD courier-imap-5.1.4.ebuild 7073 BLAKE2B d788b265a62a8405dc57ca2e6e3f8fc39a8563eeb3e9f2b36b169836931cf359fdcfaf7d9e5c9a866e71a53eeab965b7111a2fdcce7423d2e55c32cba69fc51f SHA512 8e90d5264574e8be0a95b08f0c6b24a36cd4bd875974339851cd872fcbbcb6b5a6649807127cb96af2c40a5bc01c3cab44a64d18300e1c3b5321aeb1772f8efb
 MISC metadata.xml 463 BLAKE2B 548ad09a1ed2b0c44cbb80ab66b653185b178873ae88f5a33545b759914fcb9e6491eef7c9e6da0a713f40c92b3b084cb36dec6f411ca8cba6db76767c8ca237 SHA512 d1aaf82b4ce4775d8e8f97f8900e10aaf403b1224744263d76c3eb890e0ec08c8e108b2f631498bd21ae3551c211747374526d73dd9764c01c4e6af5de78b950
diff --git a/net-mail/courier-imap/courier-imap-5.1.4.ebuild b/net-mail/courier-imap/courier-imap-5.1.4.ebuild
index 9e22cae7ef82..c734ba4b2ad7 100644
--- a/net-mail/courier-imap/courier-imap-5.1.4.ebuild
+++ b/net-mail/courier-imap/courier-imap-5.1.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 IUSE="berkdb debug fam +gdbm gnutls ipv6 selinux trashquota"
 REQUIRED_USE="|| ( berkdb gdbm )"
diff --git a/net-mail/getmail/Manifest b/net-mail/getmail/Manifest
index 88d131018922..a055bf486a6f 100644
--- a/net-mail/getmail/Manifest
+++ b/net-mail/getmail/Manifest
@@ -1,3 +1,3 @@
 DIST getmail-6.14.tar.gz 185308 BLAKE2B c74fce627e6a23e0b209dddca690301f80626d9c4489d8cd2391884908e6f1c017602ed23ca4d343e2dd400b911d3f808235231217afd38f96017d8f0d20b3a2 SHA512 b8d2df52cbf145ee7e00ec1dbf589013d3caf8e39a3981e6ae4f1e36fe0b3d3d88df639e03e8697c39e6d00e20ddf1e995ed17f0b1fa1fa2ea52a803c16f062f
-EBUILD getmail-6.14.ebuild 779 BLAKE2B 1edbef38260d9e112287511cc35db1ea18ab43c453b9a5307d39a950f9d24d00233d3cbc08af972d64ce65dfd2f250c5e15e3946db71d08b73a8985920cbc8a0 SHA512 21969af79422b0f53ff9a1dfffcd571fb56f17561e5f08e6500d43bfb046c5f1fa32136544cdbc5b92dd2e0b28af12c08c5e34d83630316f0b86bb5254f78016
+EBUILD getmail-6.14.ebuild 778 BLAKE2B aca076c12f21939cc7db0546db6a6d4b432dc0142b22d1517feffbe044f663ef5b999b04b096fdb6ce267655c4f41fcf24776ab7280f9ada937e479cc65daec1 SHA512 a7ce4ddda04bafe7a04e0e3ce90c5a8b71e4df05e40689b978c88e97d72adf959b66a81eda58132dcf0964225d0985d97a50e4b84558c649f6d343e6b1ea96a8
 MISC metadata.xml 716 BLAKE2B 4e72451457ace0c7335d06a94ad5f01e8d7efcd03520f5c058ab989bd962a8e719c742b23c4628e928197b002578b8f3d92c69d70f55f902b352d159b514eb3a SHA512 f4d28a26166d50307bb2a8d5bb7628725ca8af089043d4f8b40b79f31307b3fea56abdefab4c50af1d486942475b311d1072164f096d0d31b9f9668ffecf0e6e
diff --git a/net-mail/getmail/getmail-6.14.ebuild b/net-mail/getmail/getmail-6.14.ebuild
index 5f757ea11287..77838027d828 100644
--- a/net-mail/getmail/getmail-6.14.ebuild
+++ b/net-mail/getmail/getmail-6.14.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/getmail6/getmail6/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 S="${WORKDIR}/getmail6-${PV}"
 
diff --git a/net-mail/imapsync/Manifest b/net-mail/imapsync/Manifest
index 32cb5c9d733a..8d79a56c039d 100644
--- a/net-mail/imapsync/Manifest
+++ b/net-mail/imapsync/Manifest
@@ -1,3 +1,3 @@
 DIST imapsync-1.977.tar.gz 1814568 BLAKE2B ccbe678f331a59b2ee50150b4e6dd3b2a7fb7750f204f3d67c90beed600b83b38a712bfa723dc0a73d21fb9bc03a5013f287469afa1164962cfb0f2923d93910 SHA512 b9810d53f5dc4e0a350e18dff03563c38cd64cff45ad741e77211a22ab49695de14bc4f09df6cf5fde7f3025f1f54d614f7c79ece1bda9f4c0052e5f38dedfd9
-EBUILD imapsync-1.977.ebuild 1889 BLAKE2B 03229ec748f0dbe2ab20f11a33cb76e8d92e24ddd233f28fa413b6370dd251fda434f1b6b4a38f2c62c8c5c310565ad6421a9068dcd65ba718303e4eae37d283 SHA512 e3e6be608cd773f9e017653517102cc9242fb16e23271963571c2d8f2e1806cfca156319581192fce975ef42fd27a638c92a144841aa7adc81b61403d98d8294
+EBUILD imapsync-1.977.ebuild 1920 BLAKE2B 2ca01f33f6a9debfa97d8d2c20a0bb251ff5333e688a57b44bec17f37c7e41b480c32804ab2c67cfdcc0e84797246e638821be211d521f21e7a395b68600353e SHA512 0dd1d813fe65b16bc13a36382322c887f35a3c8430f6bfaea42e8415ee549e7e8fb095a8826ad6d08d3e6e3c2843d4789cf63d97563d68d99e1cd8de26825e69
 MISC metadata.xml 250 BLAKE2B fff8167dc4ff7cfc2cbafb7d225906ddbf4a10e51aacf0cc5fc4dd444807e132e87a8625294900774c10420f14cf1ff0da18c931fe3c7d4d8acd11ae1bde5fd5 SHA512 f2fa2d1be0decfdc1b2f06e3cd2b385664213fa204af151101055e99e434d2ae0c3ce40681d8531301b44050dc7565861aa36fd4504ec3c23cd5fe97bbfdbcfa
diff --git a/net-mail/imapsync/imapsync-1.977.ebuild b/net-mail/imapsync/imapsync-1.977.ebuild
index 94d001832ff1..98cb42dd636a 100644
--- a/net-mail/imapsync/imapsync-1.977.ebuild
+++ b/net-mail/imapsync/imapsync-1.977.ebuild
@@ -58,6 +58,7 @@ RDEPEND="
 	# JSON::WebToken
 	# JSON::WebToken::Crypt::RSA
 DEPEND="${RDEPEND}"
+BDEPEND="sys-apps/lsb-release"
 	#test? (
 	#	virtual/perl-Test
 	#	dev-perl/Test-Deep
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index 46810a259dba..058dc66803b0 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -1,7 +1,9 @@
 AUX 70mu-gentoo-autoload.el 68 BLAKE2B 518f6544d9b36a845e58fca8c4c9dc02c6855f48576508d47718afb1b08b4f83ce87f257e68756690f4ac70ed9770b7064f2613dc3c4077bbcf9b826512644d0 SHA512 ae50746ba93e3ac81a11d3c8746b72182fcdadc3e29966d65233debd8e6b8aa56f76f5e6a70fc68f7761e4dd55045d2b32e3765cedcced4813de3682187beeea
+DIST mu-1.6.10.tar.xz 867008 BLAKE2B 6cce22f18691c3ad6dda1ec012d72c398df2ba4d1beca70fc6f88d87aa9b749e2aa4c03f5c0e0d70f4f9978e2beb60ea02642b8ff71e86e0668df726e5923b52 SHA512 a51847b338afeff9c9fa88c4698df4b85289d017063cb5e3410eb967c605d8779618dcbd988e2d923a92291c1e0738ec84afecf017c76a63776149619d134887
 DIST mu-1.6.6.tar.xz 866724 BLAKE2B 3417d4b3e5bfae943558fbc936ca0207be912f9548621b1599437484e94f3b49271aa1e97e7cc2b5b6027b8e0cf97d3b96d2052772f7783d897b4fa0dcf03184 SHA512 07daf9864bfd1ff4278aee98a0ae9c4fc3be94468e3b2022ae801f048f339b5becdb9ad8ebb2e12b9131e0e6dfcfb541bdca8288657dc19d47b0e510831f54eb
 DIST mu-1.6.7.tar.xz 867136 BLAKE2B 12b19d15c01a7101e3a936b12ee87fa5519c0e047e354f2fd1d481939dd5dffa34a94a5e7f3fda20e27771377e78524065cf5f93f7a2f818e202cdc93090ebff SHA512 ceae7b4508fc607dcda0fc20e9fb92b3533b1ba7ef94823cba2cd3a6ad3f18ccd3d2ea7da20e4c190e53f2d00ccdd3e1d25e12b89a08bf5233f5656be90b3c14
 DIST mu-1.6.9.tar.xz 867188 BLAKE2B 526f67acd505a1d02cc12841d7d5f99e4b91a8aa3923cc1bccf045faf3a89bef99827c7461e78d000aefa48634a38fcf263346c14f275e3053c9774e2f8219c9 SHA512 c0ba5fc984fa445c44f89b84f911952c4a3aebf9484c60df75bd6a144cad3e68e1b2de98d8bbf5faae51d81ed99adb85280e4c1a40e7b0d587a00e0d80937495
+EBUILD mu-1.6.10.ebuild 1444 BLAKE2B ebcdab939aa5224eb1967f186e0ed1980ad57a96553b0a53372c3a2d19386d47e5651182f284375aa92a40e75879b2f155a4c9f4621b34068e1027efdd138b12 SHA512 8288d3b0ebf61bc90dfe05e4608c206534c94b22aa587874dd65b96d2e1ae281f0b45d847b476498124a1637b0ec340c1c6e50508c69489f0d0801bddec82f13
 EBUILD mu-1.6.6.ebuild 1362 BLAKE2B ca704ccd04361f92723d13c12a9a97f744ad2715f79a406b1dd40848984a7ff256aa73f9e8c8656c7ca67b51a7a699ccce366ff0c2e5dc9a6cbbc57dce27219a SHA512 05b1a606d2821b1cfbd65e3c6377e30d82ae1d6878e276685d70e7b76d80183d14292d6131c3e28d4f1a4f59c80234bc1e41cb5092dfcdceb1e88c243047c7a5
 EBUILD mu-1.6.7.ebuild 1366 BLAKE2B e88b818ba377df9a116abe8f8caea256ecb6036795e2a3212fd44bd645c88d5c85a90d205098e698beb224f48a7d48f4c66b59fd084015b078c2157897003ca6 SHA512 a76b9d3287e9b0a0d48716f978d3a8e79070a616143a5b82cb135b7005387dc0bf672e57d8b2a17fcb3838485260c85bc3973912533e939330410e69e7585cfe
 EBUILD mu-1.6.9.ebuild 1451 BLAKE2B 18b94e22a8064e4de535a28786a474b614cbfdc2e1781b210df9005e5272e94be807292e34887667ad1d346655e6fc5777c9eb4caf0d5ea9410c644bdf3432ae SHA512 62e433556c01cd16a36540d42b7d36a3f17e199e87abb4d42840428a8e2ca96ef74a48e3e94ce3d23e71c3766b20fbca779c5eb69ab8ececa25f4efee3d659e4
diff --git a/net-mail/mu/mu-1.6.10.ebuild b/net-mail/mu/mu-1.6.10.ebuild
new file mode 100644
index 000000000000..10dba93b30d6
--- /dev/null
+++ b/net-mail/mu/mu-1.6.10.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp-common
+
+DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
+HOMEPAGE="https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu"
+SRC_URI="https://github.com/djcb/mu/releases/download/${PV}/mu-${PV}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+IUSE="emacs guile readline"
+
+DEPEND="
+	dev-libs/glib:2
+	dev-libs/gmime:3.0
+	>=dev-libs/xapian-1.4:=
+	emacs? ( >=app-editors/emacs-25.3:* )
+	guile? ( >=dev-scheme/guile-2.2:* )
+	readline? ( sys-libs/readline:= )"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+SITEFILE="70mu-gentoo-autoload.el"
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable emacs mu4e)
+		$(use_enable guile)
+		$(use_enable readline)
+		--disable-gtk
+		--disable-webkit
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -type f -delete || die
+}
+
+pkg_preinst() {
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		elog "After upgrading from an old major version, you should"
+		elog "rebuild your mail index."
+	fi
+}
+
+pkg_postinst() {
+	if use emacs; then
+		einfo "To use mu4e you need to configure it in your .emacs file"
+		einfo "See the manual for more information:"
+		einfo "https://www.djcbsoftware.nl/code/mu/mu4e/"
+
+		elisp-site-regen
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index b359a64b5d01..306a994c3a0c 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -2,7 +2,7 @@ AUX 50notmuch-gentoo.el 291 BLAKE2B f7d4a05ca84f08e2c2779faf8a580f39f7f49f18501e
 AUX notmuch-0.32.1-tests.patch 4674 BLAKE2B c2eff70dcbf18a3276a97b3a9058f2a51647fddd6ef28ede2b1878aeb3ec3f6c5bfa5ac250c10f7cba3923031af3c4665a06190ab78b481448d9234e63e67594 SHA512 7870b5381b257cd9acc31c67f2654ecc711ddfde36c5f4a9969e43051eb43c1f0b716f926a85da4a8ec6c726bff1543cdcee9520e9b25eba2f8730bf206add5d
 DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b4046772058706f13d516f65421a5105593660f1c556907bb2bb9607a3c2521243d1be07bffb70817ad3b8461680ca SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0
 DIST notmuch-0.32.2.tar.xz 725652 BLAKE2B 02801f57bd62b8020298babcc8243276f95fb535621178b2b0b8dfb58d14e8123b7b1fa7d2c246c9e005ca2c7c2d594aeea710408c3d14f26ffcd550c03b4d9a SHA512 e4151cb3ba0e5d26e67572a37c3132d0e35af5d9ca4339d88d8ba25385b6022c376a75abcffb57fda3242c836f6e40dec39c4038674682616b6e5785223295bf
-DIST notmuch-0.33.2.tar.xz 733228 BLAKE2B e0a206695944bd57ab3ba1488bbff10c6744b57126eddeead45653a20df8edde21e0c618f9b4af5731e41bb469538883770ef61da4b28e2fd7dc108d994a7433 SHA512 15f4ecbd991df3a64c2b89aeb6bf7649e76ff2010f80120a15c10c9c5e913a90696ef6a760cbea24bbc9a3ca8cae18fada13d80e69c848cc142d355f2a513f5d
+DIST notmuch-0.34.tar.xz 748232 BLAKE2B 161fc1bd047b5489a4f2fd64f4843e73fd82cf6a408ef04ab1bab34df0995fd4199585cf8fa12980a4fdab054d03437323ed366ca87f2f6dad2d006900cad352 SHA512 c7c802ee6fc056cb626611e3403541e404c628d238983299faf877e7eca9dfb94bd643c399e6a6cda53b051d2ad837ad03b124a1f44e17c7637a9c9b23e33c73
 EBUILD notmuch-0.32.2-r1.ebuild 6727 BLAKE2B 51f07469163bbad95fd87ddae50f137920171185fda318fe2fd0b6b7cb09cd67cb43d73a0eaa320b9b1e401d009ee8b17efe0d66edfc56b8cfc0549efc846f3c SHA512 d307f3f52b3041953c5c5f42ff35710ad9089769100525f49acc7c4e51951c7468f67b0a621b0968a3cf5b3572ec4d683545fad5aaf5338003a84156d1b590ff
-EBUILD notmuch-0.33.2.ebuild 6835 BLAKE2B 9539f6facdbf906454b0a79861dcf049c6016b5b25731bd26037fe1f786eaf4b0bd5c45b496d22b21f1e92d19094dd5c62ec0ebd4bbd055513f4eaf58be923c2 SHA512 9c7dc4eeebfde3c6672fb50830309a9d906cbf23c955ee36d4f787477552197d0e391712ebfc2661945f903cf147c42a02bf5159e2821c2beac765b52dc0c2fd
+EBUILD notmuch-0.34.ebuild 7236 BLAKE2B e5ce38995edef03ba47768537c19ec29ea8346957c467bf1868d737d97379c7ca3195767ee9d206efcfbc64b8457ba8560c3358a5d7b0529315780603a9349d9 SHA512 09a88a14e6a4347ea85a7bf3c7e5a29dfecf5493a9f8cfe30f9b6bb55c100d8d2edf74ccb450d3bb4078812d285e49fd37625e3d3ae7afc3dacaa412dcef8935
 MISC metadata.xml 1303 BLAKE2B 0efb03056bdd6b69e5a34feda715557fa94ae797ece1ac650d7ed3719a439069c9fcaf8308fb893048021dbf9b0691ea01096f7219fa5b9367cbb16c261c3372 SHA512 9eb0041d9336fb9778532e4947f37af4ec4272c5fbd24dd0cf26c8779e2e609a7198f107b2538b2e6c2b20cf29e2c648a59275725c00cad8ef550ab9bcab355b
diff --git a/net-mail/notmuch/notmuch-0.33.2.ebuild b/net-mail/notmuch/notmuch-0.34.ebuild
index 4cc225e3c559..d7b1744e55c7 100644
--- a/net-mail/notmuch/notmuch-0.33.2.ebuild
+++ b/net-mail/notmuch/notmuch-0.34.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 DISTUTILS_OPTIONAL=1
 DISTUTILS_USE_SETUPTOOLS=manual
 NEED_EMACS="24.1"
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit bash-completion-r1 desktop distutils-r1 elisp-common flag-o-matic pax-utils toolchain-funcs xdg-utils
 
@@ -142,6 +142,14 @@ src_configure() {
 		$(use_with emacs)
 	)
 
+	# FIXME:
+	# Checking for GMime session key extraction support... * ACCESS DENIED: open_wr: /dev/bus/usb/001/011
+	# notmuch configure compiles a program _check_session_keys.c, inline in ./configure script
+	# gmime/gpg/scdaemon tries to open usb devices in GMime test
+	# we pretend to allow it, without actually allowing it to read or write.
+	# https://bugs.gentoo.org/821328
+	addpredict /dev/bus/usb
+
 	econf "${myconf[@]}"
 }
 
diff --git a/net-mail/rss2email/Manifest b/net-mail/rss2email/Manifest
index cb77a35b3be3..311484517c9f 100644
--- a/net-mail/rss2email/Manifest
+++ b/net-mail/rss2email/Manifest
@@ -1,9 +1,3 @@
-DIST rss2email-3.12.2.tar.gz 74096 BLAKE2B 5b7d6808d5741795de805e49bb955694a39a087e1dd64820303243227bf4b12ff9ee9354008c4f6cce415a8a8f84266266f8a677d6fed4eefa69713e5f664de9 SHA512 4df498cebd74bb25ffa2caa5aa851ccb106b0fa1b98113c5643cdd3ed8f9a73d266a649df521b8237740ea491ba086a65df0ba60c28a60a3d63360b8280a3888
-DIST rss2email-3.12.3.tar.gz 74151 BLAKE2B 5bbd796d204e6fbb7720de3c23df19c28374faea757907f69d6cd38cc560503bdc7229e7dc71aaaa89b8303942369a800d3bf9c5ac2d1d0def2b27d795352bc8 SHA512 189f6d81020a582a6a0d142cd31cf2dd200382037f4e87444a4d3df58d9feeb3b5503a689ea91c5ad88d70cfc6a7f9767314cbaa0dad0f20cb525a8251df3026
 DIST rss2email-3.13.1.tar.gz 159108 BLAKE2B 4651765d97f4b5c35559511765e7f1697f9fde461f69cf2e42a8b94232e287c915f8727e7709666a3bf7644664e93ef0bae88e9a41e6acb93aacd1a2ae5ca839 SHA512 fbfd47c3512fc86a4db692245f7765281515b733cfd9bb13e8f7d225c8fe20a816469be2f1f9e71e925216686e6f470349c16573ab9c662d8e2b4e9d1b6debe6
-DIST rss2email-3.13.tar.gz 157303 BLAKE2B 907d8f11af6c547287fcaf3fa6063850a98b560db112a047a1c860f82d818b08d4eebc174da8d83ed73673cf5c0105ab7fb7b8fd13c27280535de13f85d843f8 SHA512 548919d11762e751c2ae7ab84135aa8571104a616f0e516faf8bd9c340777972273e6642a91180387d0125300c89d6212a9da7b901f15b430f7b58284d896e98
-EBUILD rss2email-3.12.2-r1.ebuild 769 BLAKE2B 89df0b5714085967eed8d19ff839f12ee764ada6d8d96d1399dc17621ae8c29a6b326fab67ff38ccc0e226ee81c8b276d722aacc9bf7dfa86f590298af8116a2 SHA512 b45fe99e4c1ccfbcb6dddb4fe96764653449a8a2c2df652821770541110954afb76b4e69cef0e75f6d1617f7682eba25554e9a62c071e868d8c80422678cd870
-EBUILD rss2email-3.12.3.ebuild 732 BLAKE2B f7e222d4ec1264c9f6d347067f82b8894a44de914949cae3e7f3f67ea21770222fc873892dfad4353fefda33bd5a43f3f0f23580f17f430cf2369ff07312016f SHA512 097694250cebd769d4139d48804558fadbe2da633c22403b03f1b34355b19b75e34e09ed6ad09dac10b7abb7c7443c387a41283864299fd150aeeb80e27edbfb
 EBUILD rss2email-3.13.1.ebuild 762 BLAKE2B 8795bc26445e81d6dfda3f87bd1d27a6b8dc21cd11d57f475d7f7d04287fe2ad642f2e9cf6ed2b00b7f050387e3e6f57a0b95409a45513c433ab42bdcb52cce6 SHA512 930f9197b7ebaf5cc9c76815075b1192a63a6cfbe6b121f88e4ddb8fff284885098e586aa76068b32eb83b8588471eab4677063b509fab0f4d4fc111228fc16b
-EBUILD rss2email-3.13.ebuild 876 BLAKE2B 177963d767cd34d9972435b2f30fa0b396709064a5c45ba354a315d08d9538ada18e4e2d1843345b98474135e20149f1fe36bbf546d4922cfd42e99e27b99bc3 SHA512 5ba0bd61956e96c7c52b5dcd4eb3ccac311a381af6827bdc1222c58e5a116251763450f050bab8bd7aea077ce78746a77ada1f3491424cdffc4af4ce93f1dc14
 MISC metadata.xml 460 BLAKE2B d6c729983475469d59109d1975ef8cb0bc7f07a4d3b55e03828682246d0140b31b019b3b614a6104acff8f78049cf86a6474dbd2465808f585ab193456915d61 SHA512 aa01aa301922fe3ad7c526a9cf7cd71edf4f86ee5d699a686549468c09c613afac1935ecb646a7bf55e5994ef04fe0c5d96aa5d384dc020bf401e28e47b1cf9c
diff --git a/net-mail/rss2email/rss2email-3.12.2-r1.ebuild b/net-mail/rss2email/rss2email-3.12.2-r1.ebuild
deleted file mode 100644
index 2a8f05b6bb48..000000000000
--- a/net-mail/rss2email/rss2email-3.12.2-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Support for Python >=3.9 currently broken by feedparser <6
-# (see bug https://bugs.gentoo.org/768120)
-PYTHON_COMPAT=( python3_{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.3.ebuild b/net-mail/rss2email/rss2email-3.12.3.ebuild
deleted file mode 100644
index d77199fe53f2..000000000000
--- a/net-mail/rss2email/rss2email-3.12.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Support for Python >=3.9 currently broken by feedparser <6
-# (see bug https://bugs.gentoo.org/768120)
-PYTHON_COMPAT=( python3_{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}]
-	"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	distutils-r1_src_install
-	doman r2e.1
-}
diff --git a/net-mail/rss2email/rss2email-3.13.ebuild b/net-mail/rss2email/rss2email-3.13.ebuild
deleted file mode 100644
index 4efe89638d75..000000000000
--- a/net-mail/rss2email/rss2email-3.13.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Tests are broken for Python >=3.9
-# (see upstream issue https://github.com/rss2email/rss2email/issues/178)
-PYTHON_COMPAT=( python3_{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-2020.1.16[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests unittest
-
-src_install() {
-	distutils-r1_src_install
-	doman r2e.1
-}
-
-python_test() {
-	cd test/ || die  # or the tests won't find their data
-	distutils-r1_python_test
-}