gentoo resync : 09.07.2022

2 files changed, 11 insertions, 30 deletions

diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index a08664930aba..08764bbb873e 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -25,5 +25,5 @@ DIST exim-pdf-4.96.tar.xz 2137468 BLAKE2B 7f61767f91864c43a3b7b6ca36ec7f41da6ad7
 DIST system_filter.exim.gz 3075 BLAKE2B d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79 SHA512 cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3
 EBUILD exim-4.94.2-r7.ebuild 14992 BLAKE2B 41b12e90e25606d117b47c213fa8d4c27124da935d1ddfc6df28144fdee585b60194110884ebfcf7fbcd34c5798e4b3c0386ca7f35174932ec371d31d00329fc SHA512 d70ea9bd3e4dca90d3f528f6f1a642f01f623e0de6ebdd04268ad4cc9ef20764fd046ec14707485955aaf710a4c4275c7285867579ecf275262acb578f2281e7
 EBUILD exim-4.94.2-r8.ebuild 16260 BLAKE2B 829c9ec037b421849e55acbf4bf911f90d262b89e26bd1698c44894ce03ae760ff7cd9008b5b71f58f69cf77fdc9876527014071fe54e31946f1de6ea1fc048f SHA512 a4820d3df1d51f33020984c64e8c19951aaf90430c8974de067bdc3c9287d95825f1a851a8135cdd2aaad5b2eaab94822abdee80bdcce70752f2f0e9ec518e9d
-EBUILD exim-4.96-r1.ebuild 16459 BLAKE2B b010c07359f13443f108ac05d892f0d7d88b4dd4874e548fff6a8cf77e8570a14f87fa5d85501db028ce00a1fcdb74c12b6980ce64a917f6d48c834890724977 SHA512 a22f1dc5d70deadb14a6d5b2c760132f7309eb9169da56a43b110c906c0ffdf7f19d364e8ba54ce5ee0019d8d66cbaceb4e7d836c775ae4bbdd24eb50dd492b3
+EBUILD exim-4.96-r1.ebuild 15869 BLAKE2B 28298c02de539ba42680548aa4b7bd60129ac380ba60f4dfa59ffe2d79ce055c1576fd4ddbe4e0d3fb045892489636550c78f9b57a9748f938f056a4db633fc6 SHA512 a4bd058a81ec653b093c62662e7ee21093932ad58d795d7397f12ee9965060c85c52ba37bf3c3f6028e4ceb610127c14c5159f7d9540fa108decee462d98641e
 MISC metadata.xml 2759 BLAKE2B 4f5d0d9fbd244b0836de4bd0d3b84f45376628a12e019c89e49e6dbd7128c19f16281fdfb401d852f57f27f547184351000382cc7333a524f7be280e0799d8d8 SHA512 85a2eaef07eb68d51a1307c6d76bef6620e7311ffda593750ebee5fe84affac2e026c971818500004c0ab9722a8e84c8eb0394fb66bb2ba6cd3465cf7e1f1a73
diff --git a/mail-mta/exim/exim-4.96-r1.ebuild b/mail-mta/exim/exim-4.96-r1.ebuild
index 1d04cbc97f35..719ead900410 100644
--- a/mail-mta/exim/exim-4.96-r1.ebuild
+++ b/mail-mta/exim/exim-4.96-r1.ebuild
@@ -8,7 +8,7 @@ inherit db-use toolchain-funcs multilib pam systemd
 IUSE="arc berkdb +dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl
 dsn exiscan-acl gdbm gnutls idn ipv6 ldap lmtp maildir mbx
 mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux
-socks5 spf sqlite srs srs-alt +srs-native +ssl syslog tdb tcpd +tpda X"
+socks5 spf sqlite srs +ssl syslog tdb tcpd +tpda X"
 REQUIRED_USE="
 	arc? ( dkim spf )
 	dane? ( ssl !gnutls )
@@ -17,10 +17,7 @@ REQUIRED_USE="
 	gnutls? ( ssl )
 	pkcs11? ( ssl )
 	spf? ( exiscan-acl )
-	srs? (
-		exiscan-acl
-		^^ ( srs-alt srs-native )
-	)
+	srs? ( exiscan-acl )
 	|| ( berkdb gdbm tdb )
 "
 # NOTE on USE="gnutls dane", gnutls[dane] is masked in base, unmasked
@@ -79,7 +76,6 @@ COMMON_DEPEND=">=sys-apps/sed-4.0.5
 	redis? ( dev-libs/hiredis:= )
 	spf? ( >=mail-filter/libspf2-1.2.5-r1 )
 	dmarc? ( mail-filter/opendmarc:= )
-	srs? ( srs-alt? ( mail-filter/libsrs_alt ) )
 	X? (
 		x11-libs/libX11
 		x11-libs/libXmu
@@ -491,22 +487,11 @@ src_configure() {
 
 	# Sender Rewriting Scheme
 	if use srs; then
-		# NOTE: we currently USE-default to srs-alt, because this is
-		# what USE=srs used to be.  Eventually we want to rid ourselves
-		# of this external implementation.
-		if use srs-alt; then
-			# historical default, until 4.95
-			cat >> Makefile <<- EOC
-				EXPERIMENTAL_SRS_ALT=yes
-				EXTRALIBS_EXIM += -lsrs_alt
-			EOC
-		fi
-		if use srs-native; then
-			# this one is the default/supported variant since 4.95
-			cat >> Makefile <<- EOC
-				SUPPORT_SRS=yes
-			EOC
-		fi
+		# this one is the default/supported variant since 4.95, and the
+		# only variant available since 4.96
+		cat >> Makefile <<- EOC
+			SUPPORT_SRS=yes
+		EOC
 	fi
 
 	# Delivery Sender Notifications extra information in fail message
@@ -655,13 +640,9 @@ pkg_postinst() {
 		einfo "documentation at the bottom of this prerelease message:"
 		einfo "  http://article.gmane.org/gmane.mail.exim.devel/3579"
 	fi
-	if use srs-alt; then
-		einfo "SRS support using libsrs_alt is experimental in this"
-		einfo "release of Exim"
-		elog "You are using libsrs_alt to implement SRS support."
-		elog "The native SRS implementation (USE=srs-native) is the"
-		elog "default implementation, which means libsrs_alt may go"
-		elog "away in a future release."
+	if use srs; then
+		einfo "SRS support using libsrs_alt was dropped in this"
+		einfo "release of Exim, you are now using the native SRS implementation"
 	fi
 	use dsn && einfo "extra information in fail DSN message is experimental"
 	einfo