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 C496813933E for ; Fri, 23 Jul 2021 19:21:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 29625E0BF4; 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 0BD0CE0BF4 for ; Fri, 23 Jul 2021 19:21:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 64C3033FAD1 for ; Fri, 23 Jul 2021 19:21:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D495A7A3 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: <1627068022.66a1194907411653f87fbf9b1d1b1e3732aeadf5.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/man-pages/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/man-pages/man-pages-5.11-r1.ebuild sys-apps/man-pages/man-pages-5.11.ebuild sys-apps/man-pages/man-pages-5.12-r1.ebuild sys-apps/man-pages/man-pages-5.12-r2.ebuild X-VCS-Directories: sys-apps/man-pages/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 66a1194907411653f87fbf9b1d1b1e3732aeadf5 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: 751c5587-3722-4a3c-a02c-2ab9be3cbf1d X-Archives-Hash: 1f241316927b6f2a218848390266c263 commit: 66a1194907411653f87fbf9b1d1b1e3732aeadf5 Author: Ulrich Müller gentoo org> AuthorDate: Thu Jul 22 13:13:50 2021 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Fri Jul 23 19:20:22 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66a11949 sys-apps/man-pages: Don't install passwd.5 A more accurate version of it is installed by sys-apps/shadow. Bug: https://bugs.gentoo.org/776787 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Ulrich Müller gentoo.org> .../man-pages/{man-pages-5.11.ebuild => man-pages-5.11-r1.ebuild} | 7 +++++++ .../{man-pages-5.12-r1.ebuild => man-pages-5.12-r2.ebuild} | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/sys-apps/man-pages/man-pages-5.11.ebuild b/sys-apps/man-pages/man-pages-5.11-r1.ebuild similarity index 94% rename from sys-apps/man-pages/man-pages-5.11.ebuild rename to sys-apps/man-pages/man-pages-5.11-r1.ebuild index 557612b1144..003bfac75bb 100644 --- a/sys-apps/man-pages/man-pages-5.11.ebuild +++ b/sys-apps/man-pages/man-pages-5.11-r1.ebuild @@ -39,6 +39,13 @@ PDEPEND=" sys-apps/man-pages-posix " +src_prepare() { + default + + # passwd.5 installed by sys-apps/shadow #776787 + rm man5/passwd.5 || die +} + src_configure() { :; } src_compile() { :; } diff --git a/sys-apps/man-pages/man-pages-5.12-r1.ebuild b/sys-apps/man-pages/man-pages-5.12-r2.ebuild similarity index 94% rename from sys-apps/man-pages/man-pages-5.12-r1.ebuild rename to sys-apps/man-pages/man-pages-5.12-r2.ebuild index 539d00f108a..fa7c93e7d50 100644 --- a/sys-apps/man-pages/man-pages-5.12-r1.ebuild +++ b/sys-apps/man-pages/man-pages-5.12-r2.ebuild @@ -43,6 +43,13 @@ PDEPEND=" sys-apps/man-pages-posix " +src_prepare() { + default + + # passwd.5 installed by sys-apps/shadow #776787 + rm man5/passwd.5 || die +} + src_configure() { :; } src_compile() { :; }