commit:     26fd1ea112723ed0ad447e7656e94357d24fbd5d
Author:     Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  5 12:08:17 2016 +0000
Commit:     Jason Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Tue Jul  5 12:09:50 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26fd1ea1

mail-mta/opensmtpd: bring back makemap and newaliases

Package-Manager: portage-2.3.0

 ...21504_p1.ebuild => opensmtpd-5.9.2.201607021504_p1-r1.ebuild} | 2 ++
 mail-mta/opensmtpd/opensmtpd-5.9.2_p1-r1.ebuild                  | 9 +++++----
 .../{opensmtpd-5.9.2_p1.ebuild => opensmtpd-5.9.2_p1-r2.ebuild}  | 9 ++++++---
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/mail-mta/opensmtpd/opensmtpd-5.9.2.201607021504_p1.ebuild 
b/mail-mta/opensmtpd/opensmtpd-5.9.2.201607021504_p1-r1.ebuild
similarity index 96%
rename from mail-mta/opensmtpd/opensmtpd-5.9.2.201607021504_p1.ebuild
rename to mail-mta/opensmtpd/opensmtpd-5.9.2.201607021504_p1-r1.ebuild
index f4f32a6..9999795 100644
--- a/mail-mta/opensmtpd/opensmtpd-5.9.2.201607021504_p1.ebuild
+++ b/mail-mta/opensmtpd/opensmtpd-5.9.2.201607021504_p1-r1.ebuild
@@ -69,6 +69,8 @@ src_install() {
        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

diff --git a/mail-mta/opensmtpd/opensmtpd-5.9.2_p1-r1.ebuild 
b/mail-mta/opensmtpd/opensmtpd-5.9.2_p1-r1.ebuild
index f4f32a6..eec682c 100644
--- a/mail-mta/opensmtpd/opensmtpd-5.9.2_p1-r1.ebuild
+++ b/mail-mta/opensmtpd/opensmtpd-5.9.2_p1-r1.ebuild
@@ -16,11 +16,10 @@ 
SRC_URI="https://www.opensmtpd.org/archives/${MY_P/_}.tar.gz";
 
 LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl pam +mta"
+KEYWORDS="amd64 x86"
+IUSE="pam +mta"
 
-DEPEND="!libressl? ( dev-libs/openssl:0 )
-               libressl? ( dev-libs/libressl )
+DEPEND="dev-libs/openssl:0
                sys-libs/zlib
                pam? ( virtual/pam )
                sys-libs/db:=
@@ -69,6 +68,8 @@ src_install() {
        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

diff --git a/mail-mta/opensmtpd/opensmtpd-5.9.2_p1.ebuild 
b/mail-mta/opensmtpd/opensmtpd-5.9.2_p1-r2.ebuild
similarity index 91%
rename from mail-mta/opensmtpd/opensmtpd-5.9.2_p1.ebuild
rename to mail-mta/opensmtpd/opensmtpd-5.9.2_p1-r2.ebuild
index 334da3a..9999795 100644
--- a/mail-mta/opensmtpd/opensmtpd-5.9.2_p1.ebuild
+++ b/mail-mta/opensmtpd/opensmtpd-5.9.2_p1-r2.ebuild
@@ -16,10 +16,11 @@ 
SRC_URI="https://www.opensmtpd.org/archives/${MY_P/_}.tar.gz";
 
 LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="pam +mta"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl pam +mta"
 
-DEPEND="dev-libs/openssl:0
+DEPEND="!libressl? ( dev-libs/openssl:0 )
+               libressl? ( dev-libs/libressl )
                sys-libs/zlib
                pam? ( virtual/pam )
                sys-libs/db:=
@@ -68,6 +69,8 @@ src_install() {
        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

Reply via email to