summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason A. Donenfeld <zx2c4@gentoo.org>2020-02-05 14:01:36 +0100
committerJason A. Donenfeld <zx2c4@gentoo.org>2020-02-05 14:02:07 +0100
commita9c487b4ea3f7555ef7a40c11d101d2ebca8413f (patch)
tree87ba1b9c1a4b6f0e44e7a4a24e7f67b439a56bfd /mail-mta/opensmtpd
parentdev-python/eyeD3: Remove py2 from 0.8.11 (diff)
downloadgentoo-a9c487b4ea3f7555ef7a40c11d101d2ebca8413f.tar.gz
gentoo-a9c487b4ea3f7555ef7a40c11d101d2ebca8413f.tar.bz2
gentoo-a9c487b4ea3f7555ef7a40c11d101d2ebca8413f.zip
mail-mta/opensmtpd: fixups from qa review
Package-Manager: Portage-2.3.86, Repoman-2.3.20 Signed-off-by: Jason A. Donenfeld <zx2c4@gentoo.org>
Diffstat (limited to 'mail-mta/opensmtpd')
-rw-r--r--mail-mta/opensmtpd/opensmtpd-6.0.3_p1-r2.ebuild51
-rw-r--r--mail-mta/opensmtpd/opensmtpd-6.6.2_p1.ebuild51
2 files changed, 52 insertions, 50 deletions
diff --git a/mail-mta/opensmtpd/opensmtpd-6.0.3_p1-r2.ebuild b/mail-mta/opensmtpd/opensmtpd-6.0.3_p1-r2.ebuild
index 10d6ce9bc02e..aa6cbcc3cab1 100644
--- a/mail-mta/opensmtpd/opensmtpd-6.0.3_p1-r2.ebuild
+++ b/mail-mta/opensmtpd/opensmtpd-6.0.3_p1-r2.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit multilib flag-o-matic eutils pam toolchain-funcs autotools systemd
+inherit pam toolchain-funcs autotools systemd
DESCRIPTION="Lightweight but featured SMTP daemon from OpenBSD"
HOMEPAGE="https://www.opensmtpd.org"
@@ -14,29 +14,30 @@ SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
IUSE="libressl pam +mta"
-DEPEND="acct-user/smtpd
- acct-user/smtpq
- !libressl? ( dev-libs/openssl:0 )
- libressl? ( dev-libs/libressl )
- elibc_musl? ( sys-libs/fts-standalone )
- sys-libs/zlib
- pam? ( sys-libs/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]
+DEPEND="
+ acct-user/smtpd
+ acct-user/smtpq
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ elibc_musl? ( sys-libs/fts-standalone )
+ sys-libs/zlib
+ pam? ( sys-libs/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}"
@@ -71,7 +72,7 @@ src_install() {
dodir /usr/sbin
dosym smtpctl /usr/sbin/sendmail
dosym ../sbin/smtpctl /usr/bin/sendmail
- mkdir -p "${ED}"/usr/$(get_libdir)
+ mkdir -p "${ED}"/usr/$(get_libdir) || die
ln -s --relative "${ED}"/usr/sbin/smtpctl "${ED}"/usr/$(get_libdir)/sendmail || die
fi
}
diff --git a/mail-mta/opensmtpd/opensmtpd-6.6.2_p1.ebuild b/mail-mta/opensmtpd/opensmtpd-6.6.2_p1.ebuild
index 78d71db39df8..71d8c7213d09 100644
--- a/mail-mta/opensmtpd/opensmtpd-6.6.2_p1.ebuild
+++ b/mail-mta/opensmtpd/opensmtpd-6.6.2_p1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit multilib flag-o-matic eutils pam toolchain-funcs autotools systemd
+inherit pam autotools systemd
DESCRIPTION="Lightweight but featured SMTP daemon from OpenBSD"
HOMEPAGE="https://www.opensmtpd.org"
@@ -14,29 +14,30 @@ SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
IUSE="libressl pam +mta"
-DEPEND="acct-user/smtpd
- acct-user/smtpq
- !libressl? ( dev-libs/openssl:0/1.1 )
- libressl? ( dev-libs/libressl )
- elibc_musl? ( sys-libs/fts-standalone )
- sys-libs/zlib
- pam? ( sys-libs/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]
+DEPEND="
+ acct-user/smtpd
+ acct-user/smtpq
+ !libressl? ( >=dev-libs/openssl-1.1:0= )
+ libressl? ( dev-libs/libressl:0= )
+ elibc_musl? ( sys-libs/fts-standalone )
+ sys-libs/zlib
+ pam? ( sys-libs/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}"
@@ -66,7 +67,7 @@ src_install() {
dodir /usr/sbin
dosym smtpctl /usr/sbin/sendmail
dosym ../sbin/smtpctl /usr/bin/sendmail
- mkdir -p "${ED}"/usr/$(get_libdir)
+ mkdir -p "${ED}"/usr/$(get_libdir) || die
ln -s --relative "${ED}"/usr/sbin/smtpctl "${ED}"/usr/$(get_libdir)/sendmail || die
fi
}