Added die also to 9999 ebuild, thanks Arfrever for the hint bug #393287

Package-Manager: portage-2.1.10.40/cvs/Linux i686

diff --git a/dev-vcs/mercurial/ChangeLog b/dev-vcs/mercurial/ChangeLog
index 2cbf05664d18ab2474101287923871379f7ec627..af2d7ca13b412c2d71d8f4042d21a806ffd6bc09 100644 (file)
--- a/dev-vcs/mercurial/ChangeLog
+++ b/dev-vcs/mercurial/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-vcs/mercurial
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.61 2011/12/15 20:40:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.62 2011/12/16 21:31:43 ago Exp $
+
+  16 Dec 2011; Agostino Sarubbo <ago@gentoo.org> mercurial-9999.ebuild:
+  Added die also to 9999 ebuild, thanks Arfrever for the hint bug #393287
 
   15 Dec 2011; Agostino Sarubbo <ago@gentoo.org> mercurial-2.0.1.ebuild:
   Added '|| die' where missing, wrt bug #393287

diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index 2b37c24a82a15be7489a42a29826cc7779e36635..e9092d3db6470e0610a55b949cf411146573a41f 100644 (file)
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -8,17 +8,17 @@ DIST mercurial-2.0.tar.gz 3090977 RMD160 f0c5f143eabff4a6c06d512cecd718bf594d06b
 EBUILD mercurial-1.7.ebuild 3572 RMD160 b554405532f747c724d60a0a621951679f0107e3 SHA1 25537aece6845e32bd7d07f01684f92266fa63ab SHA256 d54a330388d1d1c3437c0f9a39f6a10ba62b358c740f8b3f2d24284dbaf3cae2
 EBUILD mercurial-2.0.1.ebuild 4004 RMD160 befdda02423006766c38e5183f38cae7d7919014 SHA1 ecf51cdcce5b7970032e018264a11820b233a5cc SHA256 cd98be5ccec551516d3d3a7072e467629a2f36e1fb7df1ef34ad3e44d21dad40
 EBUILD mercurial-2.0.ebuild 3774 RMD160 f3356dff3f251d71a52abda95d9e468333c57d23 SHA1 a16d1c455dfcdfb88042f54ef4c4f1605bde9a61 SHA256 684ecd5998c92c5214c57832d01808d86eb9dba0575942b9d14aea463292ed2e
-EBUILD mercurial-9999.ebuild 3400 RMD160 da98241f4ac161e92e1bd2edf1d376e3fa8287cc SHA1 868f8eeec559b0187e823f5de9778ca2f3f7c10f SHA256 5d2c3e7445864f34459c1cf74783ff2518cf6a3c675705ce18c515b535e094b0
-MISC ChangeLog 26406 RMD160 15638dc3ad1e016604f4fa56eb333f1b15707337 SHA1 1456ae8c6ff99cff95ba3b7e28ecdabb244cf6d3 SHA256 3ed7efcf0e7ef119989c59f512de30d0903d6c9e7ee29ffe09969f64166b8f8f
+EBUILD mercurial-9999.ebuild 3481 RMD160 d3ec02624bdfb07c18592d80ad9d551dacac0fa9 SHA1 873d500f9aa3a340eb33ec6ee088bd8ec6a219b1 SHA256 dd57034ed361dd3a731647170075ecc95c0d5cf3e267a36bbe39b11978cac4ba
+MISC ChangeLog 26553 RMD160 32270ed07b27b8040d872e54659f1e0b06bc94d6 SHA1 6994ddcb44e7e399450dbd5b7196d4f570d16a2c SHA256 fbdd3d15292dd8b098bcf1c602f7953e5f96c6b562a41ef66e310657c4e1d408
 MISC metadata.xml 537 RMD160 094da5d55adea235b0980078f03edbc1e2006af9 SHA1 f01f12737cceb293ad828c22c9b1a37a4b51306b SHA256 41fac9bbf087e7bcf85d6ae1a1892c8b0e650e85e44346287f1215e1831948f2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCgAGBQJO6ltsAAoJEOTDgjZ80txdeckH/0tXspGXIRvM9o4KEfJgzcpB
-7vhTXZa46hZfbKjbuzTEnyBAtB5cUXGGNtiVG7NSZ5nJPttMrhniqTu0F6XRKPfX
-4CB0rY55dYwSh8P5vXY2JbqGDyXlGQ4wUyL3IdcXb60JC/+hclSuRdsfZn4CyISq
-sZpEJrbaAB6QtI80Uk/JrRkS7BYUQsdkIqDdPdaybfU5hF56WuNsB1aueOEq0G4t
-umwIFLZ+GZCYhgCi29wj6lk1ggN3I+YQBtWaWjJF42b65PWlzwrgxY24+9nNvbIq
-IS4m1G50nIxTApswz8NuW/6dNIuvkyEbcfvbSB0MON8EeevE796utxSvp1KKZTc=
-=sbhv
+iQEcBAEBCgAGBQJO67jWAAoJEOTDgjZ80txdf1AH/RBui1GY89r6YtPnDNRFFlB1
+qf5DWEnXlN0EtuSALqd02n0dOqLkzy9ckhYuRAPfa+mFX6HwhXRBLDc00wx+a4TK
+8uGyW39wRXHlVGyc+ujhPwSfLtpQfT37uV0y9CwU8qtR2ap33/sHG/LXXOMoJiCI
+RmpV7jiKIxVzduqZ7RNMHitx5kPoeO03nZx+R1H9K5SdZjgMMLK2UCe5XypFmUfK
+hc1U9EqQsmPAYlE48n0xu9uV+acbkgGWUd8aOYSRJ9wUudJBfjLu0AyNyAMOyxia
+Y7agZ+Ks2zAQri4q4yYa3g4M3ZvBZ7VHfzcf71cn8W2BY0wCVVMlqd9vU/W8bAI=
+=8BER
 -----END PGP SIGNATURE-----

diff --git a/dev-vcs/mercurial/mercurial-9999.ebuild b/dev-vcs/mercurial/mercurial-9999.ebuild
index 1fcdbd9321b8d2d3489842cdfcf98c009c330d20..1b7edb2a85dedd489eb2b574a4cdb890ec9bdf2a 100644 (file)
--- a/dev-vcs/mercurial/mercurial-9999.ebuild
+++ b/dev-vcs/mercurial/mercurial-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-9999.ebuild,v 1.10 2011/09/09 16:50:10 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-9999.ebuild,v 1.11 2011/12/16 21:31:43 ago Exp $
 
 EAPI=3
 PYTHON_DEPEND="2"
@@ -42,12 +42,12 @@ src_compile() {
        distutils_src_compile
 
        if use emacs; then
-               cd "${S}"/contrib
+               cd "${S}"/contrib || die
                elisp-compile mercurial.el || die "elisp-compile failed!"
        fi
 
        rm -rf contrib/{win32,macosx}
-       make doc
+       make doc || die
 }
 
 src_install() {
@@ -57,27 +57,27 @@ src_install() {
 
        if use zsh-completion ; then
                insinto /usr/share/zsh/site-functions
-               newins contrib/zsh_completion _hg
+               newins contrib/zsh_completion _hg || die
        fi
 
        rm -f doc/*.?.txt
-       dodoc CONTRIBUTORS README doc/*.txt
-       cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/
+       dodoc CONTRIBUTORS README doc/*.txt || die
+       cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/ || die
 
-       dobin hgeditor
-       dobin contrib/hgk
-       dobin contrib/hg-ssh
+       dobin hgeditor || die
+       dobin contrib/hgk || die
+       dobin contrib/hg-ssh || die
 
        rm -f contrib/hgk contrib/hg-ssh
 
        rm -f contrib/bash_completion
-       cp -r contrib "${ED}"/usr/share/doc/${PF}/
-       doman doc/*.?
+       cp -r contrib "${ED}"/usr/share/doc/${PF}/ || die
+       doman doc/*.? || die
 
        cat > "${T}/80mercurial" <<-EOF
 HG="${EPREFIX}/usr/bin/hg"
 EOF
-       doenvd "${T}/80mercurial"
+       doenvd "${T}/80mercurial" || die
 
        if use emacs; then
                elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!"
@@ -86,7 +86,7 @@ EOF
 }
 
 src_test() {
-       cd "${S}/tests/"
+       cd "${S}/tests/" || die
        rm -rf *svn*                            # Subversion tests fail with 1.5
        rm -f test-archive                      # Fails due to verbose tar output changes
        rm -f test-convert-baz*         # GNU Arch baz