From de0847d07aaf9e70e9794421eb7789ceb0b44d55 Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
Date: Tue, 23 Mar 2010 13:55:00 +0000
Subject: [PATCH] python_generate_wrapper_scripts() and
 python_execute_function() internally call die(). Package-Manager:
 portage-15841-svn/cvs/Linux x86_64

---
 app-portage/metagen/Manifest             | 12 +-----------
 app-portage/metagen/metagen-0.5.1.ebuild |  8 +++-----
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/app-portage/metagen/Manifest b/app-portage/metagen/Manifest
index a9a13621b3f6..7852d1d28050 100644
--- a/app-portage/metagen/Manifest
+++ b/app-portage/metagen/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST metagen-0.3.tar.bz2 3590 RMD160 dea3dd9ebe3c82838eee05acdf4bf42ba69da7e0 SHA1 d5ad3b2ac4d6bd3464a2ca11cb739eb7ec5d5968 SHA256 8c2f53a07695df94db3020892f6279785838003b643baab49f0e30932f33a776
 DIST metagen-0.5.1.tar.gz 6025 RMD160 281bb72e205ec1278937f89997658885c2527035 SHA1 212654f488cb3e1692b41d8ca4c513b1e43f86bd SHA256 3d5c81ccc781af93f135e50cd9a426469cce5efa658ab90b82c5b2700ee3ba84
 DIST metagen-0.5.tbz2 7116 RMD160 d9e15107bff6533f11f6d1ad365760ca46804588 SHA1 5608d8a15f7227c6bb54c5f0fede26dd0676e3b5 SHA256 499c3ec42688b8cdd56e77bc74dbdb18c34a55b8b9a945034b0f20975deaf4d3
 EBUILD metagen-0.3.ebuild 776 RMD160 5c43fb74a7e4aea198c4d6a256a958bbb2773d8a SHA1 2dea19727db5d510799fe1f3c40f4c87fd322a7b SHA256 425241d0af761bdb62575ee03adf767066631ac2c31e6390f198f36feae23da6
-EBUILD metagen-0.5.1.ebuild 1221 RMD160 a5d9055e28b9ed6f438634c5aed77fda60c8788a SHA1 d83c30d39e8f93997e8faea4f887d46966b0c006 SHA256 80efad87dd16123548a0967e135f29d7cc1bd4153b2069c2ae08734370930e3e
+EBUILD metagen-0.5.1.ebuild 1133 RMD160 08ba76874f341d01203a7a501f32ab1dd08a79e4 SHA1 6941172595e2e6e98843a9adeee899b74144fe86 SHA256 1854d4f55842093bff9883516f82cd5218d5e47db6830712a5d547f9f4029570
 EBUILD metagen-0.5.ebuild 982 RMD160 5e8e24dda3770fda73e3a5b6327040c32287fd76 SHA1 e4eea5e3cc84ee7446b63b8f89fc50b85a852226 SHA256 0367346315a1e55a1e557855505169b45573daf10a7cc5296b2c7875e501f458
 EBUILD metagen-9999.ebuild 1112 RMD160 542ba949748f69a1d662511e96e07023a0687ab9 SHA1 c8c54e473e3f2b2234d697e1f7034d7e4402e82f SHA256 4ddf96aa9010baf914d6b4b5b3f0081d5672f91c51de846e254334cc3b3cc200
 MISC ChangeLog 2209 RMD160 419d6094ba6ccc589fdbaab35440fceb37b0f8ae SHA1 34b7f852d7531ebb8535b6cc80c3ba0348edfe98 SHA256 3ad017a583c7b876b1cc72cb997da42a92efeb9587cfccedf433ecb77d1f44a2
 MISC metadata.xml 513 RMD160 59df4ce739f7b3ddad362b0ef586ee4755a114c4 SHA1 ff0ae17355ee98a8e48cbb1ce5c815a70d93dd0b SHA256 b0a9fe175fd33e9326250b027559b8d90c1a640ab63b53c6a238a791376d9df5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkuoQYgACgkQdIssYB9vBoMoWwCfUPsrklYOkga7UTyDKl5m/SCX
-QCsAn18Prul7G3WwQqHZMtTi9DzB/2+i
-=QwkG
------END PGP SIGNATURE-----
diff --git a/app-portage/metagen/metagen-0.5.1.ebuild b/app-portage/metagen/metagen-0.5.1.ebuild
index 58301f27b5ed..c3c2753e3c79 100644
--- a/app-portage/metagen/metagen-0.5.1.ebuild
+++ b/app-portage/metagen/metagen-0.5.1.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/app-portage/metagen/metagen-0.5.1.ebuild,v 1.1 2010/03/23 05:18:31 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/metagen/metagen-0.5.1.ebuild,v 1.2 2010/03/23 13:55:00 arfrever Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
@@ -30,8 +30,7 @@ src_install() {
 
 	python_execute_function metagen_install
 
-	python_generate_wrapper_scripts "${D}"/usr/bin/${PN} \
-		|| die 'python_generate_wrapper_scripts failed'
+	python_generate_wrapper_scripts "${D}"/usr/bin/${PN}
 
 	doman "docs/metagen.1"
 }
@@ -39,8 +38,7 @@ src_install() {
 src_test() {
 	einfo "Starting tests..."
 	testing() {
-		$(PYTHON) -c "from metagen import metagenerator; metagenerator.do_tests()" \
-			|| die "metagen tests failed"
+		$(PYTHON) -c "from metagen import metagenerator; metagenerator.do_tests()"
 	}
 	python_execute_function testing
 	einfo "Tests completed."
-- 
2.26.2