gentoo resync : 03.11.2018

7 files changed, 19 insertions, 338 deletions

diff --git a/mail-mta/opensmtpd/Manifest b/mail-mta/opensmtpd/Manifest
index a467d71b5411..3b2601ea74fc 100644
--- a/mail-mta/opensmtpd/Manifest
+++ b/mail-mta/opensmtpd/Manifest
@@ -1,12 +1,9 @@
-AUX opensmtpd-6.0.2_p1-autoconf.patch 1465 BLAKE2B eef70d8c9d07412f8201f813bcac3bf5dff8894ec3127e7fb614d89d417e61a9caa48e08b764989cff0afb97774032acff0505e4be7865dc35e8a495c79d9049 SHA512 7d8d30c089d72a2581fb65044a1b81140067ee67311cc23e08dd4cf4a9bfe437689c41bac08ab46ae6ca78637ddac29804cdc42c8b94f549d666138d04ae38fd
-AUX opensmtpd-6.0.2_p1-libressl.patch 3283 BLAKE2B 5d2fc9b30241f09b9e7a5cbd2e0c709b63c4f9f113800f598f77bbff51f31b3e24baad37e75b82359c0d65452d8a2536b315a21674e4c6b60d031bdee53ce0f2 SHA512 67b5bb221f10e014749592d24f7681bea6872785fa4a70e4e4b978f94859b527c4999aabb489586f7c19fac182acca450bdfa01af3ebc52c009f723830212058
-AUX opensmtpd-6.0.2_p1-musl.patch 1373 BLAKE2B 298e8b4fb3a27b367866983f7469e9b56cf58b97e3adb3323e367cd60aca9f0ec20fb0e087059f572c376d65029c5e19648641488b35988ecdaab8e938b59623 SHA512 217e7212345f4202bf7e136b2d5b347a9967ea10d15ef50a216bfcd8e4a522076e4ee2044d18a606baf670c0fe6a339951b6381cdb9047730e06987ab7796790
 AUX smtpd.initd 231 BLAKE2B a4991c9226daa2289cb20238dcee0dad8b4ff83474327649b61c7394e46fc929c7792b885f58bf76769567ad2058134b97e5019b508e2edec108a4bafb9cc2b4 SHA512 e4c8386bd7e8d8171172aa181305a55ca67cba6d4c82d77d8846e1bd3301dd9d118bb39dad6c144677f050194de813e4d83e06ea6dd591d4f07da8c4a1edde37
 AUX smtpd.pam 147 BLAKE2B 1706fe27cf53621428f563af146d1197dfc59133dda79fe08141ec4ca9b240880ef63da3f27e4fb8b653af4ae413ca42cdeb343e1f4e737b7e6258c0d338223d SHA512 d0574cc732138fefffe3ca78da2d689f0849de70dfd65204c99a98a58b2165eb46b23a1c32b356ea2eaf8abd56a4929c7419b29cec1d6b284e344680bab24086
 AUX smtpd.service 138 BLAKE2B c76db1847110622621701cdf1fdb764d26bf28b86a25adf9ae8e0ba15838a2a9ddc677f54f5d5fe191591b2bd5c7f20067fc00b6679f448e25371e27f231589d SHA512 b70b173ac275b871d78bac0e55b2e0c8d8a6538c7f2c4dc86fe67fb37a1ee942e0442353b338b286759618299f51b144396251db13f82c9afa035dcaae11a258
 AUX smtpd.socket 114 BLAKE2B e684727be39592dce128cc0ab02f8e5bc4510591dcb2c170b49c120e84319b53e10eae275bc6a26ed8c9d51e53a21e41c551f18afd2441602cefc4e93344d50c SHA512 fbbccb4aab80a4a4612609e590965940642321119a65359cf2490530f81d55706a0105309d321a624d40348f12776724d2cf6b8bf29ea24391e60ef8b8bc8ba2
-DIST opensmtpd-6.0.2p1.tar.gz 695513 BLAKE2B ad048364943c3abd3e0f40b06bc77831c91b8d1bfe8bc95753a0c5e5add4eacf6288aa7c7613a07979b04c0d34fad4f26e65cba8cbe3a060c9d8dbca734b75e7 SHA512 1e4275795dd2c43174ffa268398a0d9864ce4cb7d370330f7b8c55a9b40e757616bbd280919a409ebde403769e3dea62047857dc2ff98d7ecce660b459c7ff1c
-EBUILD opensmtpd-6.0.2_p1-r1.ebuild 2368 BLAKE2B 0610124d425fddeb8bce5f94fd2cb7b37829081cf6132783775ecbfeefebf08df48f6e7b8b75da307ea7da274775382d38695882a0749e20b668c0998be81576 SHA512 2e34a97ac7c36379c7f0755c8bf7574ef7f3b1f620a304c027cc62730ce148272f50a7a1b48fd4980d65a22479878d8c8125449e2ada074a5a354ef7c2b07e95
-EBUILD opensmtpd-6.0.2_p1-r2.ebuild 2539 BLAKE2B 38296533bf29f2978c5416c33d521068e0cb7caaf78a0dffc866cbd52d1f2769870d21763e03cd69a8e2ca5d83d54910f122b4741246c29972aad5c96bd4efd1 SHA512 649af9aebea5870b16ca0eeb393dd988535a8c9a77c7e99ab0545469539f29c16be1905deb6d64d21b7ec71884ec89c85abdbb78a0ab0b091574876f0a4503b5
-EBUILD opensmtpd-6.0.2_p1.ebuild 2303 BLAKE2B 9418f85098784560af2fc2a415390a8a236e8dbed426da60b225ece441bdc2733714757048f2dc308e666f9c8928f76c32c61f585070625724693366a0494096 SHA512 93a454e7a3633381814ec8e447ed988e0b8fe8df5344dbe669402be3d7cfdb00cc37a14065a753ba946cf60ad5b34b01595bccd938900b4523c8d13d81848b07
+DIST opensmtpd-6.0.3p1.tar.gz 699702 BLAKE2B 49f08e8329adc049a562b6ef7efa4c0a39cbcfe8a158cb905cfc726a7302ffe9833ccfb52041340767d55d0f2ae2087e8eac92b7359016c6c76b4d963a334558 SHA512 e579818a0ddbe637deb5a4e40f43eaf797783903ceac18fd89a57581b135b9e407d424e1a70ff7b4b06a0ee50bafb6e8ab2451371917887904b06ff1b55d320f
+DIST opensmtpd-6.4.0p1.tar.gz 718638 BLAKE2B 23c1c286a865efcbd16461ec8930f5325a6e164a58ceb7bbe0feb9088bcf615b7fd7e2eb6820bcde161864c476087b39c289c75ea5ca0b18c46710f9723b3dd7 SHA512 c60dbac857925041769104adae33393f526a328767e19bc78d06e45a13b7dd50f3eefdaa3811b8da330c24a670e98da74e18af5ac486266dade6255a6f3b5135
+EBUILD opensmtpd-6.0.3_p1.ebuild 2118 BLAKE2B 495035e86ae34e04f0d68ae4d82227351b72cebb7e214b36e50d1c6cf5cefffe9cb2fef41f6214c723a141bca87460983889e20f8b3335872a43f13920f36744 SHA512 6a8aafcfd54d7bb3c11f745a8a8d46a861a129777302add1f54cda396320677cb12e993b097aefc0d5ff081febc93b85fe32d6caece03f0c9a0dadeb7ace0d81
+EBUILD opensmtpd-6.4.0_p1.ebuild 2062 BLAKE2B aa407d9d5a94c1b3243cd6c9994b1698b1ea2449d52239d118a7c1071404055edea6e1e29fa2edfaf6c9629d63889d8f577ffc5857d060cf6bb4ae384c67df7e SHA512 e040f564469f5b50927d7a7c0e6e78e8d2cb206b9c5e26ba71fc562ec43f0857db04d21280857f2ee1960ecac4828b1aec1b0ae7dd2021787b171e1cdd4dfe55
 MISC metadata.xml 595 BLAKE2B c13a49c15ec7c4430834682a4428b80e81be9832cbf6fbdd506ce9bcfc625aabf342d094ee83c689e63573cff9bfb2abee86196374c617c75aa487eb83ad0e4c SHA512 aa7344806cd011cec6c7afa277345eb2988f11970ea3038d969efa50d5b1f485f199f15a1b632197700791c2242ed8f712ff3cc382b1491e44c14ee94075a1d5
diff --git a/mail-mta/opensmtpd/files/opensmtpd-6.0.2_p1-autoconf.patch b/mail-mta/opensmtpd/files/opensmtpd-6.0.2_p1-autoconf.patch
deleted file mode 100644
index d490a9029191..000000000000
--- a/mail-mta/opensmtpd/files/opensmtpd-6.0.2_p1-autoconf.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 9370e962bfa1032ab16c48c79977536eae665d75 Mon Sep 17 00:00:00 2001
-From: Freddy DISSAUX <dsx@pouet.bsdsx.fr>
-Date: Sat, 17 Sep 2016 08:50:14 +0200
-Subject: [PATCH] Fix expression, as explain in
-
-https://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.69/html_node/Generic-Declarations.html#Generic-Declarations
-
-"Unlike the other `AC_CHECK_*S' macros, when a symbol is not
-declared, HAVE_DECL_symbol is defined to `0' instead of
-leaving HAVE_DECL_symbol undeclared."
----
- openbsd-compat/defines.h        | 2 +-
- openbsd-compat/openbsd-compat.h | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/openbsd-compat/defines.h b/openbsd-compat/defines.h
-index 0a94d76..bda39e9 100644
---- a/openbsd-compat/defines.h
-+++ b/openbsd-compat/defines.h
-@@ -85,7 +85,7 @@
- # define STDERR_FILENO   2
- #endif
- 
--#if defined(HAVE_DECL_O_NONBLOCK) && HAVE_DECL_O_NONBLOCK == 0
-+#if !HAVE_DECL_O_NONBLOCK
- # define O_NONBLOCK      00004	/* Non Blocking Open */
- #endif
- 
-diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h
-index fd931d0..1ef2925 100644
---- a/openbsd-compat/openbsd-compat.h
-+++ b/openbsd-compat/openbsd-compat.h
-@@ -212,11 +212,11 @@ void errc(int, int, const char *, ...);
- #define pledge(promises, paths) 0
- #endif
- 
--#ifndef HAVE_DECL_AF_LOCAL
-+#if !HAVE_DECL_AF_LOCAL
- #define AF_LOCAL AF_UNIX
- #endif
- 
--#ifndef HAVE_DECL_WAIT_MYPGRP
-+#if !HAVE_DECL_WAIT_MYPGRP
- #define WAIT_MYPGRP 0
- #endif
- 
diff --git a/mail-mta/opensmtpd/files/opensmtpd-6.0.2_p1-libressl.patch b/mail-mta/opensmtpd/files/opensmtpd-6.0.2_p1-libressl.patch
deleted file mode 100644
index e1656b94040c..000000000000
--- a/mail-mta/opensmtpd/files/opensmtpd-6.0.2_p1-libressl.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From f948b923873a93472dea9b786cf60a3472b0ddc8 Mon Sep 17 00:00:00 2001
-From: Samuel Holland <samuel@sholland.org>
-Date: Wed, 11 Jan 2017 17:35:29 -0600
-Subject: [PATCH] fix compatibility with libressl
-
-These functions are exported by libcrypto from libressl, due to its
-similar OpenBSD compatibility layer, but they are not present in any
-header files. Thus, while we can use the existing compiled function,
-and do not need to provide our own, we do need to provide the prototype
-for it.
-
-This avoids implicit function declarations and the resulting crashes due
-to pointer truncation.
-
-The patch is based on an equivalent patch for OpenSSH from
-https://bugzilla.mindrot.org/show_bug.cgi?id=2465
-Also see
-https://github.com/libressl-portable/portable/issues/109
-
-Fixes #691
----
- openbsd-compat/defines.h        |  9 ---------
- openbsd-compat/openbsd-compat.h | 25 +++++++++++++++----------
- 2 files changed, 15 insertions(+), 19 deletions(-)
-
-diff --git a/openbsd-compat/defines.h b/openbsd-compat/defines.h
-index 2cbfbca..3ffcc81 100644
---- a/openbsd-compat/defines.h
-+++ b/openbsd-compat/defines.h
-@@ -422,15 +422,6 @@ typedef uint16_t	in_port_t;
- #define INET6_ADDRSTRLEN 46
- #endif
- 
--/*
-- * Platforms that have arc4random_uniform() and not arc4random_stir()
-- * shouldn't need the latter.
-- */
--#if defined(HAVE_ARC4RANDOM) && defined(HAVE_ARC4RANDOM_UNIFORM) && \
--    !defined(HAVE_ARC4RANDOM_STIR)
--# define arc4random_stir()
--#endif
--
- #ifndef HAVE_VA_COPY
- # ifdef HAVE___VA_COPY
- #  define va_copy(dest, src) __va_copy(dest, src)
-diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h
-index a51385b..51f33bb 100644
---- a/openbsd-compat/openbsd-compat.h
-+++ b/openbsd-compat/openbsd-compat.h
-@@ -119,20 +119,25 @@ int	BSDoptind;		/* index into parent argv vector */
- int getpeereid(int , uid_t *, gid_t *);
- #endif 
- 
--#ifdef HAVE_ARC4RANDOM
--# ifndef HAVE_ARC4RANDOM_STIR
--#  define arc4random_stir()
--# endif
--#else
-+#if !defined(HAVE_ARC4RANDOM) || defined(LIBRESSL_VERSION_NUMBER)
- unsigned int arc4random(void);
-+#endif
-+
-+#if defined(HAVE_ARC4RANDOM_STIR)
- void arc4random_stir(void);
--#endif /* !HAVE_ARC4RANDOM */
-+#elif defined(HAVE_ARC4RANDOM) || defined(LIBRESSL_VERSION_NUMBER)
-+/* Recent system/libressl implementation; no need for explicit stir */
-+# define arc4random_stir()
-+#else
-+/* openbsd-compat/arc4random.c provides arc4random_stir() */
-+void arc4random_stir(void);
-+#endif
- 
--#ifndef HAVE_ARC4RANDOM_BUF
-+#if !defined(HAVE_ARC4RANDOM_BUF) || defined(LIBRESSL_VERSION_NUMBER)
- void arc4random_buf(void *, size_t);
- #endif
- 
--#ifndef HAVE_ARC4RANDOM_UNIFORM
-+#if !defined(HAVE_ARC4RANDOM_UNIFORM) || defined(LIBRESSL_VERSION_NUMBER)
- uint32_t arc4random_uniform(uint32_t);
- #endif
- 
-@@ -174,7 +179,7 @@ int vasprintf(char **, const char *, va_list);
- int vsnprintf(char *, size_t, const char *, va_list);
- #endif
- 
--#ifndef HAVE_EXPLICIT_BZERO
-+#if !defined(HAVE_EXPLICIT_BZERO) || defined(LIBRESSL_VERSION_NUMBER)
- void explicit_bzero(void *p, size_t n);
- #endif
- 
-@@ -200,7 +205,7 @@ int pidfile(const char *basename);
- struct passwd *pw_dup(const struct passwd *);
- #endif
- 
--#ifndef HAVE_REALLOCARRAY
-+#if !defined(HAVE_REALLOCARRAY) || defined(LIBRESSL_VERSION_NUMBER)
- void *reallocarray(void *, size_t, size_t);
- #endif
- 
diff --git a/mail-mta/opensmtpd/files/opensmtpd-6.0.2_p1-musl.patch b/mail-mta/opensmtpd/files/opensmtpd-6.0.2_p1-musl.patch
deleted file mode 100644
index 065fbcdbe1a6..000000000000
--- a/mail-mta/opensmtpd/files/opensmtpd-6.0.2_p1-musl.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 2ab442623e689532910b34ff0dbbc2167da02330 Mon Sep 17 00:00:00 2001
-From: Samuel Holland <samuel@sholland.org>
-Date: Wed, 11 Jan 2017 17:39:07 -0600
-Subject: [PATCH] fix musl compatibility (missing function prototypes)
-
-inet_net_pton is already compiled, but no prototype is provided.
-res_hnok is provided by the compatibility layer in libasr.
-
-These fixes avoid warnings about implicit function declaration.
-
-Fixes #758
----
- configure.ac                    | 1 +
- openbsd-compat/openbsd-compat.h | 8 ++++++++
- 2 files changed, 9 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 42e092f..e27c514 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -594,6 +594,7 @@ AC_CHECK_FUNCS([ \
- 	pledge \
- 	pw_dup \
- 	reallocarray \
-+	res_hnok \
- 	setenv \
- 	setlinebuf \
- 	setproctitle \
-diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h
-index a51385b..5d2e2c2 100644
---- a/openbsd-compat/openbsd-compat.h
-+++ b/openbsd-compat/openbsd-compat.h
-@@ -208,10 +208,18 @@ void *reallocarray(void *, size_t, size_t);
- void errc(int, int, const char *, ...);
- #endif
- 
-+#ifndef HAVE_INET_NET_PTON
-+int inet_net_pton(int, const char *, void *, size_t);
-+#endif
-+
- #ifndef HAVE_PLEDGE
- #define pledge(promises, paths) 0
- #endif
- 
-+#ifndef HAVE_RES_HNOK
-+int res_hnok(const char *);
-+#endif
-+
- #if !HAVE_DECL_AF_LOCAL
- #define AF_LOCAL AF_UNIX
- #endif
diff --git a/mail-mta/opensmtpd/opensmtpd-6.0.2_p1-r2.ebuild b/mail-mta/opensmtpd/opensmtpd-6.0.2_p1-r2.ebuild
deleted file mode 100644
index e0657bdfc3f5..000000000000
--- a/mail-mta/opensmtpd/opensmtpd-6.0.2_p1-r2.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib user flag-o-matic eutils pam toolchain-funcs autotools systemd versionator
-
-DESCRIPTION="Lightweight but featured SMTP daemon from OpenBSD"
-HOMEPAGE="https://www.opensmtpd.org"
-MY_P="${P}"
-if [ $(get_last_version_component_index) -eq 4 ]; then
-	MY_P="${PN}-$(get_version_component_range 4-)"
-fi
-SRC_URI="https://www.opensmtpd.org/archives/${MY_P/_}.tar.gz"
-
-LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="libressl pam +mta"
-
-DEPEND="!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-		elibc_musl? ( sys-libs/fts-standalone )
-		sys-libs/zlib
-		pam? ( virtual/pam )
-		sys-libs/db:=
-		dev-libs/libevent
-		app-misc/ca-certificates
-		net-mail/mailbase
-		net-libs/libasr
-		!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/postfix
-		!mail-mta/qmail-ldap
-		!mail-mta/sendmail
-		!mail-mta/ssmtp[mta]
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P/_}
-
-src_prepare() {
-	# Use /run instead of /var/run
-	sed -i -e '/pidfile_path/s:_PATH_VARRUN:"/run/":' openbsd-compat/pidfile.c || die
-	epatch "${FILESDIR}"/${P}-autoconf.patch
-	epatch "${FILESDIR}"/${P}-libressl.patch
-	epatch "${FILESDIR}"/${P}-musl.patch
-	epatch_user
-	eautoreconf
-}
-
-src_configure() {
-	tc-export AR
-	AR="$(which "$AR")" econf \
-		--with-table-db \
-		--with-user-smtpd=smtpd \
-		--with-user-queue=smtpq \
-		--with-group-queue=smtpq \
-		--with-path-socket=/run \
-		--with-path-CAfile=/etc/ssl/certs/ca-certificates.crt \
-		--sysconfdir=/etc/opensmtpd \
-		$(use_with pam auth-pam)
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}"/smtpd.initd smtpd
-	systemd_dounit "${FILESDIR}"/smtpd.{service,socket}
-	use pam && newpamd "${FILESDIR}"/smtpd.pam smtpd
-	dosym /usr/sbin/smtpctl /usr/sbin/makemap
-	dosym /usr/sbin/smtpctl /usr/sbin/newaliases
-	if use mta ; then
-		dodir /usr/sbin
-		dosym /usr/sbin/smtpctl /usr/sbin/sendmail
-		dosym /usr/sbin/smtpctl /usr/bin/sendmail
-		dosym /usr/sbin/smtpctl /usr/$(get_libdir)/sendmail
-	fi
-}
-
-pkg_preinst() {
-	enewgroup smtpd 25
-	enewuser smtpd 25 -1 /var/empty smtpd
-	enewgroup smtpq 252
-	enewuser smtpq 252 -1 /var/empty smtpq
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Plugins for SQLite, MySQL, PostgreSQL, LDAP, socketmaps,"
-	einfo "Redis, and many other useful addons and filters are"
-	einfo "available in the mail-filter/opensmtpd-extras package."
-	einfo
-}
diff --git a/mail-mta/opensmtpd/opensmtpd-6.0.2_p1-r1.ebuild b/mail-mta/opensmtpd/opensmtpd-6.0.3_p1.ebuild
index 8bbf33ddb9f3..b8e388fa4fe1 100644
--- a/mail-mta/opensmtpd/opensmtpd-6.0.2_p1-r1.ebuild
+++ b/mail-mta/opensmtpd/opensmtpd-6.0.3_p1.ebuild
@@ -1,25 +1,22 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit multilib user flag-o-matic eutils pam toolchain-funcs autotools systemd versionator
+inherit multilib user flag-o-matic eutils pam toolchain-funcs autotools systemd
 
 DESCRIPTION="Lightweight but featured SMTP daemon from OpenBSD"
 HOMEPAGE="https://www.opensmtpd.org"
-MY_P="${P}"
-if [ $(get_last_version_component_index) -eq 4 ]; then
-	MY_P="${PN}-$(get_version_component_range 4-)"
-fi
-SRC_URI="https://www.opensmtpd.org/archives/${MY_P/_}.tar.gz"
+SRC_URI="https://www.opensmtpd.org/archives/${P/_}.tar.gz"
 
 LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="libressl pam +mta"
 
 DEPEND="!libressl? ( dev-libs/openssl:0 )
 		libressl? ( dev-libs/libressl )
+		elibc_musl? ( sys-libs/fts-standalone )
 		sys-libs/zlib
 		pam? ( virtual/pam )
 		sys-libs/db:=
@@ -41,14 +38,7 @@ DEPEND="!libressl? ( dev-libs/openssl:0 )
 "
 RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${MY_P/_}
-
-src_prepare() {
-	# Use /run instead of /var/run
-	sed -i -e '/pidfile_path/s:_PATH_VARRUN:"/run/":' openbsd-compat/pidfile.c || die
-	epatch_user
-	eautoreconf
-}
+S=${WORKDIR}/${P/_}
 
 src_configure() {
 	tc-export AR
diff --git a/mail-mta/opensmtpd/opensmtpd-6.0.2_p1.ebuild b/mail-mta/opensmtpd/opensmtpd-6.4.0_p1.ebuild
index 0c7c96ffc44d..e65261f47d5c 100644
--- a/mail-mta/opensmtpd/opensmtpd-6.0.2_p1.ebuild
+++ b/mail-mta/opensmtpd/opensmtpd-6.4.0_p1.ebuild
@@ -1,24 +1,21 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit multilib user flag-o-matic eutils pam toolchain-funcs autotools systemd versionator
+inherit multilib user flag-o-matic eutils pam toolchain-funcs autotools systemd
 
 DESCRIPTION="Lightweight but featured SMTP daemon from OpenBSD"
 HOMEPAGE="https://www.opensmtpd.org"
-MY_P="${P}"
-if [ $(get_last_version_component_index) -eq 4 ]; then
-	MY_P="${PN}-$(get_version_component_range 4-)"
-fi
-SRC_URI="https://www.opensmtpd.org/archives/${MY_P/_}.tar.gz"
+SRC_URI="https://www.opensmtpd.org/archives/${P/_}.tar.gz"
 
 LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="" #~amd64 ~arm ~arm64 ~x86"
 IUSE="pam +mta"
 
-DEPEND="dev-libs/openssl:0
+DEPEND="dev-libs/libressl
+		elibc_musl? ( sys-libs/fts-standalone )
 		sys-libs/zlib
 		pam? ( virtual/pam )
 		sys-libs/db:=
@@ -40,14 +37,7 @@ DEPEND="dev-libs/openssl:0
 "
 RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${MY_P/_}
-
-src_prepare() {
-	# Use /run instead of /var/run
-	sed -i -e '/pidfile_path/s:_PATH_VARRUN:"/run/":' openbsd-compat/pidfile.c || die
-	epatch_user
-	eautoreconf
-}
+S=${WORKDIR}/${P/_}
 
 src_configure() {
 	tc-export AR