4 files changed, 2 insertions, 149 deletions
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 70dce49e4ef4..a69961458f44 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/msmtp/Manifest b/mail-mta/msmtp/Manifest
index 9555b2862d0f..c19c2c6877d0 100644
--- a/mail-mta/msmtp/Manifest
+++ b/mail-mta/msmtp/Manifest
@@ -1,7 +1,5 @@
 AUX msmtpd.confd 518 BLAKE2B e537ca90e9c4debd53936b227352b73f5ca1e7114ba8daa3121f1979dfc3495996a820276292ec6da63ce79d8f42bafb45c74daacb6778e5b56656aa9688ecbd SHA512 e6f4f39da73aace9f5a4f8e080ca897f51265b8806836366121d61f5367596955eefca377c5fe9c4094f3a9ecbe04801cf38fcc6017c73a9e4b7a68fc9a81528
 AUX msmtpd.init 347 BLAKE2B 9faea920dc23ebcdb62b05595acf4f70dd3d654645ed0f5ba6f76316762986c9951905f675c2e527c5e0b5eee2bcf53a14e018d8d64080b97e82da4e3abaa0b8 SHA512 e3080dc1fb7b72b6332ebcd4f807780dc04d32b8d3e5740b62f618d5d8f39f7c2a119604e26282e1d98c1365fff7920944401c399267461fab7ae2cdfdac44d7
-DIST msmtp-1.8.22.tar.xz 390692 BLAKE2B 9bb6b7a7afbcc191ed2b45418d968c9b2176ec3d2d423cb9ff13b7afbb0b34978ce954f923f785281b5bca9c36d881a912d1b00c2ce102487df40228066b8e09 SHA512 13307bd8004bb7e229193b74f4e736c8462624a4aa1aedbb57421098efb2aa6b8cf1358ebc874a2db48aa6266414b4c6a1673d631356e92c1c538391533e098a
 DIST msmtp-1.8.23.tar.xz 401656 BLAKE2B 7033c7e8ad74826ab233bd9b08b8db8e17f6c9bd4cc9f6e65890099e4e12445f4665acc2faf1468f5d6f5e16a53c2479d5a0144e39d65c0521436832c1a049c5 SHA512 69675cb539fa5c78b83e90a460e8215e56b1d0fa7a18729eb058b8d51414d13b88fbcdb2092767e7e96c325a143230ac09e041ea74d068bf267e508418cf674a
-EBUILD msmtp-1.8.22.ebuild 3302 BLAKE2B 2fbda946b7a56068cfde3c8aabc21c6e7c79ead3b875a1f79d373ca78fbf70aad5c8a848d59aa7a6fb2d990304756b9bba4e8b9863949ee40743a6cfd22a1af6 SHA512 1e5978d6c3a8a6828e385bcfc2b54630120834d5bcaaab9ac289c64c1391643783dfdfcef69eaac779e901095c8c90c3e0d469aef8e1b449cc6e8b528095d0fe
-EBUILD msmtp-1.8.23.ebuild 3264 BLAKE2B c9377094f4a18acf21919d6c01c111360864b11829f6200bf1ca2a6dae3b0c1fec3b458db3d9260872f918c23a5546cba5a8e3ae0fa897e967de76543717fd15 SHA512 ffa7ef582ce7671a1ceff9981b48fbdeb93b0b2173697f046407a6a71752ea007dbc283d817d0a8b60d58247f3bb132f7904819a9ff25ee1dc38bf2602561cc4
+EBUILD msmtp-1.8.23.ebuild 3259 BLAKE2B be4199080b932b91072a7abb3901b3744a00283bcf84bfafcff9f72f512176ac56a059f5dc84812d145ec4344a45f9c8ff75382b85ab322ecc3169c2e80aebdd SHA512 5943060699b38b2633af5e72c3229650b7cc7e69a546131a08479bb7922d253a4211aeada5fcacd9ef7b5df36b0144f796ad5331c7e3c13bb49d88dbb6a54d2e
 MISC metadata.xml 390 BLAKE2B c245db441455174144a9071fc47570fe4760b8fe696baef76f32e69ef9a9d221efaf8dba090a555e0a5aa47b601703ada191c7b88c134271924bc46e61227d8e SHA512 b90c6215a3044a7964b2e6ff6817eb40bb79fc4d1b845904788b8990ca6dcc58f2ff5f1745a977a374ee8a9ecf0775a18db2d91d0c8c41a597f70a10033d6035
diff --git a/mail-mta/msmtp/msmtp-1.8.22.ebuild b/mail-mta/msmtp/msmtp-1.8.22.ebuild
deleted file mode 100644
index 4c38a0a5f186..000000000000
--- a/mail-mta/msmtp/msmtp-1.8.22.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 2004-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit fcaps
-
-DESCRIPTION="An SMTP client and SMTP plugin for mail user agents such as Mutt"
-HOMEPAGE="https://marlam.de/msmtp/"
-SRC_URI="https://marlam.de/msmtp/releases/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="daemon doc gnome-keyring +gnutls idn +mta nls sasl ssl vim-syntax"
-
-# fcaps.eclass unconditionally defines "filecaps" USE flag which we need for
-# USE="daemon" in order to set the caps we need.
-REQUIRED_USE="daemon? ( filecaps )"
-
-# Upstream discourages usage of openssl. See also
-# https://marlam.de/msmtp/news/openssl-discouraged/
-DEPEND="
-	gnome-keyring? ( app-crypt/libsecret )
-	idn? ( net-dns/libidn2:= )
-	nls? ( virtual/libintl )
-	sasl? ( virtual/gsasl )
-	ssl? (
-		gnutls? ( net-libs/gnutls[idn?] )
-		!gnutls? ( dev-libs/libretls:= )
-	)
-"
-
-RDEPEND="${DEPEND}
-	net-mail/mailbase
-	daemon? (
-		acct-group/msmtpd
-		acct-user/msmtpd
-	)
-	mta? (
-		!mail-mta/courier
-		!mail-mta/esmtp
-		!mail-mta/exim
-		!mail-mta/netqmail
-		!mail-mta/nullmailer
-		!mail-mta/postfix
-		!mail-mta/sendmail
-		!mail-mta/opensmtpd
-		!>=mail-mta/ssmtp-2.64-r2[mta]
-	)
-"
-
-BDEPEND="
-	doc? ( virtual/texi2dvi )
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-DOCS="AUTHORS ChangeLog NEWS README THANKS doc/msmtprc*"
-
-src_prepare() {
-	# Use default Gentoo location for mail aliases
-	sed 's:/etc/aliases:/etc/mail/aliases:' \
-		-i scripts/find_alias/find_alias_for_msmtp.sh || die
-
-	default
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-gai-idn
-		$(use_enable nls)
-		$(use_with daemon msmtpd)
-		$(use_with gnome-keyring libsecret)
-		$(use_with idn libidn)
-		$(use_with sasl libgsasl)
-		$(use_with ssl tls $(usex gnutls gnutls libtls))
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use doc ; then
-		cd doc || die
-		emake html pdf
-	fi
-}
-
-src_install() {
-	default
-
-	if use daemon ; then
-		fcaps CAP_NET_BIND_SERVICE usr/bin/msmtpd
-		newinitd "${FILESDIR}"/msmtpd.init msmtpd
-		newconfd "${FILESDIR}"/msmtpd.confd msmtpd
-	fi
-
-	if use doc ; then
-		dodoc doc/msmtp.{html,pdf}
-	fi
-
-	if use mta ; then
-		dosym ../bin/msmtp /usr/sbin/sendmail
-		dosym ../bin/msmtp /usr/$(get_libdir)/sendmail
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins scripts/vim/msmtp.vim
-	fi
-
-	insinto /etc
-	newins doc/msmtprc-system.example msmtprc
-
-	src_install_contrib find_alias find_alias_for_msmtp.sh
-	src_install_contrib msmtpqueue "*.sh" "README ChangeLog"
-	src_install_contrib msmtpq "msmtpq msmtp-queue" README.msmtpq
-	src_install_contrib set_sendmail set_sendmail.sh set_sendmail.conf
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		einfo "Please edit ${EROOT}/etc/msmtprc before first use."
-		einfo "In addition, per user configuration files can be placed"
-		einfo "as '~/.msmtprc'.  See the msmtprc-user.example file under"
-		einfo "/usr/share/doc/${PF}/ for an example."
-	fi
-}
-
-src_install_contrib() {
-	subdir="$1"
-	bins="$2"
-	docs="$3"
-	local dir=/usr/share/${PN}/${subdir}
-	insinto ${dir}
-	exeinto ${dir}
-	for i in ${bins} ; do
-		doexe scripts/${subdir}/${i}
-	done
-	for i in ${docs} ; do
-		newdoc scripts/${subdir}/${i} ${subdir}.${i}
-	done
-}
diff --git a/mail-mta/msmtp/msmtp-1.8.23.ebuild b/mail-mta/msmtp/msmtp-1.8.23.ebuild
index 7546837afc7f..3d4fe9c0efda 100644
--- a/mail-mta/msmtp/msmtp-1.8.23.ebuild
+++ b/mail-mta/msmtp/msmtp-1.8.23.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://marlam.de/msmtp/releases/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="daemon doc gnome-keyring +gnutls idn +mta nls sasl ssl"
 
 # fcaps.eclass unconditionally defines "filecaps" USE flag which we need for