Remove rpm man pages which are also included with app-arch/rpm. Bug #346249

Package-Manager: portage-2.2.0_alpha75/cvs/Linux x86_64

3 files changed, 118 insertions, 18 deletions

diff --git a/app-i18n/man-pages-ja/ChangeLog b/app-i18n/man-pages-ja/ChangeLog
index 1b2d31bf9180..9c4cdc6d2967 100644
--- a/app-i18n/man-pages-ja/ChangeLog
+++ b/app-i18n/man-pages-ja/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/man-pages-ja
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-ja/ChangeLog,v 1.29 2010/11/15 16:21:03 matsuu Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-ja/ChangeLog,v 1.30 2011/11/23 23:22:14 naota Exp $
+
+*man-pages-ja-20101110-r1 (23 Nov 2011)
+
+  23 Nov 2011; Naohiro Aota <naota@gentoo.org>
+  +man-pages-ja-20101110-r1.ebuild:
+  Remove rpm man pages which are also included with app-arch/rpm. Bug #346249
 
 *man-pages-ja-20101110 (15 Nov 2010)
 
diff --git a/app-i18n/man-pages-ja/Manifest b/app-i18n/man-pages-ja/Manifest
index e4732ce935fb..4a2d605b2165 100644
--- a/app-i18n/man-pages-ja/Manifest
+++ b/app-i18n/man-pages-ja/Manifest
@@ -1,27 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 DIST man-pages-ja-20070515.tar.gz 3415989 RMD160 3d1e706899c7f9b7693f01aabe4ae03ce8c869be SHA1 807531b36f11e74d9c7a8fe5d1d5d41a9ace63db SHA256 1f6209d5a57e40cef754ba207500c7be41883301d980efdeac976f75c2a0d4c1
 DIST man-pages-ja-20101110.tar.gz 3815928 RMD160 61cfedffb6ff83b77cc78cc50b9705aed4d76353 SHA1 34a1e1aabd1463ed9b803f7e2ddf1d32af8246e3 SHA256 6cbcebeb10cc0bc7636c1283327660b6a642a0ace97cdd5f13d4e0796de6ace3
 DIST portage-man-pages-ja-20060415.tar.gz 67347 RMD160 90fd4eb29454c0f8b082f80b4fdbae5caa96562a SHA1 713ff2e3e81068b39fa595c72077c1aed115aa40 SHA256 e847d0ab11b7cc1b5b9e8c2c11591665efe8f00d6d7a277c0b9489906d4eaf3a
 EBUILD man-pages-ja-20070515.ebuild 1765 RMD160 013069bf905a77596e260b05745ebbdbca3c4d30 SHA1 08ef4eb083a8c44486b30ff10acc4cc8e0ea0f78 SHA256 7f5b226d0f1c1e340f528d04b17145d09bb3a4f087d6c4ea2268d6be4d235e7c
+EBUILD man-pages-ja-20101110-r1.ebuild 2054 RMD160 90e3ee25e6bad18e3cafee9f3007c4dc186f4026 SHA1 23ebaf6c9a384dc33c9633fa12fd473a8b78fb3c SHA256 9926f07534c9d3d478c0e5a746313a27c6c0c8316973a3328ec34b10b8953f60
 EBUILD man-pages-ja-20101110.ebuild 1992 RMD160 52dd7cc2ae5fde35641d940c5a05bf0aee9e2330 SHA1 907176debec158f8bf998bc75206c4aa56d51dfe SHA256 c5e9a3da2dbd978fc7831613fbe943a51eed01431e1ac13732f27692c9ac9a68
-MISC ChangeLog 9324 RMD160 adab7cfbc7a5ab7f9d6de1f6c3bbcb9fc820114d SHA1 2bd6ee6ece6028b206378d42f0ad58ccf3a9a71f SHA256 0cb25f8a075ace5d3beab414420844f0eb22edb687887d7a3a6b5ea6b425965e
+MISC ChangeLog 9526 RMD160 e2c8bd909104239a01eb6457cfa415591c3959d7 SHA1 20a564f62fab674f519264cf670b752eff83a3ad SHA256 34c25a04d6f277bbf0c896af061a995332dd7793696dd2030d9a5f26cf496b6f
 MISC metadata.xml 508 RMD160 5ba571e6e461ff59ed5b771c94a1b539d2a5735e SHA1 93fe042b19f0291ac77e5b55ccdf5e95b21bdf28 SHA256 08d6d36824b177500d7f2ffe746f0a5a5cfbdbab7622b07cc2a5291df1fb3cc4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJM4V34AAoJECaGw+YFKA1prQ0P/0VqkpyiV0xN4KCzze0il3zJ
-UJdURCibC4Y1h28l+bgzXV8ZFtpQtn3fsTp+bcZ6t8TmFsy4JFbt6tFieQLrHBXb
-xIdm1glTTbyMlkv5sWTsp1oCb7U/HIEPdR4cfB0iB8LUrgbKqwBecujZu6VUvQdg
-N6X7yIoYusOb74330FJM+BZ2TTJOH+VcqrJsB36BOlO79XqWZTtKnlPY+siMwmLc
-Q2tKek8KT0QFrOydDLuQOrh2GbyZtEtYNoIbLhVqkNn2vxO2DLczMtfRBDgOlgVH
-fBzKbHtZLU0m0fUQBq1DKj0sp9eLQQ5zk0iV2aqX8t1hQxTUHI9Y/T8g2zvB+1Wy
-r4G+L3NwF/aZBi+pEa74twLNLyws3M5ottOg0jaodTnM87XWeQEZNvdq6vwAf6mv
-T4mwbSytYq3mi5gMYKsiBzQvaDAOiuI5+tBOWzhXhk2qprlBfB2qAPZf0PlhgOoF
-6zf+7QVtzr+R4uw1IEBIvzNIcTxBdriY3GVb7SX12UUW93WMc55WnG3Rr0HmPpNq
-jgwxDUPwrxntkxL5MrV+nTRJ2EDriL35ep+0l8yF6C7TEMMycIiZh5CB//lISCmf
-Y/9IrWWgnX5RVxtGA3GhAQW7kreaG6+PJN7wuRPu5W+bzgCHGH9synCQW0rnlPR5
-hiaGFxkuAerjH1Z7T5Bs
-=kTie
+iQIcBAEBCAAGBQJOzYA9AAoJEDYO1FT4VRUUStAQAIPOC7ahLPXrkPfMv2580y0i
+CBFQNS02gwscs4X82JElBXIHvr8RR32VAhzBjo87a4cXkEUrmSedYXAumOOOjY9L
+mnx06X0a+R8m2Y578LPi/P1weN4tFcVFVV0gLGkEklVhvzKnOE011LIQlGOha3Yq
+FeYeerggciDPQJzrhlhZ9TDrA2qfzUF59MiEfPQ3C4Rt233UHjhUXIGiAsPm6liO
+2i6AYm+VRQmMkGfBAabEhBD2F848B+LIBKfcuqo2hy+cXk1N6VeVuVgk13y9n7L/
+Ac8Njjt8Bo4Cg0P0DQG5IRqFCIl5j9GAC+QxJl+rz1EXFYrZsqpcbVnVNQEG9Iqu
+S/csVQrl3kz8Rlz+o4FcjbT6sadk1UCIO/8HrrbwYIlaczwt3vbkUfuI+WctYWXu
+4I3lddgtsOGFcxY/Qy6fymKOE+RaVdhfHSPBmVlQQyb8pXrFfV4eL6uIjELtauP1
+1JoiOsvO56aMgKz/2F2bKRYF22YiQLAW24lubs0K7iay2YpLWKBk3cFV//MmTPg6
+avEkon6KE9VBtHIYW37406Uz22R/EaM0Px8dtluWpOrMT61k+gW84a2EfTEBj8/z
+4tRLqbqy6vl7VeKZTEOu+wYQIwOXl7DBbB5p677fvBuc1yuNSYDbhRNeLoAqqX1G
+FrOedYg8gmGfmjjftaiV
+=EyDm
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/man-pages-ja/man-pages-ja-20101110-r1.ebuild b/app-i18n/man-pages-ja/man-pages-ja-20101110-r1.ebuild
new file mode 100644
index 000000000000..e4d78f177205
--- /dev/null
+++ b/app-i18n/man-pages-ja/man-pages-ja-20101110-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2011 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-20101110-r1.ebuild,v 1.1 2011/11/23 23:22:14 naota Exp $
+
+EAPI="3"
+GENTOO_MAN_P="portage-${PN}-20060415"
+
+DESCRIPTION="A collection of manual pages translated into Japanese"
+HOMEPAGE="http://linuxjm.sourceforge.jp/ http://www.gentoo.gr.jp/jpmain/translation.xml"
+SRC_URI="http://linuxjm.sourceforge.jp/${P}.tar.gz
+	http://dev.gentoo.org/~hattya/distfiles/${GENTOO_MAN_P}.tar.gz"
+
+LICENSE="as-is GPL-2 LGPL-2 BSD MIT FDL-1.1 LDP-1 LDP-1a"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND="virtual/man"
+
+src_prepare() {
+
+	sed -i -e "/^\(man\|shadow\)/s:Y:N:" script/pkgs.list || die
+
+	# 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/*/man8/{vigr,vipw}.8 || die
+	# - app-arch/rpm +nls
+	rm -f manual/rpm/man8/rpm*.8 || die
+
+	for f in manual/*/man8/ld{,-linux}.so.8 ; do
+		mv ${f} ${f/.so.8/.so.ja.8} || die
+	done
+	mv "${WORKDIR}"/${GENTOO_MAN_P}/portage/g-cpan.pl{,.ja}.1 || die
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+
+	local x y z pkg
+
+	for x in $(tac script/pkgs.list | grep -v '^[#].*'); do
+		if [[ -z "$pkg" ]]; then
+			pkg=$x
+			continue
+		fi
+
+		if [[ "$x" == "N" ]]; then
+			pkg=
+			continue
+		fi
+
+		einfo "install $pkg"
+
+		for y in $(ls -d manual/$pkg/man* 2>/dev/null); do
+			doman -i18n=ja $y/*
+		done
+
+		pkg=
+	done
+
+	dodoc README || die
+
+	cd "${WORKDIR}"/${GENTOO_MAN_P}
+
+	for x in *; do
+		if [ -d "$x" ]; then
+			einfo "install $x"
+
+			for z in $(for y in $x/*.[1-9]; do echo ${y##*.}; done | sort | uniq); do
+				doman -i18n=ja $x/*.$z
+			done
+		fi
+	done
+
+	newdoc ChangeLog ChangeLog.GentooJP || die
+
+}
+
+pkg_postinst() {
+
+	echo
+	elog "You need to set appropriate LANG variables to use"
+	elog "Japanese manpages."
+	elog "e.g."
+	elog "\tLANG=\"ja_JP.eucJP\""
+	elog "\texport LANG"
+	echo
+
+}