summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2021-07-24 00:54:55 +0200
committerUlrich Müller <ulm@gentoo.org>2021-07-24 01:06:18 +0200
commitbb2aaa5012e7045bf3b124d3b23ab2e5b56d9e8b (patch)
tree50a622bedf47d61909f6f6585f5a477295da5714
parentapp-i18n/man-pages-it: Don't install passwd.5 (diff)
downloadgentoo-bb2aaa50.tar.gz
gentoo-bb2aaa50.tar.bz2
gentoo-bb2aaa50.zip
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@gentoo.org>
-rw-r--r--app-i18n/man-pages-ja/man-pages-ja-20171215-r1.ebuild (renamed from app-i18n/man-pages-ja/man-pages-ja-20171215.ebuild)1
-rw-r--r--app-i18n/man-pages-ja/man-pages-ja-20180315-r1.ebuild (renamed from app-i18n/man-pages-ja/man-pages-ja-20180315.ebuild)3
2 files changed, 3 insertions, 1 deletions
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
index de70fa027bd0..a0032aa708eb 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
index d37c1cb8beba..385f0d11be23 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