[gentoo-commits] repo/gentoo:master commit in: net-mail/mailbase/

[Mikle Kolyada]

commit:     3ffc287d4c5029841b977e8a6ff011a034605664
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 23 14:09:16 2021 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Jan 23 14:10:13 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ffc287d

net-mail/mailbase: install pam files conditionally

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 .../mailbase/{mailbase-1.5-r1.ebuild => mailbase-1.5-r2.ebuild}    | 7 ++++---
 net-mail/mailbase/{mailbase-1.6.ebuild => mailbase-1.6-r1.ebuild}  | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/net-mail/mailbase/mailbase-1.5-r1.ebuild 
b/net-mail/mailbase/mailbase-1.5-r2.ebuild
similarity index 85%
rename from net-mail/mailbase/mailbase-1.5-r1.ebuild
rename to net-mail/mailbase/mailbase-1.5-r2.ebuild
index ce871f5f8f8..e7d481a196e 100644
--- a/net-mail/mailbase/mailbase-1.5-r1.ebuild
+++ b/net-mail/mailbase/mailbase-1.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,9 +32,10 @@ src_install() {
 
        dosym spool/mail /var/mail
 
-       newpamd "${FILESDIR}"/common-pamd-include pop
-       newpamd "${FILESDIR}"/common-pamd-include imap
        if use pam ; then
+               newpamd "${FILESDIR}"/common-pamd-include pop
+               newpamd "${FILESDIR}"/common-pamd-include imap
+
                local p
                for p in pop3 pop3s pops ; do
                        dosym pop /etc/pam.d/${p}

diff --git a/net-mail/mailbase/mailbase-1.6.ebuild 
b/net-mail/mailbase/mailbase-1.6-r1.ebuild
similarity index 90%
rename from net-mail/mailbase/mailbase-1.6.ebuild
rename to net-mail/mailbase/mailbase-1.6-r1.ebuild
index 81158f51db8..2d43e4feac0 100644
--- a/net-mail/mailbase/mailbase-1.6.ebuild
+++ b/net-mail/mailbase/mailbase-1.6-r1.ebuild
@@ -32,9 +32,9 @@ src_install() {
 
        dosym spool/mail /var/mail
 
-       newpamd "${FILESDIR}"/common-pamd-include pop
-       newpamd "${FILESDIR}"/common-pamd-include imap
        if use pam ; then
+               newpamd "${FILESDIR}"/common-pamd-include pop
+               newpamd "${FILESDIR}"/common-pamd-include imap
                local p
                for p in pop3 pop3s pops ; do
                        dosym pop /etc/pam.d/${p}