6 files changed, 5 insertions, 79 deletions
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index c92feac0d5d0..c9287b41e7e5 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/msmtp/Manifest b/mail-mta/msmtp/Manifest
index 06e57721183c..9384f217ad33 100644
--- a/mail-mta/msmtp/Manifest
+++ b/mail-mta/msmtp/Manifest
@@ -1,6 +1,7 @@
 AUX msmtpd.confd 518 BLAKE2B e537ca90e9c4debd53936b227352b73f5ca1e7114ba8daa3121f1979dfc3495996a820276292ec6da63ce79d8f42bafb45c74daacb6778e5b56656aa9688ecbd SHA512 e6f4f39da73aace9f5a4f8e080ca897f51265b8806836366121d61f5367596955eefca377c5fe9c4094f3a9ecbe04801cf38fcc6017c73a9e4b7a68fc9a81528
 AUX msmtpd.init 347 BLAKE2B 9faea920dc23ebcdb62b05595acf4f70dd3d654645ed0f5ba6f76316762986c9951905f675c2e527c5e0b5eee2bcf53a14e018d8d64080b97e82da4e3abaa0b8 SHA512 e3080dc1fb7b72b6332ebcd4f807780dc04d32b8d3e5740b62f618d5d8f39f7c2a119604e26282e1d98c1365fff7920944401c399267461fab7ae2cdfdac44d7
 DIST msmtp-1.8.20.tar.xz 385696 BLAKE2B cf75715538a65ac0f6fb3b8407e5b7cec865d552b6ecc5a450f5e35d4e42581cfb9f15bb7edc67dae1846018a834769d4e3be5da60ae0e52390cb61531a29a87 SHA512 cc5ad4ab21d05f24bac75ab25607d1ede50f5ac24ce40d72cf1b61f9cdfc48e9af477f9975d799a93f1990d0c2e24b651e5a3b3aa6b71279b37a4a43fce11f11
-EBUILD msmtp-1.8.20-r1.ebuild 3373 BLAKE2B 2764027e82bf592e22251baf87c682fe45f8a61d28a345e33272638168f3d38170ae08dda5b5c0d859e5fe3421f9d32a953e750954f61ba723bb5a7d0cb294c7 SHA512 97e366299086fd5a18943bb0a9dff02184dd36c943ffc48046e4e226577e81d2ebcd4c7f189f247c133c13c631a4c5a846006642049441288e06791775a2eef7
+DIST msmtp-1.8.22.tar.xz 390692 BLAKE2B 9bb6b7a7afbcc191ed2b45418d968c9b2176ec3d2d423cb9ff13b7afbb0b34978ce954f923f785281b5bca9c36d881a912d1b00c2ce102487df40228066b8e09 SHA512 13307bd8004bb7e229193b74f4e736c8462624a4aa1aedbb57421098efb2aa6b8cf1358ebc874a2db48aa6266414b4c6a1673d631356e92c1c538391533e098a
 EBUILD msmtp-1.8.20.ebuild 3295 BLAKE2B af1dd33dc889c181bb7d2bedc672ff256a601c35b5825e737d543bf90f668af587f6bc5aeee482f26b5f20dd5bf198d7cb9448cc7d28617cc2e5c6461db0ee16 SHA512 35bbc8225ee6c393efad2d1096a30f4ef4ba72c98b3f5ce1ccc63b1d35ada68fd99c25b957c64aab68d519bda73f68c71048b314e0b194af161a52b3fb1f439b
+EBUILD msmtp-1.8.22.ebuild 3300 BLAKE2B 3242df863fd7f1273586af1afb83922c33989f41292ae3a30b9e1e1bae5d4115deb14b38bcf6bb633417389ac8f2651dcdcf9bed0a7d491c6228941da1572849 SHA512 f84131bd942a5eb02bab9c2c679b6fe9d4dc1546079b2c01937663e6db8eee4f51167feed33740c255789f9f1f0767fd37360d17e2ca02d33ab51e419d409820
 MISC metadata.xml 465 BLAKE2B 7f717e69ef79495226cf6472403a9ddb3858e67857909bcf85f1cedabfbf72e97241013de8da77b38bb7753cf8787882179f2a5cc22dd6560830432fda7339f9 SHA512 0a3c7b60c57947be068a6eeb204d9c48fe5f939a4b4f830273e751f31bd6bc6ee97a674da7e2d31e12caff0cc2e0ebc99379d56b1ad1681c737bfd86496e05fc
diff --git a/mail-mta/msmtp/msmtp-1.8.20-r1.ebuild b/mail-mta/msmtp/msmtp-1.8.22.ebuild
index 2aa41783e3f1..e0afc3931611 100644
--- a/mail-mta/msmtp/msmtp-1.8.20-r1.ebuild
+++ b/mail-mta/msmtp/msmtp-1.8.22.ebuild
@@ -41,14 +41,11 @@ RDEPEND="${DEPEND}
 		!mail-mta/courier
 		!mail-mta/esmtp
 		!mail-mta/exim
-		!mail-mta/mini-qmail
 		!mail-mta/netqmail
 		!mail-mta/nullmailer
 		!mail-mta/postfix
-		!mail-mta/qmail-ldap
 		!mail-mta/sendmail
 		!mail-mta/opensmtpd
-		!<mail-mta/ssmtp-2.64-r2
 		!>=mail-mta/ssmtp-2.64-r2[mta]
 	)
 "
diff --git a/mail-mta/protonmail-bridge/Manifest b/mail-mta/protonmail-bridge/Manifest
index d29f5af55040..d24f3314ea31 100644
--- a/mail-mta/protonmail-bridge/Manifest
+++ b/mail-mta/protonmail-bridge/Manifest
@@ -1,8 +1,5 @@
 AUX protonmail-bridge.service 334 BLAKE2B a63e6f2e5c91cb90fe62a7a3864b3884e793392fb3c16f8df0e3f0d3a567cabe8aa6cb6170248f5556211fcf582b187ae56fd4c645522ce02054b42161f76924 SHA512 2ac55654ad2e0454bf936bc8ddfe842d9b4988f92493b48bc599d7641f6e45bdb7990f97fb4efbe997314d5ec1ef5f70beee9af4710755c3e29aba7bc849f111
-DIST protonmail-bridge-2.1.1-vendor.tar.xz 3778060 BLAKE2B 4350201ec1890eb398360df82d2b623800399e0d536545030254d4e17bac55729fe5d9d6238250b5599a5d4f59014804f442d9bf804a589ecf3be13b248e9bb3 SHA512 736a4c7e3536d8aff48a3987ef46ba0b1ca1aeb5f0346b78ecde93e989f921affa56dd63e70b66b026bdae8c843c7540a07623a744662958dca243e614421a5c
-DIST protonmail-bridge-2.1.1.tar.gz 2034768 BLAKE2B 8748650cd90610803bbba4ed503a01be308225367a82da403ed209f0ed593f2202dc3424ba3c2bc09b3fcfa19ff04cb67351e840aac9fc35f17bc6d512962774 SHA512 c280c61d7a8aaf6e7063183431184e2807e8cdb9ba68cb1a14e45529ccac2b2df7e6ee5b71d7e01341a4b625546ea8cf48ade7cbec64abd998cf8227d9b684de
-DIST protonmail-bridge-2.2.0-deps.tar.xz 237226036 BLAKE2B bb1eabb4a56c19ff6c79b4543ad39f94fe5821d02cf246110a1a41b64c55271c5cfc0be18e496f8f7a76d02d180567ac8dbaba520b27dd38c08708d885c66c1f SHA512 4a3da64b27732d55aaaff8850b9ce0e6c03deecbc8a051338a3bee4066250f10b99fb5f25d9d2cd5541b8de94ee2c11a2805b4344f28764b494e2b645c60b175
-DIST protonmail-bridge-2.2.0.tar.gz 3098013 BLAKE2B 310c84eab7973174a331247bde6f64dad03a3ed05ad241300e5c2c2f7361e5d7c4598201400c6f51a0df49e7ccb57a6230fc1b1c4b749e29d2f2796d3d4c8b81 SHA512 ca0941b37fccbdf8a581426e69ec0c8840ed384bc4fc64592fcf0f228303a3f9f46d41ad56310bc0f99e1bb633ff8c9fcd3c3ab11b5ba34ad6960342111e8fe2
-EBUILD protonmail-bridge-2.1.1-r1.ebuild 1416 BLAKE2B a9eb4eb06868ef61ff813ad07f05edbc976aa043f79b4c3f17f503f8dc8b653f401f8303d0624a6e78f7d10ff6c1912c0fe1f58f16a6af7fff73f517d63ef664 SHA512 756de69d2cbf51065b119416dd7852484e37e979b0375c6f928d173d46ee074638ab8121bcdbcff04f19fbfa8c24b7b38eb30f07b4e2c119c433308e3f311baf
-EBUILD protonmail-bridge-2.2.0.ebuild 1282 BLAKE2B acdc3ed50ad453ce5990d3489b93aa64e485cedd2bab69e25bd0b379ba1fd3050e15a02ac3883c15a05912d1339badae470dc6b520eb5774bae48fe5ea52ad2c SHA512 3195aae736579ace0a32897dc8c3bc17fc9f4326755d9d5e7fce53acfcc9f022655e6e187f6652b254def26ab2cd58f72f3a4c470ca828185b32a3ce10aa467a
+DIST protonmail-bridge-2.2.2-deps.tar.xz 237555984 BLAKE2B b069b1b9015e0a96cc0f5558216058c23c1488a67abc29363f4111f9175eac9f204f5f14b54a090040e6d340d4aeb69d1e3b1e59685c3dcef9499ae93526f411 SHA512 8ae9bd6bdbc8a16d7cb0e5a3405ef3dca1737f7b3b5e53b9f954618eadfccd94c5ca1a3994a20745f234e81dbace28bc2df0489e28dbf6dc322b508a11acf813
+DIST protonmail-bridge-2.2.2.tar.gz 5057358 BLAKE2B f2b585ec16c1b6864e4a23436f30c36253beed0453a1068f52f19af8b47b7b626ec779795486ce3719716b5785b2a3c60fbe62ed192b724c6d88ceb507abc590 SHA512 c17ce614ab1074ddeeb9842ce98e6c9cbcb57f44a0bc75cdf74b9a7085257768824a549a9ae5870dcb45243655a90f0956600912c69fc1e826c58d36e8ee19fe
+EBUILD protonmail-bridge-2.2.2.ebuild 1282 BLAKE2B acdc3ed50ad453ce5990d3489b93aa64e485cedd2bab69e25bd0b379ba1fd3050e15a02ac3883c15a05912d1339badae470dc6b520eb5774bae48fe5ea52ad2c SHA512 3195aae736579ace0a32897dc8c3bc17fc9f4326755d9d5e7fce53acfcc9f022655e6e187f6652b254def26ab2cd58f72f3a4c470ca828185b32a3ce10aa467a
 MISC metadata.xml 619 BLAKE2B 3350b5193ecc34b4511694c91a0990dbfed6204fc1e2db2acd869da46249bb73acc690cd186771eff77968f6d4009991a23f3e3055b6e4f3092d0da6aac026ac SHA512 7f21301b2375c7173750bf67e4df84aede219a5a7dc4b4b55776a6486eda1f7e3693677a10cf7b6971335b2df3b275bf7e4f27e0b22e3cf23420a8db858eaef0
diff --git a/mail-mta/protonmail-bridge/protonmail-bridge-2.1.1-r1.ebuild b/mail-mta/protonmail-bridge/protonmail-bridge-2.1.1-r1.ebuild
deleted file mode 100644
index e29f387b2288..000000000000
--- a/mail-mta/protonmail-bridge/protonmail-bridge-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module systemd xdg-utils
-
-MY_PN="proton-bridge"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Serves ProtonMail to IMAP/SMTP clients"
-HOMEPAGE="https://protonmail.com/bridge https://github.com/ProtonMail/proton-bridge/"
-SRC_URI="https://github.com/ProtonMail/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~marecki/dists/${CATEGORY}/${PN}/${P}-vendor.tar.xz"
-
-LICENSE="Apache-2.0 BSD BSD-2 GPL-3+ ISC LGPL-3+ MIT MPL-2.0 Unlicense"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="gui"
-
-# Quite a few tests require Internet access
-PROPERTIES="test_network"
-RESTRICT="test"
-
-RDEPEND="app-crypt/libsecret"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	xdg_environment_reset
-	default
-	# Temporary, will soon be handled by go-module.eclass
-	mv "${WORKDIR}"/vendor/ "${S}" || die "Failed to deploy the vendor tarball"
-}
-
-src_compile() {
-	if use gui; then
-		emake \
-			QT_DOC_DIR="/usr/share/qt5-doc" \
-			QT_PKG_CONFIG=true \
-			build
-	else
-		emake build-nogui
-	fi
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	exeinto /usr/bin
-	newexe ${MY_PN} ${PN}
-
-	systemd_douserunit "${FILESDIR}"/${PN}.service
-
-	# FIXME: USE=gui will probably need more files
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use gui && xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	use gui && xdg_icon_cache_update
-}
diff --git a/mail-mta/protonmail-bridge/protonmail-bridge-2.2.0.ebuild b/mail-mta/protonmail-bridge/protonmail-bridge-2.2.2.ebuild
index 3eb8df2b3026..3eb8df2b3026 100644
--- a/mail-mta/protonmail-bridge/protonmail-bridge-2.2.0.ebuild
+++ b/mail-mta/protonmail-bridge/protonmail-bridge-2.2.2.ebuild