Add missing die: || "..." -> || die "..."

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.24-tuxonice-r9 i686

4 files changed, 23 insertions, 9 deletions

diff --git a/x11-misc/xvidcap/ChangeLog b/x11-misc/xvidcap/ChangeLog
index c6c54cf98bdb..8676874fcdbd 100644
--- a/x11-misc/xvidcap/ChangeLog
+++ b/x11-misc/xvidcap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xvidcap
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvidcap/ChangeLog,v 1.41 2008/04/13 23:27:54 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvidcap/ChangeLog,v 1.42 2008/06/29 07:48:22 tove Exp $
+
+  29 Jun 2008; Torsten Veller <tove@gentoo.org> xvidcap-1.1.6-r2.ebuild,
+  xvidcap-1.1.7_rc1.ebuild:
+  Add missing die: || "..." -> || die "..."
 
 *xvidcap-1.1.7_rc1 (13 Apr 2008)
 
diff --git a/x11-misc/xvidcap/Manifest b/x11-misc/xvidcap/Manifest
index a084d33531b5..86aa91694a7c 100644
--- a/x11-misc/xvidcap/Manifest
+++ b/x11-misc/xvidcap/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX xvidcap-1.1.6-ffmpeg.patch 426 RMD160 feb6301777033bc3ff18bbc73ac9fde1d50b85a1 SHA1 b1f3942b3addb454d3d5aadce4c89ed9eb774e8c SHA256 7de6304ece3db116174d59f1c61d020d334c7289584993c6d193c69980c37561
 AUX xvidcap-1.1.7_rc1-ffmpeg.patch 6973 RMD160 f20d8adadbc07df0230ee3304f596faceba57eac SHA1 33d16bb2ae95ab89b376c5b625001a65daa010f3 SHA256 886066f9c59c9323e3c0c52a56307c4f45adbe188d5f3f6baf69eff45f30833c
 AUX xvidcap-1.1.7_rc1-new-ffmpeg-headers.patch 1685 RMD160 2960af16c3f3170d1e1fddc9b5667d18fc981f1b SHA1 6f09848845416b04b526bf5dfb2e66c9ba5c97a0 SHA256 be990d311777f362625973fa633ee174eb8b0bb64fda6bf19953d37b633f9453
@@ -5,7 +8,14 @@ DIST xvidcap-1.1.4rc1.tar.gz 2642762 RMD160 9e0d13da57feb6991a6ebe0d42db399d97da
 DIST xvidcap-1.1.6.tar.gz 4298103 RMD160 d204c5285ad7d7926b844b543b6233c2adce5a0c SHA1 64a179c301a9b3d06fe47f596721033be9a1a305 SHA256 17ca7b7f8ce12f7e312b2abc2da7f381dc0e964cdac6312631cd7987f02b9fba
 DIST xvidcap-1.1.7rc1.tar.gz 4459712 RMD160 a2fb829fb4e7c220de6ffeea513dd995bf0fa340 SHA1 88d935ee17857b190454fbee11cd394f41af60c0 SHA256 487bf07b2f9ead6a59682d091081e47cfe4ca5777de32e6cec5bef55fa51c82f
 EBUILD xvidcap-1.1.4_rc1.ebuild 1051 RMD160 eacabe656a41c52448c1d956a90e8a149cb2504b SHA1 233d7ae0c015628fb776af0e907a067feb44ec22 SHA256 4cc37fd9c0ab83acd723bc3146c47c7cb6bea992791cb59c7b19dcc959308dfd
-EBUILD xvidcap-1.1.6-r2.ebuild 1300 RMD160 ac82088a47da81dafa73ad566cc2ab7e4b19bb86 SHA1 199d91006e42f03e5a040af074e2627198541d0b SHA256 a4c2e1e25bc9a08674714870f36cc3ea6fd56d7b69afee63a3ec4d27fd771aba
-EBUILD xvidcap-1.1.7_rc1.ebuild 1422 RMD160 7e87b09ffc78958142b87e326d3085e5d44b507a SHA1 6ec9f51fb8cd3ead10620efbdb4369a39eeb10d9 SHA256 623a17a2095a556d8d4038650c17c34fbbcafda3c8d53e76130066574da5f932
-MISC ChangeLog 6368 RMD160 000fd01402d085107476ec895cb097f19a3a7b28 SHA1 e792b9462a5d38b7d918081d980cc58553823f58 SHA256 47d2c484c93b32ae2100ab9d9c3d50b1a1c6a1111a70573f3b4ab07849605712
+EBUILD xvidcap-1.1.6-r2.ebuild 1304 RMD160 fb58d31b4775d67010d41c98fdb6a218677a39c8 SHA1 28e7ee9cba1dd258ffd53ec850b0ae20595b036c SHA256 024baa0f2efb5290e08630246bc524286cfd4a57e60b30d48c299e08c74852b7
+EBUILD xvidcap-1.1.7_rc1.ebuild 1424 RMD160 209624285b0bd14fb11777b9c71255469b9fead8 SHA1 b52bdb0aa6923d2d5274d3c963f2f14cacbd0d34 SHA256 ba7d0749ded22ff1b1f8a4588449e6650d188eb4416c497c4bda61021d849fa4
+MISC ChangeLog 6512 RMD160 d7898db04ac70a909761976b5d488652bc61f59a SHA1 bd53c27389ee17e1a4785acc3fe09147b570fdaf SHA256 3c77309b27303def9ad1620fbacdab1c3cb1cadc1315f60c442db92775975c7a
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkhnPk0ACgkQV3J2n04EauxPXwCglQ7acdUdk95kdTY3t7MDeNHR
+LO4AnjO1ZKfbMQS6R1siu6PYsURXg/2o
+=2C1Y
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/xvidcap/xvidcap-1.1.6-r2.ebuild b/x11-misc/xvidcap/xvidcap-1.1.6-r2.ebuild
index a59982f3f121..8f23e4299ddf 100644
--- a/x11-misc/xvidcap/xvidcap-1.1.6-r2.ebuild
+++ b/x11-misc/xvidcap/xvidcap-1.1.6-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvidcap/xvidcap-1.1.6-r2.ebuild,v 1.3 2007/06/30 09:53:08 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvidcap/xvidcap-1.1.6-r2.ebuild,v 1.4 2008/06/29 07:48:22 tove Exp $
 
 GCONF_DEBUG="no"
 
@@ -42,7 +42,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || "emake install failed."
+	emake DESTDIR="${D}" install || die "emake install failed."
 
 	# Almost like bug #58322 but directory name changed.
 	rm -rf "${D}"/usr/share/doc/${PN}
diff --git a/x11-misc/xvidcap/xvidcap-1.1.7_rc1.ebuild b/x11-misc/xvidcap/xvidcap-1.1.7_rc1.ebuild
index 2b40f101fadf..e4e385f19c73 100644
--- a/x11-misc/xvidcap/xvidcap-1.1.7_rc1.ebuild
+++ b/x11-misc/xvidcap/xvidcap-1.1.7_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvidcap/xvidcap-1.1.7_rc1.ebuild,v 1.1 2008/04/13 23:27:54 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvidcap/xvidcap-1.1.7_rc1.ebuild,v 1.2 2008/06/29 07:48:22 tove Exp $
 
 GCONF_DEBUG="no"
 
@@ -47,7 +47,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || "emake install failed."
+	emake DESTDIR="${D}" install || die "emake install failed."
 
 	# Almost like bug #58322 but directory name changed.
 	rm -rf "${D}"/usr/share/doc/${PN}