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 B951713933E for ; Fri, 23 Jul 2021 23:07:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 155B1E0B66; Fri, 23 Jul 2021 23:07:33 +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 EF207E0B66 for ; Fri, 23 Jul 2021 23:07:32 +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 864EE342B67 for ; Fri, 23 Jul 2021 23:07:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D912E7EE for ; Fri, 23 Jul 2021 23:07:28 +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: <1627081578.8d6a1ba1b1699ae7b806e254a99db436c5a32bbb.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/man-pages-ru/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-i18n/man-pages-ru/man-pages-ru-5.03.2390.2390.20191017-r1.ebuild app-i18n/man-pages-ru/man-pages-ru-5.03.2390.2390.20191017.ebuild X-VCS-Directories: app-i18n/man-pages-ru/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 8d6a1ba1b1699ae7b806e254a99db436c5a32bbb X-VCS-Branch: master Date: Fri, 23 Jul 2021 23:07:28 +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: 7a69332b-148b-45ee-a4b4-7089a99ab545 X-Archives-Hash: a8b23a4329dec5348a450d3f786caa1b commit: 8d6a1ba1b1699ae7b806e254a99db436c5a32bbb Author: Ulrich Müller gentoo org> AuthorDate: Fri Jul 23 22:56:21 2021 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Fri Jul 23 23:06:18 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d6a1ba1 app-i18n/man-pages-ru: Don't install passwd.5 File collision with sys-apps/shadow. Closes: https://bugs.gentoo.org/803587 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Ulrich Müller gentoo.org> ...191017.ebuild => man-pages-ru-5.03.2390.2390.20191017-r1.ebuild} | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app-i18n/man-pages-ru/man-pages-ru-5.03.2390.2390.20191017.ebuild b/app-i18n/man-pages-ru/man-pages-ru-5.03.2390.2390.20191017-r1.ebuild similarity index 85% rename from app-i18n/man-pages-ru/man-pages-ru-5.03.2390.2390.20191017.ebuild rename to app-i18n/man-pages-ru/man-pages-ru-5.03.2390.2390.20191017-r1.ebuild index 9fc6918f302..c22c58267e9 100644 --- a/app-i18n/man-pages-ru/man-pages-ru-5.03.2390.2390.20191017.ebuild +++ b/app-i18n/man-pages-ru/man-pages-ru-5.03.2390.2390.20191017-r1.ebuild @@ -17,6 +17,12 @@ RDEPEND="virtual/man" S="${WORKDIR}/${PN}_${MY_PV}" +src_prepare() { + default + # Remove man page provided by sys-apps/shadow + rm man5/passwd.5 || die +} + src_install() { insinto /usr/share/man/ru doins -r man*