gentoo auto-resync : 14:12:2022 - 03:28:57

6 files changed, 1 insertions, 655 deletions

diff --git a/mail-mta/sendmail/Manifest b/mail-mta/sendmail/Manifest
index 406ad792e279..ff2bf744c52a 100644
--- a/mail-mta/sendmail/Manifest
+++ b/mail-mta/sendmail/Manifest
@@ -1,17 +1,11 @@
 AUX sendmail 595 BLAKE2B fe4532e30c6bc84effbdd59de70a27e2565fa7b4437c1fdc64ca169adf14702b8fa739123f2b0f0d2069b33939efe0c3382ea51716bf5fb1905f04f6074c8ac2 SHA512 0a1611eeec33a7d7eecff75ed6c8f70abf0d6d8cf4a5242f084da0d4139e0e871239e9893a53782e5dab80c4386c62d96ec03839fc98a497e697fce1f7a149aa
 AUX sendmail-8.16.1-build-system.patch 9701 BLAKE2B f1bbf82ab321b502ecbd5d2658e549275330ec6f6fdd2a31af36aba580adc1fafa74acaf1213798787c5b6c985e86f366f68e4c260212e4856e5778201400bfc SHA512 9a3dad2df6a84729a5dd7dfc7c696acacdb96d1b0856f763604e1183f9fb7e7e5fc6012d4299c9e0a6a57c65d763d4ca607f3c7862a2055aa3aedf3994ed22fe
-AUX sendmail-8.17.1-cyrus-sasl-auth.patch 1066 BLAKE2B cd1dddf88beaae1bc3705fa648d14b737c596f735074627fe0a2c5ebabd83af1ef765bca19410b2752568123b94a87484184c5a91b6a4c2eb802f32c6afaeea1 SHA512 3a28bbef546be6a7336a63c86d7ec6b7897480cead98be653f9c4a192496ae522fb5211336b07ab1e75741d20ebf14f84a6a487a093cce0f50862fa98f925f9b
 AUX sendmail-delivered_hdr.patch 341 BLAKE2B a29362584d77bd317de58c1967a9cfb3a2e0d1c5f0b37504d13c1404830687137f9342fe567ea969b40989115a292d947064f37b307c2a3e9b75051ee53d28ff SHA512 1e97ca1b32e6cbb69fe08d4e1c5dee0763ef874537448e60129f71f82bc92c78fc5d9e124568d21188b6e6e2186a1a3c9f1362b0d0734f7e12e2272643238254
 AUX sendmail-procmail.mc 295 BLAKE2B ca3a2e0939dbf09ab8e4042737bc8c5489bae114baad9a9c09f1d698ad881fd050e57cec42929709b5635e83d3f6393ea1b70c51e01af8110d145d46ec4ec70a SHA512 eb693fb91acdc3cbc4601d517119300f238c20e86dc0dbc137a209ce56bd5bf7d7a8c9848a143daf932be487d919004da994ba2dbd7494ea5be6e08929549d58
 AUX sendmail.mc-r1 285 BLAKE2B 7710e6ae53d3b8e8756a63629a3c6c7f0c8dd21b7f6dc82b9d0bafe426f450132a85f2163f6b832ea6b100eba70c95a4a2927b6a0848faf45891777e0a6eb51d SHA512 f197572f4004cd1f9de4c423d1d5ded382535b9643b32aa8dc03889cdf76bf918702a77a20edde5f2d19276ca7ec473cac5db01c42b0833cda950cfc11cbbf41
 AUX sendmail.service 349 BLAKE2B dc154b2fed04553247f3a64e31351377e18f95830dac22b4498f8e2afd7e91844081d7f8eb2efb2e8b9ec9fdf022d919eccb4f383b99c1fa9ec989cc5b69cbde SHA512 4e0f263e5d125cfb0c80f96416ffd1bdb7ce3f53fa78fc516fadd3ef10c6bd6f148e081c2b9f1be4394198fd45713b47520462b70b16bdf6a3c771fa18bbe5e7
 AUX site.config.m4 564 BLAKE2B 85bcbe7b9a26071aedf0d1b530c1276d93de21d82972add0908c035a958dc34ebe15941a37add15f24116e3cf2779bf003d965baae10dbbcafdb61f0af453227 SHA512 82d9bbb233e6ffbcef411f8a8184b47aea27f3dc0b41ace053e0107e05a5fe6929d9dd76d3d1baf0ce43be78dc46f40888ad0c93e4f126f6ce0c0372007a262d
 AUX sm-client.service 418 BLAKE2B a9057cac008c11d3cfd5a4b662cf3fc71a33be79e8890a54e556a258b098ceccc2e9941f62dce868498751bd22f23f45289bc84a8250020b140acbd2b6508b58 SHA512 26e5a64790fd7106e45de0f4dfafb3b648094953bd1831a223ca7c60b7cb75b673fb554b426a6aa0e7dc200a134fd042b4ecc6795641cfddd82bd04e4c7ea324
-DIST sendmail.8.16.1.tar.gz 2236402 BLAKE2B 80a9c2f1d04719099703e55f0a0c54fd638cf69b72839d358ae6863c95c9e0965d1b7fdd5b1807bec1ffdf87bca0c7c9ba91060962e6de5da5bf14422f6279ea SHA512 d7d4aac3c6d7505782abdb166204901b8b51cac000d610dfe40eda9eef7441a073af9e8e0b14c8719b07b445f55a1e2c28ac63d663d0daa7f1eafc5a101788b2
 DIST sendmail.8.17.1.9.tar.gz 2345302 BLAKE2B 378f2f98ffff6457c49f934228964e792acec6f33fbabd89a8712f09f1dc7afc951b7c984a397aa7dd3773d86bdf57a946ea9ac54ae426bc0b8ea4c040e2ad4a SHA512 ad8198b12bdc0037de5b64b2504bd5e0a42bf054274a4834163a7c46953b9aec23d52d58063cc6b925d90199973608f35edeb40128671ae32889f4558e5c0d4b
-DIST sendmail.8.17.1.tar.gz 2284027 BLAKE2B 4cbbc2bb536a48ea27994721e9dfefff7739ef1c825bbc0397202e600d8dad8f9a2572a777204693cf9630f767865d50566f0827be6b52be41c1e25532cb394c SHA512 ae42343fb06c09f2db5d919d602afc4241914387dfdae0f15e0967dda3be25bf1d3a4637b57266763679646a3cea6aa07e6453266fd9b7358c1a09ec2b627a15
-EBUILD sendmail-8.16.1-r2.ebuild 6147 BLAKE2B 2d54d5e075b359e16272e18e26ac54fd958af557b4df9d60fd2d9ce1c0b54d8f36d53dcfecb81937dc3aa81f03e1403f5e7ec47040c89d0b9fb085b172eb2ecb SHA512 1ab1a5df00df381269c669439b00843e363e1566bc19667a9467711a3cda90c5e7b57873aa4369e06de37447763d205b98741df3fb125b85867a6786c24d0bda
-EBUILD sendmail-8.17.1-r2.ebuild 6192 BLAKE2B 3b2f1e24ab16b21147c4156fdd4c34401fd7e40f7ea970da24ed6eba367263cc0982e56a2272b33b0e88047fdcd6e01f667c7cd6f157606e03304ce29c26502c SHA512 57741cf33a4a61b843ec8a180ff4391881392f66be0138110b23cc3e0f42cf40cbd0e09b568b02f5a3d7f093677f502ca9ebdd49eb65d317ad864514ffd20633
-EBUILD sendmail-8.17.1-r3.ebuild 6256 BLAKE2B ea0876c1111c156d4ef853d84a94dd23bbe05eb5a11167d23fb86f659bb1b8dad80b747f771c1795e3fa007cfcde04bb77e19f42e5f5c4459bb7369b6128470b SHA512 f1e99a68b71806c1139b331cd50d89484d508713e7e2c7c9dc746ac3dd49b78ff5ab7aba77941c8a8afbbd55a0401760888b00235acd24df8f8fccb9939c48e9
-EBUILD sendmail-8.17.1.9.ebuild 6488 BLAKE2B 7acf6c8d0f0c97d04170d0bd78284c832ed74edfbc8933ac3530a7b170349de7e9fcb9f6818f645a1e4a1dd1aec13f7254d6a4f5582365f1a35e958bf25d367e SHA512 99e39f7dace0c271636b406141cf5c7ea954825ff283886660973e82011f2e8d092170cc841329c7f054fdaf57c2c15ada97d96acec33bf771fa34871c890e14
+EBUILD sendmail-8.17.1.9.ebuild 6448 BLAKE2B a8f41dca3a00124030118fae1e520443f5b23e9cc751e75a204ab6fd8cdc6340a8f199445bb41660ef5ea98d6c0c7da88762dd527459b0e8f77b7c570f61cf0e SHA512 7b5510ae475ce32fe225308618d53a05d48ae6edac913c5523ef0864d026cef7b903f610ab5cf68ba7f701d336b140c30abeb2bd324c429a31b769377ae275b0
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/mail-mta/sendmail/files/sendmail-8.17.1-cyrus-sasl-auth.patch b/mail-mta/sendmail/files/sendmail-8.17.1-cyrus-sasl-auth.patch
deleted file mode 100644
index ddbe2b1fb02e..000000000000
--- a/mail-mta/sendmail/files/sendmail-8.17.1-cyrus-sasl-auth.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://bugs.gentoo.org/859172
-https://bz-attachments.freebsd.org/attachment.cgi?id=233353
-https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=263287
-https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=262935
---- a/sendmail/sendmail.h
-+++ b/sendmail/sendmail.h
-@@ -760,7 +760,7 @@ extern bool	filesys_free __P((long));
- # define SASL_IS_AUTH	2		/* authenticated */
- 
- /* SASL options */
--# define SASL_AUTH_AUTH	0x1000		/* use auth= only if authenticated */
-+# define SASL_AUTH_AUTH	0x10000		/* use auth= only if authenticated */
- # if SASL >= 20101
- #  define SASL_SEC_MASK	SASL_SEC_MAXIMUM /* mask for SASL_SEC_* values: sasl.h */
- # else /* SASL >= 20101 */
-@@ -775,6 +775,9 @@ extern bool	filesys_free __P((long));
- #  endif /* SASL_SEC_NOPLAINTEXT & SASL_SEC_MASK) == 0 ... */
- # endif /* SASL >= 20101 */
- # define MAXOUTLEN 8192	/* length of output buffer, should be 2^n */
-+# if (SASL_AUTH_AUTH & SASL_SEC_MASK) != 0
-+#  ERROR "change SASL_AUTH_AUTH notify sendmail.org!"
-+# endif
- 
- /* functions */
- extern char	*intersect __P((char *, char *, SM_RPOOL_T *));
-
diff --git a/mail-mta/sendmail/sendmail-8.16.1-r2.ebuild b/mail-mta/sendmail/sendmail-8.16.1-r2.ebuild
deleted file mode 100644
index 1dee86100cb7..000000000000
--- a/mail-mta/sendmail/sendmail-8.16.1-r2.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Note: please bump this together with mail-filter/libmilter
-
-inherit systemd toolchain-funcs
-
-DESCRIPTION="Widely-used Mail Transport Agent (MTA)"
-HOMEPAGE="https://www.sendmail.org/"
-SRC_URI="ftp://ftp.sendmail.org/pub/${PN}/${PN}.${PV}.tar.gz"
-
-LICENSE="Sendmail GPL-2" # GPL-2 is here for initscript
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE="ipv6 ldap mbox nis sasl sockets ssl tcpd"
-
-BDEPEND="
-	sys-devel/m4
-	virtual/pkgconfig"
-DEPEND="
-	acct-group/smmsp
-	>=acct-user/smmsp-0-r2
-	net-mail/mailbase
-	>=sys-libs/db-3.2:=
-	ldap? ( net-nds/openldap:= )
-	nis? ( net-libs/libnsl:= )
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.10 )
-	ssl? ( dev-libs/openssl:0= )
-	tcpd? ( sys-apps/tcp-wrappers )"
-RDEPEND="
-	${DEPEND}
-	>=mail-filter/libmilter-1.0.2_p1-r1
-	!mail-mta/courier
-	!mail-mta/esmtp
-	!mail-mta/exim
-	!mail-mta/mini-qmail
-	!mail-mta/msmtp[mta]
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/opensmtpd
-	!mail-mta/postfix
-	!mail-mta/qmail-ldap
-	!>=mail-mta/ssmtp-2.64-r2[mta]
-	!net-mail/vacation"
-PDEPEND="!mbox? ( mail-filter/procmail )"
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-8.16.1-build-system.patch
-	eapply -p0 "${FILESDIR}"/${PN}-delivered_hdr.patch
-	eapply_user
-
-	local confCCOPTS="${CFLAGS}"
-	local confENVDEF="-DMAXDAEMONS=64 -DHAS_GETHOSTBYNAME2=1"
-	local confLDOPTS="${LDFLAGS}"
-	local confLIBS=
-	local confMAPDEF="-DMAP_REGEX"
-	local conf_sendmail_LIBS=
-
-	if use ldap; then
-		confMAPDEF+=" -DLDAPMAP"
-		confLIBS+=" -lldap -llber"
-	fi
-
-	if use sasl; then
-		confCCOPTS+=" $($(tc-getPKG_CONFIG) --cflags libsasl2)"
-		confENVDEF+=" -DSASL=2"
-		conf_sendmail_LIBS+=" $($(tc-getPKG_CONFIG) --libs libsasl2)"
-	fi
-
-	if use ssl; then
-		# Bug #542370 - lets add support for modern crypto (PFS)
-		confCCOPTS+=" $($(tc-getPKG_CONFIG) --cflags openssl)"
-		confENVDEF+=" -DSTARTTLS -D_FFR_DEAL_WITH_ERROR_SSL"
-		confENVDEF+=" -D_FFR_TLS_1 -D_FFR_TLS_EC"
-		conf_sendmail_LIBS+=" $($(tc-getPKG_CONFIG) --libs openssl)"
-	fi
-
-	if use tcpd; then
-		confENVDEF+=" -DTCPWRAPPERS"
-		confLIBS+=" -lwrap"
-	fi
-
-	use ipv6 && confENVDEF+=" -DNETINET6"
-	use nis && confENVDEF+=" -DNIS"
-	use sockets && confENVDEF+=" -DSOCKETMAP"
-
-	sed -e "s|@@confCC@@|$(tc-getCC)|" \
-		-e "s|@@confCCOPTS@@|${confCCOPTS}|" \
-		-e "s|@@confENVDEF@@|${confENVDEF}|" \
-		-e "s|@@confLDOPTS@@|${confLDOPTS}|" \
-		-e "s|@@confLIBS@@|${confLIBS}|" \
-		-e "s|@@confMAPDEF@@|${confMAPDEF}|" \
-		-e "s|@@conf_sendmail_LIBS@@|${conf_sendmail_LIBS}|" \
-		"${FILESDIR}"/site.config.m4 > devtools/Site/site.config.m4 \
-		|| die "failed to generate site.config.m4"
-
-	echo "APPENDDEF(\`confLIBDIRS', \`-L${EPREFIX}/usr/$(get_libdir)')" \
-		>> devtools/Site/site.config.m4 || die "failed adding to site.config.m4"
-}
-
-src_compile() {
-	sh Build AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "compilation failed in main build script"
-}
-
-src_install() {
-	dodir /usr/{bin,$(get_libdir)}
-	dodir /usr/share/man/man{1,5,8} /usr/sbin /usr/share/sendmail-cf
-	dodir /var/spool/{mqueue,clientmqueue} /etc/conf.d
-
-	keepdir /var/spool/{clientmqueue,mqueue}
-
-	local emakeargs=(
-		DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)"
-		MANROOT=/usr/share/man/man
-		SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root
-		MANOWN=root MANGRP=root INCOWN=root INCGRP=root
-		LIBOWN=root LIBGRP=root GBINOWN=root GBINGRP=root
-		MSPQOWN=root CFOWN=root CFGRP=root
-	)
-
-	local dir
-	for dir in libsmutil sendmail mailstats praliases smrsh makemap vacation editmap; do
-		emake -j1 -C obj.*/${dir} "${emakeargs[@]}" install
-	done
-	for dir in rmail mail.local; do
-		emake -j1 -C obj.*/${dir} "${emakeargs[@]}" force-install
-	done
-
-	fowners root:smmsp /usr/sbin/sendmail
-	fperms 2555 /usr/sbin/sendmail
-	fowners smmsp:smmsp /var/spool/clientmqueue
-	fperms 770 /var/spool/clientmqueue
-	fperms 700 /var/spool/mqueue
-	dosym ../sbin/makemap /usr/bin/makemap
-	dodoc FAQ KNOWNBUGS README RELEASE_NOTES doc/op/op.ps
-
-	dodoc sendmail/{SECURITY,TUNING}
-	newdoc sendmail/README README.sendmail
-	newdoc smrsh/README README.smrsh
-
-	newdoc cf/README README.cf
-	newdoc cf/cf/README README.install-cf
-
-	dodoc -r contrib
-
-	cp -pPR cf/. "${ED}"/usr/share/sendmail-cf || die
-
-	insinto /etc/mail
-	if use mbox; then
-		newins "${FILESDIR}"/sendmail.mc-r1 sendmail.mc
-	else
-		newins "${FILESDIR}"/sendmail-procmail.mc sendmail.mc
-	fi
-
-	# See discussion on bug #730890
-	m4 "${ED}"/usr/share/sendmail-cf/m4/cf.m4 \
-		<(grep -v "${EPREFIX}"/usr/share/sendmail-cf/m4/cf.m4 "${ED}"/etc/mail/sendmail.mc) \
-		> "${ED}"/etc/mail/sendmail.cf || die "cf.m4 failed"
-
-	echo "include(\`/usr/share/sendmail-cf/m4/cf.m4')dnl" \
-		> "${ED}"/etc/mail/submit.mc || die "submit.mc echo failed"
-
-	cat "${ED}"/usr/share/sendmail-cf/cf/submit.mc \
-		>> "${ED}"/etc/mail/submit.mc || die "submit.mc cat failed"
-
-	echo "# local-host-names - include all aliases for your machine here" \
-		> "${ED}"/etc/mail/local-host-names || die "local-host-names echo failed"
-
-	cat <<- EOF > "${ED}"/etc/mail/trusted-users || die "trusted-users cat failed"
-		# trusted-users - users that can send mail as others without a warning
-		# apache, mailman, majordomo, uucp are good candidates
-	EOF
-
-	cat <<- EOF > "${ED}"/etc/mail/access || die "access cat failed"
-		# Check the /usr/share/doc/sendmail/README.cf file for a description
-		# of the format of this file. (search for access_db in that file)
-		# The /usr/share/doc/sendmail/README.cf is part of the sendmail-doc
-		# package.
-		#
-
-	EOF
-
-	cat <<- EOF > "${ED}"/etc/conf.d/sendmail || die "sendmail cat failed"
-		# Config file for /etc/init.d/sendmail
-		# add start-up options here
-		SENDMAIL_OPTS="-bd -q30m -L sm-mta" # default daemon mode
-		CLIENTMQUEUE_OPTS="-Ac -q30m -L sm-cm" # clientmqueue
-		KILL_OPTS="" # add -9/-15/your favorite evil SIG level here
-
-	EOF
-
-	if use sasl; then
-		dodir /etc/sasl2
-		cat <<- EOF > "${ED}"/etc/sasl2/Sendmail.conf || die "Sendmail.conf cat ailed"
-			pwcheck_method: saslauthd
-			mech_list: PLAIN LOGIN
-
-		EOF
-	fi
-
-	doinitd "${FILESDIR}"/sendmail
-	systemd_dounit "${FILESDIR}"/sendmail.service
-	systemd_dounit "${FILESDIR}"/sm-client.service
-}
diff --git a/mail-mta/sendmail/sendmail-8.17.1-r2.ebuild b/mail-mta/sendmail/sendmail-8.17.1-r2.ebuild
deleted file mode 100644
index 28381d79fb26..000000000000
--- a/mail-mta/sendmail/sendmail-8.17.1-r2.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Note: please bump this together with mail-filter/libmilter
-
-inherit systemd toolchain-funcs
-
-DESCRIPTION="Widely-used Mail Transport Agent (MTA)"
-HOMEPAGE="https://www.sendmail.org/"
-SRC_URI="ftp://ftp.sendmail.org/pub/${PN}/${PN}.${PV}.tar.gz"
-
-LICENSE="Sendmail GPL-2" # GPL-2 is here for initscript
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="ipv6 ldap mbox nis sasl sockets ssl tcpd"
-
-BDEPEND="
-	sys-devel/m4
-	virtual/pkgconfig"
-DEPEND="
-	acct-group/smmsp
-	>=acct-user/smmsp-0-r2
-	net-mail/mailbase
-	>=sys-libs/db-3.2:=
-	ldap? ( net-nds/openldap:= )
-	nis? ( net-libs/libnsl:= )
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.10 )
-	ssl? ( dev-libs/openssl:0= )
-	tcpd? ( sys-apps/tcp-wrappers )"
-RDEPEND="
-	${DEPEND}
-	>=mail-filter/libmilter-1.0.2_p2
-	!mail-mta/courier
-	!mail-mta/esmtp
-	!mail-mta/exim
-	!mail-mta/mini-qmail
-	!mail-mta/msmtp[mta]
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/opensmtpd
-	!mail-mta/postfix
-	!mail-mta/qmail-ldap
-	!>=mail-mta/ssmtp-2.64-r2[mta]
-	!net-mail/vacation"
-PDEPEND="!mbox? ( mail-filter/procmail )"
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-8.16.1-build-system.patch
-	eapply -p0 "${FILESDIR}"/${PN}-delivered_hdr.patch
-	eapply_user
-
-	local confCCOPTS="${CFLAGS}"
-	# See bug #808954 for FLOCK
-	local confENVDEF="-DMAXDAEMONS=64 -DHAS_GETHOSTBYNAME2=1 -DHASFLOCK=1"
-	local confLDOPTS="${LDFLAGS}"
-	local confLIBS=
-	local confMAPDEF="-DMAP_REGEX"
-	local conf_sendmail_LIBS=
-
-	if use ldap; then
-		confMAPDEF+=" -DLDAPMAP"
-		confLIBS+=" -lldap -llber"
-	fi
-
-	if use sasl; then
-		confCCOPTS+=" $($(tc-getPKG_CONFIG) --cflags libsasl2)"
-		confENVDEF+=" -DSASL=2"
-		conf_sendmail_LIBS+=" $($(tc-getPKG_CONFIG) --libs libsasl2)"
-	fi
-
-	if use ssl; then
-		# Bug #542370 - lets add support for modern crypto (PFS)
-		confCCOPTS+=" $($(tc-getPKG_CONFIG) --cflags openssl)"
-		confENVDEF+=" -DSTARTTLS -D_FFR_DEAL_WITH_ERROR_SSL"
-		confENVDEF+=" -D_FFR_TLS_1 -D_FFR_TLS_EC"
-		conf_sendmail_LIBS+=" $($(tc-getPKG_CONFIG) --libs openssl)"
-	fi
-
-	if use tcpd; then
-		confENVDEF+=" -DTCPWRAPPERS"
-		confLIBS+=" -lwrap"
-	fi
-
-	use ipv6 && confENVDEF+=" -DNETINET6"
-	use nis && confENVDEF+=" -DNIS"
-	use sockets && confENVDEF+=" -DSOCKETMAP"
-
-	sed -e "s|@@confCC@@|$(tc-getCC)|" \
-		-e "s|@@confCCOPTS@@|${confCCOPTS}|" \
-		-e "s|@@confENVDEF@@|${confENVDEF}|" \
-		-e "s|@@confLDOPTS@@|${confLDOPTS}|" \
-		-e "s|@@confLIBS@@|${confLIBS}|" \
-		-e "s|@@confMAPDEF@@|${confMAPDEF}|" \
-		-e "s|@@conf_sendmail_LIBS@@|${conf_sendmail_LIBS}|" \
-		"${FILESDIR}"/site.config.m4 > devtools/Site/site.config.m4 \
-		|| die "failed to generate site.config.m4"
-
-	echo "APPENDDEF(\`confLIBDIRS', \`-L${EPREFIX}/usr/$(get_libdir)')" \
-		>> devtools/Site/site.config.m4 || die "failed adding to site.config.m4"
-}
-
-src_compile() {
-	sh Build AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "compilation failed in main build script"
-}
-
-src_install() {
-	dodir /usr/{bin,$(get_libdir)}
-	dodir /usr/share/man/man{1,5,8} /usr/sbin /usr/share/sendmail-cf
-	dodir /var/spool/{mqueue,clientmqueue} /etc/conf.d
-
-	keepdir /var/spool/{clientmqueue,mqueue}
-
-	local emakeargs=(
-		DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)"
-		MANROOT=/usr/share/man/man
-		SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root
-		MANOWN=root MANGRP=root INCOWN=root INCGRP=root
-		LIBOWN=root LIBGRP=root GBINOWN=root GBINGRP=root
-		MSPQOWN=root CFOWN=root CFGRP=root
-	)
-
-	local dir
-	for dir in libsmutil sendmail mailstats praliases smrsh makemap vacation editmap; do
-		emake -j1 -C obj.*/${dir} "${emakeargs[@]}" install
-	done
-	for dir in rmail mail.local; do
-		emake -j1 -C obj.*/${dir} "${emakeargs[@]}" force-install
-	done
-
-	fowners root:smmsp /usr/sbin/sendmail
-	fperms 2555 /usr/sbin/sendmail
-	fowners smmsp:smmsp /var/spool/clientmqueue
-	fperms 770 /var/spool/clientmqueue
-	fperms 700 /var/spool/mqueue
-	dosym ../sbin/makemap /usr/bin/makemap
-	dodoc FAQ KNOWNBUGS README RELEASE_NOTES doc/op/op.ps
-
-	dodoc sendmail/{SECURITY,TUNING}
-	newdoc sendmail/README README.sendmail
-	newdoc smrsh/README README.smrsh
-
-	newdoc cf/README README.cf
-	newdoc cf/cf/README README.install-cf
-
-	dodoc -r contrib
-
-	cp -pPR cf/. "${ED}"/usr/share/sendmail-cf || die
-
-	insinto /etc/mail
-	if use mbox; then
-		newins "${FILESDIR}"/sendmail.mc-r1 sendmail.mc
-	else
-		newins "${FILESDIR}"/sendmail-procmail.mc sendmail.mc
-	fi
-
-	# See discussion on bug #730890
-	m4 "${ED}"/usr/share/sendmail-cf/m4/cf.m4 \
-		<(grep -v "${EPREFIX}"/usr/share/sendmail-cf/m4/cf.m4 "${ED}"/etc/mail/sendmail.mc) \
-		> "${ED}"/etc/mail/sendmail.cf || die "cf.m4 failed"
-
-	echo "include(\`/usr/share/sendmail-cf/m4/cf.m4')dnl" \
-		> "${ED}"/etc/mail/submit.mc || die "submit.mc echo failed"
-
-	cat "${ED}"/usr/share/sendmail-cf/cf/submit.mc \
-		>> "${ED}"/etc/mail/submit.mc || die "submit.mc cat failed"
-
-	echo "# local-host-names - include all aliases for your machine here" \
-		> "${ED}"/etc/mail/local-host-names || die "local-host-names echo failed"
-
-	cat <<- EOF > "${ED}"/etc/mail/trusted-users || die "trusted-users cat failed"
-		# trusted-users - users that can send mail as others without a warning
-		# apache, mailman, majordomo, uucp are good candidates
-	EOF
-
-	cat <<- EOF > "${ED}"/etc/mail/access || die "access cat failed"
-		# Check the /usr/share/doc/sendmail/README.cf file for a description
-		# of the format of this file. (search for access_db in that file)
-		# The /usr/share/doc/sendmail/README.cf is part of the sendmail-doc
-		# package.
-		#
-
-	EOF
-
-	cat <<- EOF > "${ED}"/etc/conf.d/sendmail || die "sendmail cat failed"
-		# Config file for /etc/init.d/sendmail
-		# add start-up options here
-		SENDMAIL_OPTS="-bd -q30m -L sm-mta" # default daemon mode
-		CLIENTMQUEUE_OPTS="-Ac -q30m -L sm-cm" # clientmqueue
-		KILL_OPTS="" # add -9/-15/your favorite evil SIG level here
-
-	EOF
-
-	if use sasl; then
-		dodir /etc/sasl2
-		cat <<- EOF > "${ED}"/etc/sasl2/Sendmail.conf || die "Sendmail.conf cat ailed"
-			pwcheck_method: saslauthd
-			mech_list: PLAIN LOGIN
-
-		EOF
-	fi
-
-	doinitd "${FILESDIR}"/sendmail
-	systemd_dounit "${FILESDIR}"/sendmail.service
-	systemd_dounit "${FILESDIR}"/sm-client.service
-}
diff --git a/mail-mta/sendmail/sendmail-8.17.1-r3.ebuild b/mail-mta/sendmail/sendmail-8.17.1-r3.ebuild
deleted file mode 100644
index a2ae30989f5d..000000000000
--- a/mail-mta/sendmail/sendmail-8.17.1-r3.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Note: please bump this together with mail-filter/libmilter
-
-inherit systemd toolchain-funcs
-
-DESCRIPTION="Widely-used Mail Transport Agent (MTA)"
-HOMEPAGE="https://www.sendmail.org/"
-SRC_URI="ftp://ftp.sendmail.org/pub/${PN}/${PN}.${PV}.tar.gz"
-
-LICENSE="Sendmail GPL-2" # GPL-2 is here for initscript
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="ipv6 ldap mbox nis sasl sockets ssl tcpd"
-
-BDEPEND="
-	sys-devel/m4
-	virtual/pkgconfig"
-DEPEND="
-	acct-group/smmsp
-	>=acct-user/smmsp-0-r2
-	net-mail/mailbase
-	>=sys-libs/db-3.2:=
-	ldap? ( net-nds/openldap:= )
-	nis? ( net-libs/libnsl:= )
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.10 )
-	ssl? ( dev-libs/openssl:0= )
-	tcpd? ( sys-apps/tcp-wrappers )"
-RDEPEND="
-	${DEPEND}
-	>=mail-filter/libmilter-1.0.2_p2
-	!mail-mta/courier
-	!mail-mta/esmtp
-	!mail-mta/exim
-	!mail-mta/mini-qmail
-	!mail-mta/msmtp[mta]
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/opensmtpd
-	!mail-mta/postfix
-	!mail-mta/qmail-ldap
-	!>=mail-mta/ssmtp-2.64-r2[mta]
-	!net-mail/vacation"
-PDEPEND="!mbox? ( mail-filter/procmail )"
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-8.16.1-build-system.patch
-	eapply "${FILESDIR}"/${PN}-8.17.1-cyrus-sasl-auth.patch
-	eapply -p0 "${FILESDIR}"/${PN}-delivered_hdr.patch
-	eapply_user
-
-	local confCCOPTS="${CFLAGS}"
-	# See bug #808954 for FLOCK
-	local confENVDEF="-DMAXDAEMONS=64 -DHAS_GETHOSTBYNAME2=1 -DHASFLOCK=1"
-	local confLDOPTS="${LDFLAGS}"
-	local confLIBS=
-	local confMAPDEF="-DMAP_REGEX"
-	local conf_sendmail_LIBS=
-
-	if use ldap; then
-		confMAPDEF+=" -DLDAPMAP"
-		confLIBS+=" -lldap -llber"
-	fi
-
-	if use sasl; then
-		confCCOPTS+=" $($(tc-getPKG_CONFIG) --cflags libsasl2)"
-		confENVDEF+=" -DSASL=2"
-		conf_sendmail_LIBS+=" $($(tc-getPKG_CONFIG) --libs libsasl2)"
-	fi
-
-	if use ssl; then
-		# Bug #542370 - lets add support for modern crypto (PFS)
-		confCCOPTS+=" $($(tc-getPKG_CONFIG) --cflags openssl)"
-		confENVDEF+=" -DSTARTTLS -D_FFR_DEAL_WITH_ERROR_SSL"
-		confENVDEF+=" -D_FFR_TLS_1 -D_FFR_TLS_EC"
-		conf_sendmail_LIBS+=" $($(tc-getPKG_CONFIG) --libs openssl)"
-	fi
-
-	if use tcpd; then
-		confENVDEF+=" -DTCPWRAPPERS"
-		confLIBS+=" -lwrap"
-	fi
-
-	use ipv6 && confENVDEF+=" -DNETINET6"
-	use nis && confENVDEF+=" -DNIS"
-	use sockets && confENVDEF+=" -DSOCKETMAP"
-
-	sed -e "s|@@confCC@@|$(tc-getCC)|" \
-		-e "s|@@confCCOPTS@@|${confCCOPTS}|" \
-		-e "s|@@confENVDEF@@|${confENVDEF}|" \
-		-e "s|@@confLDOPTS@@|${confLDOPTS}|" \
-		-e "s|@@confLIBS@@|${confLIBS}|" \
-		-e "s|@@confMAPDEF@@|${confMAPDEF}|" \
-		-e "s|@@conf_sendmail_LIBS@@|${conf_sendmail_LIBS}|" \
-		"${FILESDIR}"/site.config.m4 > devtools/Site/site.config.m4 \
-		|| die "failed to generate site.config.m4"
-
-	echo "APPENDDEF(\`confLIBDIRS', \`-L${EPREFIX}/usr/$(get_libdir)')" \
-		>> devtools/Site/site.config.m4 || die "failed adding to site.config.m4"
-}
-
-src_compile() {
-	sh Build AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "compilation failed in main build script"
-}
-
-src_install() {
-	dodir /usr/{bin,$(get_libdir)}
-	dodir /usr/share/man/man{1,5,8} /usr/sbin /usr/share/sendmail-cf
-	dodir /var/spool/{mqueue,clientmqueue} /etc/conf.d
-
-	keepdir /var/spool/{clientmqueue,mqueue}
-
-	local emakeargs=(
-		DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)"
-		MANROOT=/usr/share/man/man
-		SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root
-		MANOWN=root MANGRP=root INCOWN=root INCGRP=root
-		LIBOWN=root LIBGRP=root GBINOWN=root GBINGRP=root
-		MSPQOWN=root CFOWN=root CFGRP=root
-	)
-
-	local dir
-	for dir in libsmutil sendmail mailstats praliases smrsh makemap vacation editmap; do
-		emake -j1 -C obj.*/${dir} "${emakeargs[@]}" install
-	done
-	for dir in rmail mail.local; do
-		emake -j1 -C obj.*/${dir} "${emakeargs[@]}" force-install
-	done
-
-	fowners root:smmsp /usr/sbin/sendmail
-	fperms 2555 /usr/sbin/sendmail
-	fowners smmsp:smmsp /var/spool/clientmqueue
-	fperms 770 /var/spool/clientmqueue
-	fperms 700 /var/spool/mqueue
-	dosym ../sbin/makemap /usr/bin/makemap
-	dodoc FAQ KNOWNBUGS README RELEASE_NOTES doc/op/op.ps
-
-	dodoc sendmail/{SECURITY,TUNING}
-	newdoc sendmail/README README.sendmail
-	newdoc smrsh/README README.smrsh
-
-	newdoc cf/README README.cf
-	newdoc cf/cf/README README.install-cf
-
-	dodoc -r contrib
-
-	cp -pPR cf/. "${ED}"/usr/share/sendmail-cf || die
-
-	insinto /etc/mail
-	if use mbox; then
-		newins "${FILESDIR}"/sendmail.mc-r1 sendmail.mc
-	else
-		newins "${FILESDIR}"/sendmail-procmail.mc sendmail.mc
-	fi
-
-	# See discussion on bug #730890
-	m4 "${ED}"/usr/share/sendmail-cf/m4/cf.m4 \
-		<(grep -v "${EPREFIX}"/usr/share/sendmail-cf/m4/cf.m4 "${ED}"/etc/mail/sendmail.mc) \
-		> "${ED}"/etc/mail/sendmail.cf || die "cf.m4 failed"
-
-	echo "include(\`/usr/share/sendmail-cf/m4/cf.m4')dnl" \
-		> "${ED}"/etc/mail/submit.mc || die "submit.mc echo failed"
-
-	cat "${ED}"/usr/share/sendmail-cf/cf/submit.mc \
-		>> "${ED}"/etc/mail/submit.mc || die "submit.mc cat failed"
-
-	echo "# local-host-names - include all aliases for your machine here" \
-		> "${ED}"/etc/mail/local-host-names || die "local-host-names echo failed"
-
-	cat <<- EOF > "${ED}"/etc/mail/trusted-users || die "trusted-users cat failed"
-		# trusted-users - users that can send mail as others without a warning
-		# apache, mailman, majordomo, uucp are good candidates
-	EOF
-
-	cat <<- EOF > "${ED}"/etc/mail/access || die "access cat failed"
-		# Check the /usr/share/doc/sendmail/README.cf file for a description
-		# of the format of this file. (search for access_db in that file)
-		# The /usr/share/doc/sendmail/README.cf is part of the sendmail-doc
-		# package.
-		#
-
-	EOF
-
-	cat <<- EOF > "${ED}"/etc/conf.d/sendmail || die "sendmail cat failed"
-		# Config file for /etc/init.d/sendmail
-		# add start-up options here
-		SENDMAIL_OPTS="-bd -q30m -L sm-mta" # default daemon mode
-		CLIENTMQUEUE_OPTS="-Ac -q30m -L sm-cm" # clientmqueue
-		KILL_OPTS="" # add -9/-15/your favorite evil SIG level here
-
-	EOF
-
-	if use sasl; then
-		dodir /etc/sasl2
-		cat <<- EOF > "${ED}"/etc/sasl2/Sendmail.conf || die "Sendmail.conf cat ailed"
-			pwcheck_method: saslauthd
-			mech_list: PLAIN LOGIN
-
-		EOF
-	fi
-
-	doinitd "${FILESDIR}"/sendmail
-	systemd_dounit "${FILESDIR}"/sendmail.service
-	systemd_dounit "${FILESDIR}"/sm-client.service
-}
diff --git a/mail-mta/sendmail/sendmail-8.17.1.9.ebuild b/mail-mta/sendmail/sendmail-8.17.1.9.ebuild
index d266f2ed79b2..a136caf3c842 100644
--- a/mail-mta/sendmail/sendmail-8.17.1.9.ebuild
+++ b/mail-mta/sendmail/sendmail-8.17.1.9.ebuild
@@ -144,7 +144,6 @@ src_install() {
 	fowners smmsp:smmsp /var/spool/clientmqueue
 	fperms 770 /var/spool/clientmqueue
 	fperms 700 /var/spool/mqueue
-	dosym ../sbin/makemap /usr/bin/makemap
 	dodoc FAQ KNOWNBUGS README RELEASE_NOTES doc/op/op.ps
 
 	dodoc sendmail/{SECURITY,TUNING}