[gentoo-commits] repo/gentoo:master commit in: net-ftp/ftpbase/

[Mikle Kolyada]

commit:     d06386545e7df671604303f2fe4912128d86a2d0
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 24 10:32:50 2021 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Jan 24 10:33:22 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0638654

net-ftp/ftpbase: install pam files conditionally

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

 .../{ftpbase-0.01-r3.ebuild => ftpbase-0.01-r4.ebuild}        | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/net-ftp/ftpbase/ftpbase-0.01-r3.ebuild 
b/net-ftp/ftpbase/ftpbase-0.01-r4.ebuild
similarity index 67%
rename from net-ftp/ftpbase/ftpbase-0.01-r3.ebuild
rename to net-ftp/ftpbase/ftpbase-0.01-r4.ebuild
index f278d506cef..19eee733db9 100644
--- a/net-ftp/ftpbase/ftpbase-0.01-r3.ebuild
+++ b/net-ftp/ftpbase/ftpbase-0.01-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils pam user
+inherit pam
 
 DESCRIPTION="FTP layout package"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage";
@@ -30,10 +30,7 @@ src_install() {
        insinto /etc
        doins "${FILESDIR}/ftpusers"
 
-       cp "${FILESDIR}/ftp-pamd-include" "${T}" || die
-       if use elibc_FreeBSD; then
-               sed -i -e "/pam_listfile.so/s/^.*$/account  required  
pam_ftpusers.so no_warn disallow/" \
-                       "${T}"/ftp-pamd-include || die
+       if use pam; then
+               newpamd "${FILESDIR}"/ftp-pamd-include ftp
        fi
-       newpamd "${T}"/ftp-pamd-include ftp
 }