From bb2aaa5012e7045bf3b124d3b23ab2e5b56d9e8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulrich=20M=C3=BCller?= Date: Sat, 24 Jul 2021 00:54:55 +0200 Subject: [PATCH] app-i18n/man-pages-ja: Don't install passwd.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit File collision with sys-apps/shadow. Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Ulrich Müller --- ...ages-ja-20171215.ebuild => man-pages-ja-20171215-r1.ebuild} | 1 + ...ages-ja-20180315.ebuild => man-pages-ja-20180315-r1.ebuild} | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) rename app-i18n/man-pages-ja/{man-pages-ja-20171215.ebuild => man-pages-ja-20171215-r1.ebuild} (98%) rename app-i18n/man-pages-ja/{man-pages-ja-20180315.ebuild => man-pages-ja-20180315-r1.ebuild} (96%) diff --git a/app-i18n/man-pages-ja/man-pages-ja-20171215.ebuild b/app-i18n/man-pages-ja/man-pages-ja-20171215-r1.ebuild similarity index 98% rename from app-i18n/man-pages-ja/man-pages-ja-20171215.ebuild rename to app-i18n/man-pages-ja/man-pages-ja-20171215-r1.ebuild index de70fa027bd0f..a0032aa708eb9 100644 --- a/app-i18n/man-pages-ja/man-pages-ja-20171215.ebuild +++ b/app-i18n/man-pages-ja/man-pages-ja-20171215-r1.ebuild @@ -23,6 +23,7 @@ src_prepare() { # remove man pages that are provided by other packages. # - sys-apps/shadow +nls rm -f manual/*/man1/{chfn,chsh,newgrp,su,passwd,groups}.1 || die + rm -f manual/*/man5/passwd.5 || die rm -f manual/*/man8/{vigr,vipw}.8 || die # - app-arch/rpm +nls rm -rf manual/rpm || die diff --git a/app-i18n/man-pages-ja/man-pages-ja-20180315.ebuild b/app-i18n/man-pages-ja/man-pages-ja-20180315-r1.ebuild similarity index 96% rename from app-i18n/man-pages-ja/man-pages-ja-20180315.ebuild rename to app-i18n/man-pages-ja/man-pages-ja-20180315-r1.ebuild index d37c1cb8bebae..385f0d11be23f 100644 --- a/app-i18n/man-pages-ja/man-pages-ja-20180315.ebuild +++ b/app-i18n/man-pages-ja/man-pages-ja-20180315-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -23,6 +23,7 @@ src_prepare() { # remove man pages that are provided by other packages. # - sys-apps/shadow +nls rm -f manual/*/man1/{chfn,chsh,newgrp,su,passwd,groups}.1 || die + rm -f manual/*/man5/passwd.5 || die rm -f manual/*/man8/{vigr,vipw}.8 || die # - app-arch/rpm +nls rm -rf manual/rpm || die