update

Package-Manager: portage-2203-svn

4 files changed, 23 insertions, 102 deletions

diff --git a/app-i18n/man-pages-ja/Manifest b/app-i18n/man-pages-ja/Manifest
index 7a9f4b8abab1..13e3cdc67181 100644
--- a/app-i18n/man-pages-ja/Manifest
+++ b/app-i18n/man-pages-ja/Manifest
@@ -1,10 +1,8 @@
 MD5 71f17be1d51cf6552db2708270a994cc ChangeLog 6299
-MD5 0df2cea45b1b8531bcece297c9303154 files/digest-man-pages-ja-20040915 153
 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 154
-MD5 b7d69529d12a696d9b702860ffffeb74 man-pages-ja-20040915.ebuild 1942
 MD5 5a4a95eedd55524ea58085cdadae0a10 man-pages-ja-20041115.ebuild 2102
-MD5 7e96c081bcc752870e8a1d72bd61dcab man-pages-ja-20050415.ebuild 2212
+MD5 226b040efa20d728febc7819698f2a85 man-pages-ja-20050415.ebuild 2074
 MD5 61958a893a499964a3532e42a1de3575 man-pages-ja-20060415.ebuild 2065
 MD5 475629439c6cc71bc10ec394f4da68cf metadata.xml 566
diff --git a/app-i18n/man-pages-ja/files/digest-man-pages-ja-20040915 b/app-i18n/man-pages-ja/files/digest-man-pages-ja-20040915
deleted file mode 100644
index c7817156d822..000000000000
--- a/app-i18n/man-pages-ja/files/digest-man-pages-ja-20040915
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 b85b6d9b84e5465c865351718ac6a4b0 man-pages-ja-20040915.tar.gz 3040634
-MD5 66b03e94d3b09467394bc2cf425f1da3 portage-manpages-ja-20040915.tar.gz 55177
diff --git a/app-i18n/man-pages-ja/man-pages-ja-20040915.ebuild b/app-i18n/man-pages-ja/man-pages-ja-20040915.ebuild
deleted file mode 100644
index 9de2b19c1d23..000000000000
--- a/app-i18n/man-pages-ja/man-pages-ja-20040915.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2005 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-20040915.ebuild,v 1.1 2005/09/02 04:30:28 vapier Exp $
-
-MY_P="man-pages-ja-${PV}"
-GENTOO_MAN_P="portage-${P/man-/man}"
-
-DESCRIPTION="A collection of manual pages translated into Japanese"
-HOMEPAGE="http://www.linux.or.jp/JM/ http://www.gentoo.gr.jp/jpmain/translation.xml"
-SRC_URI="http://www.linux.or.jp/JM/${MY_P}.tar.gz
-	http://dev.gentoo.org/~hattya/distfiles/${GENTOO_MAN_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-DEPEND="!>=sys-apps/groff-1.19
-	=sys-apps/groff-1.18*
-	sys-apps/man"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if ! groff -v -Tnippon >/dev/null 2>&1 ; then
-		ewarn
-		ewarn "You need to compile groff with multilingual support."
-		ewarn "Please recompile sys-apps/groff with USE=\"cjk\"."
-		ewarn
-		die "groff m17n support disabled."
-	fi
-}
-
-src_compile() { :; }
-
-src_install() {
-
-	for x in $(grep '^[^#].*' script/pkgs.list | cut -f1 | sort); do
-		for a in $(ls -d manual/$x/man* 2>/dev/null); do
-			jmandir=$(echo $a | cut -d/ -f3)
-
-			einfo "install $x:  /usr/share/man/ja/$jmandir/"
-
-			insinto /usr/share/man/ja/$jmandir
-			doins $a/*
-		done
-	done
-
-	cd ${WORKDIR}/man
-	for x in $(for y in *.[1-9]; do echo ${y##*.}; done | sort | uniq); do
-		einfo "install portage:  /usr/share/man/ja/man$x/"
-
-		insinto /usr/share/man/ja/man$x
-		doins *.$x
-	done
-	cd -
-
-	dodoc ChangeLog INSTALL README
-
-}
-
-pkg_postinst() {
-
-	einfo
-	einfo "You need to set appropriate LANG and PAGER variables to use"
-	einfo "Japanese manpages."
-	einfo "e.g."
-	einfo "\tLANG=\"ja_JP.eucJP\""
-	einfo "\tPAGER=\"jless\""
-	einfo "\tJLESSCHARSET=\"ja\""
-	einfo "\texport LANG PAGER JLESSCHARSET"
-	einfo "or"
-	einfo "\tLANG=\"ja_JP.eucJP\""
-	einfo "\tPAGER=\"lv -c\""
-	einfo "\texport LANG PAGER"
-	einfo
-
-}
diff --git a/app-i18n/man-pages-ja/man-pages-ja-20050415.ebuild b/app-i18n/man-pages-ja/man-pages-ja-20050415.ebuild
index ebfeaac658eb..21908bd28254 100644
--- a/app-i18n/man-pages-ja/man-pages-ja-20050415.ebuild
+++ b/app-i18n/man-pages-ja/man-pages-ja-20050415.ebuild
@@ -1,27 +1,26 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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-20050415.ebuild,v 1.2 2005/09/24 18:08:50 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-ja/man-pages-ja-20050415.ebuild,v 1.3 2006/05/04 12:07:59 hattya Exp $
+
+IUSE=""
 
-MY_P="man-pages-ja-${PV}"
 GENTOO_MAN_P="portage-${P/man-/man}"
 
 DESCRIPTION="A collection of manual pages translated into Japanese"
 HOMEPAGE="http://www.linux.or.jp/JM/ http://www.gentoo.gr.jp/jpmain/translation.xml"
-SRC_URI="http://www.linux.or.jp/JM/${MY_P}.tar.gz
+SRC_URI="http://www.linux.or.jp/JM/${P}.tar.gz
 	http://dev.gentoo.org/~hattya/distfiles/${GENTOO_MAN_P}.tar.gz"
 
 LICENSE="GPL-2"
-SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
+SLOT="0"
 
 DEPEND="!>=sys-apps/groff-1.19
 	=sys-apps/groff-1.18*
 	sys-apps/man"
 
-S=${WORKDIR}/${MY_P}
-
 pkg_setup() {
+
 	if ! groff -v -Tnippon >/dev/null 2>&1 ; then
 		ewarn
 		ewarn "You need to compile groff with multilingual support."
@@ -29,37 +28,39 @@ pkg_setup() {
 		ewarn
 		die "groff m17n support disabled."
 	fi
-}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# Get rid of file collisions with man and shadow
-	rm -r manual/{man{,-db},shadow}
-	rm manual/*/man{1/{chfn,chsh,groups,newgrp,passwd,su}.1,8/{vigr,vipw}.8}
 }
 
-src_compile() { :; }
+src_compile() {
+
+	return
+
+}
 
 src_install() {
+
 	local x y z
 
 	for x in $(grep '^[^#].*' script/pkgs.list | cut -f1 | sort); do
 		for y in $(ls -d manual/$x/man* 2>/dev/null); do
 			jmandir=$(echo $y | cut -d/ -f3)
 
+			einfo "$(printf "install %-20s  /usr/share/man/ja/$jmandir" $x:)"
+
 			insinto /usr/share/man/ja/$jmandir
-			doins $y/* || die "doins $y"
+			doins $y/*
 		done
 	done
 
-	cd "${WORKDIR}/${GENTOO_MAN_P}"
+	cd ${WORKDIR}/${GENTOO_MAN_P}
 
 	for x in *; do
 		if [ -d "$x" ]; then
 			for z in $(for y in $x/*.[1-9]; do echo ${y##*.}; done | sort | uniq); do
+				einfo "$(printf "install %-20s  /usr/share/man/ja/man$z" $x:)"
+
 				insinto /usr/share/man/ja/man$z
-				doins $x/*.$z || die "doins $x"
+				doins $x/*.$z
 			done
 		fi
 	done
@@ -72,6 +73,7 @@ src_install() {
 }
 
 pkg_postinst() {
+
 	einfo
 	einfo "You need to set appropriate LANG and PAGER variables to use"
 	einfo "Japanese manpages."
@@ -85,4 +87,5 @@ pkg_postinst() {
 	einfo "\tPAGER=\"lv -c\""
 	einfo "\texport LANG PAGER"
 	einfo
+
 }