commit: bb2aaa5012e7045bf3b124d3b23ab2e5b56d9e8b
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 23 22:54:55 2021 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Jul 23 23:06:18 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb2aaa50
app-i18n/man-pages-ja: Don't install passwd.5
File collision with sys-apps/shadow.
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
.../{man-pages-ja-20171215.ebuild => man-pages-ja-20171215-r1.ebuild} | 1 +
.../{man-pages-ja-20180315.ebuild => man-pages-ja-20180315-r1.ebuild} | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
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 de70fa027bd..a0032aa708e 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 d37c1cb8beb..385f0d11be2 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
