commit:     a88fa1a16f579f03e516eb307ecd0be888a85da5
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 22 13:17:31 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Jul 23 19:20:28 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a88fa1a1

sys-apps/shadow: Install the passwd.5 man page

This needs a somewhat awkward blocker against sys-apps/man-pages,
which can be simplified when >=man-pages-5.12-r2 becomes stable.

Bug: https://bugs.gentoo.org/776787
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 sys-apps/shadow/{shadow-4.8.1-r3.ebuild => shadow-4.8.1-r4.ebuild} | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/sys-apps/shadow/shadow-4.8.1-r3.ebuild 
b/sys-apps/shadow/shadow-4.8.1-r4.ebuild
similarity index 97%
rename from sys-apps/shadow/shadow-4.8.1-r3.ebuild
rename to sys-apps/shadow/shadow-4.8.1-r4.ebuild
index 38ebf6be89e..8992f16a172 100644
--- a/sys-apps/shadow/shadow-4.8.1-r3.ebuild
+++ b/sys-apps/shadow/shadow-4.8.1-r4.ebuild
@@ -40,6 +40,9 @@ DEPEND="${COMMON_DEPEND}
        >=sys-kernel/linux-headers-4.14
 "
 RDEPEND="${COMMON_DEPEND}
+       !<sys-apps/man-pages-5.11-r1
+       !=sys-apps/man-pages-5.12-r0
+       !=sys-apps/man-pages-5.12-r1
        pam? ( >=sys-auth/pambase-20150213 )
        su? ( !sys-apps/util-linux[su(-)] )
 "
@@ -205,8 +208,8 @@ src_install() {
        fi
 
        # Remove manpages that are handled by other packages
-       find "${ED}"/usr/share/man \
-               '(' -name id.1 -o -name passwd.5 -o -name getspnam.3 ')' \
+       find "${ED}"/usr/share/man -type f \
+               '(' -name id.1 -o -name getspnam.3 ')' \
                -delete
 
        cd "${S}" || die

Reply via email to