4 files changed, 39 insertions, 20 deletions
diff --git a/app-text/namazu/ChangeLog b/app-text/namazu/ChangeLog
index 7c87f0de089e..d7ee6cfc5b47 100644
--- a/app-text/namazu/ChangeLog
+++ b/app-text/namazu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/namazu
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/namazu/ChangeLog,v 1.15 2006/04/28 13:44:49 hattya Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/namazu/ChangeLog,v 1.16 2006/07/14 13:13:01 hattya Exp $
+
+  14 Jul 2006; Akinori Hattori <hattya@gentoo.org> namazu-2.0.14.ebuild,
+  namazu-2.0.16.ebuild:
+  fixes bug #140343. and use emake for install.
 
 *namazu-2.0.16 (28 Apr 2006)
 
diff --git a/app-text/namazu/files/digest-namazu-2.0.16 b/app-text/namazu/files/digest-namazu-2.0.16
index 8d87c29e5513..5740ffc45184 100644
--- a/app-text/namazu/files/digest-namazu-2.0.16
+++ b/app-text/namazu/files/digest-namazu-2.0.16
@@ -1 +1,3 @@
 MD5 8a66627a321cc1b1e39e42fff2736fd9 namazu-2.0.16.tar.gz 1185299
+RMD160 13ce0d0e1a80f4677164c5e5c5d525dc2089c236 namazu-2.0.16.tar.gz 1185299
+SHA256 a4b028d8e183b16ad856991587841fe9672621b168b5f89464e161f5ba842752 namazu-2.0.16.tar.gz 1185299
diff --git a/app-text/namazu/namazu-2.0.14.ebuild b/app-text/namazu/namazu-2.0.14.ebuild
index 9e9afb0c2863..c76a2e642bb1 100644
--- a/app-text/namazu/namazu-2.0.14.ebuild
+++ b/app-text/namazu/namazu-2.0.14.ebuild
@@ -1,6 +1,6 @@
-# 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-text/namazu/namazu-2.0.14.ebuild,v 1.6 2005/12/04 19:48:35 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/namazu/namazu-2.0.14.ebuild,v 1.7 2006/07/14 13:13:01 hattya Exp $
 
 IUSE="chasen cjk emacs kakasi nls tcltk"
 
@@ -13,11 +13,23 @@ KEYWORDS="x86 ppc64 ~ppc ~amd64"
 SLOT="0"
 
 DEPEND=">=dev-perl/File-MMagic-1.20
+	chasen? ( app-text/chasen )
 	cjk? ( app-i18n/nkf )
-	nls? ( sys-devel/gettext )
-	chasen? ( dev-perl/Text-ChaSen )
 	kakasi? ( dev-perl/Text-Kakasi )
-	tcltk?  ( dev-lang/tk www-client/lynx )"
+	nls? ( sys-devel/gettext )
+	tcltk? (
+		dev-lang/tk
+		www-client/lynx
+	)"
+
+src_unpack() {
+
+	unpack ${A}
+	cd "${S}"
+
+	sed -i "s:\(rm -f \$(filterdir).*$\):# \1:" filter/Makefile.in
+
+}
 
 src_compile() {
 
@@ -32,18 +44,16 @@ src_compile() {
 		`use_enable tcltk tknamazu` \
 		${myconf} \
 		|| die
-	sed -ie "s:\(rm -f \$(filterdir).*$\):# \1:" filter/Makefile
 	emake || die
 
 }
 
 src_install () {
 
-	make DESTDIR=${D} install || die
-	rm -r ${D}/usr/share/namazu/etc
+	emake DESTDIR="${D}" install || die
+	rm -rf "${D}"/usr/share/namazu/{doc,etc}
 
-	rm *NLS
-	dodoc [A-Z][A-Z]* ChangeLog*
+	dodoc AUTHORS CREDITS ChangeLog* HACKING* NEWS README* THANKS TODO
 
 	if use emacs; then
 		docinto lisp
diff --git a/app-text/namazu/namazu-2.0.16.ebuild b/app-text/namazu/namazu-2.0.16.ebuild
index 17bfca0d4389..16c78df5824c 100644
--- a/app-text/namazu/namazu-2.0.16.ebuild
+++ b/app-text/namazu/namazu-2.0.16.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-text/namazu/namazu-2.0.16.ebuild,v 1.1 2006/04/28 13:44:51 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/namazu/namazu-2.0.16.ebuild,v 1.2 2006/07/14 13:13:01 hattya Exp $
 
 IUSE="chasen cjk emacs kakasi nls tcltk"
 
@@ -13,18 +13,21 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 SLOT="0"
 
 DEPEND=">=dev-perl/File-MMagic-1.20
+	chasen? ( app-text/chasen )
 	cjk? ( app-i18n/nkf )
-	nls? ( sys-devel/gettext )
-	chasen? ( dev-perl/Text-ChaSen )
 	kakasi? ( dev-perl/Text-Kakasi )
-	tcltk?  ( dev-lang/tk www-client/lynx )"
+	nls? ( sys-devel/gettext )
+	tcltk? (
+		dev-lang/tk
+		www-client/lynx
+	)"
 
 src_unpack() {
 
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
-	sed -i -e "s:\(rm -f \$(filterdir).*$\):# \1:" filter/Makefile.in
+	sed -i "s:\(rm -f \$(filterdir).*$\):# \1:" filter/Makefile.in
 
 }
 
@@ -47,8 +50,8 @@ src_compile() {
 
 src_install () {
 
-	make DESTDIR=${D} install || die
-	rm -rf ${D}/usr/share/namazu/{doc,etc}
+	emake DESTDIR="${D}" install || die
+	rm -rf "${D}"/usr/share/namazu/{doc,etc}
 
 	dodoc AUTHORS CREDITS ChangeLog* HACKING* NEWS README* THANKS TODO
 	dohtml -r doc/*