Don't call die() in subshell.

Package-Manager: portage-HEAD/cvs/Linux x86_64

diff --git a/dev-lang/swig/Manifest b/dev-lang/swig/Manifest
index 761915a55758045d77d3621d8666d7cf48abc4fb..05b800093f83566e47af4be2fb7eed444a74dc1e 100644 (file)
--- a/dev-lang/swig/Manifest
+++ b/dev-lang/swig/Manifest
@@ -15,7 +15,7 @@ EBUILD swig-1.3.35.ebuild 1978 RMD160 4a108300ccb47e6889d1e960314021322fcb0d91 S
 EBUILD swig-1.3.36.ebuild 2115 RMD160 4e8d579fe0aa5e2536774419fd811ad8db19a12e SHA1 a2452157c294d787a42d04a50436e136d384ee00 SHA256 600be03ad0dc2c4e2ca07e77880742ec03a83ae88b6bf2306834728237a3dea7
 EBUILD swig-1.3.38.ebuild 1355 RMD160 6333306adbd65d4e8955cde78c2120264b9bd605 SHA1 9c2088651f4f313958fd63c04dd8541a2e2980bd SHA256 156980df231184a034ef75cfe5ef429dd99fd00a88790a420f06ddfa663ccaf0
 EBUILD swig-1.3.39.ebuild 694 RMD160 4419b90b49566208cad69a46f1779a32b752e575 SHA1 b31874ee2a76d624e8b71337f9f65f145cc81147 SHA256 d99a387e6bfef1adc503e7e35e8db1d75537bb988059e8f91319a32d189bcda5
-EBUILD swig-1.3.40-r1.ebuild 1458 RMD160 167b5de6d09d5b03128cd7550cb3e310dfaa5ff0 SHA1 35eea989ed37df52f69b47d9de9ab39b7867ef58 SHA256 e5695e18398eb296b688966e6a18879483cdb319ef7ff185021b1126f6463eb1
+EBUILD swig-1.3.40-r1.ebuild 1461 RMD160 20206288a9da22d107cc64ef49002bb4f6357d99 SHA1 3d4f5bf2ee1c5c8b230700a6eb1251856ccb7eaf SHA256 77832ba26ac683f4f717271e228d87117cb7576465b93d78d8893803817e692c
 EBUILD swig-1.3.40.ebuild 809 RMD160 bd5a8918d1a40b2e1656c88e43c9ac854f08b068 SHA1 5d887de572f96cc9a9e5b5c8fe306d077439609d SHA256 908e85a396ada676ef14f3841dacf00cd12910feae13c6a583e1c0e24b662226
 MISC ChangeLog 16174 RMD160 e77e18fcb7bd8f401b079e88a32645d0185721a1 SHA1 f8608e3beb755d787f117a7a5bd33f0a5d043de8 SHA256 26e52f90d4919d68f8c7b9523e7ed8fbc5a32bb8eebed38ac9674765b84ae46b
 MISC metadata.xml 1168 RMD160 c3678cd8d1c6badf979ba15ec3b70b351052c93e SHA1 c8710cc9c3446076d7797c29c44d217203aa6dc6 SHA256 8f32706e4f02702197e49fa79085ee1f60503848725a2748eeaa218d56a3a82b

diff --git a/dev-lang/swig/swig-1.3.40-r1.ebuild b/dev-lang/swig/swig-1.3.40-r1.ebuild
index 60df38321b9db67f77e718c8715463f72e45965e..25a923e807fe814dfad2f4605003f9cd159c663f 100644 (file)
--- a/dev-lang/swig/swig-1.3.40-r1.ebuild
+++ b/dev-lang/swig/swig-1.3.40-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swig/swig-1.3.40-r1.ebuild,v 1.2 2010/04/16 07:28:28 pchrist Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swig/swig-1.3.40-r1.ebuild,v 1.3 2010/04/16 13:42:20 arfrever Exp $
 
 EAPI="3"
 #inherit autotools #mono #48511
@@ -36,8 +36,8 @@ src_test() {
 
 src_install() {
        emake DESTDIR="${D}" install || die "target install failed"
-       dodoc ANNOUNCE CHANGES CHANGES.current FUTURE NEW README TODO \
-       || die "dodoc failed"
-       use doc && ( dohtml -r Doc/{Devel,Manual} \
-       || die "Failed to install html documentation" )
+       dodoc ANNOUNCE CHANGES CHANGES.current FUTURE NEW README TODO || die "dodoc failed"
+       if use doc; then
+               dohtml -r Doc/{Devel,Manual} || die "Failed to install html documentation"
+       fi
 }