From: Jason A. Donenfeld <zx2c4@gentoo.org>
Date: Tue, 5 Jul 2016 12:08:17 +0000 (+0200)
Subject: mail-mta/opensmtpd: bring back makemap and newaliases
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=26fd1ea112723ed0ad447e7656e94357d24fbd5d;p=gentoo.git

mail-mta/opensmtpd: bring back makemap and newaliases

Package-Manager: portage-2.3.0
---

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 f4f32a666da5..99997957261d 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 f4f32a666da5..eec682cb5459 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 334da3ae49f5..99997957261d 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