gentoo resync : 28.04.2021

2 files changed, 44 insertions, 31 deletions

diff --git a/mail-mta/ssmtp/Manifest b/mail-mta/ssmtp/Manifest
index ae36976a6821..9a1e5ffbe935 100644
--- a/mail-mta/ssmtp/Manifest
+++ b/mail-mta/ssmtp/Manifest
@@ -1,4 +1,4 @@
 DIST ssmtp-2.64-patches-4.tar.xz 6928 BLAKE2B 6f1d9a823273298abc58025c94cb288e1e296031580f63ed489a9d2559cd8846761e78c6fdfc1a385e645f990bc739ce3cf3ad0d1c1a3006dd3bd60e4a38c4f4 SHA512 6fa57c0bc5ad363e21bf69fb60f1cbb87ad1ead393a53ab5bd25b709303c321a29ed37ce7fe95b94dae748703bba3b0631fc2a95e40957c5241b5d9f42bc0c4a
 DIST ssmtp_2.64.orig.tar.bz2 52501 BLAKE2B be158f8d969f98e1a7105bf4b741da960efa2a1c4a941426d6b6ec0677df13a2272fc71a93d2c44fe65c7d0a30e9acc4ec8259ed298b746c8d9ceefd64f95336 SHA512 911752e744420adf58552b9cf3a6e558d8b39103e5ad33a9ed4429b9a3a2091f7674aac11fe9bbd66747a61cdabe6bd638b80efcaadc86b057c12e2e235cca72
-EBUILD ssmtp-2.64-r3.ebuild 2995 BLAKE2B 9bba711820aac1fd40a35385f2f16fcd7127bbf6a59abfab210101c4b18e5a3b2525c4d740c6f717665c873acdb1c19a6660f4e149e733854f941492e47d3edc SHA512 3f9c224ae3ca73677b85a769bbf2e1071595b4eda203e8053a873361c8a1db45faddfd1591abae7b2a35779c2902078622b7002b7e471f1ed1c4b088be6ed1f2
+EBUILD ssmtp-2.64-r4.ebuild 3606 BLAKE2B 05c8a9c4a3bba94ae313d8fe3054a52af3169ed6c79fdb37c76cf89ae01be171d9f0b5f59b0e81b29309ab42e3674ba95db787a70bbada4b1f96cd65faf32d99 SHA512 ea7535e360713ce49ed0ee761c1f4328cd14d72cfc8e5973154e34318a4e91922fa9b4cbd4267f82ff73f7246c532046cd99ee0f4275786052b3f4433a886312
 MISC metadata.xml 259 BLAKE2B eb59516b105b0fdc4b755c3852b714707dba4f5b414eb0eea763db68aa0c5d1971b55866972ef14f1e3e5bc81ccb66975a24b9292aa796edf02877d649a661f2 SHA512 3e7a5afefe4f2095be4347e56af64eef343bbb4920ef80a7d93c88111864e8993f899328af33e736324960d26f30939e29e001e90381548a353ee0089f96a766
diff --git a/mail-mta/ssmtp/ssmtp-2.64-r3.ebuild b/mail-mta/ssmtp/ssmtp-2.64-r4.ebuild
index 7a6224993762..321bf549dfd8 100644
--- a/mail-mta/ssmtp/ssmtp-2.64-r3.ebuild
+++ b/mail-mta/ssmtp/ssmtp-2.64-r4.ebuild
@@ -1,61 +1,71 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 PATCHSET=4
-
 WANT_AUTOMAKE=none
 
-inherit eutils autotools user
+inherit autotools
 
 DESCRIPTION="Extremely simple MTA to get mail off the system to a Mailhub"
 HOMEPAGE="ftp://ftp.debian.org/debian/pool/main/s/ssmtp/"
-SRC_URI="mirror://debian/pool/main/s/ssmtp/${P/-/_}.orig.tar.bz2
-	https://dev.gentoo.org/~pinkbyte/distfiles/patches/${P}-patches-${PATCHSET}.tar.xz"
+SRC_URI="
+	mirror://debian/pool/main/s/ssmtp/${P/-/_}.orig.tar.bz2
+	https://dev.gentoo.org/~pinkbyte/distfiles/patches/${P}-patches-${PATCHSET}.tar.xz
+"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ipv6 libressl +ssl gnutls +mta"
 
-DEPEND="ssl? (
+DEPEND="
+	!prefix? ( acct-group/ssmtp )
+	ssl? (
 		gnutls? ( net-libs/gnutls[openssl] )
 		!gnutls? (
 			!libressl? ( dev-libs/openssl:0= )
 			libressl? ( dev-libs/libressl:0= )
 		)
-	)"
-RDEPEND="${DEPEND}
+	)
+"
+RDEPEND="
+	${DEPEND}
 	net-mail/mailbase
 	mta? (
-		!net-mail/mailwrapper
 		!mail-mta/courier
 		!mail-mta/esmtp
 		!mail-mta/exim
 		!mail-mta/mini-qmail
 		!mail-mta/msmtp[mta]
-		!mail-mta/nbsmtp
 		!mail-mta/netqmail
 		!mail-mta/nullmailer
 		!mail-mta/postfix
 		!mail-mta/qmail-ldap
 		!mail-mta/sendmail
 		!mail-mta/opensmtpd
-	)"
+	)
+"
 
 REQUIRED_USE="gnutls? ( ssl )"
 
-pkg_setup() {
-	if ! use prefix; then
-		enewgroup ssmtp
-	fi
-}
-
 src_prepare() {
-	EPATCH_SUFFIX="patch" EPATCH_SOURCE="${WORKDIR}/patches" \
-		epatch
-	epatch_user
+	default
+
+	eapply "${WORKDIR}"/patches/0010_all_maxsysuid.patch
+	eapply "${WORKDIR}"/patches/0020_all_from-format-fix.patch
+	eapply "${WORKDIR}"/patches/0030_all_authpass.patch
+	eapply "${WORKDIR}"/patches/0040_all_darwin7.patch
+	eapply "${WORKDIR}"/patches/0050_all_strndup.patch
+	eapply "${WORKDIR}"/patches/0060_all_opessl_crypto.patch
+	eapply "${WORKDIR}"/patches/0070_all_solaris-basename.patch
+	eapply "${WORKDIR}"/patches/0080_all_gnutls.patch
+	eapply "${WORKDIR}"/patches/0090_all_debian-remote-addr.patch
+	eapply "${WORKDIR}"/patches/0100_all_ldflags.patch
+	eapply "${WORKDIR}"/patches/0110_all_stdint.patch
+	eapply "${WORKDIR}"/patches/0120_all_aliases.patch
+	eapply -p0 "${WORKDIR}"/patches/0130_all_garbage-writes.patch
 
 	# let's start by not using configure.in anymore as future autoconf
 	# versions will not support it.
@@ -65,11 +75,14 @@ src_prepare() {
 }
 
 src_configure() {
-	econf \
-		--sysconfdir="${EPREFIX}"/etc/ssmtp \
-		$(use_enable ssl) $(use_with gnutls) \
-		$(use_enable ipv6 inet6) \
+	local myeconfargs=(
+		--sysconfdir="${EPREFIX}"/etc/ssmtp
+		$(use_enable ssl) $(use_with gnutls)
+		$(use_enable ipv6 inet6)
 		--enable-md5auth
+	)
+
+	econf "${myeconfargs[@]}"
 }
 
 src_compile() {
@@ -86,15 +99,15 @@ src_install() {
 	insinto /etc/ssmtp
 	doins ssmtp.conf revaliases
 
-	local conffile="${ED}etc/ssmtp/ssmtp.conf"
+	local conffile="${ED}/etc/ssmtp/ssmtp.conf"
 
 	# Sorry about the weird indentation, I couldn't figure out a cleverer way
 	# to do this without having horribly >80 char lines.
 	sed -i -e "s:^hostname=:\n# Gentoo bug #47562\\
-# Commenting the following line will force ssmtp to figure\\
-# out the hostname itself.\n\\
-# hostname=:" \
-		"${conffile}" || die "sed failed"
+	# Commenting the following line will force ssmtp to figure\\
+	# out the hostname itself.\n\\
+	# hostname=:" \
+	"${conffile}" || die "sed failed"
 
 	# Comment rewriteDomain (bug #243364)
 	sed -i -e "s:^rewriteDomain=:#rewriteDomain=:" "${conffile}"