don't install man pages that are provided by sys-apps/shadow

Package-Manager: portage-2.0.54-r2

4 files changed, 20 insertions, 9 deletions

diff --git a/app-i18n/man-pages-ja/ChangeLog b/app-i18n/man-pages-ja/ChangeLog
index 2b2ea3f682ba..345c6d53897b 100644
--- a/app-i18n/man-pages-ja/ChangeLog
+++ b/app-i18n/man-pages-ja/ChangeLog
@@ -1,12 +1,18 @@
 # ChangeLog for app-i18n/man-pages-ja
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-ja/ChangeLog,v 1.7 2006/05/16 13:20:01 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-ja/ChangeLog,v 1.8 2006/05/17 10:54:52 hattya Exp $
+
+*man-pages-ja-20060415-r2 (17 May 2006)
+
+  17 May 2006; Akinori Hattori <hattya@gentoo.org>
+  -man-pages-ja-20060415-r1.ebuild, +man-pages-ja-20060415-r2.ebuild:
+  don't install man pages that are provided by sys-apps/shadow
 
 *man-pages-ja-20060415-r1 (16 May 2006)
 
   16 May 2006; Akinori Hattori <hattya@gentoo.org>
   -man-pages-ja-20060415.ebuild, +man-pages-ja-20060415-r1.ebuild:
-  Don't install man pages of man and shadow
+  don't install man pages of man and shadow
 
   09 May 2006; Gustavo Zacarias <gustavoz@gentoo.org>
   man-pages-ja-20050415.ebuild:
diff --git a/app-i18n/man-pages-ja/Manifest b/app-i18n/man-pages-ja/Manifest
index b3fb691ac81e..bb03cb4150fa 100644
--- a/app-i18n/man-pages-ja/Manifest
+++ b/app-i18n/man-pages-ja/Manifest
@@ -1,8 +1,8 @@
-MD5 8e0b785bf443e8666c646cf9f1751603 ChangeLog 6822
+MD5 2f436b6e916c7b9aed3425df80d45400 ChangeLog 7048
 MD5 9ba4ab9843ce463a09144a4265e05e69 files/digest-man-pages-ja-20041115 153
 MD5 0ee23ca65e525e327a81af5f32699f7d files/digest-man-pages-ja-20050415 153
-MD5 ddef1be4fb804567a0296821acf0f1e6 files/digest-man-pages-ja-20060415-r1 154
+MD5 ddef1be4fb804567a0296821acf0f1e6 files/digest-man-pages-ja-20060415-r2 154
 MD5 5a4a95eedd55524ea58085cdadae0a10 man-pages-ja-20041115.ebuild 2102
 MD5 8f309ccd5a48c2bb6d9fd7a255ef0fca man-pages-ja-20050415.ebuild 2072
-MD5 59c402de2119fefb7da94ec1b126cd3d man-pages-ja-20060415-r1.ebuild 2139
+MD5 ecf0575f69557fa0b82514d0472baae2 man-pages-ja-20060415-r2.ebuild 2330
 MD5 a327e1af9975957b8f1619c4435b0863 metadata.xml 508
diff --git a/app-i18n/man-pages-ja/files/digest-man-pages-ja-20060415-r1 b/app-i18n/man-pages-ja/files/digest-man-pages-ja-20060415-r2
index ae48b1f0251e..ae48b1f0251e 100644
--- a/app-i18n/man-pages-ja/files/digest-man-pages-ja-20060415-r1
+++ b/app-i18n/man-pages-ja/files/digest-man-pages-ja-20060415-r2
diff --git a/app-i18n/man-pages-ja/man-pages-ja-20060415-r1.ebuild b/app-i18n/man-pages-ja/man-pages-ja-20060415-r2.ebuild
index ef73cacc9b6c..8a9f9ef1ed9e 100644
--- a/app-i18n/man-pages-ja/man-pages-ja-20060415-r1.ebuild
+++ b/app-i18n/man-pages-ja/man-pages-ja-20060415-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-ja/man-pages-ja-20060415-r1.ebuild,v 1.1 2006/05/16 13:20:01 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-ja/man-pages-ja-20060415-r2.ebuild,v 1.1 2006/05/17 10:54:52 hattya Exp $
 
 IUSE=""
 
@@ -65,6 +65,14 @@ src_install() {
 		pkg=
 	done
 
+	# remove man pages that are provided by other packages.
+	# - sys-apps/shadow +nls
+	rm -f ${D}/usr/share/man/ja/man1/{chfn,chsh,newgrp,su,passwd,groups}.1
+	rm -f ${D}/usr/share/man/ja/man8/{vigr,vipw}.8
+
+	dodoc ChangeLog README
+
+
 	cd ${WORKDIR}/${GENTOO_MAN_P}
 
 	for x in *; do
@@ -79,9 +87,6 @@ src_install() {
 	done
 
 	newdoc ChangeLog ChangeLog.GentooJP
-	cd -
-
-	dodoc ChangeLog INSTALL README
 
 }