overlay

commit: 14254ff47dffb83b7485ffb43b629f49952156a4
parent: 2f275f6acb0ba7f9bb2741bd7d11af68e87573a3
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date:   Sun,  7 Jun 2020 01:02:38 +0200

mail-mta/opensmtpd: Sync with ::gentoo

Diffstat:
M
mail-mta/opensmtpd/opensmtpd-6.7.1_p1.ebuild
54
++++++++++++++----------------------------------------

1 file changed, 14 insertions(+), 40 deletions(-)
diff --git a/mail-mta/opensmtpd/opensmtpd-6.7.1_p1.ebuild b/mail-mta/opensmtpd/opensmtpd-6.7.1_p1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Copyright 2018-2019 Haelwenn (lanodan) Monnier <contact@hacktivis.me>
+# Copyright 1999-2020 Gentoo Authors
+# Copyright 2018-2020 Haelwenn (lanodan) Monnier <contact@hacktivis.me>
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit multilib user flag-o-matic pam toolchain-funcs autotools systemd
+inherit pam systemd
 
 DESCRIPTION="Lightweight but featured SMTP daemon from OpenBSD"
 HOMEPAGE="https://www.opensmtpd.org"
@@ -13,10 +13,12 @@ SRC_URI="https://www.opensmtpd.org/archives/${P/_}.tar.gz"
 LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="libressl pam mdoc +mta"
+IUSE="libressl pam +mta"
 
 DEPEND="
-	!libressl? ( >=dev-libs/openssl-1.1.0:0 )
+	acct-user/smtpd
+	acct-user/smtpq
+	!libressl? ( >=dev-libs/openssl-1.1.0:0= )
 	libressl? ( >=dev-libs/libressl-3.0.2 )
 	sys-libs/zlib
 	pam? ( sys-libs/pam )
@@ -45,30 +47,17 @@ RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${P/_}
 
-src_prepare() {
-	default
-
-	# Use /run instead of /var/run
-	sed -i -e '/pidfile_path/s:_PATH_VARRUN:"/run/":' openbsd-compat/pidfile.c || die
-	sed -i -e 's;/usr/libexec/;/usr/libexec/opensmtpd/;g' smtpd/parse.y || die
-
-	append-cflags "-ffunction-sections"
-	append-ldflags "-Wl,--gc-sections"
-
-	eautoreconf
-}
-
 src_configure() {
-	tc-export AR
-	AR="$(which "$AR")" econf \
-		--with-table-db \
+	econf \
+		--sysconfdir=/etc/opensmtpd \
+		--with-path-mbox=/var/spool/mail \
+		--with-path-empty=/var/empty \
+		--with-path-socket=/run \
+		--with-path-CAfile=/etc/ssl/certs/ca-certificates.crt \
 		--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 \
-		--with-mantype=$(usex mdoc doc man) \
+		--with-mantype=doc \
 		$(use_with pam auth-pam)
 }
 
@@ -90,18 +79,3 @@ src_install() {
 		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
-}