gentoo resync : 17.06.2021

5 files changed, 6 insertions, 15 deletions

diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 69c50f049a74..3d83cf5002aa 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/netqmail/Manifest b/mail-mta/netqmail/Manifest
index 17aa02c2d446..64dfa1eb8b15 100644
--- a/mail-mta/netqmail/Manifest
+++ b/mail-mta/netqmail/Manifest
@@ -17,5 +17,5 @@ DIST qmail-103.patch 2104 BLAKE2B 23721b3331c719f3b6deca8b2603bf824b66068d3901a8
 DIST qmail-smtputf8.patch 6693 BLAKE2B 1b9cd78e63ab9f2f8ca9f49c49406f603efb31d323bb4423aaa8b970c2c26a7e76496a449a98501765dc1a5e6659d9bfd49a6dafbdba14db9a9594e1d1c9b94f SHA512 8cafdf1a4f1fd41e6b11ee2abddac5c3da4a1d2ab17b5d3847433875a91f867a26eb358ae8c41791f1e77758e5a2c311134a286d888ccd23fbede6d9f0b475c4
 DIST qmail-spp-0.42.tar.gz 18689 BLAKE2B df67f10f6daf9601fd074c774c5be4decca59f3e790774d502c28ebd495f9d7523ecebfd37abd333e347151647364d08d3ccc25099c82748bf7b7ea84bb18977 SHA512 03449862886a0ca20fbadab4c94b34b55d185f8df3261bd68aea99e9ded9edfab4477c6b38a8e0295e9b38b0045615da8b1a906a458f28745eadd3c4d882bcbf
 DIST vu555316.patch 617 BLAKE2B fa98c360cb199fc4367c668d605399cc53ab2d26668f5ed6bbf0c26449fdf584f71fd415d80ba7babb6593dc842ec342aba4f7357ae838e6556d43f1dc76b6d9 SHA512 5d7810360e5eaa8e8ee141fe92c765d9458aa12198a8d0ac702e0630e08d060ad4a1d33690d434f20f5aff79eb200cd8173bebc334c411e340c0198b5d8d1a65
-EBUILD netqmail-1.06-r14.ebuild 4652 BLAKE2B feed5888be36a94e43b1c5f75052e7465ffa309916cee70b6e3699f2620cb648e3d3183e00a64491b25ab81087e0a4388d8794c7746c353ec89efa727edd1bc2 SHA512 0227a491cf5df61eb504efade213e9d3a3e9aaf8a5cece99a78f359e1f9a94e70a6fcca2ade6e9bc925cd28aeb80c0c03216217f0fbad1564b72b88a8e94fd31
+EBUILD netqmail-1.06-r14.ebuild 4345 BLAKE2B 48056ad52ebc8021ea61f73478e57f2a2212627d7597a9506ef7c042e4ef355cc3602732d466bee8f2dcb9e9f92384b9358f12c4a08ff9b6b2b2cf58172c6ff9 SHA512 f8ff24912bf0492a901d19aeb87e6d8a172c6b5af0dba2af452ffeb9d70f398aab147c8afceb208e256258d6c1299767d9ab8b1b318c02d678f82eac6c76b504
 MISC metadata.xml 750 BLAKE2B 57f6e3a507f543a4491fc7b0340050a35bb86efcf987d1bed48b9937fed56a225ff3e5e577a97038b2c21257e321f2fbf1c65f69ccb009c67891f9fcecaf357a SHA512 e973a7170cb17b6b322dd2c63e4bf56a90b6331cbcc7183a647b862e7d0392882773f9171b840f0dbdeb9a411fb72fdf4c000481fcf5d670003c3136327a1fac
diff --git a/mail-mta/netqmail/netqmail-1.06-r14.ebuild b/mail-mta/netqmail/netqmail-1.06-r14.ebuild
index 0e04cd4db012..aef1ed5b4dd2 100644
--- a/mail-mta/netqmail/netqmail-1.06-r14.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r14.ebuild
@@ -83,17 +83,6 @@ RDEPEND="${DEPEND}
 	!mail-mta/ssmtp[mta]
 "
 
-pkg_setup() {
-	if [[ -n "${QMAIL_PATCH_DIR}" ]]; then
-		eerror
-		eerror "The QMAIL_PATCH_DIR variable for custom patches"
-		eerror "has been removed from ${PN}. If you need custom patches"
-		eerror "see 'user patches' in the portage manual."
-		eerror
-		die "QMAIL_PATCH_DIR is not supported anymore"
-	fi
-}
-
 src_unpack() {
 	genqmail_src_unpack
 	use qmail-spp && qmail_spp_src_unpack
diff --git a/mail-mta/opensmtpd/Manifest b/mail-mta/opensmtpd/Manifest
index 1fdf70c6b8ff..c86d13dc3c5e 100644
--- a/mail-mta/opensmtpd/Manifest
+++ b/mail-mta/opensmtpd/Manifest
@@ -3,5 +3,5 @@ AUX smtpd.pam 147 BLAKE2B 1706fe27cf53621428f563af146d1197dfc59133dda79fe08141ec
 AUX smtpd.service 138 BLAKE2B c76db1847110622621701cdf1fdb764d26bf28b86a25adf9ae8e0ba15838a2a9ddc677f54f5d5fe191591b2bd5c7f20067fc00b6679f448e25371e27f231589d SHA512 b70b173ac275b871d78bac0e55b2e0c8d8a6538c7f2c4dc86fe67fb37a1ee942e0442353b338b286759618299f51b144396251db13f82c9afa035dcaae11a258
 AUX smtpd.socket 114 BLAKE2B e684727be39592dce128cc0ab02f8e5bc4510591dcb2c170b49c120e84319b53e10eae275bc6a26ed8c9d51e53a21e41c551f18afd2441602cefc4e93344d50c SHA512 fbbccb4aab80a4a4612609e590965940642321119a65359cf2490530f81d55706a0105309d321a624d40348f12776724d2cf6b8bf29ea24391e60ef8b8bc8ba2
 DIST opensmtpd-6.8.0p2.tar.gz 860189 BLAKE2B 603e8516860eddefb1694ea4cb5631cec2df2a19fa3193b25388caf73c41e82d44e57847fc95b5187488cae629542e72ff2d5a17badc15cef1647bdb173d7827 SHA512 48f152b75575146fdd09bdf47123041ea62fefb6e5de33a69826bf91a2126a918f8db1caffadb2f142a1a21de8126d492de88cb65bdf169e61c0b22d3e78d290
-EBUILD opensmtpd-6.8.0_p2.ebuild 1773 BLAKE2B 4aeb8833c0d5606aa842d0cfbba18f713c1e4896560f9e03e1d3ae2bd57444a827a6d114006657fd7c691ee59faca65b3f15bfd9bf71a4e2b65190104349fb84 SHA512 088d646a35aa20b437fbe4f90d87eadc49a9c6024946a6e90039229ae87f39ce09a89d5fd1df46098ba0ab886ff81d5b69bde1932d06fa28f24ea0dbb9102b5f
+EBUILD opensmtpd-6.8.0_p2.ebuild 1909 BLAKE2B 0ad4bb55c63d81ba80dcb547fc5c47841e0a649c15702b0ff566780f439763a7d3fd2bffd933cb5a80359179570d06b59ca1f68706ff7b18b05ebeec8806908d SHA512 9599fc98d6dc284d4218979d981a8b24f56fa7c54c7de60f4c52c3ca11ffa11e3eb7ca1020da1a8ba05ea8ce3cd105254c9c40c32ff0f819e571ec3620b3fbca
 MISC metadata.xml 595 BLAKE2B c13a49c15ec7c4430834682a4428b80e81be9832cbf6fbdd506ce9bcfc625aabf342d094ee83c689e63573cff9bfb2abee86196374c617c75aa487eb83ad0e4c SHA512 aa7344806cd011cec6c7afa277345eb2988f11970ea3038d969efa50d5b1f485f199f15a1b632197700791c2242ed8f712ff3cc382b1491e44c14ee94075a1d5
diff --git a/mail-mta/opensmtpd/opensmtpd-6.8.0_p2.ebuild b/mail-mta/opensmtpd/opensmtpd-6.8.0_p2.ebuild
index 53f82ac42483..9adcaa46b33a 100644
--- a/mail-mta/opensmtpd/opensmtpd-6.8.0_p2.ebuild
+++ b/mail-mta/opensmtpd/opensmtpd-6.8.0_p2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.opensmtpd.org/archives/${P/_}.tar.gz"
 LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-IUSE="pam +mta berkdb"
+IUSE="berkdb +mta pam split-usr"
 
 DEPEND="
 	acct-user/smtpd
@@ -66,7 +66,9 @@ src_install() {
 	if use mta ; then
 		dodir /usr/sbin
 		dosym smtpctl /usr/sbin/sendmail
-		dosym ../sbin/smtpctl /usr/bin/sendmail
+		# on USE="-split-usr" system sbin and bin are merged
+		# so symlink made above will collide with one below
+		use split-usr && dosym ../sbin/smtpctl /usr/bin/sendmail
 		mkdir -p "${ED}"/usr/$(get_libdir) || die
 		ln -s --relative "${ED}"/usr/sbin/smtpctl "${ED}"/usr/$(get_libdir)/sendmail || die
 	fi