From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 501AA13933E for ; Fri, 23 Jul 2021 19:21:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 73593E0C09; Fri, 23 Jul 2021 19:21:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5BDC1E0C09 for ; Fri, 23 Jul 2021 19:21:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7CE8E34069F for ; Fri, 23 Jul 2021 19:21:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E7D937B2 for ; Fri, 23 Jul 2021 19:21:15 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1627068028.a88fa1a16f579f03e516eb307ecd0be888a85da5.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/shadow/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/shadow/shadow-4.8.1-r3.ebuild sys-apps/shadow/shadow-4.8.1-r4.ebuild X-VCS-Directories: sys-apps/shadow/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: a88fa1a16f579f03e516eb307ecd0be888a85da5 X-VCS-Branch: master Date: Fri, 23 Jul 2021 19:21:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d75e579d-cbbb-4351-82cb-78881c24a26d X-Archives-Hash: de8b69a2bda0ba15330e7ef476ffcab0 commit: a88fa1a16f579f03e516eb307ecd0be888a85da5 Author: Ulrich Müller gentoo org> AuthorDate: Thu Jul 22 13:17:31 2021 +0000 Commit: Ulrich Müller gentoo 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 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-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