gentoo resync : 29.01.2021

8 files changed, 29 insertions, 22 deletions

diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 181daec95b3b..23a2cdcd9f8a 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 3aca0f74a67f..89879070d698 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -26,6 +26,6 @@ DIST exim-4.94.tar.xz 1828824 BLAKE2B 3836ae6427830b16fa366f5ca35431144eb48b922b
 DIST exim-pdf-4.93.0.4.tar.xz 2069744 BLAKE2B 28730134293d87b16d672df66119ff97aaf2d796cf28842bb5bf6831a0be6a186a5cce503200b9fc985aaa14386053ca83c259625949634c5a28937b285247ca SHA512 929b4198a3e8764a64478e7ff5a9c7398ad1990114206b68494b1f1f563c23405c7b440e2f21a9f777e9e3cd3a3398d6faea3b882407f731ef3a767c27fd9361
 DIST exim-pdf-4.94.tar.xz 2089804 BLAKE2B 08f4631e903f1344d76da8dc1dcfd122cd5963bb2efbd54a486e7cf95df9e7ef06aa31dead1243a007656f05c18993f3fda18ba16ba1fde9377ac33324d5fe99 SHA512 d56666b619ba850dfa68de90afc7435bae741d72d18b5837762781ba18032878323ad40978e0113d4b88a01fd7a1d07213e6a74c38d699371d62796b6c3c35cc
 DIST system_filter.exim.gz 3075 BLAKE2B d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79 SHA512 cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3
-EBUILD exim-4.93.0.4-r1.ebuild 14020 BLAKE2B 2d97b3d39774320271507fdf50f93d9dac88bdaa54b0d8387b2baeb6fff6baee9bc4185b86591f12053f3210b18514f027a6de9a103daad81d871fee837a9c7e SHA512 382c09462376ff6a156ede33316585c38e93a4e5474271f06bd141be20567af2df4e0a26539a219d09cd3b760a754dfc187fd75c712637cc60723b5d2e7f5526
-EBUILD exim-4.94-r1.ebuild 14071 BLAKE2B 45c3311c8b1b6f13c15d5d43bf0ed5713008955c39f29191e2890b97cbed568ea473c1ff41277006735d08ea2d0c410d8ed73457c367dc7fc26a64a7c5824028 SHA512 f1a8b2a59de39c586b1df3370750e9c2daf8cad753120e63edfcecd09471d146896007e7fa7b478c7fcdd908d9929a0dd693f30d323302a942736cf2c28028fd
+EBUILD exim-4.93.0.4-r2.ebuild 14043 BLAKE2B f16a191151ed0ed32522c1291cfab414fc08978120cc0e92c967d73040a3d55528dd276d705dce334ffac22e8f217bda391084e6d1b6cb2d2ea6fff8cf8742df SHA512 517b16cf091b60d7ff03db68e17f243d1dd8a34b551d6539f1a01bfbec09584bef2fd4be05397557a592e7ac669709af9df0b6a230e889a930209eb53d7bc42f
+EBUILD exim-4.94-r2.ebuild 14094 BLAKE2B 6209011bfe3f3ced3f3bf9e0d3d5113380cae164b3125df7baff787e48ef67532ae7c062152a7732e6d298643e0676c92d9990f6724dbeef16affecad24a0a05 SHA512 77b07c5901593e79ec75029252346e5225981efcd29f659906ff11f8df4390d8aeb88432507a3b5cc68b76a934b2a7a5e9dd277cabcf7dea1eae83aff2f5bd45
 MISC metadata.xml 2457 BLAKE2B c1dcbaedd069b41c4cfb190806b44014229d53cf6d6f72e04b99dc91f223567cb4f30100792aae72658780da0579fa26e6fb8a0266565bcc0c307996d59ac3ed SHA512 9044abccd15525c7676fc218b62d9b663bd155482894eced9c0cfc8a22e8cd7353009adc75a9f3de15b14f267e6ee6b4f4c91d8bd9260931c0b9de6bf48c762f
diff --git a/mail-mta/exim/exim-4.93.0.4-r1.ebuild b/mail-mta/exim/exim-4.93.0.4-r2.ebuild
index 19d13cef361f..b47b3f94f56d 100644
--- a/mail-mta/exim/exim-4.93.0.4-r1.ebuild
+++ b/mail-mta/exim/exim-4.93.0.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -537,7 +537,9 @@ src_install() {
 	doins "${WORKDIR}"/system_filter.exim
 	doins "${FILESDIR}"/auth_conf.sub
 
-	pamd_mimic system-auth exim auth account
+	if use pam; then
+		pamd_mimic system-auth exim auth account
+	fi
 
 	# headers, #436406
 	if use dlfunc ; then
diff --git a/mail-mta/exim/exim-4.94-r1.ebuild b/mail-mta/exim/exim-4.94-r2.ebuild
index 52358f32bef5..5fb494208b3d 100644
--- a/mail-mta/exim/exim-4.94-r1.ebuild
+++ b/mail-mta/exim/exim-4.94-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -535,7 +535,9 @@ src_install() {
 	doins "${WORKDIR}"/system_filter.exim
 	doins "${FILESDIR}"/auth_conf.sub
 
-	pamd_mimic system-auth exim auth account
+	if use pam; then
+		pamd_mimic system-auth exim auth account
+	fi
 
 	# headers, #436406
 	if use dlfunc ; then
diff --git a/mail-mta/protonmail-bridge/Manifest b/mail-mta/protonmail-bridge/Manifest
index 7d86371362ac..2627e554558a 100644
--- a/mail-mta/protonmail-bridge/Manifest
+++ b/mail-mta/protonmail-bridge/Manifest
@@ -373,7 +373,7 @@ DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20191120175047-4206685974f2.mod 95 BLAKE2B
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip 101467 BLAKE2B 8bb0aec8e693a4c0da59f1931e1fdcf6f94a236faba149d5af91e87284f39c693d20be65248eecde739cb555e371804fa6c723a56c69e6d02a347ba908e968b1 SHA512 bee7757d760f5ba1b9f7523af358652a5cb65f2b0064da097f78450871b2636efcbab0298a9871bbb3ce8012bf95a155949251d4f61464dde510097b936b47a8
 DIST protonmail-bridge-1.5.4.tar.gz 1838395 BLAKE2B b81cc14f7da259941f4bdfae0f3e06782e22ce959193a34873aea06480658b3cde6e73f01d6796097d8e103b85d32ac845f371faf17aca7210e45667f74b0325 SHA512 83621ceaac54190b9143f67c50ae98ec3ea96bff399f415838561d64cf277e772925793af701b5f493460fb0edced4383253dc5a24264f4a89e30417f12de49f
-DIST protonmail-bridge-1.5.6.tar.gz 1843107 BLAKE2B b61a7ca5fadaea9551eb801482a5fe6d4979b67ed61ec421cd8c7a43b4e9d8aef72684f82b4333ea73d119cc232188230686b67d66d662a71539837d0a687dbf SHA512 345091ff5f09e357daea7fb05e04be2803a6632c4cb3ba5c6475799ed5a193e76d23f540a8f77f88fed3098e27dda6ff4334aa9a96eb2c6b88333a8ff33d99d2
+DIST protonmail-bridge-1.5.7.tar.gz 1843039 BLAKE2B 302479620048718eb2f430ad45aa08dbdc94c0db3e32fc7e9b813097fe12a19cb8b1839e32ad0570fe3d350e710612774e8019c60924a6005883e31a7c70621a SHA512 9a0baee9ba4afbf1ef79cf8af36cf971996a3057b1f1cb407cdbf56ac33c0e82b4074aaab9729dc1c924a414ef8551d1b6d7fc8addf4f21d7426ff097fc156c8
 EBUILD protonmail-bridge-1.5.4.ebuild 21425 BLAKE2B e863898ac05b61ba37eeb97a4ae0cb3caae5ab16c2288771ec13d0de3287c1b0fd0a1446e79ca46d63f1953148d6b73efa54f756916a4b8d59845cb92464d735 SHA512 12587129d0d9db2aaa32c66262f51b8dbf1fd39442a09221a01cacb59080d6bd53bbdc56558dad630e0831d912631c086040dee4fefbaa29517d2be4adf0992b
-EBUILD protonmail-bridge-1.5.6.ebuild 21832 BLAKE2B 819e368d8a8c88a14fa0e40ce4712bf45b5dae1544e7f4563a3f115c5a4cf7475b5619da337c9dbcbda48d6f289a98b324065e360133e30e9792e7fb5acdb48d SHA512 86204433cfbfe790c4d34c76ff3a5ac3c17af489f394898e476d18bfa82b7b53e9d633e3903c3074ada06cf8d64ab3cc2e6715de451882f1c9d2f5287b0546c7
+EBUILD protonmail-bridge-1.5.7.ebuild 21832 BLAKE2B 819e368d8a8c88a14fa0e40ce4712bf45b5dae1544e7f4563a3f115c5a4cf7475b5619da337c9dbcbda48d6f289a98b324065e360133e30e9792e7fb5acdb48d SHA512 86204433cfbfe790c4d34c76ff3a5ac3c17af489f394898e476d18bfa82b7b53e9d633e3903c3074ada06cf8d64ab3cc2e6715de451882f1c9d2f5287b0546c7
 MISC metadata.xml 618 BLAKE2B a392fa79076ac6eed79581e425edc46eeaa42e4ff3193fe23845062f4de9e8e9edc067473724707ce07025973f0942bdebc94b10c7f02f1e477835ce969ab556 SHA512 813f43dcdec361b1fd0f354245e7572ef2061500bea09fcf2712c1d44883cfadbd0c37dcf960d5dc34c848530a3dd80abaeb6b5da26fbb81363116ec737a1c84
diff --git a/mail-mta/protonmail-bridge/protonmail-bridge-1.5.6.ebuild b/mail-mta/protonmail-bridge/protonmail-bridge-1.5.7.ebuild
index ac6c8951fc6f..ac6c8951fc6f 100644
--- a/mail-mta/protonmail-bridge/protonmail-bridge-1.5.6.ebuild
+++ b/mail-mta/protonmail-bridge/protonmail-bridge-1.5.7.ebuild
diff --git a/mail-mta/sendmail/Manifest b/mail-mta/sendmail/Manifest
index 47ad7b3ffe5d..707f1ddb711a 100644
--- a/mail-mta/sendmail/Manifest
+++ b/mail-mta/sendmail/Manifest
@@ -14,5 +14,5 @@ AUX sm-client.service 418 BLAKE2B a9057cac008c11d3cfd5a4b662cf3fc71a33be79e8890a
 DIST sendmail.8.15.2.tar.gz 2207417 BLAKE2B 3d9dfb5bc2b535e30ef2fc61333e12a9b1fc45a5d730d2bed1ef956adb574721833f87aeba0475705b76e0c7d6cf00f9a10025bffb0de6c6b4dae606eb2ec399 SHA512 04feb37316c13b66b1518596507a7da7c16cb0bf1abf10367f7fd888a428fadb093a9efa55342fa55b936c3f0cbdc63b9e2505cd99201a69a0c05b8ad65f49f9
 DIST sendmail.8.16.1.tar.gz 2236402 BLAKE2B 80a9c2f1d04719099703e55f0a0c54fd638cf69b72839d358ae6863c95c9e0965d1b7fdd5b1807bec1ffdf87bca0c7c9ba91060962e6de5da5bf14422f6279ea SHA512 d7d4aac3c6d7505782abdb166204901b8b51cac000d610dfe40eda9eef7441a073af9e8e0b14c8719b07b445f55a1e2c28ac63d663d0daa7f1eafc5a101788b2
 EBUILD sendmail-8.15.2-r2.ebuild 7259 BLAKE2B c30fe7036eb3e65dc6c83574984e5ca887c6f9ac6a5cf6eeba929b475cfc0514accf87b7a289f953260f52d30a881197cf9791713161b64daa73816041d8d0ee SHA512 5d0b2189cbbfd8765d71dcdec262841a5b32a38f7393406e92fe72acd4a28825988ece85e2e7dedd83442d00eab04d8518c82d3c7e5094a6c84a7120613368c5
-EBUILD sendmail-8.16.1.ebuild 6372 BLAKE2B eade89d5d472b53edf2732b7322f0a0d88c44d2b6288b9488bf2d52489ec0634ddb866cc5bc9fea3fbd7f3943f293a645acee95fb39e568e08cdf9662cf27a91 SHA512 4953d88700d707d2ef8fb5324211c5eee8de0487fa45a68ad12251bbb6bc86c1df49275cf68be3a7c12cfd5fd10dcb54bb55f5ca544617f50863a3860f957ad6
+EBUILD sendmail-8.16.1.ebuild 6541 BLAKE2B 38a17e69978704632c4e9aab0e59b2b4c92fb8420c2dfd077cd11df98141cff3001809ce8026f4c95193cfead069e09d86e257d9b20c60ee50f9c6cd303a6680 SHA512 1b87bd6e32985ff14c97b73ff819e771ad61ad0b0560b4ffa8faac30db3a4115421cba0fbe8cda1818d136fdae4e1401bb6c3ce1d30b4416a2e261b862fecb86
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/mail-mta/sendmail/sendmail-8.16.1.ebuild b/mail-mta/sendmail/sendmail-8.16.1.ebuild
index bd72f71759ce..edb48e9e4712 100644
--- a/mail-mta/sendmail/sendmail-8.16.1.ebuild
+++ b/mail-mta/sendmail/sendmail-8.16.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -55,6 +55,8 @@ src_prepare() {
 	local confENVDEF="-DMAXDAEMONS=64"
 	local conf_sendmail_LIBS=""
 
+	confENVDEF="${confLIBS} -DHAS_GETHOSTBYNAME2=1"
+
 	use sasl && confLIBS="${confLIBS} -lsasl2"  \
 		&& confENVDEF="${confENVDEF} -DSASL=2" \
 		&& confCCOPTS="${confCCOPTS} -I/usr/include/sasl" \
@@ -87,7 +89,7 @@ src_prepare() {
 		-e "s/@@conf_sendmail_LIBS@@/${conf_sendmail_LIBS}/" \
 		"${FILESDIR}"/site.config.m4 > devtools/Site/site.config.m4 || die "sed failed"
 
-	echo "APPENDDEF(\`confLIBDIRS', \`-L${EROOT}/usr/$(get_libdir)')" >> devtools/Site/site.config.m4 || die "echo failed"
+	echo "APPENDDEF(\`confLIBDIRS', \`-L${EPREFIX}/usr/$(get_libdir)')" >> devtools/Site/site.config.m4 || die "echo failed"
 
 	eapply_user
 }
@@ -144,37 +146,38 @@ src_install() {
 	newdoc cf/README README.cf
 	newdoc cf/cf/README README.install-cf
 
-	cp -pPR cf/* "${D}"/usr/share/sendmail-cf || die "copy failed"
+	cp -pPR cf/* "${ED}"/usr/share/sendmail-cf || die "copy failed"
 
 	docinto contrib
 	dodoc contrib/*
 
 	insinto /etc/mail
 
-	if use mbox
-	then
+	if use mbox; then
 		newins "${FILESDIR}"/sendmail.mc-r1 sendmail.mc
 	else
 		newins "${FILESDIR}"/sendmail-procmail.mc sendmail.mc
 	fi
 
-	m4 "${D}"/usr/share/sendmail-cf/m4/cf.m4 "${D}"/etc/mail/sendmail.mc \
-		> "${D}"/etc/mail/sendmail.cf || die "cf.m4 failed"
+	# 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" \
-		> "${D}"/etc/mail/submit.mc || die "echo failed"
+		> "${ED}"/etc/mail/submit.mc || die "echo failed"
 
-	cat "${D}"/usr/share/sendmail-cf/cf/submit.mc >> "${D}"/etc/mail/submit.mc || die "submit.mc cat 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" \
 		> "${D}"/etc/mail/local-host-names || die "local-host-names echo failed"
 
-	cat <<- EOF > "${D}"/etc/mail/trusted-users
+	cat <<- EOF > "${ED}"/etc/mail/trusted-users
 		# trusted-users - users that can send mail as others without a warning
 		# apache, mailman, majordomo, uucp are good candidates
 	EOF
 
-	cat <<- EOF > "${D}"/etc/mail/access
+	cat <<- EOF > "${ED}"/etc/mail/access
 		# 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
@@ -183,7 +186,7 @@ src_install() {
 
 	EOF
 
-	cat <<- EOF > "${D}"/etc/conf.d/sendmail
+	cat <<- EOF > "${ED}"/etc/conf.d/sendmail
 		# Config file for /etc/init.d/sendmail
 		# add start-up options here
 		SENDMAIL_OPTS="-bd -q30m -L sm-mta" # default daemon mode
@@ -194,7 +197,7 @@ src_install() {
 
 	if use sasl; then
 		dodir /etc/sasl2
-		cat <<- EOF > "${D}"/etc/sasl2/Sendmail.conf
+		cat <<- EOF > "${ED}"/etc/sasl2/Sendmail.conf
 		pwcheck_method: saslauthd
 		mech_list: PLAIN LOGIN