remove unnecessary die for elisp-common functions

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0xEC917A6D

4 files changed, 20 insertions, 20 deletions

diff --git a/app-text/namazu/ChangeLog b/app-text/namazu/ChangeLog
index fa7d621bc321..deba633ac8de 100644
--- a/app-text/namazu/ChangeLog
+++ b/app-text/namazu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/namazu
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/namazu/ChangeLog,v 1.43 2013/08/03 06:38:13 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/namazu/ChangeLog,v 1.44 2013/08/03 06:48:17 hattya Exp $
+
+  03 Aug 2013; Akinori Hattori <hattya@gentoo.org> namazu-2.0.21.ebuild,
+  namazu-2.0.22_p1.ebuild:
+  remove unnecessary die for elisp-common functions
 
   03 Aug 2013; Akinori Hattori <hattya@gentoo.org> namazu-2.0.21.ebuild:
   update to EAPI 5
diff --git a/app-text/namazu/Manifest b/app-text/namazu/Manifest
index b6362fa4c2e9..505b97113eed 100644
--- a/app-text/namazu/Manifest
+++ b/app-text/namazu/Manifest
@@ -6,14 +6,14 @@ AUX namazu-2.0.19-gentoo.patch 1258 SHA256 89218d988e64446cf65d4ff73f53a45543cc4
 AUX namazu-2.0.21-search.patch 2122 SHA256 5d5c75102e3e0dc3cb35eb91a44d7ceabc699a7ae809812e841cf64b82e13db9 SHA512 b69d347ba10d88d99f335bfa2dca61d52c284ef2f5375f43f0c7fe16fc8d39cb4b8e3ad57a1bfbc07d463284ec53dbdc805233e0c6f441b451ae50dba1e960c8 WHIRLPOOL 5df0f138b66e1f264c0e129528df491fb9bd88f5f2a6eafb349014f15a72230bdef9aac8ff5895c901ccd1f17e144354f8f7aeb24a83c802e4786d068f17ea85
 DIST namazu-2.0.21.tar.gz 1394048 SHA256 5c18afb679db07084a05aca8dffcfb5329173d99db8d07ff6d90b57c333c71f7 SHA512 c0ce1b8c8b8ce30ee7d28cfed790a9c8585d1b468eefe2ba4ac70976e09329ae04a3a3bbf0b86b9673cfdf206f2b103896daca2f053062f451884fa659b31ea6 WHIRLPOOL 61794e4c1644303c90c074c4f383a74dd8db0550c8108120bc1ee9dd47d9b1e3aeef6484008c6ee729eb7711c4da57bb0d50f16ab0353886296e70d4f9daa9db
 DIST namazu-2.0.22pre1.tar.gz 1394798 SHA256 58937c8dd62934c4b6596670361e53b20505415afa02bf1491b5ae0176d4afbb SHA512 de982a45a7e8d11f901e0e5db3ba8047d065569c56de676d6b876747e8bf5c358f0d3037a6539421cbff2c0f0cbc889d379b33500e308d038e663d62cd4b5005 WHIRLPOOL 86723855e372cfd4f7e035ca609c19114ee8531d3202a34382718cf4a037db8c883e3cf4a94616afc95e380f66720131c08f577b94975ce13fb079e9cb36a595
-EBUILD namazu-2.0.21.ebuild 1666 SHA256 e3db25400151d6fa037a4325f999513f05c949d571101f1df88be0fde2ebe2e3 SHA512 5b85973a042b2c2339d208bcd010553d069050f1224a3340f7f4b00ef23bb3bf3d52dc7fc3bacf7b964a35ceb51934ae53b6b83ba797562c6ab0dff7aa855029 WHIRLPOOL 95bfda2fabfefeebfb2bd7426e145ea0cd2c4a3fe74017adf57da164879ef67eb793fad2a475fc1718ec36a14472bc8116cc3026fe40355bad0852932edc4798
-EBUILD namazu-2.0.22_p1.ebuild 1746 SHA256 58922db6c739f9bd911b509f6ad3c9d32eb45bc756936ad8a5fd3229f4d20dc5 SHA512 033272ca1eca1eeca7a24618243d762a840eab0a20cdf24d76eb2d2ed3bf69b0290c262d51697b58da8866172cf7e80ea19d330f7ea0eb0e9c1aa92d28afd926 WHIRLPOOL 36ce3295e52bb2f356a789dd13360e49da00b4bb593ca05f75905d7eda0e76b1d4bc3bbaa82a1709a2598741c97f8a7a2e88690e563b20d2823897cca8871e9f
-MISC ChangeLog 5553 SHA256 e3e8f48f5b5c13af370318c40d06ebd40af81b96c1e0c3e6db39b1c10df250c9 SHA512 7eecb4b2137032342b0dd5c402ce6653baa1fb4c417897db03193bbf47ad3b6e9146c3255fd636a84974a4fa8871f9f4c1cb257fade4f3e936c89e9342b755cf WHIRLPOOL 4f06a1be51dae6a9f85b3d1192402741463d27726e4040c3038d3b039b394f68ceb498bbbbe823ab294c1b3e275efb809a8706a00d9bb1bc57666420ab39b8bb
+EBUILD namazu-2.0.21.ebuild 1665 SHA256 0bdd1fa5ba9cc5832cd025f474b3ebbf2a1ed3b20b101ba2e67c4960280d53b1 SHA512 e33d11bece0a6720d6b6321e9f058fc433a128968ff004bfb5a869494479a74ac4aaa9d39ad1969b99aa1f3d41038e2416a438d2b04544f058973546652fa78e WHIRLPOOL 528f68742f357edf348ca4746324af4bba253145b6cbb2fb809c3b5f5dd0e9f0e479185382b7c0ee460d045f408e47b630fe9ace9637c9fcec405ea4e17794c0
+EBUILD namazu-2.0.22_p1.ebuild 1725 SHA256 effcd7aec8af4aeba204a2c9ab487c6556225d9bfde23a383adbbdd119826eb6 SHA512 84b7ed03b247f62894dcfff0dbe60e05716daa19a6f859e2701eb18545e3f959bcb4a1317b91857c84c257ab8ac7e4c60b0bafac5c774f875ac6a36b1e962303 WHIRLPOOL 811b4fc776d33c2fdbe33762de6e7c9808b89715828ca2c5a54c20d5a334eaed57933be2148d608f416d1ef7435203c56b74af32bb58a86862d113280be2e595
+MISC ChangeLog 5706 SHA256 2a43cce186d5165b37db66638b64fc291b7a5b86c496b8bffc20ea5561ffdf28 SHA512 aa1eaa43eeda63569764bc6f88e3973f100885c12cba72fb3f99e28ea525f32fd74ab156a9104893f3f77d35192a52849a227fa5e31700e6c89a5d9ed60acd87 WHIRLPOOL cc170dd8770951aa1dd774157c0557d7b93bcf344e58c2717ef4270b86dbe796a50bc6e48eda51b200eea2455abf214973ed1eb540560509d2156a093e30b568
 MISC metadata.xml 226 SHA256 c16f962dbb1340e378c4775fd9fa31af8cac92ab8c524988a697af52dc803fdf SHA512 7e80a743152e01cd1a50155ca9fde3fdaaedba2f52fecd8d148a2c3c7f8563b4b3d46d27b499959064564160421fc717206d306b91044e1678e105ba393b28bf WHIRLPOOL 32dfbcc71ceda254a754de992f983dee6dcc4479c82dd945e72bf08ec2057c9b41a03af8cb576655080d5db8fadda5e9feb7f63d1122e4a1c2cd1050cc877cfa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlH8pV4ACgkQL46suuyRem2g/gCfdrP7LNBwvF1AFm+tZD1leVii
-XUMAoKOpYhQhYibaBeXGfTDojwOQr2z2
-=WHZo
+iEYEAREIAAYFAlH8p7oACgkQL46suuyRem3ueACgk/Fuc948r+z9xovwNAQ4XiS8
+9xsAmQGp+6+XbPrEUT7PD/LBz/IICNYZ
+=rN7f
 -----END PGP SIGNATURE-----
diff --git a/app-text/namazu/namazu-2.0.21.ebuild b/app-text/namazu/namazu-2.0.21.ebuild
index d16a85234343..b76e7f3b7e81 100644
--- a/app-text/namazu/namazu-2.0.21.ebuild
+++ b/app-text/namazu/namazu-2.0.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/namazu/namazu-2.0.21.ebuild,v 1.5 2013/08/03 06:38:13 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/namazu/namazu-2.0.21.ebuild,v 1.6 2013/08/03 06:48:17 hattya Exp $
 
 EAPI="5"
 
@@ -31,7 +31,6 @@ RDEPEND=">=dev-perl/File-MMagic-1.20
 		dev-lang/tk
 		www-client/lynx
 	)"
-
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
diff --git a/app-text/namazu/namazu-2.0.22_p1.ebuild b/app-text/namazu/namazu-2.0.22_p1.ebuild
index c93d803d4ef1..520652ad1541 100644
--- a/app-text/namazu/namazu-2.0.22_p1.ebuild
+++ b/app-text/namazu/namazu-2.0.22_p1.ebuild
@@ -1,20 +1,19 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/namazu/namazu-2.0.22_p1.ebuild,v 1.1 2013/03/01 09:47:14 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/namazu/namazu-2.0.22_p1.ebuild,v 1.2 2013/08/03 06:48:17 hattya Exp $
 
-EAPI=5
+EAPI="5"
 
 inherit autotools-utils eutils elisp-common
 
-IUSE="emacs nls tk linguas_ja"
-
 DESCRIPTION="Namazu is a full-text search engine"
 HOMEPAGE="http://www.namazu.org/"
 SRC_URI="http://www.namazu.org/test/${P/_p/pre}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS=""
 SLOT="0"
+KEYWORDS=""
+IUSE="emacs nls tk linguas_ja"
 
 RDEPEND=">=dev-perl/File-MMagic-1.20
 	emacs? ( virtual/emacs )
@@ -32,17 +31,15 @@ RDEPEND=">=dev-perl/File-MMagic-1.20
 		dev-lang/tk
 		www-client/lynx
 	)"
-
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
+S="${WORKDIR}"/${P/_p/pre}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.0.19-gentoo.patch"
 )
 DOCS=(AUTHORS CREDITS NEWS THANKS TODO)
 
-S="${WORKDIR}"/${P/_p/pre}
-
 src_configure() {
 	local myeconfargs=(
 		$(use_enable nls)
@@ -62,7 +59,7 @@ src_compile() {
 
 	if use emacs; then
 		cd lisp
-		elisp-compile gnus-nmz-1.el namazu.el || die
+		elisp-compile gnus-nmz-1.el namazu.el
 	fi
 }
 
@@ -72,8 +69,8 @@ src_install () {
 	dohtml -r doc/*
 	rm -r "${ED}"/usr/share/namazu/doc || die
 	if use emacs; then
-		elisp-install ${PN} lisp/gnus-nmz-1.el* lisp/namazu.el* || die
-		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el || die
+		elisp-install ${PN} lisp/gnus-nmz-1.el* lisp/namazu.el*
+		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
 
 		docinto lisp
 		dodoc lisp/ChangeLog*