fixes bug #140343. and use emake for install.

Package-Manager: portage-2.1.1_pre2-r8

5 files changed, 62 insertions, 25 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/Manifest b/app-text/namazu/Manifest
index 6afa1b5719dd..a277fa27980b 100644
--- a/app-text/namazu/Manifest
+++ b/app-text/namazu/Manifest
@@ -1,6 +1,24 @@
-MD5 c7e14979bbb4a622c6d6b442acfe7577 ChangeLog 1770
-MD5 257b92fc7fffeb47787ee62399496b3c files/digest-namazu-2.0.14 66
-MD5 5e5dacb3f4d05bfa568184edcc188ef0 files/digest-namazu-2.0.16 66
+DIST namazu-2.0.14.tar.gz 1032273
+DIST namazu-2.0.16.tar.gz 1185299 RMD160 13ce0d0e1a80f4677164c5e5c5d525dc2089c236 SHA1 2461a62263ceb347ae10b97e8d119d49590f93a0 SHA256 a4b028d8e183b16ad856991587841fe9672621b168b5f89464e161f5ba842752
+EBUILD namazu-2.0.14.ebuild 1311 RMD160 85adca0b692bd018bd7ca8ebdeeb7e3dae5f9558 SHA1 91b04514720cc2c1cfca6ae71e31ef356a5d04d8 SHA256 9e7355007810faf065ac60cbd594ae142a529878fe32ac976cee4ee137b7d893
+MD5 360cf8f458f9f744cf93dfea59cd9ae8 namazu-2.0.14.ebuild 1311
+RMD160 85adca0b692bd018bd7ca8ebdeeb7e3dae5f9558 namazu-2.0.14.ebuild 1311
+SHA256 9e7355007810faf065ac60cbd594ae142a529878fe32ac976cee4ee137b7d893 namazu-2.0.14.ebuild 1311
+EBUILD namazu-2.0.16.ebuild 1377 RMD160 5ff19b4d6a388ba44ca17df74048ac4d1ef6f132 SHA1 877ccb2fc954139fc9c0d2a6a603b1dd7cdfe340 SHA256 3f1bf603aa604ff29b0d2983f37deddcaf4e359a6644d06837e621771e8ea476
+MD5 ba9542e7e3fd802216cb0ecc0ec5ca61 namazu-2.0.16.ebuild 1377
+RMD160 5ff19b4d6a388ba44ca17df74048ac4d1ef6f132 namazu-2.0.16.ebuild 1377
+SHA256 3f1bf603aa604ff29b0d2983f37deddcaf4e359a6644d06837e621771e8ea476 namazu-2.0.16.ebuild 1377
+MISC ChangeLog 1916 RMD160 37b1ef29ce0c03e2d9c5c69b36428cb1f9fdc0ac SHA1 248f255f28f02ddc19e6725da2f3ce358ecc45e8 SHA256 4f87766f8ff4dd723655863c93bdcbb5c8e980b39f19a94ad1cb84a89e17690c
+MD5 10f4943d1f989d28da94053a6bbef554 ChangeLog 1916
+RMD160 37b1ef29ce0c03e2d9c5c69b36428cb1f9fdc0ac ChangeLog 1916
+SHA256 4f87766f8ff4dd723655863c93bdcbb5c8e980b39f19a94ad1cb84a89e17690c ChangeLog 1916
+MISC metadata.xml 226 RMD160 19d90fb44483e26b860cda1cc3ad46e3e89b6909 SHA1 e4f7e5ee158178c28a23573fa822f83df9308375 SHA256 c16f962dbb1340e378c4775fd9fa31af8cac92ab8c524988a697af52dc803fdf
 MD5 382a25f7a6abf0020285f37f74158690 metadata.xml 226
-MD5 1bcfd9f4d5f87414a78fc1e4ea65aaf7 namazu-2.0.14.ebuild 1223
-MD5 3557372b526b18f8d36a891ce0e97eb0 namazu-2.0.16.ebuild 1374
+RMD160 19d90fb44483e26b860cda1cc3ad46e3e89b6909 metadata.xml 226
+SHA256 c16f962dbb1340e378c4775fd9fa31af8cac92ab8c524988a697af52dc803fdf metadata.xml 226
+MD5 257b92fc7fffeb47787ee62399496b3c files/digest-namazu-2.0.14 66
+RMD160 e9410f5fb311c0a7fe4a5be196a97b51a3a894e6 files/digest-namazu-2.0.14 66
+SHA256 5aa4899d8446a5c39b3913e8f73b076cdbe0ecff79e58d5fbb0d36cc2b310cc7 files/digest-namazu-2.0.14 66
+MD5 ecdce339e25522e133d00db0627628cd files/digest-namazu-2.0.16 244
+RMD160 6a81a3fb7c6ef6f30b8e2e2e69d50d56198c0d9e files/digest-namazu-2.0.16 244
+SHA256 31cf3287b1aaa8d15b9f1aae77f59db4dfb6e599c6c8e84625e34c271af8c24d files/digest-namazu-2.0.16 244
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/*