Fixed #395029; removed "die" unneeded in EAPI 4

Package-Manager: portage-2.2.0_alpha81/cvs/Linux i686

diff --git a/dev-cpp/muParser/ChangeLog b/dev-cpp/muParser/ChangeLog
index d33bf2384a1b288e573f5f98346f130cf1d04ab8..bf327eff0e13e3bef54da7c6ea87c7b6d5ada473 100644 (file)
--- a/dev-cpp/muParser/ChangeLog
+++ b/dev-cpp/muParser/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-cpp/muParser
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/muParser/ChangeLog,v 1.20 2011/12/16 16:42:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/muParser/ChangeLog,v 1.21 2011/12/17 05:57:47 grozin Exp $
+
+  17 Dec 2011; Andrey Grozin <grozin@gentoo.org> muParser-2.1.0.ebuild:
+  Fixed #395029; removed "die" unneeded in EAPI 4
 
   16 Dec 2011; Agostino Sarubbo <ago@gentoo.org> muParser-1.34.ebuild:
   Stable for AMD64, wrt bug #393903

diff --git a/dev-cpp/muParser/Manifest b/dev-cpp/muParser/Manifest
index 4af4d8947ce94676f2af6d0d44a4a4184529f74a..83505470f62ab7f0793c8ae1feddf15695c29ce8 100644 (file)
--- a/dev-cpp/muParser/Manifest
+++ b/dev-cpp/muParser/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX muParser-1.28-destdir.patch 799 RMD160 542672389ffd3d88abc7f1b9f7b0c159808e3c90 SHA1 c8ca147ac760522a03497adf0bbf570645a1b670 SHA256 250cf7042d6cc484dc5811571c79b0027f46deac07393d97951a4a0907fadc8b
 AUX muParser-1.28-gcc43.patch 747 RMD160 e14dcb0d22e17a36c8c7c99104f7190a8a960834 SHA1 b9beddee8309a01c1e2de20848cbaa9992190679 SHA256 767ea424460f2c2e9fe33253f44655e47bfb5d8b32a606637bec8ec2302a773a
 AUX muParser-1.30-build.patch 1287 RMD160 cfe4b939f0a56ecfc5a77f0262d8724f77b7abf0 SHA1 dc07ec430d1fde3a56029b8bb0af2ced2891520f SHA256 dcb3f5a3f580508f72baaea148f69faf17c6aee086eb0b3f84f7f9ab8b3182f1
@@ -11,17 +8,6 @@ DIST muparser_v134.tar.gz 1013841 RMD160 ee7e0e4ebedde6368d1bfa100da23ac3ce94650
 DIST muparser_v2_1_0.zip 1465893 RMD160 cf52e9baca5a094bee00e5dafda4e8aa60f9f393 SHA1 797a45593e6edb86cb01f9dfe02e984849b96675 SHA256 4babb0cf4073943cb369cf78cb7a1b2c3188cdcf5406becf3b229509ce6bd17d
 EBUILD muParser-1.32-r1.ebuild 1283 RMD160 7a26b50086fd9c11c1e8cac79f3ba15b1b79c298 SHA1 5e570ead258f503bda58bb0143302735814e90fa SHA256 526307d1c184250152b66d335fb9e62173f02ef556c9540742129f3566ee5370
 EBUILD muParser-1.34.ebuild 1125 RMD160 07149f646db1071737954f9863134ce076388eb1 SHA1 6ab899954e45ba2d73765aa4afcfd6082140d16b SHA256 daeec5a1abc51a5f092aa2d07edab925ee2e1f85b67be0b2be882fd3fe4bea27
-EBUILD muParser-2.1.0.ebuild 1243 RMD160 57156f550dd1dbfd5f968a8807175ccac3b0d13b SHA1 e0e4931c34003b0440fde7334d390a185bd3e5c6 SHA256 69a97b89e5c3bfb320e626de908b084d5045939079166da10891e5ba845c7942
-MISC ChangeLog 2936 RMD160 802d8535fd21989160452fc74503d129dfa69b16 SHA1 6c8ded32219238dd43ee61010309abf5931cd4cc SHA256 702d11a48fe2a630c238e494fa8ddcc58cc7065de53c3a0b80a11ddb5258a11d
+EBUILD muParser-2.1.0.ebuild 1203 RMD160 c07f37ac3e20d31d3497157b8912b6cb342d77ff SHA1 d10691407f6272288721c4d629882c19c72009f7 SHA256 355b635d3ecf9257d3d1f8a54f91c204aca4ddf69e40e0250cc967f3ee495f02
+MISC ChangeLog 3062 RMD160 deaf530272a1f254f6cedf175ace2a1b5902345e SHA1 daa842d6f3aeb629f052dc64e9b0b9a128ce5241 SHA256 e25860504a285e5f25233ab1f50cf05a7f7bccad8f51b6ae889d28cb815e13dc
 MISC metadata.xml 371 RMD160 cf1f5ffe20bac0026d986b4629f1db0b32e1bf77 SHA1 a3fb90c57b2c5ced1868d4be2d88d3af6bc773cd SHA256 75fe203bdedd4e649cf290eeaaa575116a85ef7303f7663a3876accf1de2c4ba
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQEcBAEBCgAGBQJO63UFAAoJEOTDgjZ80txdD3QH/2mdTJQvxeTwGHxL9P+UwLHB
-Cc0LrHNPyXsNE8E6FtKNhymFqj5pbEKaKqjIzAfb4BKQjiiVt66ivT8oYd/gN3WT
-hEbVzMz7sBH7CVkIa4e9MzmWVU4X+yJUONGp5ipG/pKGldSDdmKBz+fopWwN12LK
-CGspojrjZ6gySKaQfmxRbFcKWp1eFDGuM+nhtuxZTYd2b9GWLcR2t/8XeDjxOv8X
-GKxXWybsYphm70lMzfvPXGYC3vFCm5gsWhGUtbaGgtm1a7M1HdLKf5j/NvudqNuA
-YD0/Y/jjBuvOmUj4wM0A8jmNvE1uNx88jt/smXc+hHzRDpYwkaaCJro/kqTdvnI=
-=sXCG
------END PGP SIGNATURE-----

diff --git a/dev-cpp/muParser/muParser-2.1.0.ebuild b/dev-cpp/muParser/muParser-2.1.0.ebuild
index b5245dd1a1e9559edcdefd823becfb407d887b82..fb33501343cedb7b8c138a9e1cb68476acf8fed1 100644 (file)
--- a/dev-cpp/muParser/muParser-2.1.0.ebuild
+++ b/dev-cpp/muParser/muParser-2.1.0.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-cpp/muParser/muParser-2.1.0.ebuild,v 1.2 2011/12/16 14:48:42 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/muParser/muParser-2.1.0.ebuild,v 1.3 2011/12/17 05:57:47 grozin Exp $
 
 EAPI=4
 
@@ -48,9 +48,9 @@ src_test() {
 
 src_install() {
        default
-       dodoc Changes.txt  Credits.txt || die "dodoc failed"
+       dodoc Changes.txt
        if use doc; then
                insinto /usr/share/doc/${PF}
-               doins -r docs/html || die
+               doins -r docs/html
        fi
 }